@catladder/cli 0.0.0-new-cli-52525b58 → 0.0.0-new-cli-51a5f8b1

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-new-cli-52525b58",
+  "version": "0.0.0-new-cli-51a5f8b1",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/adapters/baseContext.ts

@@ -4,6 +4,7 @@ import type {
   InputDef,
   InputResultType,
   InputsSchema,
+  OptionalInput,
 } from "../core/types";
 
 /**
@@ -32,7 +33,7 @@ export abstract class BaseContext<TInputs extends InputsSchema>
 
   get<K extends keyof TInputs & string>(
     name: K,
-  ): Promise<InputResultType<TInputs[K]>> {
+  ): Promise<OptionalInput<TInputs[K]>> {
     if (!this.cache.has(name)) {
       const spec = this.command.inputs[name];
       if (!spec) {
@@ -42,7 +43,19 @@ export abstract class BaseContext<TInputs extends InputsSchema>
           ),
         );
       }
-      this.cache.set(name, this.resolveInput(name, spec));
+      // For optional inputs (required: false), catch MissingInputError
+      // and return undefined instead of prompting
+      if (spec.required === false) {
+        this.cache.set(
+          name,
+          this.resolveInput(name, spec).catch((err) => {
+            if (err?.name === "MissingInputError") return undefined;
+            throw err;
+          }),
+        );
+      } else {
+        this.cache.set(name, this.resolveInput(name, spec));
+      }
     }
     return this.cache.get(name)!;
   }

package/src/catenv.ts

@@ -11,13 +11,20 @@ program
   .version(packageInfos.version)
   .argument("[envComponent]", "env or env:component")
   .option("-v, --verbose", "verbose output")
-  .action((envComponent: string | undefined, opts: { verbose?: boolean }) => {
-    catenv(envComponent ? parseChoice(envComponent) : null, {
-      verbose: opts.verbose ?? false,
-    }).then(() => {
-      // we have to exit manually, because we have some file watches
-      process.exit();
-    });
-  });
+  .option("-p, --print-variables", "print variables")
+  .action(
+    (
+      envComponent: string | undefined,
+      opts: { verbose?: boolean; printVariables?: boolean },
+    ) => {
+      catenv(envComponent ? parseChoice(envComponent) : null, {
+        verbose: opts.verbose ?? false,
+        printVariables: opts.printVariables ?? false,
+      }).then(() => {
+        // we have to exit manually, because we have some file watches
+        process.exit();
+      });
+    },
+  );
 
 program.parse();

package/src/cli.ts

@@ -188,8 +188,13 @@ const completionCmd = program
 completionCmd
   .command("zsh")
   .description("output zsh completion script")
-  .action(() => {
-    const binaryName = process.argv[1].split("/").pop() ?? "catladder";
+  .option(
+    "--command <cmd>",
+    "command used to invoke the CLI (e.g. 'yarn catladder')",
+  )
+  .action((opts: { command?: string }) => {
+    const binaryName =
+      opts.command ?? process.argv[1].split("/").pop() ?? "catladder";
     console.log(generateZshCompletionScript(binaryName));
   });
 

package/src/commands/cloudSQL/commandRestoreDb.ts

@@ -8,7 +8,7 @@ export const commandRestoreDb = defineCommand({
   description: "restore a db from one source to another target",
   group: "cloudSQL",
   inputs: {
-    sourceInstance: {
+    source: {
       type: "string",
       message: "Source instance (connection string or 'local')? 🤔 ",
     },
@@ -24,7 +24,7 @@ export const commandRestoreDb = defineCommand({
     },
     sourcePassword: { type: "string", message: "Source Password? 🤔 " },
     sourceDbName: { type: "string", message: "Source DB name? 🤔 " },
-    targetInstance: {
+    target: {
       type: "string",
       message: "Target INSTANCE (connection string or 'local')? 🤔  ",
     },
@@ -42,19 +42,19 @@ export const commandRestoreDb = defineCommand({
     targetDbName: { type: "string", message: "Target DB name? 🤔 " },
   },
   execute: async (ctx) => {
-    const sourceInstance = await ctx.get("sourceInstance");
+    const source = await ctx.get("source");
 
     let sourceProxy: CloudSqlBackgroundProxy;
     let targetProxy: CloudSqlBackgroundProxy;
     let sourcePort: number;
     let targetPort: number;
 
-    if (sourceInstance === "local") {
+    if (source === "local") {
       sourcePort = await ctx.get("sourceLocalPort");
     } else {
       sourcePort = 54399;
       sourceProxy = await startCloudSqlProxyInBackground({
-        instanceName: sourceInstance,
+        instanceName: source,
         localPort: sourcePort,
       });
     }
@@ -63,14 +63,14 @@ export const commandRestoreDb = defineCommand({
     const sourcePassword = await ctx.get("sourcePassword");
     const sourceDbName = await ctx.get("sourceDbName");
 
-    const targetInstance = await ctx.get("targetInstance");
+    const target = await ctx.get("target");
 
-    if (targetInstance === "local") {
+    if (target === "local") {
       targetPort = await ctx.get("targetLocalPort");
     } else {
       targetPort = 54499;
       targetProxy = await startCloudSqlProxyInBackground({
-        instanceName: targetInstance,
+        instanceName: target,
         localPort: targetPort,
       });
     }
@@ -80,7 +80,7 @@ export const commandRestoreDb = defineCommand({
     const targetDbName = await ctx.get("targetDbName");
 
     const shouldContinue = await ctx.confirm(
-      `This will drop ${targetInstance}/${targetDbName} and replace it with ${sourceInstance}/${sourceDbName}. Continue? 🤔 `,
+      `This will drop ${target}/${targetDbName} and replace it with ${source}/${sourceDbName}. Continue? 🤔 `,
     );
     if (!shouldContinue) {
       return;

package/src/commands/project/commandConfigSecrets.ts

@@ -15,6 +15,7 @@ export const commandConfigSecrets = defineCommand({
       type: "string",
       message: "environment:component",
       positional: true,
+      required: false,
       choices: async () => envAndComponents(),
     },
   },

package/src/commands/project/commandSetup.ts

@@ -7,7 +7,12 @@ export const commandSetup = defineCommand({
     "Initializes all environments and creates required resources, service accounts, etc.",
   group: "project",
   inputs: {
-    component: { type: "string", message: "component name", positional: true },
+    component: {
+      type: "string",
+      message: "component name",
+      positional: true,
+      required: false,
+    },
   },
   execute: async (ctx) => {
     const component = await ctx.get("component");

package/src/completion.ts

@@ -142,11 +142,15 @@ async function resolveChoicesForCompletion(
 
 /**
  * Generate the zsh completion script.
- * The user adds `eval "$(catladder completion zsh)"` to their .zshrc.
+ * Supports both direct invocation (`catladder`) and prefixed (`yarn catladder`).
  */
-export function generateZshCompletionScript(binaryName: string): string {
-  const funcName = binaryName.replace(/-/g, "_");
-  return `
+export function generateZshCompletionScript(command: string): string {
+  const parts = command.split(" ");
+  const funcName = command.replace(/[- ]/g, "_");
+
+  if (parts.length === 1) {
+    // Direct binary: catladder
+    return `
 ###-begin-${funcName}-completions-###
 _${funcName}_completions() {
   local -a completions
@@ -156,14 +160,47 @@ _${funcName}_completions() {
   local -a cmd_words=(\${words:1:$((CURRENT-2))})
 
   # Call the CLI's __complete command
-  completions=(\${(f)"$(${binaryName} __complete -- "\${cmd_words[*]}" "$current_word" 2>/dev/null)"})
+  completions=(\${(f)"$(${command} __complete -- "\${cmd_words[*]}" "$current_word" 2>/dev/null)"})
+
+  if [[ \${#completions[@]} -gt 0 ]]; then
+    compadd -a completions
+  fi
+}
+
+compdef _${funcName}_completions ${command}
+###-end-${funcName}-completions-###
+`.trim();
+  }
+
+  // Multi-word command (e.g., "yarn catladder")
+  // Register on the first word (e.g., "yarn") but only activate
+  // when the subcommand matches (e.g., "catladder")
+  const prefix = parts[0];
+  const subcommand = parts.slice(1).join(" ");
+  const skipWords = parts.length; // how many words to skip before CLI args
+
+  return `
+###-begin-${funcName}-completions-###
+_${funcName}_completions() {
+  # Only activate when subcommand is "${subcommand}"
+  if [[ $CURRENT -le ${skipWords} ]] || [[ "\${words[2,${skipWords}]}" != "${subcommand}" ]]; then
+    return
+  fi
+
+  local -a completions
+  local current_word="\${words[$CURRENT]}"
+
+  # Words after "${command}", excluding the current word being completed
+  local -a cmd_words=(\${words:${skipWords}:$((CURRENT-${skipWords}-1))})
+
+  completions=(\${(f)"$(${command} __complete -- "\${cmd_words[*]}" "$current_word" 2>/dev/null)"})
 
   if [[ \${#completions[@]} -gt 0 ]]; then
     compadd -a completions
   fi
 }
 
-compdef _${funcName}_completions ${binaryName}
+compdef _${funcName}_completions ${prefix}
 ###-end-${funcName}-completions-###
 `.trim();
 }

package/src/core/types.ts

@@ -103,13 +103,19 @@ export interface CommandContext<TInputs extends InputsSchema> extends IO {
    * Consume a declared input by name.
    * - Compile error if `name` is not in TInputs
    * - Return type matches the input's type (string, number, boolean, string[])
-   * - Resolution: pre-supplied value > choices function + interactive prompt > default > throw
+   * - If `required: false`, returns `undefined` when not provided (no prompt)
+   * - Otherwise: pre-supplied value > choices function + interactive prompt > default > throw
    */
   get<K extends keyof TInputs & string>(
     name: K,
-  ): Promise<InputResultType<TInputs[K]>>;
+  ): Promise<OptionalInput<TInputs[K]>>;
 }
 
+/** If the input has `required: false`, the result can be undefined */
+export type OptionalInput<T extends InputDef> = T extends { required: false }
+  ? InputResultType<T> | undefined
+  : InputResultType<T>;
+
 // ─── Command Definition ──────────────────────────────────────────────
 
 export interface CommandDef<TInputs extends InputsSchema = InputsSchema> {