npm - @catladder/cli - Versions diffs - 0.0.0-new-cli-52525b58 → 0.0.0-new-cli-51a5f8b1 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (72) hide show

package/dist/cli/src/adapters/baseContext.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { CommandContext, CommandDef, InputDef, InputResultType, InputsSchema } from "../core/types";
+import type { CommandContext, CommandDef, InputDef, InputResultType, InputsSchema, OptionalInput } from "../core/types";
 /**
  * Base class for CommandContext implementations.
  * Handles caching, the `get()` method, and `promptDirect` delegation.
@@ -15,7 +15,7 @@ export declare abstract class BaseContext<TInputs extends InputsSchema> implemen
    * Implementations check pre-supplied values, prompt interactively, use defaults, or throw.
    */
   protected abstract resolveInput<P extends InputDef>(name: string, spec: P): Promise<InputResultType<P>>;
-  get<K extends keyof TInputs & string>(name: K): Promise<InputResultType<TInputs[K]>>;
+  get<K extends keyof TInputs & string>(name: K): Promise<OptionalInput<TInputs[K]>>;
   promptDirect<P extends InputDef>(spec: P & {
     name: string;
   }): Promise<InputResultType<P>>;

package/dist/cli/src/adapters/baseContext.js CHANGED Viewed

@@ -20,7 +20,16 @@ class BaseContext {
       if (!spec) {
         return Promise.reject(new Error(`Input "${name}" is not declared in command "${this.command.name}"`));
       }
-      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 === null || err === void 0 ? void 0 : err.name) === "MissingInputError") return undefined;
+          throw err;
+        }));
+      } else {
+        this.cache.set(name, this.resolveInput(name, spec));
+      }
     }
     return this.cache.get(name);
   }

package/dist/cli/src/adapters/baseContext.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"baseContext.js","sourceRoot":"","sources":["../../../../src/adapters/baseContext.ts"],"names":[],"mappings":";;;~~AAQA~~;;;;GAIG;AACH,MAAsB,WAAW;IAK/B,YAA+B,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAFnD,UAAK,GAAG,IAAI,GAAG,EAAwB,CAAC;IAEc,CAAC;IAc/D,GAAG,CACD,IAAO;QAEP,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CACP,UAAU,IAAI,iCAAiC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CACpE,CACF,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;~~QACtD~~,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,IAA0B;QAE1B,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;CACF;~~AAzCD~~,~~kCAyCC~~"}
1	+ {"version":3,"file":"baseContext.js","sourceRoot":"","sources":["../../../../src/adapters/baseContext.ts"],"names":[],"mappings":";;;AASA;;;;GAIG;AACH,MAAsB,WAAW;IAK/B,YAA+B,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAFnD,UAAK,GAAG,IAAI,GAAG,EAAwB,CAAC;IAEc,CAAC;IAc/D,GAAG,CACD,IAAO;QAEP,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CACP,UAAU,IAAI,iCAAiC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CACpE,CACF,CAAC;YACJ,CAAC;YACD,iEAAiE;YACjE,4CAA4C;YAC5C,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CACZ,IAAI,EACJ,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC1C,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,mBAAmB;wBAAE,OAAO,SAAS,CAAC;oBACxD,MAAM,GAAG,CAAC;gBACZ,CAAC,CAAC,CACH,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,IAA0B;QAE1B,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;CACF;AArDD,kCAqDC"}

package/dist/cli/src/catenv.js CHANGED Viewed

@@ -13,10 +13,11 @@ const catenv_1 = __importDefault(require("./apps/catenv/catenv"));
 const parseChoice_1 = require("./config/parseChoice");
 const packageInfos_1 = __importDefault(require("./packageInfos"));
 const program = new commander_1.Command();
-program.name("catenv").description("Environment variable and pipeline generation via direnv").version(packageInfos_1.default.version).argument("[envComponent]", "env or env:component").option("-v, --verbose", "verbose output").action((envComponent, opts) => {
-  var _a;
+program.name("catenv").description("Environment variable and pipeline generation via direnv").version(packageInfos_1.default.version).argument("[envComponent]", "env or env:component").option("-v, --verbose", "verbose output").option("-p, --print-variables", "print variables").action((envComponent, opts) => {
+  var _a, _b;
   (0, catenv_1.default)(envComponent ? (0, parseChoice_1.parseChoice)(envComponent) : null, {
-    verbose: (_a = opts.verbose) !== null && _a !== void 0 ? _a : false
+    verbose: (_a = opts.verbose) !== null && _a !== void 0 ? _a : false,
+    printVariables: (_b = opts.printVariables) !== null && _b !== void 0 ? _b : false
   }).then(() => {
     // we have to exit manually, because we have some file watches
     process.exit();

package/dist/cli/src/catenv.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,yCAAoC;AACpC,kEAA0C;AAC1C,sDAAmD;AACnD,kEAA0C;AAE1C,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,QAAQ,CAAC;KACd,WAAW,CAAC,yDAAyD,CAAC;KACtE,OAAO,CAAC,sBAAY,CAAC,OAAO,CAAC;KAC7B,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;KAClD,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC;KACzC,MAAM,CAAC,CAAC,YAAgC,~~EAAE~~,~~IAA2B~~,~~EAAE~~,EAAE;;~~IACxE~~,IAAA,gBAAM,EAAC,YAAY,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QACtD,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,mCAAI,KAAK;~~KAC/B~~,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,8DAA8D;QAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;AACL,CAAC,~~CAAC~~,CAAC;~~AAEL~~,OAAO,CAAC,KAAK,EAAE,CAAC"}
1	+ {"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,yCAAoC;AACpC,kEAA0C;AAC1C,sDAAmD;AACnD,kEAA0C;AAE1C,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,QAAQ,CAAC;KACd,WAAW,CAAC,yDAAyD,CAAC;KACtE,OAAO,CAAC,sBAAY,CAAC,OAAO,CAAC;KAC7B,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;KAClD,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC;KACzC,MAAM,CAAC,uBAAuB,EAAE,iBAAiB,CAAC;KAClD,MAAM,CACL,CACE,YAAgC,EAChC,IAAqD,EACrD,EAAE;;IACF,IAAA,gBAAM,EAAC,YAAY,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QACtD,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,mCAAI,KAAK;QAC9B,cAAc,EAAE,MAAA,IAAI,CAAC,cAAc,mCAAI,KAAK;KAC7C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,8DAA8D;QAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEJ,OAAO,CAAC,KAAK,EAAE,CAAC"}

package/dist/cli/src/cli.js CHANGED Viewed

@@ -180,9 +180,9 @@ program.command("__complete", {
 });
 // completion commands
 const completionCmd = program.command("completion").description("shell completion setup");
-completionCmd.command("zsh").description("output zsh completion script").action(() => {
-  var _a;
-  const binaryName = (_a = process.argv[1].split("/").pop()) !== null && _a !== void 0 ? _a : "catladder";
+completionCmd.command("zsh").description("output zsh completion script").option("--command <cmd>", "command used to invoke the CLI (e.g. 'yarn catladder')").action(opts => {
+  var _a, _b;
+  const binaryName = (_b = (_a = opts.command) !== null && _a !== void 0 ? _a : process.argv[1].split("/").pop()) !== null && _b !== void 0 ? _b : "catladder";
   console.log((0, completion_1.generateZshCompletionScript)(binaryName));
 });
 completionCmd.command("install").description("install shell completions into your .zshrc").action(async () => {

package/dist/cli/src/cli.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAoC;AACpC,kEAA0C;AAC1C,uDAA2D;AAC3D,kDAA4D;AAE5D,6CAKsB;AAEtB,sBAAsB;AACtB,qDAAuC;AAEvC,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,WAAW,CAAC;KACjB,WAAW,CAAC,4CAA4C,CAAC;KACzD,OAAO,CAAC,sBAAY,CAAC,OAAO,CAAC;KAC7B,MAAM,CAAC,WAAW,EAAE,+BAA+B,CAAC,CAAC;AAExD,0CAA0C;AAC1C,MAAM,cAAc,GAAiB,EAAE,CAAC;AAExC,iFAAiF;AACjF,MAAM,eAAe,GAAG,IAAI,GAAG,EAAmB,CAAC;AAEnD;;;GAGG;AACH,SAAS,iBAAiB,CAAC,KAAe;IACxC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC;IAEvC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,eAAe,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IAE/D,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACpD,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9B,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;GAMG;AACH,SAAS,eAAe,CAAC,GAAe;IACtC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEzB,8CAA8C;IAC9C,MAAM,gBAAgB,GAA4C,EAAE,CAAC;IACrE,MAAM,UAAU,GAA4C,EAAE,CAAC;IAE/D,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1D,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;YACxB,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,+CAA+C;IAC/C,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEjD,iDAAiD;IACjD,IAAI,MAAM,GAAG,QAAQ,CAAC;IACtB,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,gBAAgB,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,IAAI,GAAG,CAAC;IACzB,CAAC;IAED,MAAM,MAAM,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEhE,2CAA2C;IAC3C,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAC/D,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9D,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAChC,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;YAClC,GAAG,CAAC,MAAM,CAAC,QAAQ,QAAQ,EAAE,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ,UAAU,EAAE,IAAI,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,8BAA8B;IAC9B,GAAG,CAAC,MAAM,CAAC,iBAAiB,EAAE,+BAA+B,CAAC,CAAC;IAE/D,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,OAAc,EAAE,EAAE;QACrC,gFAAgF;QAChF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAEzC,wCAAwC;QACxC,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YACrC,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC7B,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,2BAA2B;QAC3B,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC;YAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC/D,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACvD,CAAC,CAAC,WAAW,EAAE,CAChB,CAAC;YACF,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;gBAClC,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC5B,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC5D,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;gBACxB,CAAC;gBACD,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,sBAAsB;QACtB,IAAI,UAAU,GAA4B,EAAE,CAAC;QAC7C,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC;gBACH,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvC,CAAC;YAAC,WAAM,CAAC;gBACP,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAED,MAAM,GAAG,GAAG,IAAA,gCAAqB,EAAC,GAAG,EAAE;YACrC,UAAU;YACV,UAAU;YACV,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,GAAG,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;gBACrC,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,wBAAwB;AACxB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1C,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;QACxE,eAAe,CAAC,GAAiB,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAED,iDAAiD;AACjD,OAAO;KACJ,OAAO,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;KACvC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;KACzC,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;KACtC,MAAM,CAAC,KAAK,EAAE,QAA4B,EAAE,MAA0B,EAAE,EAAE;IACzE,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAClE,MAAM,UAAU,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;IAChC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,IAAA,2BAAc,EACtC,cAAc,EACd,KAAK,EACL,UAAU,CACX,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IAAC,WAAM,CAAC;QACP,2DAA2D;IAC7D,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEL,sBAAsB;AACtB,MAAM,aAAa,GAAG,OAAO;KAC1B,OAAO,CAAC,YAAY,CAAC;KACrB,WAAW,CAAC,wBAAwB,CAAC,CAAC;AAEzC,aAAa;KACV,OAAO,CAAC,KAAK,CAAC;KACd,WAAW,CAAC,8BAA8B,CAAC;KAC3C,MAAM,CAAC,~~GAAG~~,EAAE;;~~IACX~~,MAAM,UAAU,~~GAAG~~,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,mCAAI,WAAW,CAAC;~~IACnE~~,OAAO,CAAC,GAAG,CAAC,IAAA,wCAA2B,EAAC,UAAU,CAAC,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC;AAEL,aAAa;KACV,OAAO,CAAC,SAAS,CAAC;KAClB,WAAW,CAAC,4CAA4C,CAAC;KACzD,MAAM,CAAC,KAAK,IAAI,EAAE;;IACjB,MAAM,UAAU,GAAG,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,mCAAI,WAAW,CAAC;IACnE,MAAM,IAAA,+BAAkB,EAAC,UAAU,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC;AAEL,aAAa;KACV,OAAO,CAAC,WAAW,CAAC;KACpB,WAAW,CAAC,2CAA2C,CAAC;KACxD,MAAM,CAAC,KAAK,IAAI,EAAE;;IACjB,MAAM,UAAU,GAAG,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,mCAAI,WAAW,CAAC;IACnE,MAAM,IAAA,iCAAoB,EAAC,UAAU,CAAC,CAAC;AACzC,CAAC,CAAC,CAAC;AAEL,kBAAkB;AAClB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;IACtB,IAAA,kCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,KAAK,EAAE,CAAC"}
1	+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/cli/src/commands/cloudSQL/commandRestoreDb.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 export declare const commandRestoreDb: import("../../core").CommandDef<{
-  readonly sourceInstance: {
+  readonly source: {
     readonly type: "string";
     readonly message: "Source instance (connection string or 'local')? 🤔 ";
   };
@@ -21,7 +21,7 @@ export declare const commandRestoreDb: import("../../core").CommandDef<{
     readonly type: "string";
     readonly message: "Source DB name? 🤔 ";
   };
-  readonly targetInstance: {
+  readonly target: {
     readonly type: "string";
     readonly message: "Target INSTANCE (connection string or 'local')? 🤔  ";
   };

package/dist/cli/src/commands/cloudSQL/commandRestoreDb.js CHANGED Viewed

@@ -12,7 +12,7 @@ exports.commandRestoreDb = (0, defineCommand_1.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')? 🤔 "
     },
@@ -34,7 +34,7 @@ exports.commandRestoreDb = (0, defineCommand_1.defineCommand)({
       type: "string",
       message: "Source DB name? 🤔 "
     },
-    targetInstance: {
+    target: {
       type: "string",
       message: "Target INSTANCE (connection string or 'local')? 🤔  "
     },
@@ -58,37 +58,37 @@ exports.commandRestoreDb = (0, defineCommand_1.defineCommand)({
     }
   },
   execute: async ctx => {
-    const sourceInstance = await ctx.get("sourceInstance");
+    const source = await ctx.get("source");
     let sourceProxy;
     let targetProxy;
     let sourcePort;
     let targetPort;
-    if (sourceInstance === "local") {
+    if (source === "local") {
       sourcePort = await ctx.get("sourceLocalPort");
     } else {
       sourcePort = 54399;
       sourceProxy = await (0, startProxy_1.startCloudSqlProxyInBackground)({
-        instanceName: sourceInstance,
+        instanceName: source,
         localPort: sourcePort
       });
     }
     const sourceUsername = await ctx.get("sourceUsername");
     const sourcePassword = await ctx.get("sourcePassword");
     const sourceDbName = await ctx.get("sourceDbName");
-    const targetInstance = await ctx.get("targetInstance");
-    if (targetInstance === "local") {
+    const target = await ctx.get("target");
+    if (target === "local") {
       targetPort = await ctx.get("targetLocalPort");
     } else {
       targetPort = 54499;
       targetProxy = await (0, startProxy_1.startCloudSqlProxyInBackground)({
-        instanceName: targetInstance,
+        instanceName: target,
         localPort: targetPort
       });
     }
     const targetUsername = await ctx.get("targetUsername");
     const targetPassword = await ctx.get("targetPassword");
     const targetDbName = await ctx.get("targetDbName");
-    const shouldContinue = await ctx.confirm(`This will drop ${targetInstance}/${targetDbName} and replace it with ${sourceInstance}/${sourceDbName}. Continue? 🤔 `);
+    const shouldContinue = await ctx.confirm(`This will drop ${target}/${targetDbName} and replace it with ${source}/${sourceDbName}. Continue? 🤔 `);
     if (!shouldContinue) {
       return;
     }

package/dist/cli/src/commands/cloudSQL/commandRestoreDb.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":";;;AAAA,4DAAyD;AACzD,yDAA2D;AAE3D,iEAAkF;AAErE,QAAA,gBAAgB,GAAG,IAAA,6BAAa,EAAC;IAC5C,IAAI,EAAE,qBAAqB;IAC3B,WAAW,EAAE,gDAAgD;IAC7D,KAAK,EAAE,UAAU;IACjB,MAAM,EAAE;QACN,~~cAAc~~,EAAE;~~YACd~~,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,qDAAqD;SAC/D;QACD,eAAe,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,4BAA4B;YACrC,OAAO,EAAE,IAAI;SACd;QACD,cAAc,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,sBAAsB;YAC/B,OAAO,EAAE,UAAU;SACpB;QACD,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,sBAAsB,EAAE;QACnE,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qBAAqB,EAAE;QAChE,~~cAAc~~,EAAE;~~YACd~~,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,sDAAsD;SAChE;QACD,eAAe,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,4BAA4B;YACrC,OAAO,EAAE,IAAI;SACd;QACD,cAAc,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,sBAAsB;YAC/B,OAAO,EAAE,UAAU;SACpB;QACD,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,sBAAsB,EAAE;QACnE,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qBAAqB,EAAE;KACjE;IACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACrB,MAAM,~~cAAc~~,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,~~gBAAgB~~,CAAC,CAAC;~~QAEvD~~,IAAI,WAAoC,CAAC;QACzC,IAAI,WAAoC,CAAC;QACzC,IAAI,UAAkB,CAAC;QACvB,IAAI,UAAkB,CAAC;QAEvB,IAAI,~~cAAc~~,KAAK,OAAO,EAAE,CAAC;~~YAC/B~~,UAAU,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,KAAK,CAAC;YACnB,WAAW,GAAG,MAAM,IAAA,2CAA8B,EAAC;gBACjD,YAAY,EAAE,~~cAAc~~;~~gBAC5B~~,SAAS,EAAE,UAAU;aACtB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAEnD,MAAM,~~cAAc~~,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,~~gBAAgB~~,CAAC,CAAC;~~QAEvD~~,IAAI,~~cAAc~~,KAAK,OAAO,EAAE,CAAC;~~YAC/B~~,UAAU,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,KAAK,CAAC;YACnB,WAAW,GAAG,MAAM,IAAA,2CAA8B,EAAC;gBACjD,YAAY,EAAE,~~cAAc~~;~~gBAC5B~~,SAAS,EAAE,UAAU;aACtB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAEnD,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,OAAO,CACtC,kBAAkB,~~cAAc~~,IAAI,YAAY,wBAAwB,~~cAAc~~,IAAI,YAAY,iBAAiB,~~CACxH~~,CAAC;QACF,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAA,oBAAW,EAAC;gBAChB,cAAc;gBACd,UAAU;gBACV,cAAc;gBACd,cAAc;gBACd,cAAc;gBACd,UAAU;gBACV,YAAY;gBACZ,YAAY;aACb,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,EAAE,CAAC;YACpB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
1	+ {"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":"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"}

package/dist/cli/src/commands/project/commandConfigSecrets.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ export declare const commandConfigSecrets: import("../../core").CommandDef<{
     readonly type: "string";
     readonly message: "environment:component";
     readonly positional: true;
+    readonly required: false;
     readonly choices: () => Promise<string[]>;
   };
 }>;

package/dist/cli/src/commands/project/commandConfigSecrets.js CHANGED Viewed

@@ -20,6 +20,7 @@ exports.commandConfigSecrets = (0, defineCommand_1.defineCommand)({
       type: "string",
       message: "environment:component",
       positional: true,
+      required: false,
       choices: async () => (0, autocompletions_1.envAndComponents)()
     }
   },

package/dist/cli/src/commands/project/commandConfigSecrets.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":";;;AAAA,4DAAyD;AACzD,+FAA4F;AAC5F,2FAAyF;AAEzF,mEAAmE;AACnE,sEAAsE;AACtE,uEAAuE;AACvE,2BAA2B;AACd,QAAA,oBAAoB,GAAG,IAAA,6BAAa,EAAC;IAChD,IAAI,EAAE,wBAAwB;IAC9B,WAAW,EAAE,qCAAqC;IAClD,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE;QACN,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,uBAAuB;YAChC,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,IAAA,kCAAgB,GAAE;SACxC;KACF;IACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACrB,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACnD,mEAAmE;QACnE,iEAAiE;QACjE,+DAA+D;QAC/D,2DAA2D;QAC3D,2DAA2D;QAC3D,MAAM,IAAA,2CAAoB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC"}
1	+ {"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":";;;AAAA,4DAAyD;AACzD,+FAA4F;AAC5F,2FAAyF;AAEzF,mEAAmE;AACnE,sEAAsE;AACtE,uEAAuE;AACvE,2BAA2B;AACd,QAAA,oBAAoB,GAAG,IAAA,6BAAa,EAAC;IAChD,IAAI,EAAE,wBAAwB;IAC9B,WAAW,EAAE,qCAAqC;IAClD,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE;QACN,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,uBAAuB;YAChC,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,IAAA,kCAAgB,GAAE;SACxC;KACF;IACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACrB,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACnD,mEAAmE;QACnE,iEAAiE;QACjE,+DAA+D;QAC/D,2DAA2D;QAC3D,2DAA2D;QAC3D,MAAM,IAAA,2CAAoB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC"}

package/dist/cli/src/commands/project/commandSetup.d.ts CHANGED Viewed

@@ -3,5 +3,6 @@ export declare const commandSetup: import("../../core").CommandDef<{
     readonly type: "string";
     readonly message: "component name";
     readonly positional: true;
+    readonly required: false;
   };
 }>;

package/dist/cli/src/commands/project/commandSetup.js CHANGED Viewed

@@ -14,7 +14,8 @@ exports.commandSetup = (0, defineCommand_1.defineCommand)({
     component: {
       type: "string",
       message: "component name",
-      positional: true
+      positional: true,
+      required: false
     }
   },
   execute: async ctx => {

package/dist/cli/src/commands/project/commandSetup.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"commandSetup.js","sourceRoot":"","sources":["../../../../../src/commands/project/commandSetup.ts"],"names":[],"mappings":";;;AAAA,4DAAyD;AACzD,iEAAqE;AAExD,QAAA,YAAY,GAAG,IAAA,6BAAa,EAAC;IACxC,IAAI,EAAE,eAAe;IACrB,WAAW,EACT,qFAAqF;IACvF,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE;QACN,SAAS,EAAE,~~EAAE,~~IAAI,EAAE,QAAQ,~~EAAE,~~OAAO,EAAE,gBAAgB,~~EAAE,~~UAAU,EAAE,IAAI,EAAE;~~KAC3E~~;IACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACrB,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,IAAA,oBAAY,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACrC,CAAC;CACF,CAAC,CAAC"}
1	+ {"version":3,"file":"commandSetup.js","sourceRoot":"","sources":["../../../../../src/commands/project/commandSetup.ts"],"names":[],"mappings":";;;AAAA,4DAAyD;AACzD,iEAAqE;AAExD,QAAA,YAAY,GAAG,IAAA,6BAAa,EAAC;IACxC,IAAI,EAAE,eAAe;IACrB,WAAW,EACT,qFAAqF;IACvF,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE;QACN,SAAS,EAAE;YACT,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,gBAAgB;YACzB,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,KAAK;SAChB;KACF;IACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACrB,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,IAAA,oBAAY,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACrC,CAAC;CACF,CAAC,CAAC"}

package/dist/cli/src/completion.d.ts CHANGED Viewed

@@ -10,9 +10,9 @@ import type { CommandDef } from "./core/types";
 export declare function getCompletions(allCommands: CommandDef[], words: string[], cursorWord: string): Promise<string[]>;
 /**
  * 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 declare function generateZshCompletionScript(binaryName: string): string;
+export declare function generateZshCompletionScript(command: string): string;
 /**
  * Install completions by adding an eval line to .zshrc.
  */

package/dist/cli/src/completion.js CHANGED Viewed

@@ -126,11 +126,14 @@ async function resolveChoicesForCompletion(inputDef, cursorWord) {
 }
 /**
  * Generate the zsh completion script.
- * The user adds `eval "$(catladder completion zsh)"` to their .zshrc.
+ * Supports both direct invocation (`catladder`) and prefixed (`yarn catladder`).
  */
-function generateZshCompletionScript(binaryName) {
-  const funcName = binaryName.replace(/-/g, "_");
-  return `
+function generateZshCompletionScript(command) {
+  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
@@ -140,14 +143,45 @@ _${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/dist/cli/src/completion.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/completion.ts"],"names":[],"mappings":"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~~UAAkB~~;~~IAC5D~~,MAAM,QAAQ,GAAG,~~UAAU~~,CAAC,OAAO,CAAC,~~IAAI~~,EAAE,GAAG,CAAC,CAAC;~~IAC~~/C,OAAO;~~YACG~~,QAAQ;GACjB,QAAQ;;;;;;;;0BAQe,~~UAAU~~;;;;;;;~~WAOzB~~,QAAQ,gBAAgB,UAAU;~~UACnC~~,QAAQ;CACjB,CAAC,IAAI,EAAE,CAAC;AACT,CAAC;~~AAtBD~~,~~kEAsBC~~;AAED,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,EAAE,CACpC,aAAa,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,CAAC;AAEzD,SAAS,YAAY;IACnB,OAAO,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,QAAQ,CAAC,CAAC;AACnC,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,kBAAkB,CAAC,UAAkB;IACzD,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,WAAW,UAAU,mBAAmB,CAAC;IAC1D,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;IAExC,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,IAAA,eAAU,EAAC,SAAS,CAAC,EAAE,CAAC;QAC1B,OAAO,GAAG,IAAA,iBAAY,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,OAAO,CAAC,GAAG,CACT,mBAAmB,UAAU,6BAA6B,SAAS,EAAE,CACtE,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,UAAU,uBAAuB,QAAQ,IAAI,CAAC;IACtE,IAAA,kBAAa,EAAC,SAAS,EAAE,OAAO,GAAG,QAAQ,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,6BAA6B,UAAU,OAAO,SAAS,EAAE,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,qCAAqC,SAAS,EAAE,CAAC,CAAC;AAChE,CAAC;AArBD,gDAqBC;AAED;;GAEG;AACI,KAAK,UAAU,oBAAoB,CAAC,UAAkB;IAC3D,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,IAAI,CAAC,IAAA,eAAU,EAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,WAAW,UAAU,mBAAmB,CAAC;IAC1D,MAAM,WAAW,GAAG,KAAK,UAAU,oBAAoB,CAAC;IAExD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,sBAAsB,UAAU,aAAa,SAAS,EAAE,CAAC,CAAC;QACtE,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,OAAO;SACpB,OAAO,CACN,IAAI,MAAM,CACR,OAAO,WAAW,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAC/D,GAAG,CACJ,EACD,IAAI,CACL;SACA,OAAO,CACN,IAAI,MAAM,CACR,OAAO,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAC5D,GAAG,CACJ,EACD,IAAI,CACL,CAAC;IAEJ,IAAA,kBAAa,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,2BAA2B,UAAU,SAAS,SAAS,EAAE,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,qCAAqC,SAAS,EAAE,CAAC,CAAC;AAChE,CAAC;AAnCD,oDAmCC"}
1	+ {"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/completion.ts"],"names":[],"mappings":"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"}

package/dist/cli/src/core/types.d.ts CHANGED Viewed

@@ -82,10 +82,15 @@ 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]>>;
+  get<K extends keyof TInputs & string>(name: 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>;
 export interface CommandDef<TInputs extends InputsSchema = InputsSchema> {
   name: string;
   description: string;

package/dist/cli/src/core/types.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/core/types.ts"],"names":[],"mappings":";AAAA,wEAAwE;;;~~AA0HxE~~,wEAAwE;AAExE,MAAa,iBAAkB,SAAQ,KAAK;IAC1C,YACkB,SAAiB,EACjB,aAAqB;QAErC,KAAK,CACH,4BAA4B,SAAS,MAAM,aAAa,KAAK;YAC3D,oBAAoB,SAAS,2BAA2B,SAAS,UAAU,CAC9E,CAAC;QANc,cAAS,GAAT,SAAS,CAAQ;QACjB,kBAAa,GAAb,aAAa,CAAQ;QAMrC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAXD,8CAWC"}
1	+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/core/types.ts"],"names":[],"mappings":";AAAA,wEAAwE;;;AAgIxE,wEAAwE;AAExE,MAAa,iBAAkB,SAAQ,KAAK;IAC1C,YACkB,SAAiB,EACjB,aAAqB;QAErC,KAAK,CACH,4BAA4B,SAAS,MAAM,aAAa,KAAK;YAC3D,oBAAoB,SAAS,2BAA2B,SAAS,UAAU,CAC9E,CAAC;QANc,cAAS,GAAT,SAAS,CAAQ;QACjB,kBAAa,GAAb,aAAa,CAAQ;QAMrC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAXD,8CAWC"}

package/dist/pipeline/src/build/index.d.ts CHANGED Viewed

@@ -5,14 +5,14 @@ import type { BuildConfig, BuildConfigStandaloneType, WorkspaceBuildConfig } fro
 export * from "./node";
 export * from "./types";
 export type BuildTypes = { [type in BuildConfigStandaloneType]: {
-  jobs: (context: ComponentContextWithBuild) => CatladderJob[];
+  jobs: (context: ComponentContextWithBuild) => CatladderJob[] | Promise<CatladderJob[]>;
   defaults: (envContext: EnvironmentContext) => Partial<Extract<BuildConfig, {
     type: type;
   }>>;
 } };
 export declare const BUILD_TYPES: BuildTypes;
 export type WorkspaceBuildTypes = { [type in WorkspaceBuildConfig["type"]]: {
-  jobs: (context: WorkspaceContext) => CatladderJob[];
+  jobs: (context: WorkspaceContext) => CatladderJob[] | Promise<CatladderJob[]>;
   defaults: () => Partial<Extract<WorkspaceBuildConfig, {
     type: type;
   }>>;

package/dist/pipeline/src/build/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAOA,qCAA4C;AAC5C,iCAA+E;AAC/E,mCAA0C;AAO1C,yCAAuB;AACvB,0CAAwB;~~AAWX~~,QAAA,WAAW,GAAe;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACjC,qBAAqB,EAAE,CAAC,kBAAkB,CAAC;SAC5C,CAAC;KACH;IACD,aAAa,EAAE;QACb,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,SAAS,EAAE;QACT,IAAI,EAAE,0BAAmB;QACzB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,CAAC,wCAAwC,CAAC;YACxD,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,uBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,cAAc;YAC5B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,yBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,KAAK,EAAE;QACL,IAAI,EAAE,uBAAe;QACrB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,UAAU,EAAE;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,QAAQ;aACtB;SACF,CAAC;KACH;CACF,CAAC;~~AASW~~,QAAA,qBAAqB,GAAwB;IACxD,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;SACF,CAAC;KACH;CACF,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAOA,qCAA4C;AAC5C,iCAA+E;AAC/E,mCAA0C;AAO1C,yCAAuB;AACvB,0CAAwB;AAaX,QAAA,WAAW,GAAe;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACjC,qBAAqB,EAAE,CAAC,kBAAkB,CAAC;SAC5C,CAAC;KACH;IACD,aAAa,EAAE;QACb,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,SAAS,EAAE;QACT,IAAI,EAAE,0BAAmB;QACzB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,CAAC,wCAAwC,CAAC;YACxD,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,uBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,cAAc;YAC5B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,yBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,KAAK,EAAE;QACL,IAAI,EAAE,uBAAe;QACrB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,UAAU,EAAE;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,QAAQ;aACtB;SACF,CAAC;KACH;CACF,CAAC;AAWW,QAAA,qBAAqB,GAAwB;IACxD,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;SACF,CAAC;KACH;CACF,CAAC"}

package/dist/pipeline/src/build/node/buildJob.d.ts CHANGED Viewed

@@ -2,8 +2,8 @@ import type { BuildContextStandalone, ComponentContextWithBuild, WorkspaceContex
 import { type ComponentContext } from "../../types/context";
 import type { AppBuildJobDefinition, DockerBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createNodeBuildJobs: (context: ComponentContextWithBuild | WorkspaceContext) => CatladderJob[];
-export declare const createNodeBuildJobDefinition: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext) => AppBuildJobDefinition | undefined;
+export declare const createNodeBuildJobs: (context: ComponentContextWithBuild | WorkspaceContext) => Promise<CatladderJob[]>;
+export declare const createNodeBuildJobDefinition: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext) => Promise<AppBuildJobDefinition | undefined>;
 type NewType = ComponentContextWithBuild;
-export declare const createNodeDockerJobDefinition: (context: NewType) => DockerBuildJobDefinition;
+export declare const createNodeDockerJobDefinition: (context: NewType) => Promise<DockerBuildJobDefinition>;
 export {};

package/dist/pipeline/src/build/node/buildJob.js CHANGED Viewed

@@ -10,38 +10,39 @@ const createBuildJobDefinition_1 = require("../base/createBuildJobDefinition");
 const docker_1 = require("../docker");
 const cache_1 = require("./cache");
 const yarn_1 = require("./yarn");
-const createNodeBuildJobs = context => {
+const createNodeBuildJobs = async context => {
   if (context.type === "workspace") {
     return (0, base_1.createWorkspaceBuildJobs)(context, {
-      appBuild: (0, exports.createNodeBuildJobDefinition)(context)
+      appBuild: await (0, exports.createNodeBuildJobDefinition)(context)
     });
   }
   return (0, base_1.createComponentBuildJobs)(context, {
-    appBuild: (0, context_1.componentContextIsStandaloneBuild)(context) ? (0, exports.createNodeBuildJobDefinition)(context) : undefined,
-    dockerBuild: (0, exports.createNodeDockerJobDefinition)(context)
+    appBuild: (0, context_1.componentContextIsStandaloneBuild)(context) ? await (0, exports.createNodeBuildJobDefinition)(context) : undefined,
+    dockerBuild: await (0, exports.createNodeDockerJobDefinition)(context)
   });
 };
 exports.createNodeBuildJobs = createNodeBuildJobs;
-const createNodeBuildJobDefinition = context => {
+const createNodeBuildJobDefinition = async context => {
   const buildConfig = context.build.config;
-  const yarnInstall = (0, yarn_1.getYarnInstall)(context);
+  const [yarnInstall, nodeCache] = await Promise.all([(0, yarn_1.getYarnInstall)(context), (0, cache_1.getNodeCache)(context)]);
   return (0, createBuildJobDefinition_1.createBuildJobDefinition)(context, buildConfig, {
     prescript: yarnInstall,
-    cache: (0, cache_1.getNodeCache)(context)
+    cache: nodeCache
   });
 };
 exports.createNodeBuildJobDefinition = createNodeBuildJobDefinition;
-const createNodeDockerJobDefinition = context => {
-  var _a, _b;
+const createNodeDockerJobDefinition = async context => {
+  var _a;
   // get the default docker built-in type based on the build type
   const dockerDefaultBuiltIn = context.build.buildType === "node-static" || context.build.buildType === "storybook" ? "nginx" : "node";
+  const [yarnCache, dockerAppCopyAndBuildScript, packageManagerInfo] = await Promise.all([(0, cache_1.getYarnCache)(context, "pull"), (0, yarn_1.getDockerAppCopyAndBuildScript)(context), context.packageManagerInfo]);
   return {
     script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, dockerDefaultBuiltIn),
-    cache: [...(0, cache_1.getYarnCache)(context, "pull")],
+    cache: [...yarnCache],
     variables: {
       // only required for non static
-      DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
-      DOCKER_COPY_WORKSPACE_FILES: (_b = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.pathsToCopyInDocker.map(dir => `COPY --chown=node:node ${dir} /app/${dir}`)) === null || _b === void 0 ? void 0 : _b.join("\n")
+      DOCKER_COPY_AND_INSTALL_APP: dockerAppCopyAndBuildScript,
+      DOCKER_COPY_WORKSPACE_FILES: (_a = packageManagerInfo === null || packageManagerInfo === void 0 ? void 0 : packageManagerInfo.pathsToCopyInDocker.map(dir => `COPY --chown=node:node ${dir} /app/${dir}`)) === null || _a === void 0 ? void 0 : _a.join("\n")
     }
   };
 };

package/dist/pipeline/src/build/node/buildJob.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;AAKA,iDAG6B;AAM7B,kCAA6E;AAC7E,+EAA4E;AAC5E,sCAAsE;AAEtE,mCAAqD;AACrD,iCAAwE;AAEjE,MAAM,mBAAmB,GAAG,~~CACjC~~,OAAqD,~~EACrC~~,EAAE;~~IAClB~~,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,IAAA,oCAA4B,EAAC,OAAO,CAAC;~~SAChD~~,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EAAE,IAAA,2CAAiC,EAAC,OAAO,CAAC;YAClD,CAAC,CAAC,IAAA,oCAA4B,EAAC,OAAO,CAAC;~~YACvC~~,CAAC,CAAC,SAAS;QAEb,WAAW,EAAE,IAAA,qCAA6B,EAAC,OAAO,CAAC;~~KACpD~~,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,MAAM,4BAA4B,GAAG,~~CAC1C~~,OAAoE,~~EACjC~~,EAAE;~~IACrC~~,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;~~IAC5C~~,OAAO,IAAA,mDAAwB,EAAC,OAAO,EAAE,WAAW,EAAE;QACpD,SAAS,EAAE,WAAW;QACtB,KAAK,EAAE,~~IAAA,oBAAY,EAAC,OAAO,CAAC~~;~~KAC7B~~,CAAC,CAAC;AACL,CAAC,CAAC;~~AAVW~~,QAAA,4BAA4B,~~gCAUvC~~;AAIK,MAAM,6BAA6B,GAAG,~~CAC3C~~,OAAgB,~~EACU~~,EAAE;;~~IAC5B~~,+DAA+D;IAC/D,MAAM,oBAAoB,GACxB,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,aAAa;QACzC,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,WAAW;QACrC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,CAAC;IAEb,OAAO;QACL,MAAM,EAAE,IAAA,kDAAyC,EAC/C,OAAO,EACP,oBAAoB,CACrB;QACD,KAAK,EAAE,CAAC,GAAG,~~IAAA~~,~~oBAAY,EAAC,OAAO,EAAE,MAAM,~~CAAC~~,CAAC~~;~~QACzC~~,SAAS,EAAE;YACT,+BAA+B;YAC/B,2BAA2B,EAAE,~~IAAA,qCAA8B,EAAC,OAAO,CAAC~~;~~YACpE~~,2BAA2B,~~EACzB~~,MAAA,~~MAAA~~,~~OAAO~~,~~CAAC~~,kBAAkB,~~0CAAE~~,mBAAmB,~~CAC5C~~,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,0BAA0B,GAAG,SAAS,GAAG,EAAE,CAAC,0CACxD,IAAI,CAAC,IAAI,CAAC;~~SACjB~~;KACF,CAAC;AACJ,CAAC,CAAC;~~AAzBW~~,QAAA,6BAA6B,~~iCAyBxC~~"}
1	+ {"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;AAKA,iDAG6B;AAM7B,kCAA6E;AAC7E,+EAA4E;AAC5E,sCAAsE;AAEtE,mCAAqD;AACrD,iCAAwE;AAEjE,MAAM,mBAAmB,GAAG,KAAK,EACtC,OAAqD,EAC5B,EAAE;IAC3B,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,MAAM,IAAA,oCAA4B,EAAC,OAAO,CAAC;SACtD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EAAE,IAAA,2CAAiC,EAAC,OAAO,CAAC;YAClD,CAAC,CAAC,MAAM,IAAA,oCAA4B,EAAC,OAAO,CAAC;YAC7C,CAAC,CAAC,SAAS;QAEb,WAAW,EAAE,MAAM,IAAA,qCAA6B,EAAC,OAAO,CAAC;KAC1D,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,MAAM,4BAA4B,GAAG,KAAK,EAC/C,OAAoE,EACxB,EAAE;IAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjD,IAAA,qBAAc,EAAC,OAAO,CAAC;QACvB,IAAA,oBAAY,EAAC,OAAO,CAAC;KACtB,CAAC,CAAC;IACH,OAAO,IAAA,mDAAwB,EAAC,OAAO,EAAE,WAAW,EAAE;QACpD,SAAS,EAAE,WAAW;QACtB,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;AACL,CAAC,CAAC;AAbW,QAAA,4BAA4B,gCAavC;AAIK,MAAM,6BAA6B,GAAG,KAAK,EAChD,OAAgB,EACmB,EAAE;;IACrC,+DAA+D;IAC/D,MAAM,oBAAoB,GACxB,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,aAAa;QACzC,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,WAAW;QACrC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,CAAC;IAEb,MAAM,CAAC,SAAS,EAAE,2BAA2B,EAAE,kBAAkB,CAAC,GAChE,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC;QAC7B,IAAA,qCAA8B,EAAC,OAAO,CAAC;QACvC,OAAO,CAAC,kBAAkB;KAC3B,CAAC,CAAC;IAEL,OAAO;QACL,MAAM,EAAE,IAAA,kDAAyC,EAC/C,OAAO,EACP,oBAAoB,CACrB;QACD,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC;QACrB,SAAS,EAAE;YACT,+BAA+B;YAC/B,2BAA2B,EAAE,2BAA2B;YACxD,2BAA2B,EAAE,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,mBAAmB,CACjE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,0BAA0B,GAAG,SAAS,GAAG,EAAE,CAAC,0CACxD,IAAI,CAAC,IAAI,CAAC;SACf;KACF,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,6BAA6B,iCA+BxC"}

package/dist/pipeline/src/build/node/cache.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { Context } from "../../types/context";
 import type { CacheConfig } from "../types";
-export declare const getYarnCache: (context: Context, policy?: string) => CacheConfig[];
-export declare const getNodeModulesCache: (context: Context, policy?: string) => CacheConfig[];
-export declare const getNodeCache: (context: Context, policy?: string) => CacheConfig[];
+export declare const getYarnCache: (context: Context, policy?: string) => Promise<CacheConfig[]>;
+export declare const getNodeModulesCache: (context: Context, policy?: string) => Promise<CacheConfig[]>;
+export declare const getNodeCache: (context: Context, policy?: string) => Promise<CacheConfig[]>;

package/dist/pipeline/src/build/node/cache.js CHANGED Viewed

@@ -12,8 +12,9 @@ exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void
 const lodash_1 = require("lodash");
 const path_1 = require("path");
 const slugify_1 = __importDefault(require("slugify"));
-const getYarnCache = (context, policy = "pull-push") => {
-  const componentIsInWorkspace = context.type === "component" && context.packageManagerInfo.componentIsInWorkspace;
+const getYarnCache = async (context, policy = "pull-push") => {
+  const packageManagerInfo = await context.packageManagerInfo;
+  const componentIsInWorkspace = context.type === "component" && "componentIsInWorkspace" in packageManagerInfo && packageManagerInfo.componentIsInWorkspace;
   return [{
     scope: componentIsInWorkspace ? "global" : "buildDir",
     pathMode: componentIsInWorkspace ? "absolute" : "relative",
@@ -23,12 +24,14 @@ const getYarnCache = (context, policy = "pull-push") => {
   }];
 };
 exports.getYarnCache = getYarnCache;
-const getNodeModulesCache = (context, policy = "pull-push") => {
+const getNodeModulesCache = async (context, policy = "pull-push") => {
   var _a, _b;
-  const componentIsInWorkspace = context.type === "component" && context.packageManagerInfo.componentIsInWorkspace;
+  const packageManagerInfo = await context.packageManagerInfo;
+  const componentIsInWorkspace = context.type === "component" && "componentIsInWorkspace" in packageManagerInfo && packageManagerInfo.componentIsInWorkspace;
   const {
-    isClassic
-  } = context.packageManagerInfo;
+    isClassic,
+    workspaces
+  } = packageManagerInfo;
   // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
   // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
   return [{
@@ -38,11 +41,11 @@ const getNodeModulesCache = (context, policy = "pull-push") => {
     key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1.default)(context.build.dir) + "-node-modules",
     // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
     policy,
-    paths: [...(componentIsInWorkspace ? (0, lodash_1.uniq)(["node_modules", ...((_a = context.packageManagerInfo.workspaces.map(w => (0, path_1.join)(w.location, "node_modules"))) !== null && _a !== void 0 ? _a : []), ...(!isClassic ? [".yarn/install-state.gz", ...((_b = context.packageManagerInfo.workspaces.map(w => (0, path_1.join)(w.location, ".yarn/install-state.gz"))) !== null && _b !== void 0 ? _b : [])] : [])]) : [(0, path_1.join)(context.build.dir, "node_modules"), ...(!isClassic ? [(0, path_1.join)(context.build.dir, ".yarn/install-state.gz")] : [])])]
+    paths: [...(componentIsInWorkspace ? (0, lodash_1.uniq)(["node_modules", ...((_a = workspaces.map(w => (0, path_1.join)(w.location, "node_modules"))) !== null && _a !== void 0 ? _a : []), ...(!isClassic ? [".yarn/install-state.gz", ...((_b = workspaces.map(w => (0, path_1.join)(w.location, ".yarn/install-state.gz"))) !== null && _b !== void 0 ? _b : [])] : [])]) : [(0, path_1.join)(context.build.dir, "node_modules"), ...(!isClassic ? [(0, path_1.join)(context.build.dir, ".yarn/install-state.gz")] : [])])]
   }];
 };
 exports.getNodeModulesCache = getNodeModulesCache;
-const getNodeCache = (context, policy = "pull-push") => {
-  return [...(0, exports.getYarnCache)(context, policy), ...(0, exports.getNodeModulesCache)(context, policy)];
+const getNodeCache = async (context, policy = "pull-push") => {
+  return [...(await (0, exports.getYarnCache)(context, policy)), ...(await (0, exports.getNodeModulesCache)(context, policy))];
 };
 exports.getNodeCache = getNodeCache;

package/dist/pipeline/src/build/node/cache.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA8B;AAC9B,+BAA4B;AAC5B,sDAA8B;AAKvB,MAAM,YAAY,GAAG,~~CAC1B~~,OAAgB,EAChB,MAAM,GAAG,WAAW,~~EACL~~,EAAE;~~IACjB~~,MAAM,sBAAsB,GAC1B,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,~~OAAO~~,~~CAAC~~,kBAAkB,CAAC,sBAAsB,CAAC;~~IACpD~~,OAAO;QACL;YACE,KAAK,EAAE,sBAAsB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;YACrD,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU;YAC1D,GAAG,EAAE,MAAM;YACX,MAAM;YACN,KAAK,EAAE,CAAC,OAAO,CAAC;SACjB;KACF,CAAC;AACJ,CAAC,CAAC;~~AAhBW~~,QAAA,YAAY,~~gBAgBvB~~;AAEK,MAAM,mBAAmB,GAAG,~~CACjC~~,OAAgB,EAChB,MAAM,GAAG,WAAW,~~EACL~~,EAAE;;~~IACjB~~,MAAM,sBAAsB,GAC1B,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,~~OAAO~~,~~CAAC~~,kBAAkB,CAAC,sBAAsB,CAAC;~~IAEpD~~,MAAM,EAAE,SAAS,EAAE,~~GAAG~~,~~OAAO~~,~~CAAC~~,kBAAkB,CAAC;~~IAEjD~~,uNAAuN;IACvN,0HAA0H;IAC1H,OAAO;QACL;YACE,KAAK,EAAE,QAAQ;YACf,QAAQ,EAAE,UAAU;YAEpB,wFAAwF;YACxF,GAAG,EAAE,sBAAsB;gBACzB,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,+LAA+L;YACjP,MAAM;YACN,KAAK,EAAE;gBACL,GAAG,CAAC,sBAAsB;oBACxB,CAAC,CAAC,IAAA,aAAI,EAAC;wBACH,cAAc;wBACd,GAAG,CAAC,MAAA,~~OAAO,CAAC,kBAAkB,CAAC,~~UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,~~CAClD~~,IAAA,WAAI,EAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC,~~CACjC~~,~~mCAAI~~,EAAE,CAAC;~~wBACR~~,GAAG,CAAC,CAAC,SAAS;4BACZ,CAAC,CAAC;gCACE,wBAAwB;gCACxB,GAAG,CAAC,MAAA,~~OAAO,CAAC,kBAAkB,CAAC,~~UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,~~CAClD~~,IAAA,WAAI,EAAC,CAAC,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAC3C,mCAAI,EAAE,CAAC;6BACT;4BACH,CAAC,CAAC,EAAE,CAAC;qBACR,CAAC;oBACJ,CAAC,CAAC;wBACE,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC;wBACvC,GAAG,CAAC,CAAC,SAAS;4BACZ,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,wBAAwB,CAAC,CAAC;4BACrD,CAAC,CAAC,EAAE,CAAC;qBACR,CAAC;aACP;SACF;KACF,CAAC;AACJ,CAAC,CAAC;~~AA/CW~~,QAAA,mBAAmB,~~uBA+C9B~~;AACK,MAAM,YAAY,GAAG,~~CAC1B~~,OAAgB,EAChB,MAAM,GAAG,WAAW,~~EACL~~,EAAE;~~IACjB~~,OAAO;QACL,GAAG,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC;~~QAChC~~,GAAG,IAAA,2BAAmB,EAAC,OAAO,EAAE,MAAM,CAAC;~~KACxC~~,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB"}
1	+ {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/node/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ComponentContextWithBuild, WorkspaceContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createNodeJobs: (context: ComponentContextWithBuild | WorkspaceContext) => CatladderJob[];
-export declare const createStorybookJobs: (context: ComponentContextWithBuild) => CatladderJob[];
-export declare const createMeteorJobs: (context: ComponentContextWithBuild) => CatladderJob[];
+export declare const createNodeJobs: (context: ComponentContextWithBuild | WorkspaceContext) => Promise<CatladderJob[]>;
+export declare const createStorybookJobs: (context: ComponentContextWithBuild) => Promise<CatladderJob[]>;
+export declare const createMeteorJobs: (context: ComponentContextWithBuild) => Promise<CatladderJob[]>;