@ms-cloudpack/cli 0.77.1 → 0.77.2

package/lib/commands/start/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAK9E,gCAAgC;AAChC,eAAO,MAAM,IAAI,EAAE,mBAwBlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAQ9E,gCAAgC;AAChC,eAAO,MAAM,IAAI,EAAE,mBAmClB,CAAC"}

package/lib/commands/start/index.js

@@ -1,6 +1,8 @@
 import { InvalidArgumentError, Option } from 'commander';
 import { portNumbers } from 'get-port';
 import { reusedOptions } from '../../utilities/reusedOptions.js';
+// verify the values are correct
+const showOverlayChoices = ['always', 'errors-only', 'never'];
 /** Defines the "start" verb. */
 export const init = (program) => {
     program.addSubCommand({
@@ -14,6 +16,7 @@ export const init = (program) => {
             ],
             cache: reusedOptions.cache(),
             mode: reusedOptions.mode({ action: 'run' }),
+            showOverlay: new Option('--show-overlay <when>', 'Override whether to show the Cloudpack overlay (status badge and dialog) in the app UI.').choices(showOverlayChoices),
             logResolveMap: reusedOptions.logResolveMap(),
             logBundleInfo: reusedOptions.logBundleInfo({ requiresNoCache: true }),
             apiServerPort: getPortOption('--api-server-port <port>', 'API', true),
@@ -21,6 +24,11 @@ export const init = (program) => {
             bundleServerPort: getPortOption('--bundle-server-port <port>', 'bundle'),
             login: reusedOptions.login('start'),
         },
+        applyOptionsToConfig: (options) => {
+            if (options.showOverlay) {
+                return { extraServerConfig: { showOverlay: options.showOverlay } };
+            }
+        },
         getExecutor: () => import('./execute.js'),
         // If cwd isn't a cloudpack app, discover other cloudpack apps and possibly prompt the user
         // to choose one. Also handles --app.

package/lib/commands/start/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGzD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,gCAAgC;AAChC,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAe;QAClC,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,qCAAqC;QAClD,OAAO,EAAE;YACP,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE;YACxB,IAAI,EAAE;gBACJ,IAAI,MAAM,CAAC,cAAc,EAAE,qCAAqC,CAAC;gBACjE,IAAI,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;aACpD;YACD,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE;YAC5B,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YAC3C,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;YAC5C,aAAa,EAAE,aAAa,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;YACrE,aAAa,EAAE,aAAa,CAAC,0BAA0B,EAAE,KAAK,EAAE,IAAI,CAAC;YACrE,aAAa,EAAE,aAAa,CAAC,0BAA0B,EAAE,KAAK,CAAC;YAC/D,gBAAgB,EAAE,aAAa,CAAC,6BAA6B,EAAE,QAAQ,CAAC;YACxE,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC;SACpC;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;QACzC,2FAA2F;QAC3F,qCAAqC;QACrC,gBAAgB,EAAE,QAAQ;KAC3B,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,IAAY,EAAE,OAAiB;IACnE,OAAO,IAAI,MAAM,CACf,KAAK,EACL,gBAAgB,IAAI,YAAY,OAAO,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,UAAU,IAAI,CACzG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,oBAAoB,CAAC,wBAAwB,KAAK,GAAG,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QAClB,MAAM,IAAI,oBAAoB,CAAC,qCAAqC,KAAK,GAAG,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { InvalidArgumentError, Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { portNumbers } from 'get-port';\nimport { reusedOptions } from '../../utilities/reusedOptions.js';\n\n/** Defines the \"start\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  program.addSubCommand<StartOptions>({\n    name: 'start',\n    description: 'Starts a web inner-loop for an app.',\n    options: {\n      app: reusedOptions.app(),\n      open: [\n        new Option('--open <url>', 'Open the browser to a specific URL.'),\n        new Option('--no-open', 'Do not open the browser.'),\n      ],\n      cache: reusedOptions.cache(),\n      mode: reusedOptions.mode({ action: 'run' }),\n      logResolveMap: reusedOptions.logResolveMap(),\n      logBundleInfo: reusedOptions.logBundleInfo({ requiresNoCache: true }),\n      apiServerPort: getPortOption('--api-server-port <port>', 'API', true),\n      appServerPort: getPortOption('--app-server-port <port>', 'app'),\n      bundleServerPort: getPortOption('--bundle-server-port <port>', 'bundle'),\n      login: reusedOptions.login('start'),\n    },\n    getExecutor: () => import('./execute.js'),\n    // If cwd isn't a cloudpack app, discover other cloudpack apps and possibly prompt the user\n    // to choose one. Also handles --app.\n    discoverAppPaths: 'single',\n  });\n};\n\nfunction getPortOption(flags: string, name: string, isFirst?: boolean): Option {\n  return new Option(\n    flags,\n    `Port for the ${name} server (${isFirst ? 'single, comma-separated, or range with dash' : 'as above'}).`,\n  ).argParser(parsePorts);\n}\n\nfunction parsePorts(value: string): number[] {\n  if (value.includes('-')) {\n    const split = value.split('-');\n    if (split.length !== 2) {\n      throw new InvalidArgumentError(`Invalid port range: \"${value}\"`);\n    }\n    return [...portNumbers(parseNumber(split[0]), parseNumber(split[1]))];\n  }\n\n  return value.split(',').map(parseNumber);\n}\n\nfunction parseNumber(value: string): number {\n  value = value.trim();\n  const parsed = parseInt(value, 10);\n  if (isNaN(parsed)) {\n    throw new InvalidArgumentError(`Port must be a number; received: \"${value}\"`);\n  }\n  return parsed;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { InvalidArgumentError, Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { portNumbers } from 'get-port';\nimport { reusedOptions } from '../../utilities/reusedOptions.js';\n\n// verify the values are correct\nconst showOverlayChoices: NonNullable<StartOptions['showOverlay']>[] = ['always', 'errors-only', 'never'];\n\n/** Defines the \"start\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  program.addSubCommand<StartOptions>({\n    name: 'start',\n    description: 'Starts a web inner-loop for an app.',\n    options: {\n      app: reusedOptions.app(),\n      open: [\n        new Option('--open <url>', 'Open the browser to a specific URL.'),\n        new Option('--no-open', 'Do not open the browser.'),\n      ],\n      cache: reusedOptions.cache(),\n      mode: reusedOptions.mode({ action: 'run' }),\n      showOverlay: new Option(\n        '--show-overlay <when>',\n        'Override whether to show the Cloudpack overlay (status badge and dialog) in the app UI.',\n        // Don't specify a default for this option to avoid unconditionally overriding any value\n        // set in the ServerConfig\n      ).choices(showOverlayChoices),\n      logResolveMap: reusedOptions.logResolveMap(),\n      logBundleInfo: reusedOptions.logBundleInfo({ requiresNoCache: true }),\n      apiServerPort: getPortOption('--api-server-port <port>', 'API', true),\n      appServerPort: getPortOption('--app-server-port <port>', 'app'),\n      bundleServerPort: getPortOption('--bundle-server-port <port>', 'bundle'),\n      login: reusedOptions.login('start'),\n    },\n    applyOptionsToConfig: (options) => {\n      if (options.showOverlay) {\n        return { extraServerConfig: { showOverlay: options.showOverlay } };\n      }\n    },\n    getExecutor: () => import('./execute.js'),\n    // If cwd isn't a cloudpack app, discover other cloudpack apps and possibly prompt the user\n    // to choose one. Also handles --app.\n    discoverAppPaths: 'single',\n  });\n};\n\nfunction getPortOption(flags: string, name: string, isFirst?: boolean): Option {\n  return new Option(\n    flags,\n    `Port for the ${name} server (${isFirst ? 'single, comma-separated, or range with dash' : 'as above'}).`,\n  ).argParser(parsePorts);\n}\n\nfunction parsePorts(value: string): number[] {\n  if (value.includes('-')) {\n    const split = value.split('-');\n    if (split.length !== 2) {\n      throw new InvalidArgumentError(`Invalid port range: \"${value}\"`);\n    }\n    return [...portNumbers(parseNumber(split[0]), parseNumber(split[1]))];\n  }\n\n  return value.split(',').map(parseNumber);\n}\n\nfunction parseNumber(value: string): number {\n  value = value.trim();\n  const parsed = parseInt(value, 10);\n  if (isNaN(parsed)) {\n    throw new InvalidArgumentError(`Port must be a number; received: \"${value}\"`);\n  }\n  return parsed;\n}\n"]}

package/lib/commands/start/openBrowser.d.ts

@@ -2,7 +2,7 @@ import type { PartialContext } from '@ms-cloudpack/api-server';
 /** Open the browser. */
 export declare function openBrowser(options: {
     url: string;
-}, context: PartialContext<'telemetryClient', 'urls'>): Promise<void>;
+}, context: PartialContext<'telemetryClient', 'config' | 'urls'>): Promise<void>;
 /** Set an override for the browser opening behavior. `null` disables opening. */
 export declare function overrideOpenBrowser(fn: typeof openBrowser | null): void;
 /** Get the most recently opened URL (for tests) */

package/lib/commands/start/openBrowser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openBrowser.d.ts","sourceRoot":"","sources":["../../../src/commands/start/openBrowser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAM/D,wBAAwB;AACxB,wBAAsB,WAAW,CAC/B,OAAO,EAAE;IACP,GAAG,EAAE,MAAM,CAAC;CACb,EAED,OAAO,EAAE,cAAc,CAAC,iBAAiB,EAAE,MAAM,CAAC,GACjD,OAAO,CAAC,IAAI,CAAC,CAWf;AAED,iFAAiF;AACjF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,OAAO,WAAW,GAAG,IAAI,GAAG,IAAI,CAEvE;AAED,mDAAmD;AACnD,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAErD;AAED,qDAAqD;AACrD,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
+{"version":3,"file":"openBrowser.d.ts","sourceRoot":"","sources":["../../../src/commands/start/openBrowser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAM/D,wBAAwB;AACxB,wBAAsB,WAAW,CAC/B,OAAO,EAAE;IACP,GAAG,EAAE,MAAM,CAAC;CACb,EAED,OAAO,EAAE,cAAc,CAAC,iBAAiB,EAAE,QAAQ,GAAG,MAAM,CAAC,GAC5D,OAAO,CAAC,IAAI,CAAC,CAWf;AAED,iFAAiF;AACjF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,OAAO,WAAW,GAAG,IAAI,GAAG,IAAI,CAEvE;AAED,mDAAmD;AACnD,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAErD;AAED,qDAAqD;AACrD,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}

package/lib/commands/start/openBrowser.js

@@ -3,7 +3,7 @@ let lastOpenedUrl;
 let altOpenBrowser;
 /** Open the browser. */
 export async function openBrowser(options, 
-// urls aren't used directly in the function, but are used in a test via overrideOpenBrowser
+// session properties aren't used directly in the function, but are used in a test via overrideOpenBrowser
 context) {
     const { url } = options;
     const { telemetryClient } = context;

package/lib/commands/start/openBrowser.js.map

@@ -1 +1 @@
-{"version":3,"file":"openBrowser.js","sourceRoot":"","sources":["../../../src/commands/start/openBrowser.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,IAAI,aAAiC,CAAC;AACtC,IAAI,cAAqD,CAAC;AAE1D,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAEC;AACD,4FAA4F;AAC5F,OAAkD;IAElD,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACxB,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAEpC,aAAa,GAAG,GAAG,CAAC;IACpB,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;SAAM,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;QACnC,kIAAkI;QAClI,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACxG,CAAC;AACH,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,mBAAmB,CAAC,EAA6B;IAC/D,cAAc,GAAG,EAAE,CAAC;AACtB,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,gBAAgB;IAC9B,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,qDAAqD;AACrD,MAAM,UAAU,kBAAkB;IAChC,aAAa,GAAG,SAAS,CAAC;AAC5B,CAAC","sourcesContent":["import type { PartialContext } from '@ms-cloudpack/api-server';\nimport open from 'open';\n\nlet lastOpenedUrl: string | undefined;\nlet altOpenBrowser: typeof openBrowser | null | undefined;\n\n/** Open the browser. */\nexport async function openBrowser(\n  options: {\n    url: string;\n  },\n  // urls aren't used directly in the function, but are used in a test via overrideOpenBrowser\n  context: PartialContext<'telemetryClient', 'urls'>,\n): Promise<void> {\n  const { url } = options;\n  const { telemetryClient } = context;\n\n  lastOpenedUrl = url;\n  if (altOpenBrowser) {\n    await altOpenBrowser(options, context);\n  } else if (altOpenBrowser !== null) {\n    // This span measures the time required to create a process for the browser, but it does not imply that the browser is fully open.\n    await telemetryClient.tracer.startActiveSpan('OPEN_BROWSER', () => open(url, { newInstance: false }));\n  }\n}\n\n/** Set an override for the browser opening behavior. `null` disables opening. */\nexport function overrideOpenBrowser(fn: typeof openBrowser | null): void {\n  altOpenBrowser = fn;\n}\n\n/** Get the most recently opened URL (for tests) */\nexport function getLastOpenedUrl(): string | undefined {\n  return lastOpenedUrl;\n}\n\n/** Reset the most recently opened URL (for tests) */\nexport function resetLastOpenedUrl(): void {\n  lastOpenedUrl = undefined;\n}\n"]}
+{"version":3,"file":"openBrowser.js","sourceRoot":"","sources":["../../../src/commands/start/openBrowser.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,IAAI,aAAiC,CAAC;AACtC,IAAI,cAAqD,CAAC;AAE1D,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAEC;AACD,0GAA0G;AAC1G,OAA6D;IAE7D,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACxB,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAEpC,aAAa,GAAG,GAAG,CAAC;IACpB,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;SAAM,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;QACnC,kIAAkI;QAClI,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACxG,CAAC;AACH,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,mBAAmB,CAAC,EAA6B;IAC/D,cAAc,GAAG,EAAE,CAAC;AACtB,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,gBAAgB;IAC9B,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,qDAAqD;AACrD,MAAM,UAAU,kBAAkB;IAChC,aAAa,GAAG,SAAS,CAAC;AAC5B,CAAC","sourcesContent":["import type { PartialContext } from '@ms-cloudpack/api-server';\nimport open from 'open';\n\nlet lastOpenedUrl: string | undefined;\nlet altOpenBrowser: typeof openBrowser | null | undefined;\n\n/** Open the browser. */\nexport async function openBrowser(\n  options: {\n    url: string;\n  },\n  // session properties aren't used directly in the function, but are used in a test via overrideOpenBrowser\n  context: PartialContext<'telemetryClient', 'config' | 'urls'>,\n): Promise<void> {\n  const { url } = options;\n  const { telemetryClient } = context;\n\n  lastOpenedUrl = url;\n  if (altOpenBrowser) {\n    await altOpenBrowser(options, context);\n  } else if (altOpenBrowser !== null) {\n    // This span measures the time required to create a process for the browser, but it does not imply that the browser is fully open.\n    await telemetryClient.tracer.startActiveSpan('OPEN_BROWSER', () => open(url, { newInstance: false }));\n  }\n}\n\n/** Set an override for the browser opening behavior. `null` disables opening. */\nexport function overrideOpenBrowser(fn: typeof openBrowser | null): void {\n  altOpenBrowser = fn;\n}\n\n/** Get the most recently opened URL (for tests) */\nexport function getLastOpenedUrl(): string | undefined {\n  return lastOpenedUrl;\n}\n\n/** Reset the most recently opened URL (for tests) */\nexport function resetLastOpenedUrl(): void {\n  lastOpenedUrl = undefined;\n}\n"]}

package/lib/commands/start/types/StartOptions.d.ts

@@ -1,5 +1,6 @@
+import type { ServerConfig } from '@ms-cloudpack/common-types';
 import type { ReusedOptions } from '../../../types/ReusedOptions.js';
-export interface StartOptions extends Pick<ReusedOptions, 'app' | 'cache' | 'login' | 'logBundleInfo' | 'logResolveMap' | 'mode'> {
+export interface StartOptions extends Pick<ReusedOptions, 'app' | 'cache' | 'login' | 'logBundleInfo' | 'logResolveMap' | 'mode'>, Pick<ServerConfig, 'showOverlay'> {
     /** Whether to open the browser or a specific url to open the browser to (default true) */
     open?: boolean | string;
     /** Mostly for testing: custom port for the API server */

package/lib/commands/start/types/StartOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StartOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/types/StartOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE,MAAM,WAAW,YACf,SAAQ,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,eAAe,GAAG,eAAe,GAAG,MAAM,CAAC;IACnG,0FAA0F;IAC1F,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAExB,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC,gGAAgG;IAChG,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC,4DAA4D;IAC5D,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACtC"}
+{"version":3,"file":"StartOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/types/StartOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE,MAAM,WAAW,YACf,SAAQ,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,eAAe,GAAG,eAAe,GAAG,MAAM,CAAC,EACjG,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC;IACnC,0FAA0F;IAC1F,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAExB,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC,gGAAgG;IAChG,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC,4DAA4D;IAC5D,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACtC"}

package/lib/commands/start/types/StartOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"StartOptions.js","sourceRoot":"","sources":["../../../../src/commands/start/types/StartOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { ReusedOptions } from '../../../types/ReusedOptions.js';\n\nexport interface StartOptions\n  extends Pick<ReusedOptions, 'app' | 'cache' | 'login' | 'logBundleInfo' | 'logResolveMap' | 'mode'> {\n  /** Whether to open the browser or a specific url to open the browser to (default true) */\n  open?: boolean | string;\n\n  /** Mostly for testing: custom port for the API server */\n  apiServerPort?: number | number[];\n\n  /** Mostly for testing: custom port for the app server (also set in config via `server.port`) */\n  appServerPort?: number | number[];\n\n  /** Mostly for testing: custom port for the bundle server */\n  bundleServerPort?: number | number[];\n}\n"]}
+{"version":3,"file":"StartOptions.js","sourceRoot":"","sources":["../../../../src/commands/start/types/StartOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { ServerConfig } from '@ms-cloudpack/common-types';\nimport type { ReusedOptions } from '../../../types/ReusedOptions.js';\n\nexport interface StartOptions\n  extends Pick<ReusedOptions, 'app' | 'cache' | 'login' | 'logBundleInfo' | 'logResolveMap' | 'mode'>,\n    Pick<ServerConfig, 'showOverlay'> {\n  /** Whether to open the browser or a specific url to open the browser to (default true) */\n  open?: boolean | string;\n\n  /** Mostly for testing: custom port for the API server */\n  apiServerPort?: number | number[];\n\n  /** Mostly for testing: custom port for the app server (also set in config via `server.port`) */\n  appServerPort?: number | number[];\n\n  /** Mostly for testing: custom port for the bundle server */\n  bundleServerPort?: number | number[];\n}\n"]}

package/lib/utilities/CloudpackCommand.d.ts

@@ -1,13 +1,12 @@
 import { Command, Option, type AddHelpTextPosition, type Argument, type OutputConfiguration } from 'commander';
 import type { CommandActionModule } from '../types/CommandAction.js';
-import type { ProgramOptions } from '../types/ProgramOptions.js';
 import type { SharedOptions } from '../types/SharedOptions.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 Pick<CommandExecutorParams, 'discoverAppPaths'> {
+interface CloudpackCommandParams<TOptions extends object, TArguments extends object> extends Partial<Pick<CommandExecutorParams<TOptions>, 'discoverAppPaths' | 'applyOptionsToConfig'>> {
     /** Command name */
     name: string;
     /** Command description */
@@ -58,14 +57,12 @@ interface CloudpackCommandParams<TOptions extends object, TArguments extends obj
  */
 export declare class CloudpackCommand<TOptions extends object, TArguments extends object> {
     private _command;
-    private _programOptions;
-    private _discoverAppPaths;
+    private _executorOptions;
     /**
      * This should only be used directly (outside this class) to create the top-level `program` command.
      * To add sub-commands, use `.addSubCommand` instead.
      */
-    constructor(params: CloudpackCommandParams<TOptions, TArguments> & {
-        programOptions: ProgramOptions;
+    constructor(params: CloudpackCommandParams<TOptions, TArguments> & Pick<CommandExecutorParams<TOptions>, 'programOptions'> & {
         /** This must be undefined for the top-level program command */
         parent?: Command;
     });

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,EAAE,MAAM,EAAE,KAAK,mBAAmB,EAAE,KAAK,QAAQ,EAAE,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAC/G,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;AAOnF;;;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;IAqEH,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"}
+{"version":3,"file":"CloudpackCommand.d.ts","sourceRoot":"","sources":["../../src/utilities/CloudpackCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,mBAAmB,EAAE,KAAK,QAAQ,EAAE,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAC/G,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAmB,KAAK,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAMnF;;;GAGG;AACH,UAAU,sBAAsB,CAAC,QAAQ,SAAS,MAAM,EAAE,UAAU,SAAS,MAAM,CACjF,SAAQ,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE,kBAAkB,GAAG,sBAAsB,CAAC,CAAC;IACnG,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,gBAAgB,CAGtB;IAEF;;;OAGG;gBAGD,MAAM,EAAE,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,GAClD,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,GAAG;QACxD,+DAA+D;QAC/D,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB;IAwEL,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;CAoCnB"}

package/lib/utilities/CloudpackCommand.js

@@ -14,8 +14,7 @@ import { CloudpackHelp, optionGroups } from './CloudpackHelp.js';
  */
 export class CloudpackCommand {
     _command;
-    _programOptions;
-    _discoverAppPaths;
+    _executorOptions;
     /**
      * This should only be used directly (outside this class) to create the top-level `program` command.
      * To add sub-commands, use `.addSubCommand` instead.
@@ -23,8 +22,11 @@ export class CloudpackCommand {
     constructor(
     // The extra options here shouldn't be exposed to the `createSubCommand` API
     params) {
-        this._programOptions = params.programOptions;
-        this._discoverAppPaths = params.discoverAppPaths;
+        this._executorOptions = {
+            programOptions: params.programOptions,
+            discoverAppPaths: params.discoverAppPaths,
+            applyOptionsToConfig: params.applyOptionsToConfig,
+        };
         const command = params.parent?.command(params.name) || new Command(params.name);
         this._command = command;
         command.version(params.programOptions.version);
@@ -77,7 +79,7 @@ export class CloudpackCommand {
     addSubCommand(params) {
         return new CloudpackCommand({
             ...params,
-            programOptions: this._programOptions,
+            programOptions: this._executorOptions.programOptions,
             parent: this._command,
         });
     }
@@ -86,7 +88,7 @@ export class CloudpackCommand {
         if (this._command.parent) {
             throw new Error('Only the top-level program command can be run directly.');
         }
-        await this._command.parseAsync(this._programOptions.argv);
+        await this._command.parseAsync(this._executorOptions.programOptions.argv);
         if (this._command.args.length === 0) {
             this._command.help();
         }
@@ -135,9 +137,8 @@ export class CloudpackCommand {
                 args: processedArgs,
                 options,
                 execute,
-                programOptions: this._programOptions,
                 verb,
-                discoverAppPaths: this._discoverAppPaths,
+                ...this._executorOptions,
             });
             await commandExecutor.execute();
         });

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, 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';\nimport { parseDefine } from './parseDefine.js';\nimport { CloudpackHelp, optionGroups } from './CloudpackHelp.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\n    const isTopLevel = !params.parent;\n    command.createHelp = () => new CloudpackHelp({ isTopLevel });\n    // set the default help group for options\n    command.optionsGroup(optionGroups.default);\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 in logging.').helpGroup(optionGroups.logging),\n        debug: new Option('-d, --debug', 'Show debug information (superset of --verbose).')\n          .conflicts('verbose')\n          .helpGroup(optionGroups.logging),\n        quiet: new Option('-q, --quiet', 'Disable non-essential logging.')\n          .conflicts('verbose')\n          .conflicts('debug')\n          .helpGroup(optionGroups.logging),\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.')\n            .helpGroup(optionGroups.logging)\n            .default(!environmentInfo.isJest && !environmentInfo.isLage && !environmentInfo.isCI),\n        logFile: new Option('--log-file', 'Write a log file with all console output.').helpGroup(optionGroups.logging),\n        cachePath: new Option(\n          '--cache-path <path>',\n          'Custom cache folder. To change the default, run `cloudpack config set cachePath <path>`.',\n        ).helpGroup(optionGroups.common),\n        config: new Option(\n          '-c, --config <filename>',\n          'Custom config file name to use instead of cloudpack.config.json.',\n        ).helpGroup(optionGroups.common),\n        define: new Option('--define <key=value>', 'Define a global variable. Can be specified multiple times.')\n          .helpGroup(optionGroups.common)\n          .argParser(parseDefine),\n        features: new Option('--features <featureNames...>', 'Enable experimental features.')\n          .helpGroup(optionGroups.common)\n          .argParser(parseFeature),\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"]}
+{"version":3,"file":"CloudpackCommand.js","sourceRoot":"","sources":["../../src/utilities/CloudpackCommand.ts"],"names":[],"mappings":"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","sourcesContent":["import { Command, Option, type AddHelpTextPosition, type Argument, type OutputConfiguration } from 'commander';\nimport type { CommandActionModule } from '../types/CommandAction.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 { parseDefine } from './parseDefine.js';\nimport { CloudpackHelp, optionGroups } from './CloudpackHelp.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 Partial<Pick<CommandExecutorParams<TOptions>, 'discoverAppPaths' | 'applyOptionsToConfig'>> {\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 _executorOptions: Pick<\n    CommandExecutorParams<TOptions>,\n    'programOptions' | 'discoverAppPaths' | 'applyOptionsToConfig'\n  >;\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      Pick<CommandExecutorParams<TOptions>, 'programOptions'> & {\n        /** This must be undefined for the top-level program command */\n        parent?: Command;\n      },\n  ) {\n    this._executorOptions = {\n      programOptions: params.programOptions,\n      discoverAppPaths: params.discoverAppPaths,\n      applyOptionsToConfig: params.applyOptionsToConfig,\n    };\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\n    const isTopLevel = !params.parent;\n    command.createHelp = () => new CloudpackHelp({ isTopLevel });\n    // set the default help group for options\n    command.optionsGroup(optionGroups.default);\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 in logging.').helpGroup(optionGroups.logging),\n        debug: new Option('-d, --debug', 'Show debug information (superset of --verbose).')\n          .conflicts('verbose')\n          .helpGroup(optionGroups.logging),\n        quiet: new Option('-q, --quiet', 'Disable non-essential logging.')\n          .conflicts('verbose')\n          .conflicts('debug')\n          .helpGroup(optionGroups.logging),\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.')\n            .helpGroup(optionGroups.logging)\n            .default(!environmentInfo.isJest && !environmentInfo.isLage && !environmentInfo.isCI),\n        logFile: new Option('--log-file', 'Write a log file with all console output.').helpGroup(optionGroups.logging),\n        cachePath: new Option(\n          '--cache-path <path>',\n          'Custom cache folder. To change the default, run `cloudpack config set cachePath <path>`.',\n        ).helpGroup(optionGroups.common),\n        config: new Option(\n          '-c, --config <filename>',\n          'Custom config file name to use instead of cloudpack.config.json.',\n        ).helpGroup(optionGroups.common),\n        define: new Option('--define <key=value>', 'Define a global variable. Can be specified multiple times.')\n          .helpGroup(optionGroups.common)\n          .argParser(parseDefine),\n        features: new Option('--features <featureNames...>', 'Enable experimental features.')\n          .helpGroup(optionGroups.common)\n          .argParser(parseFeature),\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._executorOptions.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._executorOptions.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        verb,\n        ...this._executorOptions,\n      });\n      await commandExecutor.execute();\n    });\n  }\n}\n"]}

package/lib/utilities/CommandExecutor.d.ts

@@ -1,10 +1,10 @@
+import type { ReadConfigOptions } from '@ms-cloudpack/config';
 import type { CommandAction, CommandExitParams } from '../types/CommandAction.js';
 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 type BaseCommandExecutorOptions = SharedOptions & Pick<ReusedOptions, 'app'>;
-export interface CommandExecutorParams<TOptions extends BaseCommandExecutorOptions = BaseCommandExecutorOptions> {
+export interface CommandExecutorParams<TOptions extends SharedOptions> {
     /** Command-specific arguments */
     args: string[];
     /** Command-specific and shared options. */
@@ -21,17 +21,23 @@ export interface CommandExecutorParams<TOptions extends BaseCommandExecutorOptio
      * (`cwd` will still be preferred if it has a `cloudpack.config.json`.)
      * See {@link AppPathDiscoveryMode} for details.
      */
-    discoverAppPaths?: AppPathDiscoveryMode;
+    discoverAppPaths: AppPathDiscoveryMode | undefined;
+    /**
+     * Apply any command-specific CLI options that need to be passed through to `readConfig`.
+     * (Shared and reused options are applied automatically.)
+     */
+    applyOptionsToConfig: ((options: Omit<TOptions, keyof (SharedOptions & ReusedOptions)>) => Pick<ReadConfigOptions, 'extraServerConfig'> | undefined) | undefined;
 }
 /**
  * This class manages orchestration and shared state while executing a command.
  */
-export declare class CommandExecutor<TOptions extends BaseCommandExecutorOptions> {
+export declare class CommandExecutor<TOptions extends SharedOptions> {
     private _options;
     private _execute;
     private _programOptions;
     private _verb;
     private _discoverAppPaths;
+    private _applyOptionsToConfig;
     private _reporter;
     private _autoDisposableList;
     private _hasCalledExit;

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;AAI/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAQ7E,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;IA2ErC;;;OAGG;YACW,mBAAmB;IA0GjC,qEAAqE;IACrE,OAAO,CAAC,+BAA+B;YAazB,cAAc;IAkD5B,SAAS,CAAC,cAAc,QAAO,IAAI,CAgBjC;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":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAe9D,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;AAI/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAQ7E,MAAM,WAAW,qBAAqB,CAAC,QAAQ,SAAS,aAAa;IACnE,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,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAEnD;;;OAGG;IACH,oBAAoB,EAChB,CAAC,CACC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC,CAAC,KAC3D,IAAI,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,GAAG,SAAS,CAAC,GAC9D,SAAS,CAAC;CACf;AAED;;GAEG;AAEH,qBAAa,eAAe,CAAC,QAAQ,SAAS,aAAa;IACzD,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,qBAAqB,CAA0D;IACvF,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;IAYnD,uBAAuB;IAEV,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ErC;;;OAGG;YACW,mBAAmB;IAuGjC,qEAAqE;IACrE,OAAO,CAAC,+BAA+B;YAgBzB,cAAc;IAkD5B,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

@@ -21,6 +21,7 @@ export class CommandExecutor {
     _programOptions;
     _verb;
     _discoverAppPaths;
+    _applyOptionsToConfig;
     _reporter;
     _autoDisposableList;
     _hasCalledExit = false;
@@ -45,6 +46,7 @@ export class CommandExecutor {
         this._programOptions = params.programOptions;
         this._verb = params.verb;
         this._discoverAppPaths = params.discoverAppPaths;
+        this._applyOptionsToConfig = params.applyOptionsToConfig;
         this._reporter = new TaskReporter();
         this._autoDisposableList = new AutoDisposableList();
     }
@@ -127,12 +129,13 @@ export class CommandExecutor {
         let appPaths;
         if (this._discoverAppPaths) {
             // Search for cloudpack configs to determine the app path(s)
+            const { app, login } = this._options;
             const appPathsResult = this._discoverAppPaths === 'remote'
                 ? await discoverRemoteAppPaths({
                     options: {
-                        login: this._options.login,
+                        login,
                         cachePath: this._options.cachePath,
-                        desiredApp: this._options.app,
+                        desiredApp: app,
                     },
                     context: {
                         reporter: this._reporter,
@@ -141,7 +144,7 @@ export class CommandExecutor {
                 : await discoverLocalAppPaths({
                     cwd: this._programOptions.cwd,
                     discover: this._discoverAppPaths,
-                    desiredApp: this._options.app,
+                    desiredApp: app,
                 });
             if (!Array.isArray(appPathsResult)) {
                 // This means there was an error (or the user cancelled) while getting app paths.
@@ -153,14 +156,11 @@ export class CommandExecutor {
             // Just use the cwd
             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 readConfig = this._discoverAppPaths === 'remote' ? readRemoteConfigs : readLocalConfigs;
         const configs = await readConfig(appPaths, {
-            ...configOptions,
-            extraFeatures: this._options.features,
-            extraDefineFlags: this._options.define,
+            ...this._getConfigOptionsFromCliOptions(),
             enableDefaultFeatures: true,
         });
         const helpMessages = new Set(Object.values(configs)
@@ -223,6 +223,9 @@ export class CommandExecutor {
             // Handle --bundler by passing it as a universal package override, which will be appended
             // to any user-provided packageSettings so that it takes precedence.
             extraPackageSettings: options.bundler ? [{ match: '*', bundler: options.bundler }] : undefined,
+            extraFeatures: options.features,
+            extraDefineFlags: options.define,
+            ...(this._applyOptionsToConfig?.(this._options) || {}),
         };
     }
     async _initTelemetry(appName, config, telemetryApi) {

package/lib/utilities/CommandExecutor.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandExecutor.js","sourceRoot":"","sources":["../../src/utilities/CommandExecutor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EACL,YAAY,EACZ,IAAI,EACJ,kBAAkB,EAClB,oBAAoB,EACpB,eAAe,EACf,GAAG,EACH,oBAAoB,EACpB,MAAM,GACP,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,cAAc,EAA2C,MAAM,yBAAyB,CAAC;AAClG,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAG5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAoC,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AA6BvD;;GAEG;AACH,qCAAqC;AACrC,MAAM,OAAO,eAAe;IAClB,QAAQ,CAAW;IACnB,QAAQ,CAA0B;IAClC,eAAe,CAAiB;IAChC,KAAK,CAAS;IACd,iBAAiB,CAAmC;IACpD,SAAS,CAAe;IACxB,mBAAmB,CAAqB;IACxC,cAAc,GAAG,KAAK,CAAC;IACvB,KAAK,CAAW;IAChB,YAAY,GAAG,CAAC,CAAC;IACjB,YAAY,CAAc;IAC1B,sBAAsB,CAAgB;IAC9C,yFAAyF;IACjF,MAAM,CAAC,gBAAgB,GAAG,IAAI,GAAG,EAAwB,CAAC;IAE3D,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAyB;QACnD,4FAA4F;QAC5F,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,gBAAgB,EAAE,CAAC;YACxD,MAAM,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;QACjD,CAAC;QACD,eAAe,CAAC,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IAC/C,CAAC;IAED,YAAY,MAAuC;QACjD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;QACpC,IAAI,CAAC,mBAAmB,GAAG,IAAI,kBAAkB,EAAE,CAAC;IACtD,CAAC;IAED,uBAAuB;IACvB,wEAAwE;IACjE,KAAK,CAAC,OAAO;QAClB,eAAe,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC;YACH,qCAAqC;YACrC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;gBAC5B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAC5C,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAElD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC3B,OAAO;YACT,CAAC;YAED,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC;YAC1E,MAAM,OAAO,GAAwB,EAAE,CAAC;YAExC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,4DAA4D;gBAC5D,gEAAgE;gBAChE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;oBAC3F,IAAI,CAAC,YAAY,GAAG,GAAG,EAAE;wBACvB,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;wBACzC,IAAI,CAAC,GAAG,EAAE,CAAC;oBACb,CAAC,CAAC;oBAEF,OAAO,IAAI,CAAC,QAAQ,CAAC;wBACnB,GAAG,OAAO;wBACV,IAAI;wBACJ,UAAU,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC;wBAC/B,IAAI,EAAE,IAAI,CAAC,KAAK;wBAChB,OAAO,EAAE,IAAI,CAAC,QAAQ;wBACtB,WAAW,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC;wBACrE,0BAA0B,EAAE,CAAC,UAAU,EAAE,EAAE;4BACzC,IAAI,CAAC,sBAAsB,GAAG,UAAU,CAAC;wBAC3C,CAAC;qBACF,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,IAAI,MAAM,EAAE,aAAa,EAAE,CAAC;oBAC1B,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAClC,CAAC;gBACD,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACvB,CAAC;qBAAM,IAAK,MAAkB,KAAK,IAAI,EAAE,CAAC;oBACxC,gFAAgF;oBAChF,sDAAsD;oBACtD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;gBACvE,CAAC;gBACD,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;YAChC,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,+CAA+C;gBAC/C,MAAM,IAAI,CAAC,KAAK,CAAC;oBACf,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;oBACjD,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;oBAC3C,sDAAsD;oBACtD,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,QAAQ;iBAC/D,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,kEAAkE;YAClE,MAAM,GAAG,GAAG,KAAoC,CAAC;YACjD,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU;gBAC5B,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,wCAAwC;gBACtD,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,wCAAwC;YAEvF,MAAM,IAAI,CAAC,KAAK,CAAC;gBACf,SAAS,EAAE,IAAI;gBACf,OAAO;aACR,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,mBAAmB;QAC/B,IAAI,QAAkB,CAAC;QAEvB,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,4DAA4D;YAC5D,MAAM,cAAc,GAClB,IAAI,CAAC,iBAAiB,KAAK,QAAQ;gBACjC,CAAC,CAAC,MAAM,sBAAsB,CAAC;oBAC3B,OAAO,EAAE;wBACP,KAAK,EAAG,IAAI,CAAC,QAAoD,CAAC,KAAK;wBACvE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;wBAClC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG;qBAC9B;oBACD,OAAO,EAAE;wBACP,QAAQ,EAAE,IAAI,CAAC,SAAS;qBACzB;iBACF,CAAC;gBACJ,CAAC,CAAC,MAAM,qBAAqB,CAAC;oBAC1B,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG;oBAC7B,QAAQ,EAAE,IAAI,CAAC,iBAAiB;oBAChC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG;iBAC9B,CAAC,CAAC;YACT,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;gBACnC,iFAAiF;gBACjF,OAAO,cAAc,CAAC;YACxB,CAAC;YACD,QAAQ,GAAG,cAAc,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,mBAAmB;YACnB,QAAQ,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,+BAA+B,EAAE,CAAC;QAE7D,6FAA6F;QAC7F,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;QAEpC,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAC9F,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE;YACzC,GAAG,aAAa;YAChB,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ;YACrC,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YACtC,qBAAqB,EAAE,IAAI;SAC5B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;aACnB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;aAC5B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAa,CACzC,CAAC;QAEF,yDAAyD;QACzD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YACxB,WAAW,EAAE,WAAW;YACxB,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO;YACrC,WAAW,EAAE,GAAG,EAAE,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG;YACpF,WAAW,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YACzC,aAAa,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK;YACnC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO;YAChC,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG;YAC7B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK;gBACrB,CAAC,CAAC,kBAAkB;gBACpB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO;oBACrB,CAAC,CAAC,oBAAoB;oBACtB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK;wBACnB,CAAC,CAAC,eAAe;wBACjB,CAAC,CAAC,oBAAoB,CAAC;SAC9B,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAwB,EAAE,CAAC;QAEzC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QAC/F,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,YAAY,GAAG,cAAc,CAAC;YAClC,cAAc,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YAC3C,QAAQ;YACR,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC;YAC3B,OAAO,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE;SACvC,CAAC,CAAC;QAEH,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;YAChC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAc,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;YACnF,MAAM,EAAE,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;YAE3D,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YAE9E,QAAQ,CAAC,IAAI,CAAC;gBACZ,OAAO;gBACP,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;gBAClC,MAAM;gBACN,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,eAAe;gBACf,UAAU;aACX,CAAC,CAAC;QACL,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,qEAAqE;IAC7D,+BAA+B;QACrC,+DAA+D;QAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,QAAkD,CAAC;QACxE,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,cAAc,EAAE,OAAO,CAAC,MAAM;YAC9B,yFAAyF;YACzF,oEAAoE;YACpE,oBAAoB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;SAC/F,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,OAA2B,EAC3B,MAAuB,EACvB,YAA0B;QAE1B,qCAAqC;QACrC,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAEpC,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;QAE5C,MAAM,gBAAgB,GACpB,IAAI,CAAC,eAAe,CAAC,gBAAgB,IAAI,eAAe,CAAC,MAAM;YAC7D,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,gBAAgB,IAAI,eAAe,CAAC,SAAS,CAAC,yBAAyB,CAAC;QAEhG,MAAM,eAAe,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAE1E,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;QAEtF,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;YACrF,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;iBAC9D,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;iBAC5B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;YAEvB,IAAI,mBAAmB,CAAC,MAAM,EAAE,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,qBAAqB,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC3F,CAAC;YAED,MAAM,mBAAmB,GAAG;gBAC1B,IAAI,EAAE,IAAI,CAAC,KAAK;gBAChB,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACjD,WAAW,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO;gBAChG,OAAO,EAAE,OAAO,IAAI,WAAW;gBAC/B,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,QAAQ,EAAE,mBAAmB;gBAC7B,qBAAqB,EAAE,eAAe,CAAC,SAAS,CAAC,8BAA8B;gBAC/E,gCAAgC;gBAChC,GAAG,eAAe,CAAC,GAAG;aACvB,CAAC;YAEF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBAC/D,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,eAAe,CAAC;IACzB,CAAC;IAES,cAAc,GAAG,GAAS,EAAE;QACpC,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,IAAI,IAAI,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAE9B,sCAAsC;YACtC,2DAA2D;YAC3D,yEAAyE;YACzE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;QAEtB,oCAAoC;QACpC,KAAK,IAAI,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC;IAEF;;;OAGG;IACO,KAAK,CAAC,KAAK,CAAC,MAAyB;QAC7C,MAAM,EAAE,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC;QACxF,MAAM,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,IAAI,qBAAqB,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;QAEjH,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,mEAAmE;YACnE,8FAA8F;YAC9F,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;gBAC5B,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;qBACxC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,KAAK,GAAG,CAAC;qBAC1C,IAAI,CAAC,IAAI,CAAC,CAAC;gBACd,OAAO,CAAC,IAAI,CAAC,0DAA0D,YAAY,GAAG,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAE3B,sCAAsC;YACtC,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;YAEzC,8DAA8D;YAC9D,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;gBAC5B,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO;gBAC3C,QAAQ,EAAE,QAAQ,KAAK,CAAC;aACzB,CAAC,CAAC;QACL,CAAC;QAED,eAAe,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAE3C,yEAAyE;QACzE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC","sourcesContent":["import type { ReadConfigOptions } from '@ms-cloudpack/config';\nimport type { CloudpackConfig, PackageJson } from '@ms-cloudpack/common-types';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport {\n  TaskReporter,\n  bold,\n  debugLoggingConfig,\n  defaultLoggingConfig,\n  noLoggingConfig,\n  red,\n  verboseLoggingConfig,\n  yellow,\n} from '@ms-cloudpack/task-reporter';\nimport { startTelemetry, type TelemetryApi, type TelemetryClient } from '@ms-cloudpack/telemetry';\nimport path from 'path';\nimport type { CommandAction, CommandExitParams, AppCommandContext } from '../types/CommandAction.js';\nimport type { ProgramOptions } from '../types/ProgramOptions.js';\nimport type { SharedOptions } from '../types/SharedOptions.js';\nimport { AutoDisposableList } from './AutoDisposableList.js';\nimport { getVersion } from '@ms-cloudpack/package-utilities';\nimport { environmentInfo } from '@ms-cloudpack/environment';\nimport type { ReusedOptions } from '../types/ReusedOptions.js';\nimport type { AppPathDiscoveryMode } from '../types/AppPathDiscoveryMode.js';\nimport { discoverRemoteAppPaths } from './discoverRemoteAppPaths.js';\nimport { discoverLocalAppPaths } from './discoverLocalAppPaths.js';\nimport { TaskRunner } from '@ms-cloudpack/api-server';\nimport { readLocalConfigs, type InvalidCloudpackConfigError } from './readLocalConfigs.js';\nimport { readRemoteConfigs } from './readRemoteConfigs.js';\nimport { getCliStartTime } from './getCliStartTime.js';\n\nexport type BaseCommandExecutorOptions = SharedOptions & Pick<ReusedOptions, 'app'>;\n\nexport interface CommandExecutorParams<TOptions extends BaseCommandExecutorOptions = BaseCommandExecutorOptions> {\n  /** Command-specific arguments */\n  args: string[];\n\n  /** Command-specific and shared options. */\n  options: TOptions;\n\n  /** Function to execute the command. */\n  execute: CommandAction<TOptions>;\n\n  /** Shared program-level configuration. */\n  programOptions: ProgramOptions;\n\n  /** Verb being run, e.g. `bundle` or `cache clean`. */\n  verb: string;\n\n  /**\n   * By default, the command will run against `cwd` (usually `process.cwd()`).\n   * If this option is set, attempt to discover app path(s) instead.\n   * (`cwd` will still be preferred if it has a `cloudpack.config.json`.)\n   * See {@link AppPathDiscoveryMode} for details.\n   */\n  discoverAppPaths?: AppPathDiscoveryMode;\n}\n\n/**\n * This class manages orchestration and shared state while executing a command.\n */\n// 'app' is an optional reused option\nexport class CommandExecutor<TOptions extends BaseCommandExecutorOptions> {\n  private _options: TOptions;\n  private _execute: CommandAction<TOptions>;\n  private _programOptions: ProgramOptions;\n  private _verb: string;\n  private _discoverAppPaths: AppPathDiscoveryMode | undefined;\n  private _reporter: TaskReporter;\n  private _autoDisposableList: AutoDisposableList;\n  private _hasCalledExit = false;\n  private _args: string[];\n  private _sigintCount = 0;\n  private _onInterrupt?: () => void;\n  private _getMessageOnInterrupt?: () => string;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- options type isn't used\n  private static _activeInstances = new Set<CommandExecutor<any>>();\n\n  public static async exitAll(params: CommandExitParams): Promise<void> {\n    // There should only be one instance at a time, but we assume multiple instances for safety.\n    for (const instance of CommandExecutor._activeInstances) {\n      await instance._exit(params);\n      process.off('SIGINT', instance._sigintHandler);\n    }\n    CommandExecutor._activeInstances = new Set();\n  }\n\n  constructor(params: CommandExecutorParams<TOptions>) {\n    this._args = params.args;\n    this._options = params.options;\n    this._execute = params.execute;\n    this._programOptions = params.programOptions;\n    this._verb = params.verb;\n    this._discoverAppPaths = params.discoverAppPaths;\n    this._reporter = new TaskReporter();\n    this._autoDisposableList = new AutoDisposableList();\n  }\n\n  /** Run the command. */\n  // This has to be a separate method because constructors can't be async.\n  public async execute(): Promise<void> {\n    CommandExecutor._activeInstances.add(this);\n    try {\n      // Handle SIGINT (Ctrl+C) gracefully.\n      if (!environmentInfo.isJest) {\n        process.on('SIGINT', this._sigintHandler);\n      }\n\n      const contexts = await this._initializeContexts();\n\n      if (!Array.isArray(contexts)) {\n        await this._exit(contexts);\n        return;\n      }\n\n      const spanName = `${this._verb.toUpperCase().replace(/ /g, '_')}_EXECUTE`;\n      const results: CommandExitParams[] = [];\n\n      for (const context of contexts) {\n        // Call the execute function which is the real command logic\n        // (ie: real init command logic, real start command logic, etc.)\n        const result = await context.telemetryClient.tracer.startActiveSpan(spanName, async (span) => {\n          this._onInterrupt = () => {\n            span.setAttribute('isInterrupted', true);\n            span.end();\n          };\n\n          return this._execute({\n            ...context,\n            span,\n            isMultiApp: contexts.length > 1,\n            args: this._args,\n            options: this._options,\n            autoDispose: (disposable) => this._autoDisposableList.add(disposable),\n            setInterruptMessageHandler: (getMessage) => {\n              this._getMessageOnInterrupt = getMessage;\n            },\n          });\n        });\n        if (result?.isInterrupted) {\n          return await this._exit(result);\n        }\n        if (result) {\n          results.push(result);\n        } else if ((result as unknown) !== null) {\n          // If the command returned null, this means it should keep running (e.g. start).\n          // We disallow returning undefined to avoid accidents.\n          throw new Error('Command executor must return exit options or null');\n        }\n        this._onInterrupt = undefined;\n      }\n\n      if (results.length) {\n        // If one or more apps returned a result, exit.\n        await this._exit({\n          message: results.map((r) => r.message).join('\\n'),\n          hasErrors: results.some((r) => r.hasErrors),\n          // If any app returned a non-zero exit code, use that.\n          exitCode: results.find(({ exitCode }) => !!exitCode)?.exitCode,\n        });\n      }\n    } catch (error) {\n      // If an error occurs, exit the process with a non-zero exit code.\n      const err = error as InvalidCloudpackConfigError;\n      const message = err.isExpected\n        ? err.message // Only show message for expected errors\n        : err.stack || err.message || String(error); // Show full stack for unexpected errors\n\n      await this._exit({\n        hasErrors: true,\n        message,\n      });\n    }\n  }\n\n  /**\n   * Determine the app paths and initialize the context for each app.\n   * @returns Context(s), or an exit options object if there was an error. (might also throw on error)\n   */\n  private async _initializeContexts(): Promise<AppCommandContext[] | CommandExitParams> {\n    let appPaths: string[];\n\n    if (this._discoverAppPaths) {\n      // Search for cloudpack configs to determine the app path(s)\n      const appPathsResult =\n        this._discoverAppPaths === 'remote'\n          ? await discoverRemoteAppPaths({\n              options: {\n                login: (this._options as unknown as Pick<ReusedOptions, 'login'>).login,\n                cachePath: this._options.cachePath,\n                desiredApp: this._options.app,\n              },\n              context: {\n                reporter: this._reporter,\n              },\n            })\n          : await discoverLocalAppPaths({\n              cwd: this._programOptions.cwd,\n              discover: this._discoverAppPaths,\n              desiredApp: this._options.app,\n            });\n      if (!Array.isArray(appPathsResult)) {\n        // This means there was an error (or the user cancelled) while getting app paths.\n        return appPathsResult;\n      }\n      appPaths = appPathsResult;\n    } else {\n      // Just use the cwd\n      appPaths = [this._programOptions.cwd];\n    }\n\n    const configOptions = this._getConfigOptionsFromCliOptions();\n\n    // The task runner is shared between all apps so that task results can potentially be reused.\n    const taskRunner = new TaskRunner();\n\n    const readConfig = this._discoverAppPaths === 'remote' ? readRemoteConfigs : readLocalConfigs;\n    const configs = await readConfig(appPaths, {\n      ...configOptions,\n      extraFeatures: this._options.features,\n      extraDefineFlags: this._options.define,\n      enableDefaultFeatures: true,\n    });\n\n    const helpMessages = new Set<string>(\n      Object.values(configs)\n        .filter((c) => c.helpMessage)\n        .map((c) => c.helpMessage) as string[],\n    );\n\n    // Set reporter options and print the product info header\n    this._reporter.setOptions({\n      productName: 'Cloudpack',\n      version: this._programOptions.version,\n      description: () => `Running \"${bold(this._programOptions.argv.slice(2).join(' '))}\"`,\n      helpMessage: [...helpMessages].join('\\n'),\n      plainTextMode: !this._options.color,\n      logFile: !!this._options.logFile,\n      cwd: this._programOptions.cwd,\n      ...(this._options.debug\n        ? debugLoggingConfig\n        : this._options.verbose\n          ? verboseLoggingConfig\n          : this._options.quiet\n            ? noLoggingConfig\n            : defaultLoggingConfig),\n    });\n\n    const contexts: AppCommandContext[] = [];\n\n    const logLevel = this._options.verbose ? 'VERBOSE' : this._options.debug ? 'DEBUG' : undefined;\n    if (!this._options.debug) {\n      this._reporter.ignoreLogMessage('ApplicationInsights:');\n    }\n\n    const telemetryApi = startTelemetry({\n      productVersion: getVersion(import.meta.url),\n      logLevel,\n      serviceName: 'cli',\n    });\n\n    this._autoDisposableList.add({\n      dispose: () => telemetryApi.shutdown(),\n    });\n\n    for (const appPath of Object.keys(configs)) {\n      const config = configs[appPath];\n      const definition = await readJson<PackageJson>(path.join(appPath, 'package.json'));\n      const { name = path.basename(appPath) } = definition || {};\n\n      const telemetryClient = await this._initTelemetry(name, config, telemetryApi);\n\n      contexts.push({\n        appPath,\n        cachePath: this._options.cachePath,\n        config,\n        reporter: this._reporter,\n        telemetryClient,\n        taskRunner,\n      });\n    }\n\n    return contexts;\n  }\n\n  /** Translate certain CLI options into options for `readConfig()`. */\n  private _getConfigOptionsFromCliOptions(): ReadConfigOptions {\n    // These options don't exist for all commands, but that's fine.\n    const options = this._options as Partial<ReusedOptions & SharedOptions>;\n    return {\n      mode: options.mode,\n      logBundleInfo: options.logBundleInfo,\n      configFileName: options.config,\n      // Handle --bundler by passing it as a universal package override, which will be appended\n      // to any user-provided packageSettings so that it takes precedence.\n      extraPackageSettings: options.bundler ? [{ match: '*', bundler: options.bundler }] : undefined,\n    };\n  }\n\n  private async _initTelemetry(\n    appName: string | undefined,\n    config: CloudpackConfig,\n    telemetryApi: TelemetryApi,\n  ): Promise<TelemetryClient> {\n    // Mark the start time for telemetry.\n    const startTime = performance.now();\n\n    const programOptions = this._programOptions;\n\n    const connectionString =\n      this._programOptions.disableTelemetry || environmentInfo.isJest\n        ? undefined\n        : config.telemetry?.connectionString || environmentInfo.cloudpack.telemetryConnectionString;\n\n    const telemetryClient = await telemetryApi.createClient(connectionString);\n\n    telemetryClient.tracer.startSpan('CLI_ENTRY', { startTime: getCliStartTime() }).end();\n\n    await telemetryClient.tracer.startActiveSpan('INIT_TELEMETRY', { startTime }, (span) => {\n      const enabledFeatureNames = Object.entries(config.features || {})\n        .filter(([, value]) => value)\n        .map(([key]) => key);\n\n      if (enabledFeatureNames.length) {\n        console.log(`Enabled features: ${enabledFeatureNames.map((f) => yellow(f)).join(', ')}`);\n      }\n\n      const telemetryAttributes = {\n        verb: this._verb,\n        arguments: programOptions.argv.slice(3).join(' '),\n        environment: environmentInfo.isCI ? 'ci' : environmentInfo.isCodespaces ? 'codespaces' : 'local',\n        appName: appName || '<unknown>',\n        mode: config.mode,\n        features: enabledFeatureNames,\n        externalCorrelationId: environmentInfo.cloudpack.telemetryExternalCorrelationId,\n        // Azure DevOps build attributes\n        ...environmentInfo.ado,\n      };\n\n      for (const [key, value] of Object.entries(telemetryAttributes)) {\n        if (value) {\n          span.setAttribute(key, value);\n        }\n      }\n    });\n\n    return telemetryClient;\n  }\n\n  protected _sigintHandler = (): void => {\n    this._sigintCount++;\n\n    if (this._sigintCount > 1) {\n      console.debug('Forcing exit');\n\n      // We are forcing the process to exit.\n      // No clean-up is needed because user pressed Ctrl+C twice.\n      // eslint-disable-next-line no-restricted-properties -- top-level cleanup\n      process.exit(1);\n    }\n\n    this._onInterrupt?.();\n\n    // We are trying to exit gracefully.\n    void this._exit({ isInterrupted: true, message: '' });\n  };\n\n  /**\n   * Exit function called with the result returned by the command's execute function,\n   * or manually via `CommandExecutor.exitAll()` in tests.\n   */\n  protected async _exit(params: CommandExitParams): Promise<never> {\n    const { hasErrors = this._reporter.hasErrors(), exitCode = hasErrors ? 1 : 0 } = params;\n    const message = params.isInterrupted ? this._getMessageOnInterrupt?.() || 'Interrupted by user' : params.message;\n\n    if (this._hasCalledExit) {\n      // Skip most of the operations if exit() was called multiple times.\n      // But only use the error message if not in a test, due to the way we're mocking process.exit.\n      if (!environmentInfo.isJest) {\n        const prettyParams = Object.entries(params)\n          .map(([key, value]) => `${key}=\"${value}\"`)\n          .join(', ');\n        console.warn(`exit() was called multiple times. This call's options: ${prettyParams}.`);\n      }\n    } else {\n      this._hasCalledExit = true;\n\n      // Dispose all registered disposables.\n      await this._autoDisposableList.dispose();\n\n      // Show the summary message (this will throw if called twice).\n      await this._reporter.complete({\n        summary: hasErrors ? red(message) : message,\n        showHelp: exitCode !== 0,\n      });\n    }\n\n    CommandExecutor._activeInstances.delete(this);\n    process.off('SIGINT', this._sigintHandler);\n\n    // eslint-disable-next-line no-restricted-properties -- top-level cleanup\n    process.exit(exitCode);\n  }\n}\n"]}
+{"version":3,"file":"CommandExecutor.js","sourceRoot":"","sources":["../../src/utilities/CommandExecutor.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ReadConfigOptions } from '@ms-cloudpack/config';\nimport type { CloudpackConfig, PackageJson } from '@ms-cloudpack/common-types';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport {\n  TaskReporter,\n  bold,\n  debugLoggingConfig,\n  defaultLoggingConfig,\n  noLoggingConfig,\n  red,\n  verboseLoggingConfig,\n  yellow,\n} from '@ms-cloudpack/task-reporter';\nimport { startTelemetry, type TelemetryApi, type TelemetryClient } from '@ms-cloudpack/telemetry';\nimport path from 'path';\nimport type { CommandAction, CommandExitParams, AppCommandContext } from '../types/CommandAction.js';\nimport type { ProgramOptions } from '../types/ProgramOptions.js';\nimport type { SharedOptions } from '../types/SharedOptions.js';\nimport { AutoDisposableList } from './AutoDisposableList.js';\nimport { getVersion } from '@ms-cloudpack/package-utilities';\nimport { environmentInfo } from '@ms-cloudpack/environment';\nimport type { ReusedOptions } from '../types/ReusedOptions.js';\nimport type { AppPathDiscoveryMode } from '../types/AppPathDiscoveryMode.js';\nimport { discoverRemoteAppPaths } from './discoverRemoteAppPaths.js';\nimport { discoverLocalAppPaths } from './discoverLocalAppPaths.js';\nimport { TaskRunner } from '@ms-cloudpack/api-server';\nimport { readLocalConfigs, type InvalidCloudpackConfigError } from './readLocalConfigs.js';\nimport { readRemoteConfigs } from './readRemoteConfigs.js';\nimport { getCliStartTime } from './getCliStartTime.js';\n\nexport interface CommandExecutorParams<TOptions extends SharedOptions> {\n  /** Command-specific arguments */\n  args: string[];\n\n  /** Command-specific and shared options. */\n  options: TOptions;\n\n  /** Function to execute the command. */\n  execute: CommandAction<TOptions>;\n\n  /** Shared program-level configuration. */\n  programOptions: ProgramOptions;\n\n  /** Verb being run, e.g. `bundle` or `cache clean`. */\n  verb: string;\n\n  /**\n   * By default, the command will run against `cwd` (usually `process.cwd()`).\n   * If this option is set, attempt to discover app path(s) instead.\n   * (`cwd` will still be preferred if it has a `cloudpack.config.json`.)\n   * See {@link AppPathDiscoveryMode} for details.\n   */\n  discoverAppPaths: AppPathDiscoveryMode | undefined;\n\n  /**\n   * Apply any command-specific CLI options that need to be passed through to `readConfig`.\n   * (Shared and reused options are applied automatically.)\n   */\n  applyOptionsToConfig:\n    | ((\n        options: Omit<TOptions, keyof (SharedOptions & ReusedOptions)>,\n      ) => Pick<ReadConfigOptions, 'extraServerConfig'> | undefined)\n    | undefined;\n}\n\n/**\n * This class manages orchestration and shared state while executing a command.\n */\n// 'app' is an optional reused option\nexport class CommandExecutor<TOptions extends SharedOptions> {\n  private _options: TOptions;\n  private _execute: CommandAction<TOptions>;\n  private _programOptions: ProgramOptions;\n  private _verb: string;\n  private _discoverAppPaths: AppPathDiscoveryMode | undefined;\n  private _applyOptionsToConfig: CommandExecutorParams<TOptions>['applyOptionsToConfig'];\n  private _reporter: TaskReporter;\n  private _autoDisposableList: AutoDisposableList;\n  private _hasCalledExit = false;\n  private _args: string[];\n  private _sigintCount = 0;\n  private _onInterrupt?: () => void;\n  private _getMessageOnInterrupt?: () => string;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- options type isn't used\n  private static _activeInstances = new Set<CommandExecutor<any>>();\n\n  public static async exitAll(params: CommandExitParams): Promise<void> {\n    // There should only be one instance at a time, but we assume multiple instances for safety.\n    for (const instance of CommandExecutor._activeInstances) {\n      await instance._exit(params);\n      process.off('SIGINT', instance._sigintHandler);\n    }\n    CommandExecutor._activeInstances = new Set();\n  }\n\n  constructor(params: CommandExecutorParams<TOptions>) {\n    this._args = params.args;\n    this._options = params.options;\n    this._execute = params.execute;\n    this._programOptions = params.programOptions;\n    this._verb = params.verb;\n    this._discoverAppPaths = params.discoverAppPaths;\n    this._applyOptionsToConfig = params.applyOptionsToConfig;\n    this._reporter = new TaskReporter();\n    this._autoDisposableList = new AutoDisposableList();\n  }\n\n  /** Run the command. */\n  // This has to be a separate method because constructors can't be async.\n  public async execute(): Promise<void> {\n    CommandExecutor._activeInstances.add(this);\n    try {\n      // Handle SIGINT (Ctrl+C) gracefully.\n      if (!environmentInfo.isJest) {\n        process.on('SIGINT', this._sigintHandler);\n      }\n\n      const contexts = await this._initializeContexts();\n\n      if (!Array.isArray(contexts)) {\n        await this._exit(contexts);\n        return;\n      }\n\n      const spanName = `${this._verb.toUpperCase().replace(/ /g, '_')}_EXECUTE`;\n      const results: CommandExitParams[] = [];\n\n      for (const context of contexts) {\n        // Call the execute function which is the real command logic\n        // (ie: real init command logic, real start command logic, etc.)\n        const result = await context.telemetryClient.tracer.startActiveSpan(spanName, async (span) => {\n          this._onInterrupt = () => {\n            span.setAttribute('isInterrupted', true);\n            span.end();\n          };\n\n          return this._execute({\n            ...context,\n            span,\n            isMultiApp: contexts.length > 1,\n            args: this._args,\n            options: this._options,\n            autoDispose: (disposable) => this._autoDisposableList.add(disposable),\n            setInterruptMessageHandler: (getMessage) => {\n              this._getMessageOnInterrupt = getMessage;\n            },\n          });\n        });\n        if (result?.isInterrupted) {\n          return await this._exit(result);\n        }\n        if (result) {\n          results.push(result);\n        } else if ((result as unknown) !== null) {\n          // If the command returned null, this means it should keep running (e.g. start).\n          // We disallow returning undefined to avoid accidents.\n          throw new Error('Command executor must return exit options or null');\n        }\n        this._onInterrupt = undefined;\n      }\n\n      if (results.length) {\n        // If one or more apps returned a result, exit.\n        await this._exit({\n          message: results.map((r) => r.message).join('\\n'),\n          hasErrors: results.some((r) => r.hasErrors),\n          // If any app returned a non-zero exit code, use that.\n          exitCode: results.find(({ exitCode }) => !!exitCode)?.exitCode,\n        });\n      }\n    } catch (error) {\n      // If an error occurs, exit the process with a non-zero exit code.\n      const err = error as InvalidCloudpackConfigError;\n      const message = err.isExpected\n        ? err.message // Only show message for expected errors\n        : err.stack || err.message || String(error); // Show full stack for unexpected errors\n\n      await this._exit({\n        hasErrors: true,\n        message,\n      });\n    }\n  }\n\n  /**\n   * Determine the app paths and initialize the context for each app.\n   * @returns Context(s), or an exit options object if there was an error. (might also throw on error)\n   */\n  private async _initializeContexts(): Promise<AppCommandContext[] | CommandExitParams> {\n    let appPaths: string[];\n\n    if (this._discoverAppPaths) {\n      // Search for cloudpack configs to determine the app path(s)\n      const { app, login } = this._options as unknown as Pick<ReusedOptions, 'app' | 'login'>;\n      const appPathsResult =\n        this._discoverAppPaths === 'remote'\n          ? await discoverRemoteAppPaths({\n              options: {\n                login,\n                cachePath: this._options.cachePath,\n                desiredApp: app,\n              },\n              context: {\n                reporter: this._reporter,\n              },\n            })\n          : await discoverLocalAppPaths({\n              cwd: this._programOptions.cwd,\n              discover: this._discoverAppPaths,\n              desiredApp: app,\n            });\n      if (!Array.isArray(appPathsResult)) {\n        // This means there was an error (or the user cancelled) while getting app paths.\n        return appPathsResult;\n      }\n      appPaths = appPathsResult;\n    } else {\n      // Just use the cwd\n      appPaths = [this._programOptions.cwd];\n    }\n\n    // The task runner is shared between all apps so that task results can potentially be reused.\n    const taskRunner = new TaskRunner();\n\n    const readConfig = this._discoverAppPaths === 'remote' ? readRemoteConfigs : readLocalConfigs;\n    const configs = await readConfig(appPaths, {\n      ...this._getConfigOptionsFromCliOptions(),\n      enableDefaultFeatures: true,\n    });\n\n    const helpMessages = new Set<string>(\n      Object.values(configs)\n        .filter((c) => c.helpMessage)\n        .map((c) => c.helpMessage) as string[],\n    );\n\n    // Set reporter options and print the product info header\n    this._reporter.setOptions({\n      productName: 'Cloudpack',\n      version: this._programOptions.version,\n      description: () => `Running \"${bold(this._programOptions.argv.slice(2).join(' '))}\"`,\n      helpMessage: [...helpMessages].join('\\n'),\n      plainTextMode: !this._options.color,\n      logFile: !!this._options.logFile,\n      cwd: this._programOptions.cwd,\n      ...(this._options.debug\n        ? debugLoggingConfig\n        : this._options.verbose\n          ? verboseLoggingConfig\n          : this._options.quiet\n            ? noLoggingConfig\n            : defaultLoggingConfig),\n    });\n\n    const contexts: AppCommandContext[] = [];\n\n    const logLevel = this._options.verbose ? 'VERBOSE' : this._options.debug ? 'DEBUG' : undefined;\n    if (!this._options.debug) {\n      this._reporter.ignoreLogMessage('ApplicationInsights:');\n    }\n\n    const telemetryApi = startTelemetry({\n      productVersion: getVersion(import.meta.url),\n      logLevel,\n      serviceName: 'cli',\n    });\n\n    this._autoDisposableList.add({\n      dispose: () => telemetryApi.shutdown(),\n    });\n\n    for (const appPath of Object.keys(configs)) {\n      const config = configs[appPath];\n      const definition = await readJson<PackageJson>(path.join(appPath, 'package.json'));\n      const { name = path.basename(appPath) } = definition || {};\n\n      const telemetryClient = await this._initTelemetry(name, config, telemetryApi);\n\n      contexts.push({\n        appPath,\n        cachePath: this._options.cachePath,\n        config,\n        reporter: this._reporter,\n        telemetryClient,\n        taskRunner,\n      });\n    }\n\n    return contexts;\n  }\n\n  /** Translate certain CLI options into options for `readConfig()`. */\n  private _getConfigOptionsFromCliOptions(): ReadConfigOptions {\n    // These options don't exist for all commands, but that's fine.\n    const options = this._options as Partial<ReusedOptions & SharedOptions>;\n    return {\n      mode: options.mode,\n      logBundleInfo: options.logBundleInfo,\n      configFileName: options.config,\n      // Handle --bundler by passing it as a universal package override, which will be appended\n      // to any user-provided packageSettings so that it takes precedence.\n      extraPackageSettings: options.bundler ? [{ match: '*', bundler: options.bundler }] : undefined,\n      extraFeatures: options.features,\n      extraDefineFlags: options.define,\n      ...(this._applyOptionsToConfig?.(this._options) || {}),\n    };\n  }\n\n  private async _initTelemetry(\n    appName: string | undefined,\n    config: CloudpackConfig,\n    telemetryApi: TelemetryApi,\n  ): Promise<TelemetryClient> {\n    // Mark the start time for telemetry.\n    const startTime = performance.now();\n\n    const programOptions = this._programOptions;\n\n    const connectionString =\n      this._programOptions.disableTelemetry || environmentInfo.isJest\n        ? undefined\n        : config.telemetry?.connectionString || environmentInfo.cloudpack.telemetryConnectionString;\n\n    const telemetryClient = await telemetryApi.createClient(connectionString);\n\n    telemetryClient.tracer.startSpan('CLI_ENTRY', { startTime: getCliStartTime() }).end();\n\n    await telemetryClient.tracer.startActiveSpan('INIT_TELEMETRY', { startTime }, (span) => {\n      const enabledFeatureNames = Object.entries(config.features || {})\n        .filter(([, value]) => value)\n        .map(([key]) => key);\n\n      if (enabledFeatureNames.length) {\n        console.log(`Enabled features: ${enabledFeatureNames.map((f) => yellow(f)).join(', ')}`);\n      }\n\n      const telemetryAttributes = {\n        verb: this._verb,\n        arguments: programOptions.argv.slice(3).join(' '),\n        environment: environmentInfo.isCI ? 'ci' : environmentInfo.isCodespaces ? 'codespaces' : 'local',\n        appName: appName || '<unknown>',\n        mode: config.mode,\n        features: enabledFeatureNames,\n        externalCorrelationId: environmentInfo.cloudpack.telemetryExternalCorrelationId,\n        // Azure DevOps build attributes\n        ...environmentInfo.ado,\n      };\n\n      for (const [key, value] of Object.entries(telemetryAttributes)) {\n        if (value) {\n          span.setAttribute(key, value);\n        }\n      }\n    });\n\n    return telemetryClient;\n  }\n\n  protected _sigintHandler = (): void => {\n    this._sigintCount++;\n\n    if (this._sigintCount > 1) {\n      console.debug('Forcing exit');\n\n      // We are forcing the process to exit.\n      // No clean-up is needed because user pressed Ctrl+C twice.\n      // eslint-disable-next-line no-restricted-properties -- top-level cleanup\n      process.exit(1);\n    }\n\n    this._onInterrupt?.();\n\n    // We are trying to exit gracefully.\n    void this._exit({ isInterrupted: true, message: '' });\n  };\n\n  /**\n   * Exit function called with the result returned by the command's execute function,\n   * or manually via `CommandExecutor.exitAll()` in tests.\n   */\n  protected async _exit(params: CommandExitParams): Promise<never> {\n    const { hasErrors = this._reporter.hasErrors(), exitCode = hasErrors ? 1 : 0 } = params;\n    const message = params.isInterrupted ? this._getMessageOnInterrupt?.() || 'Interrupted by user' : params.message;\n\n    if (this._hasCalledExit) {\n      // Skip most of the operations if exit() was called multiple times.\n      // But only use the error message if not in a test, due to the way we're mocking process.exit.\n      if (!environmentInfo.isJest) {\n        const prettyParams = Object.entries(params)\n          .map(([key, value]) => `${key}=\"${value}\"`)\n          .join(', ');\n        console.warn(`exit() was called multiple times. This call's options: ${prettyParams}.`);\n      }\n    } else {\n      this._hasCalledExit = true;\n\n      // Dispose all registered disposables.\n      await this._autoDisposableList.dispose();\n\n      // Show the summary message (this will throw if called twice).\n      await this._reporter.complete({\n        summary: hasErrors ? red(message) : message,\n        showHelp: exitCode !== 0,\n      });\n    }\n\n    CommandExecutor._activeInstances.delete(this);\n    process.off('SIGINT', this._sigintHandler);\n\n    // eslint-disable-next-line no-restricted-properties -- top-level cleanup\n    process.exit(exitCode);\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.77.1",
+  "version": "0.77.2",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -18,24 +18,24 @@
     "cloudpack": "./bin/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.64.16",
-    "@ms-cloudpack/app-server": "^0.20.8",
-    "@ms-cloudpack/bundler": "^0.25.29",
-    "@ms-cloudpack/bundler-capabilities": "^0.2.38",
-    "@ms-cloudpack/common-types": "^0.27.3",
-    "@ms-cloudpack/config": "^0.38.0",
-    "@ms-cloudpack/create-express-app": "^1.10.47",
+    "@ms-cloudpack/api-server": "^0.64.17",
+    "@ms-cloudpack/app-server": "^0.20.9",
+    "@ms-cloudpack/bundler": "^0.25.30",
+    "@ms-cloudpack/bundler-capabilities": "^0.2.39",
+    "@ms-cloudpack/common-types": "^0.27.4",
+    "@ms-cloudpack/config": "^0.38.1",
+    "@ms-cloudpack/create-express-app": "^1.10.48",
     "@ms-cloudpack/environment": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.1.10",
-    "@ms-cloudpack/link-proxy": "^0.2.30",
-    "@ms-cloudpack/overlay": "^0.19.26",
-    "@ms-cloudpack/package-utilities": "^12.3.24",
+    "@ms-cloudpack/link-proxy": "^0.2.31",
+    "@ms-cloudpack/overlay": "^0.19.27",
+    "@ms-cloudpack/package-utilities": "^12.3.25",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.1.18",
-    "@ms-cloudpack/remote-cache": "^0.11.35",
-    "@ms-cloudpack/setup-utilities": "^0.5.39",
+    "@ms-cloudpack/path-utilities": "^3.1.19",
+    "@ms-cloudpack/remote-cache": "^0.11.36",
+    "@ms-cloudpack/setup-utilities": "^0.5.40",
     "@ms-cloudpack/task-reporter": "^0.17.2",
-    "@ms-cloudpack/telemetry": "^0.11.36",
+    "@ms-cloudpack/telemetry": "^0.11.37",
     "@yarnpkg/lockfile": "^1.1.0",
     "commander": "^14.0.0",
     "cross-spawn": "^7.0.3",
@@ -48,8 +48,8 @@
     "workspace-tools": "^0.38.0"
   },
   "devDependencies": {
-    "@ms-cloudpack/common-types": "^0.27.3",
-    "@ms-cloudpack/common-types-browser": "^0.6.2",
+    "@ms-cloudpack/common-types": "^0.27.4",
+    "@ms-cloudpack/common-types-browser": "^0.6.3",
     "@ms-cloudpack/eslint-plugin-internal": "^0.0.1",
     "@ms-cloudpack/scripts": "^0.0.1",
     "@ms-cloudpack/test-utilities": "^0.5.0",

package/schema/AppConfig.json

@@ -124,7 +124,8 @@
               }
             }
           ],
-          "description": "The domain name of the server. If multiple domains are specified, the first one will be used as the primary domain used when opening the browser."
+          "description": "The domain name of the server. If multiple domains are specified, the first one will be used as the primary domain used when opening the browser.",
+          "default": "localhost"
         },
         "requestHeaders": {
           "type": "object",
@@ -149,7 +150,8 @@
         },
         "defaultPath": {
           "type": "string",
-          "description": "The default path to use when opening the browser."
+          "description": "The default path under the domain to use when opening the browser.",
+          "default": ""
         },
         "https": {
           "anyOf": [
@@ -163,6 +165,16 @@
           ],
           "description": "The config settings for the https server. Paths to files are accepted for 'ca', 'cert', 'key', and 'pfx' settings. Everything else is passed directly to the https.createServer() method. If not provided, the server will use http."
         },
+        "showOverlay": {
+          "type": "string",
+          "enum": [
+            "always",
+            "errors-only",
+            "never"
+          ],
+          "description": "Whether to show the Cloudpack overlay (status badge and dialog) in the app UI.\n\nIt's not recommended to change this unless the overlay is interfering with UI elements or tests (and if it's only needed in a specific case, use the `--show-overlay <when>` CLI option).",
+          "default": "always"
+        },
         "routes": {
           "type": "array",
           "items": {

package/schema/UserConfig.json

@@ -125,7 +125,8 @@
               }
             }
           ],
-          "description": "The domain name of the server. If multiple domains are specified, the first one will be used as the primary domain used when opening the browser."
+          "description": "The domain name of the server. If multiple domains are specified, the first one will be used as the primary domain used when opening the browser.",
+          "default": "localhost"
         },
         "requestHeaders": {
           "type": "object",
@@ -150,7 +151,8 @@
         },
         "defaultPath": {
           "type": "string",
-          "description": "The default path to use when opening the browser."
+          "description": "The default path under the domain to use when opening the browser.",
+          "default": ""
         },
         "https": {
           "anyOf": [
@@ -164,6 +166,16 @@
           ],
           "description": "The config settings for the https server. Paths to files are accepted for 'ca', 'cert', 'key', and 'pfx' settings. Everything else is passed directly to the https.createServer() method. If not provided, the server will use http."
         },
+        "showOverlay": {
+          "type": "string",
+          "enum": [
+            "always",
+            "errors-only",
+            "never"
+          ],
+          "description": "Whether to show the Cloudpack overlay (status badge and dialog) in the app UI.\n\nIt's not recommended to change this unless the overlay is interfering with UI elements or tests (and if it's only needed in a specific case, use the `--show-overlay <when>` CLI option).",
+          "default": "always"
+        },
         "routes": {
           "type": "array",
           "items": {