@ms-cloudpack/cli 0.72.52 → 0.72.54

package/lib/commands/unlink/execute.js

@@ -8,9 +8,8 @@ import path from 'path';
  */
 export const execute = async (params) => {
     // Use the current directory as the default package path.
-    const { options, contexts, reporter } = params;
+    const { options, appPath, reporter } = params;
     const { logResolveMap, cachePath } = options;
-    const { appPath } = contexts[0];
     console.debug('Unlinking packages...');
     const sessionResult = await getSessionToLink({ reporter, cachePath });
     if (!sessionResult.session) {

package/lib/commands/unlink/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/unlink/execute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAiC,KAAK,EAAE,MAAM,EAAE,EAAE;IACpE,yDAAyD;IACzD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAC/C,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEhC,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAEvC,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;IACtE,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC3B,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtF,MAAM,OAAO,GAAG,uBAAuB,OAAO,CAAC,WAAW,QAAQ,OAAO,GAAG,CAAC;IAC7E,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvC,4CAA4C;IAC5C,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;QAChE,UAAU,EAAE;YACV,IAAI,EAAE,OAAO;SACd;KACF,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IAErB,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE,CAAC;QAChD,4BAA4B;QAC5B,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACvF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC;IACjE,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,0CAA0C;QAC1C,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,2BAA2B,CAAC,EAAE,UAAU,CAAC,CAAC;IAC/E,CAAC;IAED,2BAA2B;IAC3B,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,MAAM,WAAW,GAAG,iBAAiB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IAE5E,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;AAClC,CAAC,CAAC","sourcesContent":["import type { CommandAction } from '../../types/CommandAction.js';\nimport type { UnlinkOptions } from './types/UnlinkOptions.js';\nimport { getSessionToLink } from '../link/getSessionToLink.js';\nimport { createCloudpackClient } from '@ms-cloudpack/api-server';\nimport { formatLinkSummary } from '../link/formatLinkSummary.js';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\n\n/**\n * Defines the \"unlink\" verb entry point.\n */\nexport const execute: CommandAction<UnlinkOptions> = async (params) => {\n  // Use the current directory as the default package path.\n  const { options, contexts, reporter } = params;\n  const { logResolveMap, cachePath } = options;\n  const { appPath } = contexts[0];\n\n  console.debug('Unlinking packages...');\n\n  const sessionResult = await getSessionToLink({ reporter, cachePath });\n  if (!sessionResult.session) {\n    return sessionResult;\n  }\n  const { session } = sessionResult;\n  const client = await createCloudpackClient({ url: session.urls.apiServer, reporter });\n\n  const message = `Unlinking paths for ${session.projectName} at \"${appPath}\"`;\n  const task = reporter.addTask(message);\n\n  // Send request to api server to link paths.\n  const { resolveMap, linkedPaths } = await client.unlinkPath.query({\n    linkedPath: {\n      path: appPath,\n    },\n  });\n  await client.close();\n\n  if (linkedPaths.some((p) => p.path === appPath)) {\n    // Close down with an error.\n    task.complete({ status: 'fail', message: `Failed to unlink paths.`, forceShow: true });\n    return { hasErrors: true, message: 'Failed to unlink paths.' };\n  }\n\n  if (logResolveMap) {\n    // Write the unlinked resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map-unlinked.json'), resolveMap);\n  }\n\n  // Close down successfully.\n  task.complete({ status: 'complete', message: `Unlinked paths`, forceShow: true });\n  const linkSummary = formatLinkSummary({ session, resolveMap, linkedPaths });\n\n  return { message: linkSummary };\n};\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/unlink/execute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAiC,KAAK,EAAE,MAAM,EAAE,EAAE;IACpE,yDAAyD;IACzD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAC9C,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE7C,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAEvC,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;IACtE,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC3B,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtF,MAAM,OAAO,GAAG,uBAAuB,OAAO,CAAC,WAAW,QAAQ,OAAO,GAAG,CAAC;IAC7E,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvC,4CAA4C;IAC5C,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;QAChE,UAAU,EAAE;YACV,IAAI,EAAE,OAAO;SACd;KACF,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IAErB,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE,CAAC;QAChD,4BAA4B;QAC5B,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACvF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC;IACjE,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,0CAA0C;QAC1C,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,2BAA2B,CAAC,EAAE,UAAU,CAAC,CAAC;IAC/E,CAAC;IAED,2BAA2B;IAC3B,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,MAAM,WAAW,GAAG,iBAAiB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IAE5E,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;AAClC,CAAC,CAAC","sourcesContent":["import type { CommandAction } from '../../types/CommandAction.js';\nimport type { UnlinkOptions } from './types/UnlinkOptions.js';\nimport { getSessionToLink } from '../link/getSessionToLink.js';\nimport { createCloudpackClient } from '@ms-cloudpack/api-server';\nimport { formatLinkSummary } from '../link/formatLinkSummary.js';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\n\n/**\n * Defines the \"unlink\" verb entry point.\n */\nexport const execute: CommandAction<UnlinkOptions> = async (params) => {\n  // Use the current directory as the default package path.\n  const { options, appPath, reporter } = params;\n  const { logResolveMap, cachePath } = options;\n\n  console.debug('Unlinking packages...');\n\n  const sessionResult = await getSessionToLink({ reporter, cachePath });\n  if (!sessionResult.session) {\n    return sessionResult;\n  }\n  const { session } = sessionResult;\n  const client = await createCloudpackClient({ url: session.urls.apiServer, reporter });\n\n  const message = `Unlinking paths for ${session.projectName} at \"${appPath}\"`;\n  const task = reporter.addTask(message);\n\n  // Send request to api server to link paths.\n  const { resolveMap, linkedPaths } = await client.unlinkPath.query({\n    linkedPath: {\n      path: appPath,\n    },\n  });\n  await client.close();\n\n  if (linkedPaths.some((p) => p.path === appPath)) {\n    // Close down with an error.\n    task.complete({ status: 'fail', message: `Failed to unlink paths.`, forceShow: true });\n    return { hasErrors: true, message: 'Failed to unlink paths.' };\n  }\n\n  if (logResolveMap) {\n    // Write the unlinked resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map-unlinked.json'), resolveMap);\n  }\n\n  // Close down successfully.\n  task.complete({ status: 'complete', message: `Unlinked paths`, forceShow: true });\n  const linkSummary = formatLinkSummary({ session, resolveMap, linkedPaths });\n\n  return { message: linkSummary };\n};\n"]}

package/lib/types/AutoDispose.d.ts

@@ -1,3 +1,3 @@
 import type { Disposable } from './Disposable.js';
-export type AutoDispose = <T extends Disposable>(...items: T[]) => T[];
+export type AutoDispose = <T extends Disposable>(item: T) => T;
 //# sourceMappingURL=AutoDispose.d.ts.map

package/lib/types/AutoDispose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AutoDispose.d.ts","sourceRoot":"","sources":["../../src/types/AutoDispose.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC"}
+{"version":3,"file":"AutoDispose.d.ts","sourceRoot":"","sources":["../../src/types/AutoDispose.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,UAAU,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC"}

package/lib/types/AutoDispose.js.map

@@ -1 +1 @@
-{"version":3,"file":"AutoDispose.js","sourceRoot":"","sources":["../../src/types/AutoDispose.ts"],"names":[],"mappings":"","sourcesContent":["import type { Disposable } from './Disposable.js';\n\nexport type AutoDispose = <T extends Disposable>(...items: T[]) => T[];\n"]}
+{"version":3,"file":"AutoDispose.js","sourceRoot":"","sources":["../../src/types/AutoDispose.ts"],"names":[],"mappings":"","sourcesContent":["import type { Disposable } from './Disposable.js';\n\nexport type AutoDispose = <T extends Disposable>(item: T) => T;\n"]}

package/lib/types/CommandAction.d.ts

@@ -1,12 +1,15 @@
-import type { LazyApiContextOptions } from '@ms-cloudpack/api-server';
-import type { TaskReporter } from '@ms-cloudpack/task-reporter';
+import type { CreateApiContextOptions } from '@ms-cloudpack/api-server';
 import type { AutoDispose } from './AutoDispose.js';
 import type { SharedOptions } from './SharedOptions.js';
+import type { Span } from '@ms-cloudpack/telemetry';
 /**
  * Context for running a command in a specific app (after initialization).
- * For convenience, this can be passed/spread directly to `createPartialApiContext`.
+ * For convenience, this can be passed/spread directly to `createApiContext`.
  */
-export type AppCommandContext = Pick<LazyApiContextOptions, 'appPath' | 'cachePath' | 'config' | 'reporter' | 'telemetryClient'>;
+export interface AppCommandContext extends Pick<CreateApiContextOptions, 'cachePath' | 'config' | 'reporter' | 'taskRunner' | 'telemetryClient'> {
+    /** App path (CWD for most operations). */
+    appPath: string;
+}
 export declare const ExitCodeSuccessful = 0;
 export declare const ExitCodeGenericError = 1;
 export declare const ExitCodeAuthenticationError = 2;
@@ -22,16 +25,9 @@ export interface CommandExitParams {
     /** Exit code to use. Defaults to 1 if there are errors, 0 if not. */
     exitCode?: ExitCode;
     /** True if the user interrupted an operation (ctrl+C). Sets the message automatically. */
-    isInterrupted?: true;
+    isInterrupted?: boolean;
 }
-export interface CommandActionParams<TOptions extends object> {
-    /**
-     * App paths and corresponding contexts.
-     *
-     * Unless `discoverAppPaths: 'multi'` was set during command initialization in `<command>/index.ts`,
-     * there will only be one path/context.
-     */
-    contexts: AppCommandContext[];
+export interface CommandActionParams<TOptions extends object> extends AppCommandContext {
     /**
      * Command-specific options, parsed from `process.argv`.
      * Types are generally defined in each command's `src/commands/<name>/types/<Name>Types.ts` module.
@@ -43,8 +39,15 @@ export interface CommandActionParams<TOptions extends object> {
      * For example, in `echo somestring`, `somestring` is an argument.
      */
     args: string[];
-    reporter: TaskReporter;
-    abortSignal: AbortSignal;
+    /**
+     * Whether the command is being run for multiple apps. (It only runs on one app at a time, but
+     * multi-app may impact formatting choices or other behaviors.)
+     */
+    isMultiApp: boolean;
+    /**
+     * Parent span for the command.
+     */
+    span: Span;
     /**
      * Function that can be called with any `Disposable`s that should be cleaned up automatically
      * when the program exits. (See `AutoDisposableList.add` for implementation.)
@@ -57,10 +60,15 @@ export interface CommandActionParams<TOptions extends object> {
 }
 /**
  * Command action function (executor). This is the type of the `execute` function which should
- * be exported from each command's `src/commands/<name>/execute.ts` module.
+ * be exported from each command's `src/commands/<name>/execute.ts` module and is called by
+ * `CommandExecutor` against each app.
  *
- * If it returns an object, the command wrapper will call the exit handler with that object.
- * If it returns null, it's assumed that this command is meant to keep running, such as `start`.
+ * - If it returns an object, CommandExecutor will call the exit handler with that object.
+ *   - For multi-app, it will exit immediately if `isInterrupted` is set, but otherwise it will
+ *     keep running and use the accumulation of the results.
+ * - If it returns null, it's assumed that this command is meant to keep running, such as `start`.
+ *   - NOTE: Multi-app commands should not return null (if this is needed in the future, it will
+ *     require extra logic in CommandExecutor).
  */
 export type CommandAction<TOptions> = (params: CommandActionParams<TOptions & SharedOptions>) => Promise<CommandExitParams | null>;
 export type CommandActionModule<TOptions> = {

package/lib/types/CommandAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandAction.d.ts","sourceRoot":"","sources":["../../src/types/CommandAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,qBAAqB,EACrB,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,UAAU,GAAG,iBAAiB,CACpE,CAAC;AAEF,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,oBAAoB,IAAI,CAAC;AACtC,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAC7C,MAAM,MAAM,QAAQ,GAAG,OAAO,kBAAkB,GAAG,OAAO,oBAAoB,GAAG,OAAO,2BAA2B,CAAC;AAEpH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,kFAAkF;IAClF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,0FAA0F;IAC1F,aAAa,CAAC,EAAE,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB,CAAC,QAAQ,SAAS,MAAM;IAC1D;;;;;OAKG;IACH,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAE9B;;;;OAIG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;OAGG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IAEf,QAAQ,EAAE,YAAY,CAAC;IAEvB,WAAW,EAAE,WAAW,CAAC;IAEzB;;;OAGG;IACH,WAAW,EAAE,WAAW,CAAC;IAEzB;;OAEG;IACH,0BAA0B,EAAE,CAAC,UAAU,EAAE,MAAM,MAAM,KAAK,IAAI,CAAC;CAChE;AAED;;;;;;GAMG;AACH,MAAM,MAAM,aAAa,CAAC,QAAQ,IAAI,CACpC,MAAM,EAAE,mBAAmB,CAAC,QAAQ,GAAG,aAAa,CAAC,KAClD,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;AAEvC,MAAM,MAAM,mBAAmB,CAAC,QAAQ,IAAI;IAC1C,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;CAClC,CAAC"}
+{"version":3,"file":"CommandAction.d.ts","sourceRoot":"","sources":["../../src/types/CommandAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAEpD;;;GAGG;AACH,MAAM,WAAW,iBACf,SAAQ,IAAI,CAAC,uBAAuB,EAAE,WAAW,GAAG,QAAQ,GAAG,UAAU,GAAG,YAAY,GAAG,iBAAiB,CAAC;IAC7G,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,oBAAoB,IAAI,CAAC;AACtC,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAC7C,MAAM,MAAM,QAAQ,GAAG,OAAO,kBAAkB,GAAG,OAAO,oBAAoB,GAAG,OAAO,2BAA2B,CAAC;AAEpH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,kFAAkF;IAClF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,0FAA0F;IAC1F,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB,CAAC,QAAQ,SAAS,MAAM,CAAE,SAAQ,iBAAiB;IACrF;;;;OAIG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;OAGG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IAEf;;;OAGG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;;OAGG;IACH,WAAW,EAAE,WAAW,CAAC;IAEzB;;OAEG;IACH,0BAA0B,EAAE,CAAC,UAAU,EAAE,MAAM,MAAM,KAAK,IAAI,CAAC;CAChE;AAED;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,aAAa,CAAC,QAAQ,IAAI,CACpC,MAAM,EAAE,mBAAmB,CAAC,QAAQ,GAAG,aAAa,CAAC,KAClD,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;AAEvC,MAAM,MAAM,mBAAmB,CAAC,QAAQ,IAAI;IAC1C,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;CAClC,CAAC"}

package/lib/types/CommandAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandAction.js","sourceRoot":"","sources":["../../src/types/CommandAction.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AACpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AACtC,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC","sourcesContent":["import type { LazyApiContextOptions } from '@ms-cloudpack/api-server';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { AutoDispose } from './AutoDispose.js';\nimport type { SharedOptions } from './SharedOptions.js';\n\n/**\n * Context for running a command in a specific app (after initialization).\n * For convenience, this can be passed/spread directly to `createPartialApiContext`.\n */\nexport type AppCommandContext = Pick<\n  LazyApiContextOptions,\n  'appPath' | 'cachePath' | 'config' | 'reporter' | 'telemetryClient'\n>;\n\nexport const ExitCodeSuccessful = 0;\nexport const ExitCodeGenericError = 1;\nexport const ExitCodeAuthenticationError = 2;\nexport type ExitCode = typeof ExitCodeSuccessful | typeof ExitCodeGenericError | typeof ExitCodeAuthenticationError;\n\nexport interface CommandExitParams {\n  /**\n   * Message to show on exit.\n   * If `isInterrupted` is true, use an empty string (it will show a default interrupt message).\n   */\n  message: string;\n  /** Whether there are errors. By default, checks the reporter for failed tasks. */\n  hasErrors?: boolean;\n  /** Exit code to use. Defaults to 1 if there are errors, 0 if not. */\n  exitCode?: ExitCode;\n  /** True if the user interrupted an operation (ctrl+C). Sets the message automatically. */\n  isInterrupted?: true;\n}\n\nexport interface CommandActionParams<TOptions extends object> {\n  /**\n   * App paths and corresponding contexts.\n   *\n   * Unless `discoverAppPaths: 'multi'` was set during command initialization in `<command>/index.ts`,\n   * there will only be one path/context.\n   */\n  contexts: AppCommandContext[];\n\n  /**\n   * Command-specific options, parsed from `process.argv`.\n   * Types are generally defined in each command's `src/commands/<name>/types/<Name>Types.ts` module.\n   * The command line options are defined in each command's `src/commands/<name>/index.ts` module.\n   */\n  options: TOptions;\n\n  /**\n   * Command-specific arguments. Arguments in commander are positional arguments that are not options.\n   * For example, in `echo somestring`, `somestring` is an argument.\n   */\n  args: string[];\n\n  reporter: TaskReporter;\n\n  abortSignal: AbortSignal;\n\n  /**\n   * Function that can be called with any `Disposable`s that should be cleaned up automatically\n   * when the program exits. (See `AutoDisposableList.add` for implementation.)\n   */\n  autoDispose: AutoDispose;\n\n  /**\n   * Set a callback to get the message to display if ctrl+C is pressed.\n   */\n  setInterruptMessageHandler: (getMessage: () => string) => void;\n}\n\n/**\n * Command action function (executor). This is the type of the `execute` function which should\n * be exported from each command's `src/commands/<name>/execute.ts` module.\n *\n * If it returns an object, the command wrapper will call the exit handler with that object.\n * If it returns null, it's assumed that this command is meant to keep running, such as `start`.\n */\nexport type CommandAction<TOptions> = (\n  params: CommandActionParams<TOptions & SharedOptions>,\n) => Promise<CommandExitParams | null>;\n\nexport type CommandActionModule<TOptions> = {\n  execute: CommandAction<TOptions>;\n};\n"]}
+{"version":3,"file":"CommandAction.js","sourceRoot":"","sources":["../../src/types/CommandAction.ts"],"names":[],"mappings":"AAeA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AACpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AACtC,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC","sourcesContent":["import type { CreateApiContextOptions } from '@ms-cloudpack/api-server';\nimport type { AutoDispose } from './AutoDispose.js';\nimport type { SharedOptions } from './SharedOptions.js';\nimport type { Span } from '@ms-cloudpack/telemetry';\n\n/**\n * Context for running a command in a specific app (after initialization).\n * For convenience, this can be passed/spread directly to `createApiContext`.\n */\nexport interface AppCommandContext\n  extends Pick<CreateApiContextOptions, 'cachePath' | 'config' | 'reporter' | 'taskRunner' | 'telemetryClient'> {\n  /** App path (CWD for most operations). */\n  appPath: string;\n}\n\nexport const ExitCodeSuccessful = 0;\nexport const ExitCodeGenericError = 1;\nexport const ExitCodeAuthenticationError = 2;\nexport type ExitCode = typeof ExitCodeSuccessful | typeof ExitCodeGenericError | typeof ExitCodeAuthenticationError;\n\nexport interface CommandExitParams {\n  /**\n   * Message to show on exit.\n   * If `isInterrupted` is true, use an empty string (it will show a default interrupt message).\n   */\n  message: string;\n  /** Whether there are errors. By default, checks the reporter for failed tasks. */\n  hasErrors?: boolean;\n  /** Exit code to use. Defaults to 1 if there are errors, 0 if not. */\n  exitCode?: ExitCode;\n  /** True if the user interrupted an operation (ctrl+C). Sets the message automatically. */\n  isInterrupted?: boolean;\n}\n\nexport interface CommandActionParams<TOptions extends object> extends AppCommandContext {\n  /**\n   * Command-specific options, parsed from `process.argv`.\n   * Types are generally defined in each command's `src/commands/<name>/types/<Name>Types.ts` module.\n   * The command line options are defined in each command's `src/commands/<name>/index.ts` module.\n   */\n  options: TOptions;\n\n  /**\n   * Command-specific arguments. Arguments in commander are positional arguments that are not options.\n   * For example, in `echo somestring`, `somestring` is an argument.\n   */\n  args: string[];\n\n  /**\n   * Whether the command is being run for multiple apps. (It only runs on one app at a time, but\n   * multi-app may impact formatting choices or other behaviors.)\n   */\n  isMultiApp: boolean;\n\n  /**\n   * Parent span for the command.\n   */\n  span: Span;\n\n  /**\n   * Function that can be called with any `Disposable`s that should be cleaned up automatically\n   * when the program exits. (See `AutoDisposableList.add` for implementation.)\n   */\n  autoDispose: AutoDispose;\n\n  /**\n   * Set a callback to get the message to display if ctrl+C is pressed.\n   */\n  setInterruptMessageHandler: (getMessage: () => string) => void;\n}\n\n/**\n * Command action function (executor). This is the type of the `execute` function which should\n * be exported from each command's `src/commands/<name>/execute.ts` module and is called by\n * `CommandExecutor` against each app.\n *\n * - If it returns an object, CommandExecutor will call the exit handler with that object.\n *   - For multi-app, it will exit immediately if `isInterrupted` is set, but otherwise it will\n *     keep running and use the accumulation of the results.\n * - If it returns null, it's assumed that this command is meant to keep running, such as `start`.\n *   - NOTE: Multi-app commands should not return null (if this is needed in the future, it will\n *     require extra logic in CommandExecutor).\n */\nexport type CommandAction<TOptions> = (\n  params: CommandActionParams<TOptions & SharedOptions>,\n) => Promise<CommandExitParams | null>;\n\nexport type CommandActionModule<TOptions> = {\n  execute: CommandAction<TOptions>;\n};\n"]}

package/lib/types/Disposable.d.ts

@@ -1,4 +1,4 @@
 export interface Disposable {
-    dispose: () => void | Promise<void>;
+    dispose?: () => void | Promise<void>;
 }
 //# sourceMappingURL=Disposable.d.ts.map

package/lib/types/Disposable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Disposable.d.ts","sourceRoot":"","sources":["../../src/types/Disposable.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC"}
+{"version":3,"file":"Disposable.d.ts","sourceRoot":"","sources":["../../src/types/Disposable.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC"}

package/lib/types/Disposable.js.map

@@ -1 +1 @@
-{"version":3,"file":"Disposable.js","sourceRoot":"","sources":["../../src/types/Disposable.ts"],"names":[],"mappings":"","sourcesContent":["export interface Disposable {\n  dispose: () => void | Promise<void>;\n}\n"]}
+{"version":3,"file":"Disposable.js","sourceRoot":"","sources":["../../src/types/Disposable.ts"],"names":[],"mappings":"","sourcesContent":["export interface Disposable {\n  dispose?: () => void | Promise<void>;\n}\n"]}

package/lib/utilities/AutoDisposableList.d.ts

@@ -1,7 +1,7 @@
 import type { Disposable } from '../types/Disposable.js';
 export declare class AutoDisposableList {
     private readonly disposables;
-    add<T extends Disposable>(...items: T[]): T[];
+    add<T extends Disposable>(item: T): T;
     dispose(): Promise<void>;
 }
 //# sourceMappingURL=AutoDisposableList.d.ts.map

package/lib/utilities/AutoDisposableList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AutoDisposableList.d.ts","sourceRoot":"","sources":["../../src/utilities/AutoDisposableList.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAEzC,GAAG,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;IAKvC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBtC"}
+{"version":3,"file":"AutoDisposableList.d.ts","sourceRoot":"","sources":["../../src/utilities/AutoDisposableList.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAEzC,GAAG,CAAC,CAAC,SAAS,UAAU,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC;IAK/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBtC"}

package/lib/utilities/AutoDisposableList.js

@@ -2,15 +2,15 @@ export class AutoDisposableList {
     constructor() {
         this.disposables = [];
     }
-    add(...items) {
-        this.disposables.push(...items);
-        return items;
+    add(item) {
+        this.disposables.push(item);
+        return item;
     }
     async dispose() {
         let errorCount = 0;
         await Promise.all(this.disposables.map(async (d) => {
             try {
-                await d.dispose();
+                await d.dispose?.();
             }
             catch (err) {
                 console.error(`Failed to dispose: ${err.stack || err}`);

package/lib/utilities/AutoDisposableList.js.map

@@ -1 +1 @@
-{"version":3,"file":"AutoDisposableList.js","sourceRoot":"","sources":["../../src/utilities/AutoDisposableList.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,kBAAkB;IAA/B;QACmB,gBAAW,GAAiB,EAAE,CAAC;IAuBlD,CAAC;IArBQ,GAAG,CAAuB,GAAG,KAAU;QAC5C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YAC/B,IAAI,CAAC;gBACH,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;YACpB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,sBAAuB,GAAa,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC,CAAC;gBACnE,UAAU,EAAE,CAAC;YACf,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QACF,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,gBAAgB,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;CACF","sourcesContent":["import type { Disposable } from '../types/Disposable.js';\n\nexport class AutoDisposableList {\n  private readonly disposables: Disposable[] = [];\n\n  public add<T extends Disposable>(...items: T[]): T[] {\n    this.disposables.push(...items);\n    return items;\n  }\n\n  public async dispose(): Promise<void> {\n    let errorCount = 0;\n    await Promise.all(\n      this.disposables.map(async (d) => {\n        try {\n          await d.dispose();\n        } catch (err) {\n          console.error(`Failed to dispose: ${(err as Error).stack || err}`);\n          errorCount++;\n        }\n      }),\n    );\n    if (errorCount) {\n      throw new Error(`Failed to dispose ${errorCount} disposable(s)`);\n    }\n  }\n}\n"]}
+{"version":3,"file":"AutoDisposableList.js","sourceRoot":"","sources":["../../src/utilities/AutoDisposableList.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,kBAAkB;IAA/B;QACmB,gBAAW,GAAiB,EAAE,CAAC;IAuBlD,CAAC;IArBQ,GAAG,CAAuB,IAAO;QACtC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YAC/B,IAAI,CAAC;gBACH,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YACtB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,sBAAuB,GAAa,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC,CAAC;gBACnE,UAAU,EAAE,CAAC;YACf,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QACF,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,gBAAgB,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;CACF","sourcesContent":["import type { Disposable } from '../types/Disposable.js';\n\nexport class AutoDisposableList {\n  private readonly disposables: Disposable[] = [];\n\n  public add<T extends Disposable>(item: T): T {\n    this.disposables.push(item);\n    return item;\n  }\n\n  public async dispose(): Promise<void> {\n    let errorCount = 0;\n    await Promise.all(\n      this.disposables.map(async (d) => {\n        try {\n          await d.dispose?.();\n        } catch (err) {\n          console.error(`Failed to dispose: ${(err as Error).stack || err}`);\n          errorCount++;\n        }\n      }),\n    );\n    if (errorCount) {\n      throw new Error(`Failed to dispose ${errorCount} disposable(s)`);\n    }\n  }\n}\n"]}

package/lib/utilities/CloudpackCommand.d.ts

@@ -2,18 +2,21 @@ import { Command, Option, type AddHelpTextPosition, type Argument, type OutputCo
 import type { CommandActionModule } from '../types/CommandAction.js';
 import type { ProgramOptions } from '../types/ProgramOptions.js';
 import type { SharedOptions } from '../types/SharedOptions.js';
-import { type CommandExecutorSharedParams } from './CommandExecutor.js';
+import { type CommandExecutorParams } from './CommandExecutor.js';
 /**
  * Parameters for creating a command.
  * `TOptions` should be the command-specific options (if any), e.g. `StartOptions`.
  */
-interface CloudpackCommandParams<TOptions extends object, TArguments extends object> extends CommandExecutorSharedParams {
+interface CloudpackCommandParams<TOptions extends object, TArguments extends object> extends Pick<CommandExecutorParams, 'discoverAppPaths'> {
     /** Command name */
     name: string;
     /** Command description */
     description: string;
-    /** Options specific to this command. The record ensures that all options are available in the CLI. */
-    options?: Record<keyof TOptions, Option>;
+    /**
+     * Options specific to this command. The record ensures that all options are available in the CLI.
+     * Allow multiple options for the same key since commander supports it with negatable options.
+     */
+    options?: Record<keyof TOptions, Option | Option[]>;
     /** Arguments specific to this command. Key order determines the arg order. */
     args?: Record<keyof TArguments, Argument>;
     /**

package/lib/utilities/CloudpackCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CloudpackCommand.d.ts","sourceRoot":"","sources":["../../src/utilities/CloudpackCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,EAAE,KAAK,mBAAmB,EAAE,KAAK,QAAQ,EAAE,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACrH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAmB,KAAK,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAKzF;;;GAGG;AACH,UAAU,sBAAsB,CAAC,QAAQ,SAAS,MAAM,EAAE,UAAU,SAAS,MAAM,CACjF,SAAQ,2BAA2B;IACnC,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;IAEpB,sGAAsG;IACtG,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEzC,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,UAAU,EAAE,QAAQ,CAAC,CAAC;IAE1C;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE3D,6BAA6B;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,yDAAyD;IACzD,WAAW,CAAC,EAAE;QACZ;;;WAGG;QACH,QAAQ,EAAE,mBAAmB,CAAC;QAC9B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,mDAAmD;IACnD,aAAa,CAAC,EAAE,mBAAmB,CAAC;IAEpC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,aAAa,CAAC,GAAG,IAAI,CAAC;CACvD;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,QAAQ,SAAS,MAAM,EAAE,UAAU,SAAS,MAAM;IAC9E,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,iBAAiB,CAAmC;IAE5D;;;OAGG;gBAGD,MAAM,EAAE,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG;QACrD,cAAc,EAAE,cAAc,CAAC;QAC/B,+DAA+D;QAC/D,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB;IAkDH,8BAA8B;IACvB,aAAa,CAAC,aAAa,SAAS,MAAM,EAAE,eAAe,SAAS,MAAM,GAAG,KAAK,EACvF,MAAM,EAAE,sBAAsB,CAAC,aAAa,EAAE,eAAe,CAAC,GAC7D,gBAAgB,CAAC,aAAa,EAAE,eAAe,CAAC;IAQnD,qEAAqE;IACxD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,qGAAqG;IACrG,OAAO,CAAC,aAAa;IAMrB,iGAAiG;IACjG,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,UAAU;CAqCnB"}
+{"version":3,"file":"CloudpackCommand.d.ts","sourceRoot":"","sources":["../../src/utilities/CloudpackCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,EAAE,KAAK,mBAAmB,EAAE,KAAK,QAAQ,EAAE,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACrH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAmB,KAAK,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAKnF;;;GAGG;AACH,UAAU,sBAAsB,CAAC,QAAQ,SAAS,MAAM,EAAE,UAAU,SAAS,MAAM,CACjF,SAAQ,IAAI,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;IACvD,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAEpD,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,UAAU,EAAE,QAAQ,CAAC,CAAC;IAE1C;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE3D,6BAA6B;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,yDAAyD;IACzD,WAAW,CAAC,EAAE;QACZ;;;WAGG;QACH,QAAQ,EAAE,mBAAmB,CAAC;QAC9B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,mDAAmD;IACnD,aAAa,CAAC,EAAE,mBAAmB,CAAC;IAEpC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,aAAa,CAAC,GAAG,IAAI,CAAC;CACvD;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,QAAQ,SAAS,MAAM,EAAE,UAAU,SAAS,MAAM;IAC9E,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,iBAAiB,CAAmC;IAE5D;;;OAGG;gBAGD,MAAM,EAAE,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG;QACrD,cAAc,EAAE,cAAc,CAAC;QAC/B,+DAA+D;QAC/D,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB;IAkDH,8BAA8B;IACvB,aAAa,CAAC,aAAa,SAAS,MAAM,EAAE,eAAe,SAAS,MAAM,GAAG,KAAK,EACvF,MAAM,EAAE,sBAAsB,CAAC,aAAa,EAAE,eAAe,CAAC,GAC7D,gBAAgB,CAAC,aAAa,EAAE,eAAe,CAAC;IAQnD,qEAAqE;IACxD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,qGAAqG;IACrG,OAAO,CAAC,aAAa;IAMrB,iGAAiG;IACjG,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,UAAU;CAqCnB"}

package/lib/utilities/CloudpackCommand.js

@@ -77,11 +77,14 @@ export class CloudpackCommand {
     }
     /** Add options. The generic enforces that option objects are included for all keys of a type. */
     _addOptions(options, hideOptions) {
-        for (const [name, option] of Object.entries(options)) {
-            if (hideOptions === true || hideOptions?.includes(name)) {
-                option.hideHelp();
+        for (const [name, optionOrOptions] of Object.entries(options)) {
+            const optionArray = Array.isArray(optionOrOptions) ? optionOrOptions : [optionOrOptions];
+            for (const option of optionArray) {
+                if (hideOptions === true || hideOptions?.includes(name)) {
+                    option.hideHelp();
+                }
+                this._command.addOption(option);
             }
-            this._command.addOption(option);
         }
     }
     _addAction(getExecutor) {

package/lib/utilities/CloudpackCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"CloudpackCommand.js","sourceRoot":"","sources":["../../src/utilities/CloudpackCommand.ts"],"names":[],"mappings":"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","sourcesContent":["import { Command, Help, Option, type AddHelpTextPosition, type Argument, type OutputConfiguration } from 'commander';\nimport type { CommandActionModule } from '../types/CommandAction.js';\nimport type { ProgramOptions } from '../types/ProgramOptions.js';\nimport type { SharedOptions } from '../types/SharedOptions.js';\nimport { CommandExecutor, type CommandExecutorSharedParams } from './CommandExecutor.js';\nimport { environmentInfo } from '@ms-cloudpack/environment';\nimport { parseFeature } from './parseFeature.js';\nimport type { AppPathDiscoveryMode } from '../types/AppPathDiscoveryMode.js';\n\n/**\n * Parameters for creating a command.\n * `TOptions` should be the command-specific options (if any), e.g. `StartOptions`.\n */\ninterface CloudpackCommandParams<TOptions extends object, TArguments extends object>\n  extends CommandExecutorSharedParams {\n  /** Command name */\n  name: string;\n\n  /** Command description */\n  description: string;\n\n  /** Options specific to this command. The record ensures that all options are available in the CLI. */\n  options?: Record<keyof TOptions, Option>;\n\n  /** Arguments specific to this command. Key order determines the arg order. */\n  args?: Record<keyof TArguments, Argument>;\n\n  /**\n   * Function returning an async import of the command's `src/commands/<name>/execute.ts` module.\n   * Importing only on demand makes Cloudpack start up faster since it doesn't have to parse\n   * every command's dependencies (many of which may be unrelated to the command being run).\n   *\n   * This can be undefined for a command that only has sub-commands.\n   */\n  getExecutor?: () => Promise<CommandActionModule<TOptions>>;\n\n  /** Usage message override */\n  usage?: string;\n\n  /** Alternative name for the command */\n  alias?: string;\n\n  /** Extra text to be displayed with the built-in help. */\n  addHelpText?: {\n    /**\n     * `'before'` or `'after'` to affect just this command.\n     * `'beforeAll'` or `'afterAll'` to affect this command and all its subcommands.\n     */\n    position: AddHelpTextPosition;\n    text: string;\n  };\n\n  /** Output options override (mainly for testing) */\n  outputOptions?: OutputConfiguration;\n\n  /**\n   * The shared options are relevant for most commands, but this allows omitting them from help\n   * where they're not relevant. `true` hides all shared options, or an array hides specific ones.\n   */\n  hideSharedOptions?: Array<keyof SharedOptions> | true;\n}\n\n/**\n * This wraps the `Command` class from [`commander`](https://www.npmjs.com/package/commander) with\n * Cloudpack-specific functionality and simpler APIs.\n *\n * Similar to the pattern from `commander`, this class represents both the program and its sub-commands.\n * - The top-level \"program\" command should be created with `new CloudpackCommand()`.\n * - Sub-commands should be created with the `.addSubCommand` method on the parent.\n */\nexport class CloudpackCommand<TOptions extends object, TArguments extends object> {\n  private _command: Command;\n  private _programOptions: ProgramOptions;\n  private _discoverAppPaths: AppPathDiscoveryMode | undefined;\n\n  /**\n   * This should only be used directly (outside this class) to create the top-level `program` command.\n   * To add sub-commands, use `.addSubCommand` instead.\n   */\n  constructor(\n    // The extra options here shouldn't be exposed to the `createSubCommand` API\n    params: CloudpackCommandParams<TOptions, TArguments> & {\n      programOptions: ProgramOptions;\n      /** This must be undefined for the top-level program command */\n      parent?: Command;\n    },\n  ) {\n    this._programOptions = params.programOptions;\n    this._discoverAppPaths = params.discoverAppPaths;\n\n    const command = params.parent?.command(params.name) || new Command(params.name);\n    this._command = command;\n\n    command.version(params.programOptions.version);\n    command.description(params.description);\n    command.allowExcessArguments(false);\n    command.createHelp = () => new CloudpackHelp();\n\n    params.usage && command.usage(params.usage);\n    params.alias && command.alias(params.alias);\n    params.addHelpText && command.addHelpText(params.addHelpText.position, params.addHelpText.text);\n    params.outputOptions && command.configureOutput(params.outputOptions);\n    params.getExecutor && this._addAction(params.getExecutor);\n\n    if (params.args) {\n      this._addArguemnts<TArguments>(params.args);\n    }\n\n    if (params.options) {\n      // Add the command-specific options first so they show up first in help\n      this._addOptions<TOptions>(params.options);\n    }\n\n    // Add shared options. These must be manually added to the program command and each sub-command\n    // because commander doesn't natively support inheriting options.\n    this._addOptions<SharedOptions>(\n      {\n        verbose: new Option('-v, --verbose', 'Show additional details about the running tasks.'),\n        debug: new Option('-d, --debug', 'Show debug information (superset of --verbose).').conflicts('verbose'),\n        quiet: new Option('-q, --quiet', 'Disable non-essential logging.').conflicts('verbose').conflicts('debug'),\n        color:\n          // In the parsed options, this will be a boolean `color` with default value true (except in tests and CI)\n          new Option('-n, --no-color', 'Disable colors in the output.').default(\n            !environmentInfo.isJest && !environmentInfo.isLage && !environmentInfo.isCI,\n          ),\n        features: new Option('--features <featureNames...>', 'Enable experimental features.').argParser(parseFeature),\n        cachePath: new Option(\n          '--cache-path <path>',\n          'Custom cache folder. To change the default, run `cloudpack config set cachePath <path>`.',\n        ),\n      },\n      params.hideSharedOptions,\n    );\n  }\n\n  /** Create a child command. */\n  public addSubCommand<TChildOptions extends object, TChildArguments extends object = never>(\n    params: CloudpackCommandParams<TChildOptions, TChildArguments>,\n  ): CloudpackCommand<TChildOptions, TChildArguments> {\n    return new CloudpackCommand<TChildOptions, TChildArguments>({\n      ...params,\n      programOptions: this._programOptions,\n      parent: this._command,\n    });\n  }\n\n  /** Run the program (only works on the top-level program command). */\n  public async run(): Promise<void> {\n    if (this._command.parent) {\n      throw new Error('Only the top-level program command can be run directly.');\n    }\n\n    await this._command.parseAsync(this._programOptions.argv);\n    if (this._command.args.length === 0) {\n      this._command.help();\n    }\n  }\n\n  /** Add arguments. The generic enforces that argument objects are included for all keys of a type. */\n  private _addArguemnts<TAddArguments extends object>(args: Record<keyof TAddArguments, Argument>): void {\n    for (const argument of Object.values(args)) {\n      this._command.addArgument(argument as Argument);\n    }\n  }\n\n  /** Add options. The generic enforces that option objects are included for all keys of a type. */\n  private _addOptions<TAddOptions extends object>(\n    options: Record<keyof TAddOptions, Option>,\n    hideOptions?: Array<keyof TAddOptions> | true,\n  ): void {\n    for (const [name, option] of Object.entries(options) as [keyof TAddOptions, Option][]) {\n      if (hideOptions === true || hideOptions?.includes(name)) {\n        option.hideHelp();\n      }\n      this._command.addOption(option);\n    }\n  }\n\n  private _addAction(getExecutor: NonNullable<CloudpackCommandParams<TOptions, TArguments>['getExecutor']>): void {\n    const command = this._command;\n    // The action function receives parsed options as its first parameter, but we ignore those\n    // because they only contain options *specific to this command*, not shared options like `debug`.\n    command.action(async () => {\n      // Commander has support for custom parsers that parse arguments.\n      // Use processedArgs instead of args to get the parsed arguments.\n      const processedArgs = command.processedArgs as string[];\n\n      // Get the shared options too, not just the ones for this command.\n      // (In `cloudpackCommand`, we added the shared options to each command object so that they show up\n      // in help, but commander still seems to respect options only at the first command where they're\n      // encountered, which for shared options will always be the program command.)\n      const options = command.optsWithGlobals<TOptions & SharedOptions>();\n\n      // Usually `command` will be a sub-command (e.g. \"bundle\"), but it could also be a sub-sub-command\n      // (e.g. \"cache clean\").\n      const verb = command.parent?.parent ? `${command.parent.name()} ${command.name()}` : command.name();\n\n      // Dynamically import the execute function\n      const { execute } = await getExecutor();\n      if (typeof execute !== 'function') {\n        // throw instead of exiting politely, since this is a major developer error\n        throw new Error(`No execute function was exported from the command module for ${verb}.`);\n      }\n\n      const commandExecutor = new CommandExecutor<TOptions & SharedOptions>({\n        args: processedArgs,\n        options,\n        execute,\n        programOptions: this._programOptions,\n        verb,\n        discoverAppPaths: this._discoverAppPaths,\n      });\n      await commandExecutor.execute();\n    });\n  }\n}\n\nclass CloudpackHelp extends Help {\n  visibleOptions(cmd: Command): Option[] {\n    const options = super.visibleOptions(cmd);\n\n    if (cmd.name() !== 'cloudpack') {\n      // Remove --version from help except at the top level (it's not very useful)\n      return options.filter((option) => option.name() !== 'version');\n    }\n\n    return options;\n  }\n}\n"]}
+{"version":3,"file":"CloudpackCommand.js","sourceRoot":"","sources":["../../src/utilities/CloudpackCommand.ts"],"names":[],"mappings":"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","sourcesContent":["import { Command, Help, Option, type AddHelpTextPosition, type Argument, type OutputConfiguration } from 'commander';\nimport type { CommandActionModule } from '../types/CommandAction.js';\nimport type { ProgramOptions } from '../types/ProgramOptions.js';\nimport type { SharedOptions } from '../types/SharedOptions.js';\nimport { CommandExecutor, type CommandExecutorParams } from './CommandExecutor.js';\nimport { environmentInfo } from '@ms-cloudpack/environment';\nimport { parseFeature } from './parseFeature.js';\nimport type { AppPathDiscoveryMode } from '../types/AppPathDiscoveryMode.js';\n\n/**\n * Parameters for creating a command.\n * `TOptions` should be the command-specific options (if any), e.g. `StartOptions`.\n */\ninterface CloudpackCommandParams<TOptions extends object, TArguments extends object>\n  extends Pick<CommandExecutorParams, 'discoverAppPaths'> {\n  /** Command name */\n  name: string;\n\n  /** Command description */\n  description: string;\n\n  /**\n   * Options specific to this command. The record ensures that all options are available in the CLI.\n   * Allow multiple options for the same key since commander supports it with negatable options.\n   */\n  options?: Record<keyof TOptions, Option | Option[]>; //\n\n  /** Arguments specific to this command. Key order determines the arg order. */\n  args?: Record<keyof TArguments, Argument>;\n\n  /**\n   * Function returning an async import of the command's `src/commands/<name>/execute.ts` module.\n   * Importing only on demand makes Cloudpack start up faster since it doesn't have to parse\n   * every command's dependencies (many of which may be unrelated to the command being run).\n   *\n   * This can be undefined for a command that only has sub-commands.\n   */\n  getExecutor?: () => Promise<CommandActionModule<TOptions>>;\n\n  /** Usage message override */\n  usage?: string;\n\n  /** Alternative name for the command */\n  alias?: string;\n\n  /** Extra text to be displayed with the built-in help. */\n  addHelpText?: {\n    /**\n     * `'before'` or `'after'` to affect just this command.\n     * `'beforeAll'` or `'afterAll'` to affect this command and all its subcommands.\n     */\n    position: AddHelpTextPosition;\n    text: string;\n  };\n\n  /** Output options override (mainly for testing) */\n  outputOptions?: OutputConfiguration;\n\n  /**\n   * The shared options are relevant for most commands, but this allows omitting them from help\n   * where they're not relevant. `true` hides all shared options, or an array hides specific ones.\n   */\n  hideSharedOptions?: Array<keyof SharedOptions> | true;\n}\n\n/**\n * This wraps the `Command` class from [`commander`](https://www.npmjs.com/package/commander) with\n * Cloudpack-specific functionality and simpler APIs.\n *\n * Similar to the pattern from `commander`, this class represents both the program and its sub-commands.\n * - The top-level \"program\" command should be created with `new CloudpackCommand()`.\n * - Sub-commands should be created with the `.addSubCommand` method on the parent.\n */\nexport class CloudpackCommand<TOptions extends object, TArguments extends object> {\n  private _command: Command;\n  private _programOptions: ProgramOptions;\n  private _discoverAppPaths: AppPathDiscoveryMode | undefined;\n\n  /**\n   * This should only be used directly (outside this class) to create the top-level `program` command.\n   * To add sub-commands, use `.addSubCommand` instead.\n   */\n  constructor(\n    // The extra options here shouldn't be exposed to the `createSubCommand` API\n    params: CloudpackCommandParams<TOptions, TArguments> & {\n      programOptions: ProgramOptions;\n      /** This must be undefined for the top-level program command */\n      parent?: Command;\n    },\n  ) {\n    this._programOptions = params.programOptions;\n    this._discoverAppPaths = params.discoverAppPaths;\n\n    const command = params.parent?.command(params.name) || new Command(params.name);\n    this._command = command;\n\n    command.version(params.programOptions.version);\n    command.description(params.description);\n    command.allowExcessArguments(false);\n    command.createHelp = () => new CloudpackHelp();\n\n    params.usage && command.usage(params.usage);\n    params.alias && command.alias(params.alias);\n    params.addHelpText && command.addHelpText(params.addHelpText.position, params.addHelpText.text);\n    params.outputOptions && command.configureOutput(params.outputOptions);\n    params.getExecutor && this._addAction(params.getExecutor);\n\n    if (params.args) {\n      this._addArguemnts<TArguments>(params.args);\n    }\n\n    if (params.options) {\n      // Add the command-specific options first so they show up first in help\n      this._addOptions<TOptions>(params.options);\n    }\n\n    // Add shared options. These must be manually added to the program command and each sub-command\n    // because commander doesn't natively support inheriting options.\n    this._addOptions<SharedOptions>(\n      {\n        verbose: new Option('-v, --verbose', 'Show additional details about the running tasks.'),\n        debug: new Option('-d, --debug', 'Show debug information (superset of --verbose).').conflicts('verbose'),\n        quiet: new Option('-q, --quiet', 'Disable non-essential logging.').conflicts('verbose').conflicts('debug'),\n        color:\n          // In the parsed options, this will be a boolean `color` with default value true (except in tests and CI)\n          new Option('-n, --no-color', 'Disable colors in the output.').default(\n            !environmentInfo.isJest && !environmentInfo.isLage && !environmentInfo.isCI,\n          ),\n        features: new Option('--features <featureNames...>', 'Enable experimental features.').argParser(parseFeature),\n        cachePath: new Option(\n          '--cache-path <path>',\n          'Custom cache folder. To change the default, run `cloudpack config set cachePath <path>`.',\n        ),\n      },\n      params.hideSharedOptions,\n    );\n  }\n\n  /** Create a child command. */\n  public addSubCommand<TChildOptions extends object, TChildArguments extends object = never>(\n    params: CloudpackCommandParams<TChildOptions, TChildArguments>,\n  ): CloudpackCommand<TChildOptions, TChildArguments> {\n    return new CloudpackCommand<TChildOptions, TChildArguments>({\n      ...params,\n      programOptions: this._programOptions,\n      parent: this._command,\n    });\n  }\n\n  /** Run the program (only works on the top-level program command). */\n  public async run(): Promise<void> {\n    if (this._command.parent) {\n      throw new Error('Only the top-level program command can be run directly.');\n    }\n\n    await this._command.parseAsync(this._programOptions.argv);\n    if (this._command.args.length === 0) {\n      this._command.help();\n    }\n  }\n\n  /** Add arguments. The generic enforces that argument objects are included for all keys of a type. */\n  private _addArguemnts<TAddArguments extends object>(args: Record<keyof TAddArguments, Argument>): void {\n    for (const argument of Object.values(args)) {\n      this._command.addArgument(argument as Argument);\n    }\n  }\n\n  /** Add options. The generic enforces that option objects are included for all keys of a type. */\n  private _addOptions<TAddOptions extends object>(\n    options: Record<keyof TAddOptions, Option | Option[]>,\n    hideOptions?: Array<keyof TAddOptions> | true,\n  ): void {\n    for (const [name, optionOrOptions] of Object.entries(options) as [keyof TAddOptions, Option | Option[]][]) {\n      const optionArray = Array.isArray(optionOrOptions) ? optionOrOptions : [optionOrOptions];\n      for (const option of optionArray) {\n        if (hideOptions === true || hideOptions?.includes(name)) {\n          option.hideHelp();\n        }\n        this._command.addOption(option);\n      }\n    }\n  }\n\n  private _addAction(getExecutor: NonNullable<CloudpackCommandParams<TOptions, TArguments>['getExecutor']>): void {\n    const command = this._command;\n    // The action function receives parsed options as its first parameter, but we ignore those\n    // because they only contain options *specific to this command*, not shared options like `debug`.\n    command.action(async () => {\n      // Commander has support for custom parsers that parse arguments.\n      // Use processedArgs instead of args to get the parsed arguments.\n      const processedArgs = command.processedArgs as string[];\n\n      // Get the shared options too, not just the ones for this command.\n      // (In `cloudpackCommand`, we added the shared options to each command object so that they show up\n      // in help, but commander still seems to respect options only at the first command where they're\n      // encountered, which for shared options will always be the program command.)\n      const options = command.optsWithGlobals<TOptions & SharedOptions>();\n\n      // Usually `command` will be a sub-command (e.g. \"bundle\"), but it could also be a sub-sub-command\n      // (e.g. \"cache clean\").\n      const verb = command.parent?.parent ? `${command.parent.name()} ${command.name()}` : command.name();\n\n      // Dynamically import the execute function\n      const { execute } = await getExecutor();\n      if (typeof execute !== 'function') {\n        // throw instead of exiting politely, since this is a major developer error\n        throw new Error(`No execute function was exported from the command module for ${verb}.`);\n      }\n\n      const commandExecutor = new CommandExecutor<TOptions & SharedOptions>({\n        args: processedArgs,\n        options,\n        execute,\n        programOptions: this._programOptions,\n        verb,\n        discoverAppPaths: this._discoverAppPaths,\n      });\n      await commandExecutor.execute();\n    });\n  }\n}\n\nclass CloudpackHelp extends Help {\n  visibleOptions(cmd: Command): Option[] {\n    const options = super.visibleOptions(cmd);\n\n    if (cmd.name() !== 'cloudpack') {\n      // Remove --version from help except at the top level (it's not very useful)\n      return options.filter((option) => option.name() !== 'version');\n    }\n\n    return options;\n  }\n}\n"]}

package/lib/utilities/CommandExecutor.d.ts

@@ -3,7 +3,18 @@ import type { ProgramOptions } from '../types/ProgramOptions.js';
 import type { SharedOptions } from '../types/SharedOptions.js';
 import type { ReusedOptions } from '../types/ReusedOptions.js';
 import type { AppPathDiscoveryMode } from '../types/AppPathDiscoveryMode.js';
-export interface CommandExecutorSharedParams {
+export type BaseCommandExecutorOptions = SharedOptions & Pick<ReusedOptions, 'app'>;
+export interface CommandExecutorParams<TOptions extends BaseCommandExecutorOptions = BaseCommandExecutorOptions> {
+    /** Command-specific arguments */
+    args: string[];
+    /** Command-specific and shared options. */
+    options: TOptions;
+    /** Function to execute the command. */
+    execute: CommandAction<TOptions>;
+    /** Shared program-level configuration. */
+    programOptions: ProgramOptions;
+    /** Verb being run, e.g. `bundle` or `cache clean`. */
+    verb: string;
     /**
      * By default, the command will run against `cwd` (usually `process.cwd()`).
      * If this option is set, attempt to discover app path(s) instead.
@@ -15,7 +26,7 @@ export interface CommandExecutorSharedParams {
 /**
  * This class manages orchestration and shared state while executing a command.
  */
-export declare class CommandExecutor<TOptions extends SharedOptions & Pick<ReusedOptions, 'app'>> {
+export declare class CommandExecutor<TOptions extends BaseCommandExecutorOptions> {
     private _options;
     private _execute;
     private _programOptions;
@@ -23,25 +34,14 @@ export declare class CommandExecutor<TOptions extends SharedOptions & Pick<Reuse
     private _discoverAppPaths;
     private _reporter;
     private _autoDisposableList;
-    private _abortController;
     private _hasCalledExit;
     private _args;
     private _sigintCount;
-    private _getMessageOnInterrupt;
+    private _onInterrupt?;
+    private _getMessageOnInterrupt?;
     private static _activeInstances;
     static exitAll(params: CommandExitParams): Promise<void>;
-    constructor(params: CommandExecutorSharedParams & {
-        /** Command-specific arguments */
-        args: string[];
-        /** Command-specific and shared options. */
-        options: TOptions;
-        /** Function to execute the command. */
-        execute: CommandAction<TOptions>;
-        /** Shared program-level configuration. */
-        programOptions: ProgramOptions;
-        /** Verb being run, e.g. `bundle` or `cache clean`. */
-        verb: string;
-    });
+    constructor(params: CommandExecutorParams<TOptions>);
     /** Run the command. */
     execute(): Promise<void>;
     /**

package/lib/utilities/CommandExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandExecutor.d.ts","sourceRoot":"","sources":["../../src/utilities/CommandExecutor.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAqB,MAAM,2BAA2B,CAAC;AACrG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAG7E,MAAM,WAAW,2BAA2B;IAC1C;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;CACzC;AAED;;GAEG;AAEH,qBAAa,eAAe,CAAC,QAAQ,SAAS,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC;IACtF,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,iBAAiB,CAAmC;IAC5D,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,sBAAsB,CAA+B;IAE7D,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAA8B;WAEzC,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;gBAUnE,MAAM,EAAE,2BAA2B,GAAG;QACpC,iCAAiC;QACjC,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,2CAA2C;QAC3C,OAAO,EAAE,QAAQ,CAAC;QAClB,uCAAuC;QACvC,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;QACjC,0CAA0C;QAC1C,cAAc,EAAE,cAAc,CAAC;QAC/B,sDAAsD;QACtD,IAAI,EAAE,MAAM,CAAC;KACd;IAaH,uBAAuB;IAEV,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAsCrC;;;OAGG;YACW,mBAAmB;IAyFjC,qEAAqE;IACrE,OAAO,CAAC,+BAA+B;YAYzB,cAAc;IAyE5B,SAAS,CAAC,cAAc,QAAO,IAAI,CAcjC;IAEF;;;OAGG;cACa,KAAK,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC;CAgCjE"}
+{"version":3,"file":"CommandExecutor.d.ts","sourceRoot":"","sources":["../../src/utilities/CommandExecutor.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAqB,MAAM,2BAA2B,CAAC;AACrG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAI7E,MAAM,MAAM,0BAA0B,GAAG,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAEpF,MAAM,WAAW,qBAAqB,CAAC,QAAQ,SAAS,0BAA0B,GAAG,0BAA0B;IAC7G,iCAAiC;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IAEf,2CAA2C;IAC3C,OAAO,EAAE,QAAQ,CAAC;IAElB,uCAAuC;IACvC,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAEjC,0CAA0C;IAC1C,cAAc,EAAE,cAAc,CAAC;IAE/B,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;CACzC;AAED;;GAEG;AAEH,qBAAa,eAAe,CAAC,QAAQ,SAAS,0BAA0B;IACtE,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,iBAAiB,CAAmC;IAC5D,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,YAAY,CAAC,CAAa;IAClC,OAAO,CAAC,sBAAsB,CAAC,CAAe;IAE9C,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAmC;WAE9C,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;gBASzD,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC;IAWnD,uBAAuB;IAEV,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAsErC;;;OAGG;YACW,mBAAmB;IA6FjC,qEAAqE;IACrE,OAAO,CAAC,+BAA+B;YAYzB,cAAc;IAyE5B,SAAS,CAAC,cAAc,QAAO,IAAI,CAgBjC;IAEF;;;OAGG;cACa,KAAK,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC;CAgCjE"}

package/lib/utilities/CommandExecutor.js

@@ -8,6 +8,7 @@ import { getVersion } from '@ms-cloudpack/package-utilities';
 import { environmentInfo } from '@ms-cloudpack/environment';
 import { getCliStartTime } from './getCliStartTime.js';
 import { discoverAppPaths } from './discoverAppPaths.js';
+import { TaskRunner } from '@ms-cloudpack/api-server';
 /**
  * This class manages orchestration and shared state while executing a command.
  */
@@ -19,12 +20,11 @@ export class CommandExecutor {
             await instance._exit(params);
             process.off('SIGINT', instance._sigintHandler);
         }
-        CommandExecutor._activeInstances = [];
+        CommandExecutor._activeInstances = new Set();
     }
     constructor(params) {
         this._hasCalledExit = false;
         this._sigintCount = 0;
-        this._getMessageOnInterrupt = () => `Interrupted by user`;
         this._sigintHandler = () => {
             this._sigintCount++;
             if (this._sigintCount > 1) {
@@ -34,6 +34,7 @@ export class CommandExecutor {
                 // eslint-disable-next-line no-restricted-properties -- top-level cleanup
                 process.exit(1);
             }
+            this._onInterrupt?.();
             // We are trying to exit gracefully.
             void this._exit({ isInterrupted: true, message: '' });
         };
@@ -44,43 +45,72 @@ export class CommandExecutor {
         this._verb = params.verb;
         this._discoverAppPaths = params.discoverAppPaths;
         this._reporter = new TaskReporter();
-        this._abortController = new AbortController();
         this._autoDisposableList = new AutoDisposableList();
     }
     /** Run the command. */
     // This has to be a separate method because constructors can't be async.
     async execute() {
-        CommandExecutor._activeInstances.push(this);
+        CommandExecutor._activeInstances.add(this);
         try {
             // Handle SIGINT (Ctrl+C) gracefully.
-            process.on('SIGINT', this._sigintHandler);
+            if (!environmentInfo.isJest) {
+                process.on('SIGINT', this._sigintHandler);
+            }
             const contexts = await this._initializeContexts();
             if (!Array.isArray(contexts)) {
                 await this._exit(contexts);
                 return;
             }
-            // Call the execute function which is the real command logic
-            // (ie: real init command logic, real start command logic, etc.)
-            const result = await this._execute({
-                contexts,
-                args: this._args,
-                options: this._options,
-                reporter: this._reporter,
-                abortSignal: this._abortController.signal,
-                autoDispose: (disposable) => this._autoDisposableList.add(disposable),
-                setInterruptMessageHandler: (getMessage) => {
-                    this._getMessageOnInterrupt = getMessage;
-                },
-            });
-            if (result) {
-                await this._exit(result);
+            const spanName = `${this._verb.toUpperCase().replace(/ /g, '_')}_EXECUTE`;
+            const results = [];
+            for (const context of contexts) {
+                // Call the execute function which is the real command logic
+                // (ie: real init command logic, real start command logic, etc.)
+                const result = await context.telemetryClient.tracer.startActiveSpan(spanName, async (span) => {
+                    this._onInterrupt = () => {
+                        span.setAttribute('isInterrupted', true);
+                        span.end();
+                    };
+                    return this._execute({
+                        ...context,
+                        span,
+                        isMultiApp: contexts.length > 1,
+                        args: this._args,
+                        options: this._options,
+                        autoDispose: (disposable) => this._autoDisposableList.add(disposable),
+                        setInterruptMessageHandler: (getMessage) => {
+                            this._getMessageOnInterrupt = getMessage;
+                        },
+                    });
+                });
+                if (result?.isInterrupted) {
+                    return await this._exit(result);
+                }
+                if (result) {
+                    results.push(result);
+                }
+                else if (result !== null) {
+                    // If the command returned null, this means it should keep running (e.g. start).
+                    // We disallow returning undefined to avoid accidents.
+                    throw new Error('Command executor must return exit options or null');
+                }
+                this._onInterrupt = undefined;
+            }
+            if (results.length) {
+                // If one or more apps returned a result, exit.
+                await this._exit({
+                    message: results.map((r) => r.message).join('\n'),
+                    hasErrors: results.some((r) => r.hasErrors),
+                    // If any app returned a non-zero exit code, use that.
+                    exitCode: results.find(({ exitCode }) => !!exitCode)?.exitCode,
+                });
             }
         }
         catch (error) {
             // If an error occurs, exit the process with a non-zero exit code.
             await this._exit({
                 hasErrors: true,
-                message: error instanceof Error ? error.stack || error.message : String(error),
+                message: error.stack || error.message || String(error),
             });
         }
     }
@@ -108,6 +138,8 @@ export class CommandExecutor {
             appPaths = [this._programOptions.cwd];
         }
         const configOptions = this._getConfigOptionsFromCliOptions();
+        // The task runner is shared between all apps so that task results can potentially be reused.
+        const taskRunner = new TaskRunner();
         const contexts = [];
         const helpMessages = new Set();
         const configs = {};
@@ -162,6 +194,7 @@ export class CommandExecutor {
                 config,
                 reporter: this._reporter,
                 telemetryClient,
+                taskRunner,
             });
         }
         return contexts;
@@ -224,7 +257,7 @@ export class CommandExecutor {
                 arguments: programOptions.argv.slice(3).join(' '),
                 environment: environmentInfo.isCI ? 'ci' : environmentInfo.isCodespaces ? 'codespaces' : 'local',
                 appName: appName || '<unknown>',
-                mode: config.mode || 'library',
+                mode: config.mode,
                 features: enabledFeatureNames,
                 externalCorrelationId: environmentInfo.cloudpack.telemetryExternalCorrelationId,
                 // Azure DevOps build attributes
@@ -244,7 +277,7 @@ export class CommandExecutor {
      */
     async _exit(params) {
         const { hasErrors = this._reporter.hasErrors(), exitCode = hasErrors ? 1 : 0 } = params;
-        const message = params.isInterrupted ? this._getMessageOnInterrupt() : params.message;
+        const message = params.isInterrupted ? this._getMessageOnInterrupt?.() || 'Interrupted by user' : params.message;
         if (this._hasCalledExit) {
             // Skip most of the operations if exit() was called multiple times.
             // But only use the error message if not in a test, due to the way we're mocking process.exit.
@@ -257,8 +290,6 @@ export class CommandExecutor {
         }
         else {
             this._hasCalledExit = true;
-            // Let the execute function know that we are exiting.
-            this._abortController.abort();
             // Dispose all registered disposables.
             await this._autoDisposableList.dispose();
             // Show the summary message (this will throw if called twice).
@@ -267,10 +298,12 @@ export class CommandExecutor {
                 showHelp: exitCode !== 0,
             });
         }
+        CommandExecutor._activeInstances.delete(this);
+        process.off('SIGINT', this._sigintHandler);
         // eslint-disable-next-line no-restricted-properties -- top-level cleanup
         process.exit(exitCode);
     }
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- options type isn't used
-CommandExecutor._activeInstances = [];
+CommandExecutor._activeInstances = new Set();
 //# sourceMappingURL=CommandExecutor.js.map