@ms-cloudpack/cli 0.68.3 → 0.69.1

package/lib/commands/config/set.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../src/commands/config/set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAW5D,gDAAgD;AAChD,MAAM,CAAC,MAAM,OAAO,GAA8B,KAAK,EAAE,MAAM,EAAE,EAAE;IACjE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC/C,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;IAE7B,MAAM,UAAU,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAEnC,IAAI,CAAC;QACH,qFAAqF;QACrF,yCAAyC;QACzC,MAAM,oBAAoB,CAAC,EAAE,GAAG,EAAE,GAA4B,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5E,6EAA6E;QAC7E,MAAM,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,CAAC;YACT,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,kBAAkB,GAAG,MAAO,GAAa,CAAC,OAAO,IAAI,GAAG,EAAE;SACpE,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC","sourcesContent":["import { updateUserPreference } from '@ms-cloudpack/config';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport type { UserPreferences } from '@ms-cloudpack/common-types';\n\nexport interface SetOptions {}\n\nexport interface SetArguments {\n  key: string;\n  value: string;\n}\n\n/** Delete a Cloudpack user preference value. */\nexport const execute: CommandAction<SetOptions> = async (params) => {\n  const { cwd, args, initialize, exit } = params;\n  const [key, newValue] = args;\n\n  await initialize({ appPath: cwd });\n\n  try {\n    // Commander should have validated the key based on the given choices, and the update\n    // function will also validate its input.\n    await updateUserPreference({ key: key as keyof UserPreferences, newValue });\n    // Following the pattern of other tools, we don't output anything on success.\n    await exit({ message: '' });\n  } catch (err) {\n    await exit({\n      hasErrors: true,\n      message: `Failed to set \"${key}\": ${(err as Error).message || err}`,\n    });\n  }\n};\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/info/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAE9E,+BAA+B;AAC/B,eAAO,MAAM,IAAI,EAAE,mBAsBlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/info/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAK9E,+BAA+B;AAC/B,eAAO,MAAM,IAAI,EAAE,mBAwBlB,CAAC"}

package/lib/commands/info/index.js

@@ -1,4 +1,5 @@
 import { Option } from 'commander';
+const skipSharedOptions = ['cachePath', 'features'];
 /** Defines the "info" verb. */
 export const init = (program) => {
     const infoCommand = program.addSubCommand({
@@ -10,12 +11,14 @@ export const init = (program) => {
         name: 'lock-file',
         alias: 'lockfile',
         description: 'Get info about potentially problematic deps from the lock file (yarn v1 only).',
+        skipSharedOptions,
         getExecutor: () => import('./lockFile/execute.js'),
     });
     infoCommand.addSubCommand({
         name: 'non-semver-deps',
         description: 'Get a list of non-semver deps from local packages.',
         getExecutor: () => import('./nonSemverDeps/execute.js'),
+        skipSharedOptions,
         options: {
             prod: new Option('--prod', 'Only get production deps'),
         },

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/info/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,+BAA+B;AAC/B,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;QACxC,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,+DAA+D;QAC5E,KAAK,EAAE,WAAW;KACnB,CAAC,CAAC;IAEH,WAAW,CAAC,aAAa,CAAC;QACxB,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,UAAU;QACjB,WAAW,EAAE,gFAAgF;QAC7F,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,uBAAuB,CAAC;KACnD,CAAC,CAAC;IAEH,WAAW,CAAC,aAAa,CAAC;QACxB,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,oDAAoD;QACjE,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,4BAA4B,CAAC;QACvD,OAAO,EAAE;YACP,IAAI,EAAE,IAAI,MAAM,CAAC,QAAQ,EAAE,0BAA0B,CAAC;SACvD;KACF,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\n\n/** Defines the \"info\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  const infoCommand = program.addSubCommand({\n    name: 'info',\n    description: 'Get repo info relevant to cloudpack (requires a sub-command).',\n    usage: '<command>',\n  });\n\n  infoCommand.addSubCommand({\n    name: 'lock-file',\n    alias: 'lockfile',\n    description: 'Get info about potentially problematic deps from the lock file (yarn v1 only).',\n    getExecutor: () => import('./lockFile/execute.js'),\n  });\n\n  infoCommand.addSubCommand({\n    name: 'non-semver-deps',\n    description: 'Get a list of non-semver deps from local packages.',\n    getExecutor: () => import('./nonSemverDeps/execute.js'),\n    options: {\n      prod: new Option('--prod', 'Only get production deps'),\n    },\n  });\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/info/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAInC,MAAM,iBAAiB,GAA+B,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;AAEhF,+BAA+B;AAC/B,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;QACxC,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,+DAA+D;QAC5E,KAAK,EAAE,WAAW;KACnB,CAAC,CAAC;IAEH,WAAW,CAAC,aAAa,CAAC;QACxB,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,UAAU;QACjB,WAAW,EAAE,gFAAgF;QAC7F,iBAAiB;QACjB,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,uBAAuB,CAAC;KACnD,CAAC,CAAC;IAEH,WAAW,CAAC,aAAa,CAAC;QACxB,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,oDAAoD;QACjE,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,4BAA4B,CAAC;QACvD,iBAAiB;QACjB,OAAO,EAAE;YACP,IAAI,EAAE,IAAI,MAAM,CAAC,QAAQ,EAAE,0BAA0B,CAAC;SACvD;KACF,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\nimport type { SharedOptions } from '../../types/SharedOptions.js';\n\nconst skipSharedOptions: Array<keyof SharedOptions> = ['cachePath', 'features'];\n\n/** Defines the \"info\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  const infoCommand = program.addSubCommand({\n    name: 'info',\n    description: 'Get repo info relevant to cloudpack (requires a sub-command).',\n    usage: '<command>',\n  });\n\n  infoCommand.addSubCommand({\n    name: 'lock-file',\n    alias: 'lockfile',\n    description: 'Get info about potentially problematic deps from the lock file (yarn v1 only).',\n    skipSharedOptions,\n    getExecutor: () => import('./lockFile/execute.js'),\n  });\n\n  infoCommand.addSubCommand({\n    name: 'non-semver-deps',\n    description: 'Get a list of non-semver deps from local packages.',\n    getExecutor: () => import('./nonSemverDeps/execute.js'),\n    skipSharedOptions,\n    options: {\n      prod: new Option('--prod', 'Only get production deps'),\n    },\n  });\n};\n"]}

package/lib/commands/init/execute.js

@@ -4,7 +4,7 @@ import { findCloudpackAppPaths } from '../../utilities/findCloudpackAppPaths.js'
 import { InitSummaryData } from './InitSummaryData.js';
 /** Given the path, updates the Cloudpack config with overrides and project settings. */
 export const execute = async (params) => {
-    const { options, cwd, initialize, reporter, exit, autoDispose, setInterruptMessageHandler } = params;
+    const { options, cwd, initialize, exit, autoDispose, setInterruptMessageHandler } = params;
     const appPaths = findCloudpackAppPaths(cwd);
     // `findCloudpackAppPaths` will only return an array of paths in which cloudpack.config.json was found.
     // To ensure initialize can be run even if no cloudpack.config.json was found, we use the cwd directory as a fallback.
@@ -15,7 +15,7 @@ export const execute = async (params) => {
         options,
         isInterrupted: true,
     }));
-    const summaries = await init({ appSummaries, options, contexts, reporter, autoDispose });
+    const summaries = await init({ appSummaries, options, contexts, autoDispose });
     await exit({
         exitCode: summaries.some((summary) => summary.failed) ? 1 : 0,
         message: formatInitSummary({ summaries, options }),

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

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/init/execute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,wFAAwF;AACxF,MAAM,CAAC,MAAM,OAAO,GAA+B,KAAK,EAAE,MAAM,EAAE,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,0BAA0B,EAAE,GAAG,MAAM,CAAC;IAErG,MAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAE5C,uGAAuG;IACvG,sHAAsH;IACtH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAExF,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACrC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CACnF,CAAC;IAEF,0BAA0B,CAAC,GAAG,EAAE,CAC9B,iBAAiB,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACvE,OAAO;QACP,aAAa,EAAE,IAAI;KACpB,CAAC,CACH,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;IAEzF,MAAM,IAAI,CAAC;QACT,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,OAAO,EAAE,iBAAiB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;KACnD,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import type { InitOptions } from './types/InitOptions.js';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport { init } from './init.js';\nimport { formatInitSummary } from './formatInitSummary.js';\nimport { findCloudpackAppPaths } from '../../utilities/findCloudpackAppPaths.js';\nimport { InitSummaryData } from './InitSummaryData.js';\n\n/** Given the path, updates the Cloudpack config with overrides and project settings. */\nexport const execute: CommandAction<InitOptions> = async (params) => {\n  const { options, cwd, initialize, reporter, exit, autoDispose, setInterruptMessageHandler } = params;\n\n  const appPaths = findCloudpackAppPaths(cwd);\n\n  // `findCloudpackAppPaths` will only return an array of paths in which cloudpack.config.json was found.\n  // To ensure initialize can be run even if no cloudpack.config.json was found, we use the cwd directory as a fallback.\n  const contexts = await initialize({ appPaths: appPaths.length > 0 ? appPaths : [cwd] });\n\n  const appSummaries = Object.fromEntries(\n    contexts.map((context) => [context.appPath, new InitSummaryData(context.appPath)]),\n  );\n\n  setInterruptMessageHandler(() =>\n    formatInitSummary({\n      summaries: Object.values(appSummaries).map((s) => s.summarize(options)),\n      options,\n      isInterrupted: true,\n    }),\n  );\n\n  const summaries = await init({ appSummaries, options, contexts, reporter, autoDispose });\n\n  await exit({\n    exitCode: summaries.some((summary) => summary.failed) ? 1 : 0,\n    message: formatInitSummary({ summaries, options }),\n  });\n};\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/init/execute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,wFAAwF;AACxF,MAAM,CAAC,MAAM,OAAO,GAA+B,KAAK,EAAE,MAAM,EAAE,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,0BAA0B,EAAE,GAAG,MAAM,CAAC;IAE3F,MAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAE5C,uGAAuG;IACvG,sHAAsH;IACtH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAExF,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACrC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CACnF,CAAC;IAEF,0BAA0B,CAAC,GAAG,EAAE,CAC9B,iBAAiB,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACvE,OAAO;QACP,aAAa,EAAE,IAAI;KACpB,CAAC,CACH,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;IAE/E,MAAM,IAAI,CAAC;QACT,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,OAAO,EAAE,iBAAiB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;KACnD,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import type { InitOptions } from './types/InitOptions.js';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport { init } from './init.js';\nimport { formatInitSummary } from './formatInitSummary.js';\nimport { findCloudpackAppPaths } from '../../utilities/findCloudpackAppPaths.js';\nimport { InitSummaryData } from './InitSummaryData.js';\n\n/** Given the path, updates the Cloudpack config with overrides and project settings. */\nexport const execute: CommandAction<InitOptions> = async (params) => {\n  const { options, cwd, initialize, exit, autoDispose, setInterruptMessageHandler } = params;\n\n  const appPaths = findCloudpackAppPaths(cwd);\n\n  // `findCloudpackAppPaths` will only return an array of paths in which cloudpack.config.json was found.\n  // To ensure initialize can be run even if no cloudpack.config.json was found, we use the cwd directory as a fallback.\n  const contexts = await initialize({ appPaths: appPaths.length > 0 ? appPaths : [cwd] });\n\n  const appSummaries = Object.fromEntries(\n    contexts.map((context) => [context.appPath, new InitSummaryData(context.appPath)]),\n  );\n\n  setInterruptMessageHandler(() =>\n    formatInitSummary({\n      summaries: Object.values(appSummaries).map((s) => s.summarize(options)),\n      options,\n      isInterrupted: true,\n    }),\n  );\n\n  const summaries = await init({ appSummaries, options, contexts, autoDispose });\n\n  await exit({\n    exitCode: summaries.some((summary) => summary.failed) ? 1 : 0,\n    message: formatInitSummary({ summaries, options }),\n  });\n};\n"]}

package/lib/commands/init/init.d.ts

@@ -1,4 +1,3 @@
-import type { TaskReporter } from '@ms-cloudpack/task-reporter';
 import type { AutoDispose } from '../../types/AutoDispose.js';
 import type { InitOptions } from './types/InitOptions.js';
 import type { InitSummary } from './types/InitSummary.js';
@@ -11,7 +10,6 @@ export declare function init(parameters: {
     options: InitOptions;
     contexts: AppCommandContext[];
     autoDispose: AutoDispose;
-    reporter: TaskReporter;
     /**
      * App summary objects, created ahead of time so that a partial summary can be generated
      * if the process is interrupted.

package/lib/commands/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAOtE;;GAEG;AACH,wBAAsB,IAAI,CAAC,UAAU,EAAE;IACrC,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC;IACvB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC/C,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAqBzB"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAOtE;;GAEG;AACH,wBAAsB,IAAI,CAAC,UAAU,EAAE;IACrC,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC/C,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAoBzB"}

package/lib/commands/init/init.js

@@ -12,14 +12,13 @@ import { optimizeDependencies } from './optimizeDependencies.js';
  * Init execution function.
  */
 export async function init(parameters) {
-    const { options, contexts, reporter, autoDispose, appSummaries } = parameters;
+    const { options, contexts, autoDispose, appSummaries } = parameters;
     const summaries = [];
     const taskRunner = new TaskRunner();
     for (const appContext of contexts) {
         const summary = await initApp({
             appContext,
             options,
-            reporter,
             autoDispose,
             summaryData: appSummaries[appContext.appPath],
             taskRunner,
@@ -30,19 +29,16 @@ export async function init(parameters) {
     return summaries;
 }
 async function initApp(params) {
-    const { appContext, options, reporter, autoDispose, summaryData, taskRunner, isMultiApp } = params;
+    const { appContext, options, autoDispose, summaryData, taskRunner, isMultiApp } = params;
     const { appPath, config, telemetryClient } = appContext;
     // Run prerequisites for the app.
-    runPrerequisites({ config, cwd: appPath, telemetryClient });
+    runPrerequisites(appContext);
     // If --reset is specified, reset the generated config.
     if (options.reset) {
         config.generated = {};
     }
     const apiContext = await createPartialApiContext({
-        appPath,
-        config,
-        reporter,
-        telemetryClient,
+        ...appContext,
         items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],
         taskRunner,
     });

package/lib/commands/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAOpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,UAU1B;IACC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;IAE9E,MAAM,SAAS,GAAkB,EAAE,CAAC;IAEpC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;IAEpC,KAAK,MAAM,UAAU,IAAI,QAAQ,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;YAC5B,UAAU;YACV,OAAO;YACP,QAAQ;YACR,WAAW;YACX,WAAW,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC;YAC7C,UAAU;YACV,UAAU,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC;SAChC,CAAC,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,MAQtB;IACC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IACnG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC;IAExD,iCAAiC;IACjC,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;IAE5D,uDAAuD;IACvD,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,MAAM,UAAU,GAAY,MAAM,uBAAuB,CAAC;QACxD,OAAO;QACP,MAAM;QACN,QAAQ;QACR,eAAe;QACf,KAAK,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,eAAe,CAAC;QACrG,UAAU;KACX,CAAC,CAAC;IACH,WAAW,CAAC,UAAU,CAAC,CAAC;IACxB,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC;IAEjD,8CAA8C;IAC9C,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAC5D,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE,UAAU,CAAC,CAAC;IACtE,CAAC;IAED,0DAA0D;IAC1D,MAAM,CAAC,SAAS,CAAC,eAAe,KAAK,EAAE,CAAC;IAExC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,oBAAoB,GAAG,KAAK,CAAC;QACjC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE9C,+CAA+C;QAC/C,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAChG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,EAAE,CAAC,CAAC,wCAAwC;QACpD,CAAC;QAED,YAAY,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnF;;;WAGG;QACH,SAAS,YAAY,CAAC,QAAyD;YAC7E,IAAI,oBAAoB,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YAED,mCAAmC;YACnC,KAAK,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,IAAI,QAAQ,EAAE,CAAC;gBACtD,IAAI,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;oBAChC,SAAS;gBACX,CAAC;gBAED,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAC5B,OAAO,EAAE,CAAC;gBAEV,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAErD,+DAA+D;gBAC/D,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBACnD,4CAA4C;gBAC5C,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;gBAE3C,kGAAkG;gBAClG,YAAY,CAAC;oBACX,OAAO;oBACP,WAAW;oBACX,eAAe;oBACf,MAAM;oBACN,eAAe;oBACf,UAAU;oBACV,WAAW,EAAE,OAAO;oBACpB,WAAW;oBACX,GAAG,EAAE,UAAU;oBACf,oDAAoD;oBACpD,wFAAwF;oBACxF,WAAW,EAAE,CAAC,UAAU,IAAI,WAAW;oBACvC,UAAU;oBACV,QAAQ;iBACT,CAAC;qBACC,IAAI,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,EAAE,EAAE;oBACxD,OAAO,EAAE,CAAC;oBAEV,IAAI,UAAU,EAAE,CAAC;wBACf,oBAAoB,GAAG,IAAI,CAAC;oBAC9B,CAAC;yBAAM,IAAI,eAAe,EAAE,IAAI,EAAE,CAAC;wBACjC,qGAAqG;wBACrG,iGAAiG;wBACjG,sBAAsB;wBACtB,cAAc,EAAE,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;4BACtC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;4BAC9B,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;wBACjC,CAAC,CAAC,CAAC;wBAEH,gCAAgC;wBAChC,YAAY,CAAC,eAAe,CAAC,CAAC;oBAChC,CAAC;oBAED,yDAAyD;oBACzD,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,OAAO,EAAE,CAAC;oBACZ,CAAC;gBACH,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACf,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;YACP,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAC;QAC1C,8DAA8D;QAC9D,mEAAmE;QACnE,6DAA6D;QAC7D,qBAAqB;QACrB,MAAM,2BAA2B,GAAG,MAAM,oBAAoB,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,UAAU,CAAC,CAAC;QACrG,WAAW,CAAC,sBAAsB,CAAC,2BAA2B,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC;QACnC,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,UAAU,CAAC,CAAC;QACjF,KAAK,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YACnE,WAAW,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAE/C,sFAAsF;IACtF,gEAAgE;IAChE,MAAM,iBAAiB,GAAG,MAAM,CAAC,QAAQ,EAAE,mBAAmB,IAAI,OAAO,CAAC,YAAY,CAAC;IAEvF,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,iBAAiB,EAAE,CAAC;QACxC,yFAAyF;QACzF,8CAA8C;QAC9C,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC9E,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC;QACxC,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import { type Context, TaskRunner } from '@ms-cloudpack/api-server';\nimport type { PackageImporterContext } from '@ms-cloudpack/common-types';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { AutoDispose } from '../../types/AutoDispose.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '@ms-cloudpack/api-server';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport { evaluatePath } from './evaluatePath.js';\nimport { verifyExports } from './verifyExports.js';\nimport type { AppCommandContext } from '../../types/CommandAction.js';\nimport path from 'path';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\nimport { optimizeDependencies } from './optimizeDependencies.js';\n\n/**\n * Init execution function.\n */\nexport async function init(parameters: {\n  options: InitOptions;\n  contexts: AppCommandContext[];\n  autoDispose: AutoDispose;\n  reporter: TaskReporter;\n  /**\n   * App summary objects, created ahead of time so that a partial summary can be generated\n   * if the process is interrupted.\n   */\n  appSummaries: Record<string, InitSummaryData>;\n}): Promise<InitSummary[]> {\n  const { options, contexts, reporter, autoDispose, appSummaries } = parameters;\n\n  const summaries: InitSummary[] = [];\n\n  const taskRunner = new TaskRunner();\n\n  for (const appContext of contexts) {\n    const summary = await initApp({\n      appContext,\n      options,\n      reporter,\n      autoDispose,\n      summaryData: appSummaries[appContext.appPath],\n      taskRunner,\n      isMultiApp: contexts.length > 1,\n    });\n    summaries.push(summary);\n  }\n\n  return summaries;\n}\n\nasync function initApp(params: {\n  appContext: AppCommandContext;\n  options: InitOptions;\n  reporter: TaskReporter;\n  autoDispose: AutoDispose;\n  summaryData: InitSummaryData;\n  taskRunner: TaskRunner;\n  isMultiApp: boolean;\n}): Promise<InitSummary> {\n  const { appContext, options, reporter, autoDispose, summaryData, taskRunner, isMultiApp } = params;\n  const { appPath, config, telemetryClient } = appContext;\n\n  // Run prerequisites for the app.\n  runPrerequisites({ config, cwd: appPath, telemetryClient });\n\n  // If --reset is specified, reset the generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const apiContext: Context = await createPartialApiContext({\n    appPath,\n    config,\n    reporter,\n    telemetryClient,\n    items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n    taskRunner,\n  });\n  autoDispose(apiContext);\n  const resolveMap = apiContext.session.resolveMap;\n\n  // Log the resolve map to a file if requested.\n  if (options.logResolveMap) {\n    console.log('\\nWriting resolve map to `resolve-map.json`.');\n    await writeJson(path.join(appPath, 'resolve-map.json'), resolveMap);\n  }\n\n  // Ensure config.generated.packageSettings is initialized.\n  config.generated.packageSettings ??= [];\n\n  await new Promise<void>((resolve, reject) => {\n    let pending = 0;\n    let isExitingPrematurely = false;\n    const visitedSet = new Set<string>();\n    const refreshPaths = new Set<string>();\n    const priorityMap = new Map<string, number>();\n\n    // Start with the app path or requested matches\n    const initialPaths = options.match ? getFilteredPackages(resolveMap, options.match) : [appPath];\n    if (!initialPaths.length) {\n      reject(); // getFilteredPackages will log an error\n    }\n\n    enqueuePaths(new Map(initialPaths.map((packagePath) => [packagePath, undefined])));\n\n    /**\n     * Enqueue more paths.\n     * @param newPaths Mapping from package path to importer context.\n     */\n    function enqueuePaths(newPaths: Map<string, PackageImporterContext | undefined>) {\n      if (isExitingPrematurely) {\n        return;\n      }\n\n      // Iterate through the given paths.\n      for (const [packagePath, importerContext] of newPaths) {\n        if (visitedSet.has(packagePath)) {\n          continue;\n        }\n\n        visitedSet.add(packagePath);\n        pending++;\n\n        const shouldForce = refreshPaths.delete(packagePath);\n\n        // Get the priority value for this package path, defaults to 0.\n        const priority = priorityMap.get(packagePath) ?? 0;\n        // Lower priority of this package path by 1.\n        priorityMap.set(packagePath, priority - 1);\n\n        // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.\n        evaluatePath({\n          appPath,\n          packagePath,\n          importerContext,\n          config,\n          telemetryClient,\n          resolveMap,\n          initOptions: options,\n          summaryData,\n          ctx: apiContext,\n          // No need to force if we're in a multi-app scenario\n          // as we'll re-evaluate packages if they are different since we use a different task id.\n          shouldForce: !isMultiApp && shouldForce,\n          isMultiApp,\n          priority,\n        })\n          .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {\n            pending--;\n\n            if (shouldExit) {\n              isExitingPrematurely = true;\n            } else if (pathsToEvaluate?.size) {\n              // If there are packages that need to be rebuilt, delete them from the visited set to re-enqueue them\n              // and add them to the refresh set so that on re-enqueuing we pass the `shouldRerun` flag through\n              // on single app runs.\n              pathsToRefresh?.forEach((refreshPath) => {\n                refreshPaths.add(refreshPath);\n                visitedSet.delete(refreshPath);\n              });\n\n              // Try to enqueue the new paths.\n              enqueuePaths(pathsToEvaluate);\n            }\n\n            // If nothing is pending after this call, we're complete.\n            if (!pending) {\n              resolve();\n            }\n          })\n          .catch((error) => {\n            reject(error);\n          });\n      }\n    }\n  });\n\n  if (config.features?.optimizeDependencies) {\n    // Conditionally scan dependency usage so that we can populate\n    // include/excludeDependencies automatically, ensuring the dep list\n    // is both minimal (remove unused deps) and complete (include\n    // specific devDeps.)\n    const excludedDependenciesChanges = await optimizeDependencies(summaryData.getResults(), apiContext);\n    summaryData.recordGeneratedChanges(excludedDependenciesChanges);\n  }\n\n  if (config.features?.verifyExports) {\n    const packageResults = await verifyExports(summaryData.getResults(), apiContext);\n    for (const [packagePath, errors] of Object.entries(packageResults)) {\n      summaryData.addErrors(packagePath, errors);\n    }\n  }\n\n  const summary = summaryData.summarize(options);\n\n  // The feature \"removeUnusedExports\" doesn't (yet) write summary changes, but we still\n  // want to write the generated config if that featureFlag is on.\n  const hasSummaryChanges = config.features?.removeUnusedExports || summary.totalChanges;\n\n  if (!options.check && hasSummaryChanges) {\n    // Update the generated config: either write it if there are settings, or delete it if it\n    // previously existed but is no longer needed.\n    const generatedResult = await writeGeneratedConfig(config.generated, appPath);\n    if (generatedResult === 'deleted') {\n      summary.deletedGeneratedConfig = true;\n    }\n  }\n\n  return summary;\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Context, TaskRunner } from '@ms-cloudpack/api-server';\nimport type { PackageImporterContext } from '@ms-cloudpack/common-types';\nimport type { AutoDispose } from '../../types/AutoDispose.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '@ms-cloudpack/api-server';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport { evaluatePath } from './evaluatePath.js';\nimport { verifyExports } from './verifyExports.js';\nimport type { AppCommandContext } from '../../types/CommandAction.js';\nimport path from 'path';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\nimport { optimizeDependencies } from './optimizeDependencies.js';\n\n/**\n * Init execution function.\n */\nexport async function init(parameters: {\n  options: InitOptions;\n  contexts: AppCommandContext[];\n  autoDispose: AutoDispose;\n  /**\n   * App summary objects, created ahead of time so that a partial summary can be generated\n   * if the process is interrupted.\n   */\n  appSummaries: Record<string, InitSummaryData>;\n}): Promise<InitSummary[]> {\n  const { options, contexts, autoDispose, appSummaries } = parameters;\n\n  const summaries: InitSummary[] = [];\n\n  const taskRunner = new TaskRunner();\n\n  for (const appContext of contexts) {\n    const summary = await initApp({\n      appContext,\n      options,\n      autoDispose,\n      summaryData: appSummaries[appContext.appPath],\n      taskRunner,\n      isMultiApp: contexts.length > 1,\n    });\n    summaries.push(summary);\n  }\n\n  return summaries;\n}\n\nasync function initApp(params: {\n  appContext: AppCommandContext;\n  options: InitOptions;\n  autoDispose: AutoDispose;\n  summaryData: InitSummaryData;\n  taskRunner: TaskRunner;\n  isMultiApp: boolean;\n}): Promise<InitSummary> {\n  const { appContext, options, autoDispose, summaryData, taskRunner, isMultiApp } = params;\n  const { appPath, config, telemetryClient } = appContext;\n\n  // Run prerequisites for the app.\n  runPrerequisites(appContext);\n\n  // If --reset is specified, reset the generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const apiContext: Context = await createPartialApiContext({\n    ...appContext,\n    items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n    taskRunner,\n  });\n  autoDispose(apiContext);\n  const resolveMap = apiContext.session.resolveMap;\n\n  // Log the resolve map to a file if requested.\n  if (options.logResolveMap) {\n    console.log('\\nWriting resolve map to `resolve-map.json`.');\n    await writeJson(path.join(appPath, 'resolve-map.json'), resolveMap);\n  }\n\n  // Ensure config.generated.packageSettings is initialized.\n  config.generated.packageSettings ??= [];\n\n  await new Promise<void>((resolve, reject) => {\n    let pending = 0;\n    let isExitingPrematurely = false;\n    const visitedSet = new Set<string>();\n    const refreshPaths = new Set<string>();\n    const priorityMap = new Map<string, number>();\n\n    // Start with the app path or requested matches\n    const initialPaths = options.match ? getFilteredPackages(resolveMap, options.match) : [appPath];\n    if (!initialPaths.length) {\n      reject(); // getFilteredPackages will log an error\n    }\n\n    enqueuePaths(new Map(initialPaths.map((packagePath) => [packagePath, undefined])));\n\n    /**\n     * Enqueue more paths.\n     * @param newPaths Mapping from package path to importer context.\n     */\n    function enqueuePaths(newPaths: Map<string, PackageImporterContext | undefined>) {\n      if (isExitingPrematurely) {\n        return;\n      }\n\n      // Iterate through the given paths.\n      for (const [packagePath, importerContext] of newPaths) {\n        if (visitedSet.has(packagePath)) {\n          continue;\n        }\n\n        visitedSet.add(packagePath);\n        pending++;\n\n        const shouldForce = refreshPaths.delete(packagePath);\n\n        // Get the priority value for this package path, defaults to 0.\n        const priority = priorityMap.get(packagePath) ?? 0;\n        // Lower priority of this package path by 1.\n        priorityMap.set(packagePath, priority - 1);\n\n        // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.\n        evaluatePath({\n          appPath,\n          packagePath,\n          importerContext,\n          config,\n          telemetryClient,\n          resolveMap,\n          initOptions: options,\n          summaryData,\n          ctx: apiContext,\n          // No need to force if we're in a multi-app scenario\n          // as we'll re-evaluate packages if they are different since we use a different task id.\n          shouldForce: !isMultiApp && shouldForce,\n          isMultiApp,\n          priority,\n        })\n          .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {\n            pending--;\n\n            if (shouldExit) {\n              isExitingPrematurely = true;\n            } else if (pathsToEvaluate?.size) {\n              // If there are packages that need to be rebuilt, delete them from the visited set to re-enqueue them\n              // and add them to the refresh set so that on re-enqueuing we pass the `shouldRerun` flag through\n              // on single app runs.\n              pathsToRefresh?.forEach((refreshPath) => {\n                refreshPaths.add(refreshPath);\n                visitedSet.delete(refreshPath);\n              });\n\n              // Try to enqueue the new paths.\n              enqueuePaths(pathsToEvaluate);\n            }\n\n            // If nothing is pending after this call, we're complete.\n            if (!pending) {\n              resolve();\n            }\n          })\n          .catch((error) => {\n            reject(error);\n          });\n      }\n    }\n  });\n\n  if (config.features?.optimizeDependencies) {\n    // Conditionally scan dependency usage so that we can populate\n    // include/excludeDependencies automatically, ensuring the dep list\n    // is both minimal (remove unused deps) and complete (include\n    // specific devDeps.)\n    const excludedDependenciesChanges = await optimizeDependencies(summaryData.getResults(), apiContext);\n    summaryData.recordGeneratedChanges(excludedDependenciesChanges);\n  }\n\n  if (config.features?.verifyExports) {\n    const packageResults = await verifyExports(summaryData.getResults(), apiContext);\n    for (const [packagePath, errors] of Object.entries(packageResults)) {\n      summaryData.addErrors(packagePath, errors);\n    }\n  }\n\n  const summary = summaryData.summarize(options);\n\n  // The feature \"removeUnusedExports\" doesn't (yet) write summary changes, but we still\n  // want to write the generated config if that featureFlag is on.\n  const hasSummaryChanges = config.features?.removeUnusedExports || summary.totalChanges;\n\n  if (!options.check && hasSummaryChanges) {\n    // Update the generated config: either write it if there are settings, or delete it if it\n    // previously existed but is no longer needed.\n    const generatedResult = await writeGeneratedConfig(config.generated, appPath);\n    if (generatedResult === 'deleted') {\n      summary.deletedGeneratedConfig = true;\n    }\n  }\n\n  return summary;\n}\n"]}

package/lib/commands/link/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/link/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAO1D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,WAAW,CAkD9C,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/link/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAO1D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,WAAW,CAuD9C,CAAC"}

package/lib/commands/link/execute.js

@@ -9,20 +9,20 @@ import path from 'path';
 export const execute = async (params) => {
     // Use the current directory as the default package path.
     const { options, cwd: appPath, reporter, initialize, exit } = params;
-    const { ignore: ignoredPackages, all: includeAll, ignoreResolutions, resolveStrategy, logResolveMap } = options;
+    const { ignore: ignoredPackages, all: includeAll, ignoreResolutions, resolveStrategy, logResolveMap, cachePath, } = options;
     await initialize({ appPath });
     console.debug('Linking packages...');
     console.debug('Include all:', !!includeAll);
     console.debug('Ignored packages:', ignoredPackages?.join(', ') || 'none');
     console.debug('Apply host resolutions:', !ignoreResolutions);
     console.debug('Resolve strategy:', resolveStrategy);
-    const session = await getSessionToLink({ reporter, exit });
+    const session = await getSessionToLink({ reporter, exit, cachePath });
     const client = await createCloudpackClient({ url: session.urls.apiServer, reporter });
     const includeMessage = includeAll ? ' including all internal paths' : '';
     const message = `Linking paths for ${session.projectName} at "${appPath}"${includeMessage}`;
     const task = reporter.addTask(message);
-    // Relevant options should be passed to the api server.
-    const data = {
+    // Send request to api server to link paths.
+    const { resolveMap, linkedPaths } = await client.linkPath.query({
         linkedPath: {
             path: appPath,
             ignoredPackages,
@@ -30,9 +30,7 @@ export const execute = async (params) => {
             ignoreResolutions,
             resolveStrategy,
         },
-    };
-    // Send request to api server to link paths.
-    const { resolveMap, linkedPaths } = await client.linkPath.query(data);
+    });
     await client.close();
     if (linkedPaths.find((p) => p.path === appPath) === undefined) {
         // Close down with an error.

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

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/link/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CommandAction } from '../../types/CommandAction.js';\nimport type { LinkOptions } from './types/LinkOptions.js';\nimport { getSessionToLink } from './getSessionToLink.js';\nimport { createCloudpackClient } from '@ms-cloudpack/api-server';\nimport { formatLinkSummary } from './formatLinkSummary.js';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\n\n/**\n * Defines the \"link\" verb entry point.\n */\nexport const execute: CommandAction<LinkOptions> = async (params) => {\n  // Use the current directory as the default package path.\n  const { options, cwd: appPath, reporter, initialize, exit } = params;\n\n  const { ignore: ignoredPackages, all: includeAll, ignoreResolutions, resolveStrategy, logResolveMap } = options;\n  await initialize({ appPath });\n\n  console.debug('Linking packages...');\n  console.debug('Include all:', !!includeAll);\n  console.debug('Ignored packages:', ignoredPackages?.join(', ') || 'none');\n  console.debug('Apply host resolutions:', !ignoreResolutions);\n  console.debug('Resolve strategy:', resolveStrategy);\n\n  const session = await getSessionToLink({ reporter, exit });\n  const client = await createCloudpackClient({ url: session.urls.apiServer, reporter });\n\n  const includeMessage = includeAll ? ' including all internal paths' : '';\n  const message = `Linking paths for ${session.projectName} at \"${appPath}\"${includeMessage}`;\n  const task = reporter.addTask(message);\n  // Relevant options should be passed to the api server.\n  const data = {\n    linkedPath: {\n      path: appPath,\n      ignoredPackages,\n      includeAll,\n      ignoreResolutions,\n      resolveStrategy,\n    },\n  };\n\n  // Send request to api server to link paths.\n  const { resolveMap, linkedPaths } = await client.linkPath.query(data);\n  await client.close();\n\n  if (linkedPaths.find((p) => p.path === appPath) === undefined) {\n    // Close down with an error.\n    task.complete({ status: 'fail', message: `Failed to link paths.`, forceShow: true });\n    await exit({ exitCode: 1, message: 'Failed to link paths.' });\n  }\n\n  if (logResolveMap) {\n    // Write the linked resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map-linked.json'), resolveMap);\n  }\n\n  // Close down successfully.\n  task.complete({ status: 'complete', message: `Linked paths`, forceShow: true });\n  const linkSummary = formatLinkSummary({ session, resolveMap, linkedPaths, resolveStrategy });\n\n  await exit({ exitCode: 0, message: linkSummary });\n};\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/link/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CommandAction } from '../../types/CommandAction.js';\nimport type { LinkOptions } from './types/LinkOptions.js';\nimport { getSessionToLink } from './getSessionToLink.js';\nimport { createCloudpackClient } from '@ms-cloudpack/api-server';\nimport { formatLinkSummary } from './formatLinkSummary.js';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\n\n/**\n * Defines the \"link\" verb entry point.\n */\nexport const execute: CommandAction<LinkOptions> = async (params) => {\n  // Use the current directory as the default package path.\n  const { options, cwd: appPath, reporter, initialize, exit } = params;\n  const {\n    ignore: ignoredPackages,\n    all: includeAll,\n    ignoreResolutions,\n    resolveStrategy,\n    logResolveMap,\n    cachePath,\n  } = options;\n\n  await initialize({ appPath });\n\n  console.debug('Linking packages...');\n  console.debug('Include all:', !!includeAll);\n  console.debug('Ignored packages:', ignoredPackages?.join(', ') || 'none');\n  console.debug('Apply host resolutions:', !ignoreResolutions);\n  console.debug('Resolve strategy:', resolveStrategy);\n\n  const session = await getSessionToLink({ reporter, exit, cachePath });\n  const client = await createCloudpackClient({ url: session.urls.apiServer, reporter });\n\n  const includeMessage = includeAll ? ' including all internal paths' : '';\n  const message = `Linking paths for ${session.projectName} at \"${appPath}\"${includeMessage}`;\n  const task = reporter.addTask(message);\n\n  // Send request to api server to link paths.\n  const { resolveMap, linkedPaths } = await client.linkPath.query({\n    linkedPath: {\n      path: appPath,\n      ignoredPackages,\n      includeAll,\n      ignoreResolutions,\n      resolveStrategy,\n    },\n  });\n  await client.close();\n\n  if (linkedPaths.find((p) => p.path === appPath) === undefined) {\n    // Close down with an error.\n    task.complete({ status: 'fail', message: `Failed to link paths.`, forceShow: true });\n    await exit({ exitCode: 1, message: 'Failed to link paths.' });\n  }\n\n  if (logResolveMap) {\n    // Write the linked resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map-linked.json'), resolveMap);\n  }\n\n  // Close down successfully.\n  task.complete({ status: 'complete', message: `Linked paths`, forceShow: true });\n  const linkSummary = formatLinkSummary({ session, resolveMap, linkedPaths, resolveStrategy });\n\n  await exit({ exitCode: 0, message: linkSummary });\n};\n"]}

package/lib/commands/link/getSessionToLink.d.ts

@@ -13,6 +13,8 @@ type SessionWithRequiredApiServer = Session & {
 export declare function getSessionToLink(options: {
     reporter: TaskReporter;
     exit: CommandActionParams<object>['exit'];
+    /** Cache path from CLI options */
+    cachePath: string | undefined;
 }): Promise<SessionWithRequiredApiServer>;
 export {};
 //# sourceMappingURL=getSessionToLink.d.ts.map

package/lib/commands/link/getSessionToLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSessionToLink.d.ts","sourceRoot":"","sources":["../../../src/commands/link/getSessionToLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGxD,KAAK,4BAA4B,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAE9E;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE;IAC9C,QAAQ,EAAE,YAAY,CAAC;IACvB,IAAI,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;CAC3C,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAwCxC"}
+{"version":3,"file":"getSessionToLink.d.ts","sourceRoot":"","sources":["../../../src/commands/link/getSessionToLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGxD,KAAK,4BAA4B,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAE9E;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE;IAC9C,QAAQ,EAAE,YAAY,CAAC;IACvB,IAAI,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;IAC1C,kCAAkC;IAClC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAwCxC"}

package/lib/commands/link/getSessionToLink.js

@@ -8,7 +8,7 @@ import { getCachePath } from '@ms-cloudpack/config';
 export async function getSessionToLink(options) {
     const { reporter, exit } = options;
     // Find the list of running sessions.
-    const cachePath = getCachePath();
+    const cachePath = await getCachePath(options.cachePath);
     const runningSessions = await getActiveSessions({ reporter, cachePath });
     if (runningSessions.length === 0) {
         await exit({

package/lib/commands/link/getSessionToLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSessionToLink.js","sourceRoot":"","sources":["../../../src/commands/link/getSessionToLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIpD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAGtC;IACC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAEnC,qCAAqC;IACrC,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,eAAe,GAAG,MAAM,iBAAiB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;IAEzE,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,CAAC;YACT,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,kFAAkF;SAC5F,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,qBAAqB,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE9F,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAChC,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/B,OAAO,CAAC,EAAE;QACV;YACE,KAAK,EAAE,OAAO,CAAC,WAAW;YAC1B,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,GAAG,GAAG,OAAO,CAAC,EAAE;YACtD,KAAK,EAAE,OAAO;SACf;KACF,CAAC,CACH,CAAC;IAEF,qCAAqC;IACrC,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IAC7D,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAE/C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAC5B,8CAA8C;QAC9C,MAAM,IAAI,CAAC;YACT,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,uDAAuD;SACjE,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAuC,CAAC;AACjD,CAAC","sourcesContent":["import type { CommandActionParams } from '../../types/CommandAction.js';\nimport { getActiveSessions } from './getActiveSessions.js';\nimport { getSessionFromUser } from './getSessionFromUser.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport { getCachePath } from '@ms-cloudpack/config';\n\ntype SessionWithRequiredApiServer = Session & { urls: { apiServer: string } };\n\n/**\n * Get a single active session to link packages.\n * The session must have an API server URL.\n */\nexport async function getSessionToLink(options: {\n  reporter: TaskReporter;\n  exit: CommandActionParams<object>['exit'];\n}): Promise<SessionWithRequiredApiServer> {\n  const { reporter, exit } = options;\n\n  // Find the list of running sessions.\n  const cachePath = getCachePath();\n  const runningSessions = await getActiveSessions({ reporter, cachePath });\n\n  if (runningSessions.length === 0) {\n    await exit({\n      exitCode: 1,\n      message: 'No running sessions found. Please start a session using `cloudpack start` first.',\n    });\n  }\n\n  console.debug(`Running sessions: ${runningSessions.map((session) => session.id).join(', ')}`);\n\n  const runningSessionsMap = new Map(\n    runningSessions.map((session) => [\n      session.id,\n      {\n        title: session.projectName,\n        description: session.config.appPath + ' ' + session.id,\n        value: session,\n      },\n    ]),\n  );\n\n  // Select a session to link packages.\n  const session = await getSessionFromUser(runningSessionsMap);\n  console.debug('Selected session:', session.id);\n\n  if (!session.urls.apiServer) {\n    // We should never get here, but just in case.\n    await exit({\n      exitCode: 1,\n      message: 'The selected session does not have an API server URL.',\n    });\n  }\n\n  return session as SessionWithRequiredApiServer;\n}\n"]}
+{"version":3,"file":"getSessionToLink.js","sourceRoot":"","sources":["../../../src/commands/link/getSessionToLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIpD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAKtC;IACC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAEnC,qCAAqC;IACrC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,MAAM,eAAe,GAAG,MAAM,iBAAiB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;IAEzE,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,CAAC;YACT,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,kFAAkF;SAC5F,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,qBAAqB,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE9F,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAChC,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/B,OAAO,CAAC,EAAE;QACV;YACE,KAAK,EAAE,OAAO,CAAC,WAAW;YAC1B,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,GAAG,GAAG,OAAO,CAAC,EAAE;YACtD,KAAK,EAAE,OAAO;SACf;KACF,CAAC,CACH,CAAC;IAEF,qCAAqC;IACrC,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IAC7D,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAE/C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAC5B,8CAA8C;QAC9C,MAAM,IAAI,CAAC;YACT,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,uDAAuD;SACjE,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAuC,CAAC;AACjD,CAAC","sourcesContent":["import type { CommandActionParams } from '../../types/CommandAction.js';\nimport { getActiveSessions } from './getActiveSessions.js';\nimport { getSessionFromUser } from './getSessionFromUser.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport { getCachePath } from '@ms-cloudpack/config';\n\ntype SessionWithRequiredApiServer = Session & { urls: { apiServer: string } };\n\n/**\n * Get a single active session to link packages.\n * The session must have an API server URL.\n */\nexport async function getSessionToLink(options: {\n  reporter: TaskReporter;\n  exit: CommandActionParams<object>['exit'];\n  /** Cache path from CLI options */\n  cachePath: string | undefined;\n}): Promise<SessionWithRequiredApiServer> {\n  const { reporter, exit } = options;\n\n  // Find the list of running sessions.\n  const cachePath = await getCachePath(options.cachePath);\n  const runningSessions = await getActiveSessions({ reporter, cachePath });\n\n  if (runningSessions.length === 0) {\n    await exit({\n      exitCode: 1,\n      message: 'No running sessions found. Please start a session using `cloudpack start` first.',\n    });\n  }\n\n  console.debug(`Running sessions: ${runningSessions.map((session) => session.id).join(', ')}`);\n\n  const runningSessionsMap = new Map(\n    runningSessions.map((session) => [\n      session.id,\n      {\n        title: session.projectName,\n        description: session.config.appPath + ' ' + session.id,\n        value: session,\n      },\n    ]),\n  );\n\n  // Select a session to link packages.\n  const session = await getSessionFromUser(runningSessionsMap);\n  console.debug('Selected session:', session.id);\n\n  if (!session.urls.apiServer) {\n    // We should never get here, but just in case.\n    await exit({\n      exitCode: 1,\n      message: 'The selected session does not have an API server URL.',\n    });\n  }\n\n  return session as SessionWithRequiredApiServer;\n}\n"]}

package/lib/commands/setup/index.js

@@ -4,10 +4,10 @@ export const init = (program) => {
     program.addSubCommand({
         name: 'setup',
         description: 'Sets up cert and hosts file settings for the relevant inner loop domain and https preferences.',
-        usage: '<command>',
         options: {
             force: new Option('--force', 'Forces execution of setup steps.'),
         },
+        skipSharedOptions: ['cachePath', 'features'],
         getExecutor: () => import('./execute.js'),
     });
 };

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/setup/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,+BAA+B;AAC/B,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAC;QACpB,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,gGAAgG;QAC7G,KAAK,EAAE,WAAW;QAClB,OAAO,EAAE;YACP,KAAK,EAAE,IAAI,MAAM,CAAC,SAAS,EAAE,kCAAkC,CAAC;SACjE;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\n\n/** Defines the \"info\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  program.addSubCommand({\n    name: 'setup',\n    description: 'Sets up cert and hosts file settings for the relevant inner loop domain and https preferences.',\n    usage: '<command>',\n    options: {\n      force: new Option('--force', 'Forces execution of setup steps.'),\n    },\n    getExecutor: () => import('./execute.js'),\n  });\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/setup/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,+BAA+B;AAC/B,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAC;QACpB,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,gGAAgG;QAC7G,OAAO,EAAE;YACP,KAAK,EAAE,IAAI,MAAM,CAAC,SAAS,EAAE,kCAAkC,CAAC;SACjE;QACD,iBAAiB,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC;QAC5C,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\n\n/** Defines the \"info\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  program.addSubCommand({\n    name: 'setup',\n    description: 'Sets up cert and hosts file settings for the relevant inner loop domain and https preferences.',\n    options: {\n      force: new Option('--force', 'Forces execution of setup steps.'),\n    },\n    skipSharedOptions: ['cachePath', 'features'],\n    getExecutor: () => import('./execute.js'),\n  });\n};\n"]}

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

@@ -1,7 +1,5 @@
 import type { CommandAction } from '../../types/CommandAction.js';
 import type { StartOptions } from './types/StartOptions.js';
-/** Stop all started cloudpack instances, for testing */
-export declare function stopServers(): Promise<void>;
 /**
  * Defines the "start" verb entry point.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAuB,MAAM,8BAA8B,CAAC;AAKvF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAK5D,wDAAwD;AACxD,wBAAsB,WAAW,kBAKhC;AAED;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,YAAY,CA+I/C,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAKlE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAI5D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,YAAY,CA+I/C,CAAC"}

package/lib/commands/start/execute.js

@@ -11,24 +11,19 @@ import { getStartingAppPath } from './getStartingAppPath.js';
 import { openBrowser } from './openBrowser.js';
 import { trackSession } from './trackSession.js';
 import { getCertificate } from '@ms-cloudpack/setup-utilities';
-let exitFunction;
-/** Stop all started cloudpack instances, for testing */
-export async function stopServers() {
-    if (exitFunction) {
-        await exitFunction({ exitCode: 0, message: 'stopServers called' });
-        exitFunction = undefined;
-    }
-}
+import { setStopServersFunction } from '../../utilities/stopServers.js';
 /**
  * Defines the "start" verb entry point.
  */
 export const execute = async (params) => {
-    const { options, cwd, initialize, reporter, autoDispose, exit } = params;
+    const { options, cwd, initialize, autoDispose, exit } = params;
+    setStopServersFunction(exit);
     const appPath = await getStartingAppPath(cwd, options.app);
-    const { config, telemetryClient } = await initialize({ appPath, mode: options.mode });
+    const apiContextOptions = await initialize({ appPath, mode: options.mode });
+    const { config, telemetryClient } = apiContextOptions;
     console.log('App path:', yellow(appPath));
     console.log('Bundle mode:', yellow(options.mode));
-    runPrerequisites({ config, cwd: appPath, telemetryClient });
+    runPrerequisites(apiContextOptions);
     const currentDir = path.dirname(fileURLToPath(import.meta.url));
     let overlayPath = await resolve('@ms-cloudpack/overlay', currentDir);
     // If overlay is an internal package, resolve the overlay from the current package's linked node modules
@@ -38,10 +33,7 @@ export const execute = async (params) => {
         overlayPath = cliPath ? path.join(cliPath, 'node_modules', '@ms-cloudpack/overlay') : undefined;
     }
     const [apiContext] = autoDispose(await createPartialApiContext({
-        appPath,
-        config,
-        reporter,
-        telemetryClient,
+        ...apiContextOptions,
         items: ['bus', 'watcher', 'taskRunner', 'packages', 'session', 'packageImportPaths', 'packageHashes'],
         overlayPath,
     }));
@@ -70,7 +62,7 @@ export const execute = async (params) => {
     let apiServer;
     // Start api server for tracking status and handling remote requests.
     try {
-        apiServer = await createCloudpackServer(apiContext);
+        apiServer = await createCloudpackServer({ port: options.apiServerPort }, apiContext);
     }
     catch (err) {
         const error = err;
@@ -97,7 +89,8 @@ export const execute = async (params) => {
     const { startServers } = await import('@ms-cloudpack/app-server');
     const servers = await startServers({
         definition,
-        bundleServerOptions: { disableCache: !options.cache },
+        bundleServerOptions: { disableCache: !options.cache, port: options.bundleServerPort },
+        port: options.appServerPort,
     }, apiContext);
     // Save the session to active sessions.
     const sessionTracker = await trackSession(session);
@@ -119,7 +112,6 @@ export const execute = async (params) => {
         }));
     };
     autoDispose({ dispose: cleanup });
-    exitFunction = exit;
     const defaultUrl = makeUrl(config.devServer?.defaultPath || '', session.urls.appServer).href;
     performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);
     // Open the browser.

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

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import { createPartialApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { isExternalPackage, resolve } from '@ms-cloudpack/package-utilities';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport { cyan, yellow, bold } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';\nimport type { CommandAction, CommandActionParams } from '../../types/CommandAction.js';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport { getStartingAppPath } from './getStartingAppPath.js';\nimport { openBrowser } from './openBrowser.js';\nimport { trackSession } from './trackSession.js';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { getCertificate } from '@ms-cloudpack/setup-utilities';\n\nlet exitFunction: CommandActionParams<StartOptions>['exit'] | undefined;\n\n/** Stop all started cloudpack instances, for testing */\nexport async function stopServers() {\n  if (exitFunction) {\n    await exitFunction({ exitCode: 0, message: 'stopServers called' });\n    exitFunction = undefined;\n  }\n}\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport const execute: CommandAction<StartOptions> = async (params) => {\n  const { options, cwd, initialize, reporter, autoDispose, exit } = params;\n  const appPath = await getStartingAppPath(cwd, options.app);\n  const { config, telemetryClient } = await initialize({ appPath, mode: options.mode });\n\n  console.log('App path:', yellow(appPath));\n  console.log('Bundle mode:', yellow(options.mode));\n\n  runPrerequisites({ config, cwd: appPath, telemetryClient });\n\n  const currentDir = path.dirname(fileURLToPath(import.meta.url));\n  let overlayPath = await resolve('@ms-cloudpack/overlay', currentDir);\n\n  // If overlay is an internal package, resolve the overlay from the current package's linked node modules\n  // to \"externalize\" it, so that we always use the bundled version of the overlay instead of the source.\n  if (overlayPath && !isExternalPackage(overlayPath)) {\n    const cliPath = await resolve('@ms-cloudpack/cli', currentDir);\n    overlayPath = cliPath ? path.join(cliPath, 'node_modules', '@ms-cloudpack/overlay') : undefined;\n  }\n\n  const [apiContext] = autoDispose(\n    await createPartialApiContext({\n      appPath,\n      config,\n      reporter,\n      telemetryClient,\n      items: ['bus', 'watcher', 'taskRunner', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n      overlayPath,\n    }),\n  );\n  const { packages, session } = apiContext;\n\n  // Increment the session version if caching is disabled.\n  if (options.cache === false) {\n    session.incrementSessionVersion();\n  }\n\n  // Make sure the package has a valid definition.\n  const definition = await packages.get(appPath);\n\n  // Set shared telemetry attributes which will be sent with all telemetry events.\n  telemetryClient.setSharedSpanAttribute('sessionId', session.id);\n\n  if (options.logResolveMap) {\n    // Write the resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n  }\n\n  // If a cert is needed, check that it exists.\n  if (config.devServer?.https === true && !(await getCertificate({ domain: config.devServer?.domain, cwd: appPath }))) {\n    await exit({\n      exitCode: 1,\n      message: `The local site is configured to use https in cloudpack.config.json, but is missing a cert.\\n\\nRun \"${cyan(bold('cloudpack setup'))}\" to create the required certificate and try start again.\\n`,\n    });\n    return;\n  }\n\n  const { createCloudpackServer } = await import('@ms-cloudpack/api-server');\n  let apiServer: Awaited<ReturnType<typeof createCloudpackServer>> | undefined;\n\n  // Start api server for tracking status and handling remote requests.\n  try {\n    apiServer = await createCloudpackServer(apiContext);\n  } catch (err) {\n    const error = err as { code: string };\n\n    if (error.code === 'EADDRNOTAVAIL' && config.devServer?.domain) {\n      const primaryDomain: string =\n        (Array.isArray(config.devServer.domain) ? config.devServer.domain[0] : config.devServer.domain) ||\n        '<unspecified>';\n\n      await exit({\n        exitCode: 1,\n        message:\n          `The domain \"${cyan(bold(primaryDomain))}\" in cloudpack.config.json is not resolvable.\\n\\n` +\n          `Run \"${cyan(bold('cloudpack setup'))}\" to add the appropriate entries to your hosts file and ` +\n          `try start again.\\n`,\n      });\n\n      return;\n    }\n\n    console.error('Error creating api server:', err);\n\n    throw err;\n  }\n\n  // Kick off bundling app package as soon as api server is ready.\n  void ensurePackageBundled({\n    input: { name: definition.name, version: definition.version },\n    ctx: apiContext,\n  });\n\n  // Then start bundle and app servers for hosting the app.\n  const { startServers } = await import('@ms-cloudpack/app-server');\n  const servers = await startServers(\n    {\n      definition,\n      bundleServerOptions: { disableCache: !options.cache },\n    },\n    apiContext,\n  );\n\n  // Save the session to active sessions.\n  const sessionTracker = await trackSession(session);\n\n  const cleanup = async () => {\n    // Stop tracking the session.\n    await sessionTracker.close();\n\n    await Promise.all(\n      Object.entries({ apiServer, ...servers }).map(async ([name, server]) => {\n        if (!server) return;\n\n        const desc = `${name} (${server.url})`;\n        console.info(`Closing ${desc}`);\n        try {\n          await server.close();\n          console.info(`Closed ${desc}`);\n        } catch (err) {\n          console.warn(`Error closing ${desc}:`, err);\n        }\n      }),\n    );\n  };\n\n  autoDispose({ dispose: cleanup });\n  exitFunction = exit;\n\n  const defaultUrl = makeUrl(config.devServer?.defaultPath || '', session.urls.appServer).href;\n\n  performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);\n\n  // Open the browser.\n  if (options.open !== false) {\n    openBrowser(defaultUrl).catch((err) => {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      console.warn('Error opening browser:', err?.stack || err);\n      console.warn('Please open the browser manually to:', defaultUrl);\n    });\n  } else {\n    console.log('Please open the browser manually to:', defaultUrl);\n  }\n};\n\n// cspell:ignore Prereqs\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import { createPartialApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { isExternalPackage, resolve } from '@ms-cloudpack/package-utilities';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport { cyan, yellow, bold } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport { getStartingAppPath } from './getStartingAppPath.js';\nimport { openBrowser } from './openBrowser.js';\nimport { trackSession } from './trackSession.js';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { getCertificate } from '@ms-cloudpack/setup-utilities';\nimport { setStopServersFunction } from '../../utilities/stopServers.js';\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport const execute: CommandAction<StartOptions> = async (params) => {\n  const { options, cwd, initialize, autoDispose, exit } = params;\n  setStopServersFunction(exit);\n\n  const appPath = await getStartingAppPath(cwd, options.app);\n  const apiContextOptions = await initialize({ appPath, mode: options.mode });\n  const { config, telemetryClient } = apiContextOptions;\n\n  console.log('App path:', yellow(appPath));\n  console.log('Bundle mode:', yellow(options.mode));\n\n  runPrerequisites(apiContextOptions);\n\n  const currentDir = path.dirname(fileURLToPath(import.meta.url));\n  let overlayPath = await resolve('@ms-cloudpack/overlay', currentDir);\n\n  // If overlay is an internal package, resolve the overlay from the current package's linked node modules\n  // to \"externalize\" it, so that we always use the bundled version of the overlay instead of the source.\n  if (overlayPath && !isExternalPackage(overlayPath)) {\n    const cliPath = await resolve('@ms-cloudpack/cli', currentDir);\n    overlayPath = cliPath ? path.join(cliPath, 'node_modules', '@ms-cloudpack/overlay') : undefined;\n  }\n\n  const [apiContext] = autoDispose(\n    await createPartialApiContext({\n      ...apiContextOptions,\n      items: ['bus', 'watcher', 'taskRunner', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n      overlayPath,\n    }),\n  );\n  const { packages, session } = apiContext;\n\n  // Increment the session version if caching is disabled.\n  if (options.cache === false) {\n    session.incrementSessionVersion();\n  }\n\n  // Make sure the package has a valid definition.\n  const definition = await packages.get(appPath);\n\n  // Set shared telemetry attributes which will be sent with all telemetry events.\n  telemetryClient.setSharedSpanAttribute('sessionId', session.id);\n\n  if (options.logResolveMap) {\n    // Write the resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n  }\n\n  // If a cert is needed, check that it exists.\n  if (config.devServer?.https === true && !(await getCertificate({ domain: config.devServer?.domain, cwd: appPath }))) {\n    await exit({\n      exitCode: 1,\n      message: `The local site is configured to use https in cloudpack.config.json, but is missing a cert.\\n\\nRun \"${cyan(bold('cloudpack setup'))}\" to create the required certificate and try start again.\\n`,\n    });\n    return;\n  }\n\n  const { createCloudpackServer } = await import('@ms-cloudpack/api-server');\n  let apiServer: Awaited<ReturnType<typeof createCloudpackServer>> | undefined;\n\n  // Start api server for tracking status and handling remote requests.\n  try {\n    apiServer = await createCloudpackServer({ port: options.apiServerPort }, apiContext);\n  } catch (err) {\n    const error = err as { code: string };\n\n    if (error.code === 'EADDRNOTAVAIL' && config.devServer?.domain) {\n      const primaryDomain: string =\n        (Array.isArray(config.devServer.domain) ? config.devServer.domain[0] : config.devServer.domain) ||\n        '<unspecified>';\n\n      await exit({\n        exitCode: 1,\n        message:\n          `The domain \"${cyan(bold(primaryDomain))}\" in cloudpack.config.json is not resolvable.\\n\\n` +\n          `Run \"${cyan(bold('cloudpack setup'))}\" to add the appropriate entries to your hosts file and ` +\n          `try start again.\\n`,\n      });\n\n      return;\n    }\n\n    console.error('Error creating api server:', err);\n\n    throw err;\n  }\n\n  // Kick off bundling app package as soon as api server is ready.\n  void ensurePackageBundled({\n    input: { name: definition.name, version: definition.version },\n    ctx: apiContext,\n  });\n\n  // Then start bundle and app servers for hosting the app.\n  const { startServers } = await import('@ms-cloudpack/app-server');\n  const servers = await startServers(\n    {\n      definition,\n      bundleServerOptions: { disableCache: !options.cache, port: options.bundleServerPort },\n      port: options.appServerPort,\n    },\n    apiContext,\n  );\n\n  // Save the session to active sessions.\n  const sessionTracker = await trackSession(session);\n\n  const cleanup = async () => {\n    // Stop tracking the session.\n    await sessionTracker.close();\n\n    await Promise.all(\n      Object.entries({ apiServer, ...servers }).map(async ([name, server]) => {\n        if (!server) return;\n\n        const desc = `${name} (${server.url})`;\n        console.info(`Closing ${desc}`);\n        try {\n          await server.close();\n          console.info(`Closed ${desc}`);\n        } catch (err) {\n          console.warn(`Error closing ${desc}:`, err);\n        }\n      }),\n    );\n  };\n\n  autoDispose({ dispose: cleanup });\n\n  const defaultUrl = makeUrl(config.devServer?.defaultPath || '', session.urls.appServer).href;\n\n  performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);\n\n  // Open the browser.\n  if (options.open !== false) {\n    openBrowser(defaultUrl).catch((err) => {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      console.warn('Error opening browser:', err?.stack || err);\n      console.warn('Please open the browser manually to:', defaultUrl);\n    });\n  } else {\n    console.log('Please open the browser manually to:', defaultUrl);\n  }\n};\n\n// cspell:ignore Prereqs\n"]}

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;AAI9E,gCAAgC;AAChC,eAAO,MAAM,IAAI,EAAE,mBAkBlB,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;AAK9E,gCAAgC;AAChC,eAAO,MAAM,IAAI,EAAE,mBAqBlB,CAAC"}

package/lib/commands/start/index.js

@@ -1,5 +1,6 @@
-import { Option } from 'commander';
+import { InvalidArgumentError, Option } from 'commander';
 import { parseBundleMode } from '../../utilities/parseBundleMode.js';
+import { portNumbers } from 'get-port';
 /** Defines the "start" verb. */
 export const init = (program) => {
     program.addSubCommand({
@@ -13,8 +14,34 @@ export const init = (program) => {
             app: new Option('--app <appPackageName>', 'Run Cloudpack targeting a specific app.'),
             open: new Option('--no-open', 'Do not open the browser.'),
             cache: new Option('--no-cache', 'Ensures Cloudpack rebuilds all packages when requested, rather than utilizing cached assets.'),
+            apiServerPort: getPortOption('--api-server-port <port>', 'API'),
+            appServerPort: getPortOption('--app-server-port <port>', 'app'),
+            bundleServerPort: getPortOption('--bundle-server-port <port>', 'bundle'),
         },
         getExecutor: () => import('./execute.js'),
     });
 };
+function getPortOption(flags, name) {
+    return new Option(flags, `Port to use for the ${name} server (single, comma-separated, or range with dash).`)
+        .argParser(parsePorts)
+        .hideHelp();
+}
+function parsePorts(value) {
+    if (value.includes('-')) {
+        const split = value.split('-');
+        if (split.length !== 2) {
+            throw new InvalidArgumentError(`Invalid port range: "${value}"`);
+        }
+        return [...portNumbers(parseNumber(split[0]), parseNumber(split[1]))];
+    }
+    return value.split(',').map(parseNumber);
+}
+function parseNumber(value) {
+    value = value.trim();
+    const parsed = parseInt(value, 10);
+    if (isNaN(parsed)) {
+        throw new InvalidArgumentError(`Port must be a number; received: "${value}"`);
+    }
+    return parsed;
+}
 //# sourceMappingURL=index.js.map

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,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,gCAAgC;AAChC,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAe;QAClC,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,0DAA0D;QACvE,OAAO,EAAE;YACP,IAAI,EAAE,IAAI,MAAM,CAAC,eAAe,EAAE,kEAAkE,CAAC;iBAClG,SAAS,CAAC,eAAe,CAAC;iBAC1B,OAAO,CAAC,SAAS,CAAC;YACrB,aAAa,EAAE,IAAI,MAAM,CAAC,mBAAmB,EAAE,6DAA6D,CAAC;YAC7G,GAAG,EAAE,IAAI,MAAM,CAAC,wBAAwB,EAAE,yCAAyC,CAAC;YACpF,IAAI,EAAE,IAAI,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;YACzD,KAAK,EAAE,IAAI,MAAM,CACf,YAAY,EACZ,8FAA8F,CAC/F;SACF;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { parseBundleMode } from '../../utilities/parseBundleMode.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 from the current package folder.',\n    options: {\n      mode: new Option('--mode <mode>', 'The mode to run the app in. (library | development | production)')\n        .argParser(parseBundleMode)\n        .default('library'),\n      logResolveMap: new Option('--log-resolve-map', 'Logs the resolve map to \"resolve-map.json\" for diagnostics.'),\n      app: new Option('--app <appPackageName>', 'Run Cloudpack targeting a specific app.'),\n      open: new Option('--no-open', 'Do not open the browser.'),\n      cache: new Option(\n        '--no-cache',\n        'Ensures Cloudpack rebuilds all packages when requested, rather than utilizing cached assets.',\n      ),\n    },\n    getExecutor: () => import('./execute.js'),\n  });\n};\n"]}
+{"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,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,gCAAgC;AAChC,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAe;QAClC,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,0DAA0D;QACvE,OAAO,EAAE;YACP,IAAI,EAAE,IAAI,MAAM,CAAC,eAAe,EAAE,kEAAkE,CAAC;iBAClG,SAAS,CAAC,eAAe,CAAC;iBAC1B,OAAO,CAAC,SAAS,CAAC;YACrB,aAAa,EAAE,IAAI,MAAM,CAAC,mBAAmB,EAAE,6DAA6D,CAAC;YAC7G,GAAG,EAAE,IAAI,MAAM,CAAC,wBAAwB,EAAE,yCAAyC,CAAC;YACpF,IAAI,EAAE,IAAI,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;YACzD,KAAK,EAAE,IAAI,MAAM,CACf,YAAY,EACZ,8FAA8F,CAC/F;YACD,aAAa,EAAE,aAAa,CAAC,0BAA0B,EAAE,KAAK,CAAC;YAC/D,aAAa,EAAE,aAAa,CAAC,0BAA0B,EAAE,KAAK,CAAC;YAC/D,gBAAgB,EAAE,aAAa,CAAC,6BAA6B,EAAE,QAAQ,CAAC;SACzE;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,IAAY;IAChD,OAAO,IAAI,MAAM,CAAC,KAAK,EAAE,uBAAuB,IAAI,wDAAwD,CAAC;SAC1G,SAAS,CAAC,UAAU,CAAC;SACrB,QAAQ,EAAE,CAAC;AAChB,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 { parseBundleMode } from '../../utilities/parseBundleMode.js';\nimport { portNumbers } from 'get-port';\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 from the current package folder.',\n    options: {\n      mode: new Option('--mode <mode>', 'The mode to run the app in. (library | development | production)')\n        .argParser(parseBundleMode)\n        .default('library'),\n      logResolveMap: new Option('--log-resolve-map', 'Logs the resolve map to \"resolve-map.json\" for diagnostics.'),\n      app: new Option('--app <appPackageName>', 'Run Cloudpack targeting a specific app.'),\n      open: new Option('--no-open', 'Do not open the browser.'),\n      cache: new Option(\n        '--no-cache',\n        'Ensures Cloudpack rebuilds all packages when requested, rather than utilizing cached assets.',\n      ),\n      apiServerPort: getPortOption('--api-server-port <port>', 'API'),\n      appServerPort: getPortOption('--app-server-port <port>', 'app'),\n      bundleServerPort: getPortOption('--bundle-server-port <port>', 'bundle'),\n    },\n    getExecutor: () => import('./execute.js'),\n  });\n};\n\nfunction getPortOption(flags: string, name: string) {\n  return new Option(flags, `Port to use for the ${name} server (single, comma-separated, or range with dash).`)\n    .argParser(parsePorts)\n    .hideHelp();\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) {\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/types/StartOptions.d.ts

@@ -10,5 +10,11 @@ export interface StartOptions {
     open?: boolean;
     /** Whether to use the cache on first request (default true) */
     cache?: boolean;
+    /** Mostly for testing: custom port for the API server */
+    apiServerPort?: number | number[];
+    /** Mostly for testing: custom port for the app server (also set in config via `devServer.port`) */
+    appServerPort?: number | number[];
+    /** Mostly for testing: custom port for the bundle server */
+    bundleServerPort?: number | number[];
 }
 //# sourceMappingURL=StartOptions.d.ts.map

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,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,WAAW,YAAY;IAC3B,oDAAoD;IACpD,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,6DAA6D;IAC7D,IAAI,EAAE,UAAU,CAAC;IAEjB,wGAAwG;IACxG,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,iDAAiD;IACjD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,+DAA+D;IAC/D,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB"}
+{"version":3,"file":"StartOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/types/StartOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,WAAW,YAAY;IAC3B,oDAAoD;IACpD,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,6DAA6D;IAC7D,IAAI,EAAE,UAAU,CAAC;IAEjB,wGAAwG;IACxG,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,iDAAiD;IACjD,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,+DAA+D;IAC/D,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC,mGAAmG;IACnG,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 { BundleMode } from '@ms-cloudpack/common-types';\n\nexport interface StartOptions {\n  /** Writes the resolve map to `resolve-map.json`. */\n  logResolveMap?: boolean;\n\n  /** The mode to start in (library/development/production). */\n  mode: BundleMode;\n\n  /** Specifies which specific app to run, in the case of running `init` at a higher level in the repo. */\n  app?: string;\n  /** Whether to open the browser (default true) */\n  open?: boolean;\n  /** Whether to use the cache on first request (default true) */\n  cache?: boolean;\n}\n"]}
+{"version":3,"file":"StartOptions.js","sourceRoot":"","sources":["../../../../src/commands/start/types/StartOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleMode } from '@ms-cloudpack/common-types';\n\nexport interface StartOptions {\n  /** Writes the resolve map to `resolve-map.json`. */\n  logResolveMap?: boolean;\n\n  /** The mode to start in (library/development/production). */\n  mode: BundleMode;\n\n  /** Specifies which specific app to run, in the case of running `init` at a higher level in the repo. */\n  app?: string;\n\n  /** Whether to open the browser (default true) */\n  open?: boolean;\n\n  /** Whether to use the cache on first request (default true) */\n  cache?: boolean;\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 `devServer.port`) */\n  appServerPort?: number | number[];\n\n  /** Mostly for testing: custom port for the bundle server */\n  bundleServerPort?: number | number[];\n}\n"]}