feat: move cli code to commandkit

Author: twlite

packages/commandkit/bin/index.mjs

@@ -1,53 +1,5 @@
 #!/usr/bin/env node
 
-// @ts-check
+import { bootstrapCommandkitCLI } from '../dist/index.mjs'
 
-import { Command } from 'commander';
-import { bootstrapDevelopmentServer } from './development.mjs';
-import { bootstrapProductionServer } from './production.mjs';
-import { bootstrapProductionBuild } from './build.mjs';
-
-const program = new Command('commandkit');
-
-program
-  .command('dev')
-  .description('Start your bot in development mode.')
-  .option(
-    '-c, --config <path>',
-    'Path to your commandkit config file.',
-    './commandkit.js',
-  )
-  .action(() => {
-    const options = program.opts();
-    bootstrapDevelopmentServer(options);
-  });
-
-program
-  .command('start')
-  .description(
-    'Start your bot in production mode after running the build command.',
-  )
-  .option(
-    '-c, --config <path>',
-    'Path to your commandkit.json file.',
-    './commandkit.js',
-  )
-  .action(() => {
-    const options = program.opts();
-    bootstrapProductionServer(options.config);
-  });
-
-program
-  .command('build')
-  .description('Build your project for production usage.')
-  .option(
-    '-c, --config <path>',
-    'Path to your commandkit.json file.',
-    './commandkit.json',
-  )
-  .action(() => {
-    const options = program.opts();
-    bootstrapProductionBuild(options.config);
-  });
-
-program.parse(process.argv);
+await bootstrapCommandkitCLI(process.argv);

packages/commandkit/package.json

@@ -7,18 +7,6 @@
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "bin": "./bin/index.mjs",
-  "exports": {
-    ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
-    },
-    "./cli": {
-      "require": "./dist/environment/cli.js",
-      "import": "./dist/environment/cli.mjs",
-      "types": "./dist/environment/cli.d.ts"
-    }
-  },
   "files": [
     "dist",
     "bin"
@@ -55,6 +43,8 @@
     "tsup": "^8.3.5"
   },
   "devDependencies": {
+    "@types/babel__generator": "^7.6.8",
+    "@types/babel__traverse": "^7.20.6",
     "@types/ms": "^0.7.34",
     "@types/node": "^22.10.2",
     "@types/yargs": "^17.0.32",
@@ -71,4 +61,4 @@
   "engines": {
     "node": ">=22"
   }
-}
+}

packages/commandkit/bin/build.mjs renamed to packages/commandkit/src/cli/build.ts

@@ -3,17 +3,11 @@
 import { readFile, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { build } from 'tsup';
-import {
-  Colors,
-  erase,
-  findCommandKitConfig,
-  panic,
-  write,
-} from './common.mjs';
+import { Colors, erase, findCommandKitConfig, panic, write } from './common.js';
 import ora from 'ora';
-import { commandkitPlugin } from './esbuild-plugins/plugin.mjs';
+import { commandkitPlugin } from './esbuild-plugins/plugin';
 
-export async function bootstrapProductionBuild(config) {
+export async function bootstrapProductionBuild(config: any) {
   const {
     sourcemap = false,
     minify = false,
@@ -72,7 +66,12 @@ export async function bootstrapProductionBuild(config) {
   }
 }
 
-export async function injectShims(outDir, main, antiCrash, polyfillRequire) {
+export async function injectShims(
+  outDir: string,
+  main: string,
+  antiCrash: boolean,
+  polyfillRequire: boolean,
+) {
   const path = join(process.cwd(), outDir, main);
 
   const head = ['\n\n;await (async()=>{', "  'use strict';"].join('\n');

packages/commandkit/bin/common.mjs renamed to packages/commandkit/src/cli/common.ts

@@ -7,42 +7,42 @@ import fs from 'node:fs';
 const resetColor = '\x1b[0m';
 
 export const Colors = {
-  reset: (text) => `${text}${resetColor}`,
-  bright: (text) => `\x1b[1m${text}${resetColor}`,
-  dim: (text) => `\x1b[2m${text}${resetColor}`,
-  underscore: (text) => `\x1b[4m${text}${resetColor}`,
-  blink: (text) => `\x1b[5m${text}${resetColor}`,
-  reverse: (text) => `\x1b[7m${text}${resetColor}`,
-  hidden: (text) => `\x1b[8m${text}${resetColor}`,
-
-  black: (text) => `\x1b[30m${text}${resetColor}`,
-  red: (text) => `\x1b[31m${text}${resetColor}`,
-  green: (text) => `\x1b[32m${text}${resetColor}`,
-  yellow: (text) => `\x1b[33m${text}${resetColor}`,
-  blue: (text) => `\x1b[34m${text}${resetColor}`,
-  magenta: (text) => `\x1b[35m${text}${resetColor}`,
-  cyan: (text) => `\x1b[36m${text}${resetColor}`,
-  white: (text) => `\x1b[37m${text}${resetColor}`,
-
-  bgBlack: (text) => `\x1b[40m${text}${resetColor}`,
-  bgRed: (text) => `\x1b[41m${text}${resetColor}`,
-  bgGreen: (text) => `\x1b[42m${text}${resetColor}`,
-  bgYellow: (text) => `\x1b[43m${text}${resetColor}`,
-  bgBlue: (text) => `\x1b[44m${text}${resetColor}`,
-  bgMagenta: (text) => `\x1b[45m${text}${resetColor}`,
-  bgCyan: (text) => `\x1b[46m${text}${resetColor}`,
-  bgWhite: (text) => `\x1b[47m${text}${resetColor}`,
+  reset: (text: string) => `${text}${resetColor}`,
+  bright: (text: string) => `\x1b[1m${text}${resetColor}`,
+  dim: (text: string) => `\x1b[2m${text}${resetColor}`,
+  underscore: (text: string) => `\x1b[4m${text}${resetColor}`,
+  blink: (text: string) => `\x1b[5m${text}${resetColor}`,
+  reverse: (text: string) => `\x1b[7m${text}${resetColor}`,
+  hidden: (text: string) => `\x1b[8m${text}${resetColor}`,
+
+  black: (text: string) => `\x1b[30m${text}${resetColor}`,
+  red: (text: string) => `\x1b[31m${text}${resetColor}`,
+  green: (text: string) => `\x1b[32m${text}${resetColor}`,
+  yellow: (text: string) => `\x1b[33m${text}${resetColor}`,
+  blue: (text: string) => `\x1b[34m${text}${resetColor}`,
+  magenta: (text: string) => `\x1b[35m${text}${resetColor}`,
+  cyan: (text: string) => `\x1b[36m${text}${resetColor}`,
+  white: (text: string) => `\x1b[37m${text}${resetColor}`,
+
+  bgBlack: (text: string) => `\x1b[40m${text}${resetColor}`,
+  bgRed: (text: string) => `\x1b[41m${text}${resetColor}`,
+  bgGreen: (text: string) => `\x1b[42m${text}${resetColor}`,
+  bgYellow: (text: string) => `\x1b[43m${text}${resetColor}`,
+  bgBlue: (text: string) => `\x1b[44m${text}${resetColor}`,
+  bgMagenta: (text: string) => `\x1b[45m${text}${resetColor}`,
+  bgCyan: (text: string) => `\x1b[46m${text}${resetColor}`,
+  bgWhite: (text: string) => `\x1b[47m${text}${resetColor}`,
 };
 
-export function write(message) {
+export function write(message: any) {
   process.stdout.write(message);
   process.stdout.write('\n');
 }
 
 /**
  * @returns {never}
  */
-export function panic(message) {
+export function panic(message: any) {
   write(Colors.red(`Error: ${message}`));
   process.exit(1);
 }
@@ -72,7 +72,7 @@ const possibleFileNames = [
   'commandkit.cts',
 ];
 
-export async function findCommandKitConfig(src) {
+export async function findCommandKitConfig(src: string) {
   const cwd = process.cwd();
   const locations = src
     ? [join(cwd, src)]
@@ -89,7 +89,7 @@ export async function findCommandKitConfig(src) {
   panic(`Could not locate commandkit config from ${cwd}`);
 }
 
-function ensureTypeScript(target) {
+function ensureTypeScript(target: string) {
   const isTypeScript = /\.(c|m)tsx?$/.test(target);
 
   if (isTypeScript && !process.features.typescript) {
@@ -99,7 +99,7 @@ function ensureTypeScript(target) {
   }
 }
 
-async function loadConfigInner(target) {
+async function loadConfigInner(target: string) {
   const isJSON = target.endsWith('.json');
 
   await ensureExists(target);
@@ -109,17 +109,18 @@ async function loadConfigInner(target) {
   /**
    * @type {import('..').CommandKitConfig}
    */
+  // @ts-ignore
   const config = await import(`file://${target}`, {
     assert: isJSON ? { type: 'json' } : undefined,
   }).then((conf) => conf.default || conf);
 
   return config;
 }
 
-async function ensureExists(loc) {
+async function ensureExists(loc: string) {
   await fs.promises.access(loc, fs.constants.F_OK);
 }
 
-export function erase(dir) {
+export function erase(dir: string) {
   rimrafSync(dir);
 }

packages/commandkit/bin/development.mjs renamed to packages/commandkit/src/cli/development.ts

@@ -2,23 +2,17 @@
 import { config as dotenv } from 'dotenv';
 import { join } from 'node:path';
 import { build } from 'tsup';
-import {
-  Colors,
-  erase,
-  findCommandKitConfig,
-  panic,
-  write,
-} from './common.mjs';
-import { parseEnv } from './parse-env.mjs';
+import { Colors, erase, findCommandKitConfig, panic, write } from './common';
+import { parseEnv } from './parse-env';
 import child_process from 'node:child_process';
 import ora from 'ora';
-import { injectShims } from './build.mjs';
-import { commandkitPlugin } from './esbuild-plugins/plugin.mjs';
+import { injectShims } from './build';
+import { commandkitPlugin } from './esbuild-plugins/plugin';
 
 const RESTARTING_MSG_PATTERN = /^Restarting '|".+'|"\n?$/;
 const FAILED_RUNNING_PATTERN = /^Failed running '.+'|"\n?$/;
 
-export async function bootstrapDevelopmentServer(opts) {
+export async function bootstrapDevelopmentServer(opts: any) {
   const {
     src,
     main,
@@ -93,7 +87,6 @@ export async function bootstrapDevelopmentServer(opts) {
 
     const env = dotenv({
       path: join(process.cwd(), '.env'),
-      // @ts-expect-error
       processEnv,
     });
 
@@ -109,25 +102,23 @@ export async function bootstrapDevelopmentServer(opts) {
       write(Colors.blue('[DOTENV] Loaded .env file!'));
     }
 
-    /**
-     * @type {child_process.ChildProcessWithoutNullStreams}
-     */
-    const ps = child_process.spawn(
-      'node',
-      [...nodeOptions, join(process.cwd(), '.commandkit', main)],
-      {
-        env: {
-          ...process.env,
-          ...processEnv,
-          NODE_ENV: 'development',
-          // @ts-expect-error
-          COMMANDKIT_DEV: true,
-          // @ts-expect-error
-          COMMANDKIT_PRODUCTION: false,
+    const ps: child_process.ChildProcessWithoutNullStreams =
+      child_process.spawn(
+        'node',
+        [...nodeOptions, join(process.cwd(), '.commandkit', main)],
+        {
+          env: {
+            ...process.env,
+            ...processEnv,
+            NODE_ENV: 'development',
+            // @ts-expect-error
+            COMMANDKIT_DEV: true,
+            // @ts-expect-error
+            COMMANDKIT_PRODUCTION: false,
+          },
+          cwd: process.cwd(),
         },
-        cwd: process.cwd(),
-      },
-    );
+      );
 
     let isLastLogRestarting = false,
       hasStarted = false;
@@ -182,6 +173,6 @@ export async function bootstrapDevelopmentServer(opts) {
     status.fail(
       `Error occurred after ${(performance.now() - start).toFixed(2)}ms!\n`,
     );
-    panic(e.stack ?? e);
+    panic(e instanceof Error ? e.stack : e);
   }
 }