@expressots/cli 3.0.0 → 4.0.0-preview.3

package/bin/cli.js

@@ -5,11 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BUNDLE_VERSION = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
 const chalk_1 = __importDefault(require("chalk"));
-const process_1 = require("process");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
 const project_commands_1 = require("./commands/project.commands");
+const containerize_1 = require("./containerize");
+const cicd_1 = require("./cicd");
+const migrate_1 = require("./migrate");
+const profile_1 = require("./profile");
+const dev_1 = require("./dev");
+const costs_1 = require("./costs");
+const templates_1 = require("./templates");
 const generate_1 = require("./generate");
 const cli_1 = require("./help/cli");
 const info_1 = require("./info");
@@ -17,13 +25,60 @@ const new_1 = require("./new");
 const providers_1 = require("./providers");
 const cli_2 = require("./providers/create/cli");
 const cli_ui_1 = require("./utils/cli-ui");
+const main_help_1 = require("./help/main-help");
+const command_help_registry_1 = require("./help/command-help-registry");
 const scripts_1 = require("./scripts");
+const studio_1 = require("./studio");
 /**
  * The current version of the ExpressoTS Bundle.
- * core, adapters, and cli.
+ * Derived from this CLI package's own package.json — single source of truth.
+ * The compiled binary lives at `bin/cli.js`, so the package.json is one
+ * directory above `__dirname`. When running from source via tsx the layout
+ * is `src/cli.ts` -> `../package.json`, which still resolves correctly.
  */
-exports.BUNDLE_VERSION = "3.0.0";
-process_1.stdout.write(`\n${[chalk_1.default.bold.green("🐎 Expressots")]}\n\n`);
+function readBundleVersion() {
+    try {
+        const pkgPath = (0, path_1.resolve)(__dirname, "..", "package.json");
+        const pkg = JSON.parse((0, fs_1.readFileSync)(pkgPath, "utf8"));
+        if (typeof pkg.version === "string" && pkg.version.length > 0) {
+            return pkg.version;
+        }
+    }
+    catch {
+        // fall through to the safe default below
+    }
+    return "0.0.0";
+}
+exports.BUNDLE_VERSION = readBundleVersion();
+// Respect the NO_COLOR convention (https://no-color.org). chalk v4 does
+// not auto-detect this, so we disable color output explicitly when the
+// variable is present (regardless of its value).
+if (process.env.NO_COLOR !== undefined) {
+    chalk_1.default.level = 0;
+}
+// Intercept the *top-level* help (and the bare no-command invocation)
+// to render our refined, grouped help screen instead of the sprawling
+// default yargs output. Per-command help (e.g. `new --help`) is left to
+// yargs so its rich, command-specific epilogs still work.
+const cliArgs = (0, helpers_1.hideBin)(process.argv);
+const TOP_LEVEL_HELP_TOKENS = new Set(["help", "--help", "-h"]);
+const isTopLevelHelp = cliArgs.length === 0 ||
+    (cliArgs.length === 1 && TOP_LEVEL_HELP_TOKENS.has(cliArgs[0]));
+if (isTopLevelHelp) {
+    (0, main_help_1.printMainHelp)(exports.BUNDLE_VERSION);
+    process.exit(0);
+}
+// Intercept per-command help (e.g. `costs --help`) for commands that have a
+// registered spec, rendering the same refined, grouped screen as the rest of
+// the CLI. Commands without a spec fall through to yargs' default help.
+if ((0, command_help_registry_1.tryPrintCommandHelp)(cliArgs, exports.BUNDLE_VERSION)) {
+    process.exit(0);
+}
+// Only show the banner in interactive terminals. When output is piped
+// (CI, file redirection, shell completion), the header would be noise.
+if (process.stdout.isTTY) {
+    (0, cli_ui_1.printHeader)(exports.BUNDLE_VERSION);
+}
 (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .scriptName("expressots")
     .command((0, new_1.createProject)())
@@ -34,9 +89,18 @@ process_1.stdout.write(`\n${[chalk_1.default.bold.green("🐎 Expressots")]}\n\n
     .command((0, providers_1.addProviderCMD)())
     .command((0, providers_1.removeProviderCMD)())
     .command((0, generate_1.generateProject)())
+    .command((0, containerize_1.containerize)())
+    .command((0, cicd_1.cicdCommand)())
+    .command((0, migrate_1.migrateCommand)())
+    .command((0, profile_1.profileCommand)())
+    .command((0, dev_1.devContainerCommand)())
+    .command((0, costs_1.costsCommand)())
+    .command((0, templates_1.templatesCommand)())
     .command((0, scripts_1.scriptsCommand)())
+    .command((0, studio_1.studioCommand)())
     .command((0, info_1.infoProject)())
     .command((0, cli_1.helpCommand)())
+    .completion("completion", "Generate a shell completion script (bash/zsh)")
     .demandCommand(1, "You need at least one command before moving on")
     .strict()
     .fail((msg, err, yargs) => {
@@ -64,10 +128,11 @@ process_1.stdout.write(`\n${[chalk_1.default.bold.green("🐎 Expressots")]}\n\n
     process.exit(1);
 })
     .epilog(`${chalk_1.default.bold.green("For more information:")} \n\n` +
-    "🌐 visit:\t https://expresso-ts.com\n" +
-    "💖 Sponsor:\t https://github.com/sponsors/expressots")
+    `${"🌐 visit:".padEnd(12)} https://expresso-ts.com\n` +
+    `${"💖 Sponsor:".padEnd(12)} https://github.com/sponsors/expressots`)
     .help("help", "Show command help")
     .alias("h", "help")
-    .version(false)
+    .version(exports.BUNDLE_VERSION)
+    .alias("V", "version")
     .wrap(140)
     .parse();

package/bin/commands/project.commands.d.ts

@@ -1,10 +1,18 @@
 import { CommandModule } from "yargs";
+/**
+ * Dev command options interface
+ */
+interface DevCommandOptions {
+    container?: boolean;
+    build?: boolean;
+    detach?: boolean;
+}
 /**
  * Dev command module
- * @type {CommandModule<object, object>}
+ * @type {CommandModule<object, DevCommandOptions>}
  * @returns The command module
  */
-export declare const devCommand: CommandModule<object, object>;
+export declare const devCommand: CommandModule<object, DevCommandOptions>;
 /**
  * Build command module
  * @type {CommandModule<object, object>}
@@ -18,9 +26,14 @@ export declare const buildCommand: CommandModule<object, object>;
  */
 export declare const prodCommand: CommandModule<object, object>;
 /**
- * Helper function to run a command
- * @param command The command to run
+ * Run command options
  */
-export declare const runCommand: ({ command, }: {
+interface RunCommandOptions {
     command: string;
-}) => Promise<void>;
+}
+/**
+ * Helper function to run a command
+ * @param options The command options
+ */
+export declare const runCommand: ({ command, }: RunCommandOptions) => Promise<void>;
+export {};