@ms-cloudpack/cli 0.72.13 → 0.72.14

package/lib/commands/bundle/execute.js

@@ -22,7 +22,7 @@ export const execute = async (params) => {
     if (!pathsToBundle.length) {
         return {
             message: 'No matching packages found to bundle.',
-            exitCode: 1,
+            hasErrors: true,
         };
     }
     // Show completed bundle tasks so the user knows what's happening.

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

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/bundle/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAE7E,MAAM,CAAC,MAAM,OAAO,GAAiC,KAAK,EAAE,MAAM,EAAE,EAAE;IACpE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAC5E,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC;QACzC,OAAO;QACP,aAAa,EAAE;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,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;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAElD,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CACvB,MAAM,uBAAuB,CAAC;QAC5B,GAAG,iBAAiB;QACpB,KAAK,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,oBAAoB,EAAE,eAAe,CAAC;KACtG,CAAC,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAE7G,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO;YACL,OAAO,EAAE,uCAAuC;YAChD,QAAQ,EAAE,CAAC;SACZ,CAAC;IACJ,CAAC;IAED,kEAAkE;IAClE,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,QAAQ,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvE,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,oBAAoB,GAAG,CAAC,CAAC;IAE7B,KAAK,MAAM,WAAW,IAAI,aAAa,EAAE,CAAC;QACxC,8DAA8D;QAC9D,oGAAoG;QACpG,uEAAuE;QACvE,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1F,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEvD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC;YAC5C,KAAK,EAAE;gBACL,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,UAAU;gBACV,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,WAAW,EAAE,IAAI;gBACjB,aAAa,EAAE,KAAK;aACrB;YACD,GAAG;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAEhD,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YAC1B,kBAAkB,EAAE,CAAC;QACvB,CAAC;aAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;YACnC,iBAAiB,EAAE,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,oBAAoB,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG;QACb,kBAAkB,IAAI,GAAG,CAAC,MAAM,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;QACzE,iBAAiB,IAAI,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,mCAAmC,CAAC,CAAC;QAC3F,oBAAoB,IAAI,MAAM,CAAC,oBAAoB,EAAE,qBAAqB,CAAC;KAC5E;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO;QACL,OAAO,EAAE,YAAY,MAAM,IAAI;QAC/B,SAAS,EAAE,CAAC,CAAC,kBAAkB;KAChC,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { createPartialApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { plural, red, yellow } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\n\nexport const execute: CommandAction<BundleOptions> = async (params) => {\n  const { cwd: appPath, options, reporter, initialize, autoDispose } = params;\n  const apiContextOptions = await initialize({\n    appPath,\n    configOptions: {\n      mode: options.mode,\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  console.log('Bundle mode:', yellow(options.mode));\n\n  const [ctx] = autoDispose(\n    await createPartialApiContext({\n      ...apiContextOptions,\n      items: ['packages', 'watcher', 'session', 'taskRunner', 'bus', 'packageImportPaths', 'packageHashes'],\n    }),\n  );\n\n  const pathsToBundle = options.match ? getFilteredPackages(ctx.session.resolveMap, options.match) : [appPath];\n\n  if (!pathsToBundle.length) {\n    return {\n      message: 'No matching packages found to bundle.',\n      exitCode: 1,\n    };\n  }\n\n  // Show completed bundle tasks so the user knows what's happening.\n  reporter.setOptions({ ...reporter.getOptions(), showCompleted: true });\n\n  let warnPackagesCount = 0;\n  let errorPackagesCount = 0;\n  let successPackagesCount = 0;\n\n  for (const packagePath of pathsToBundle) {\n    // If outdir is set, resolve relative to the package/app path.\n    // Otherwise, use the default path under the cloudpack cache to stay consistent with init and start,\n    // and to avoid potentially messing with the package's original output.\n    const outputPath = options.outdir ? path.resolve(packagePath, options.outdir) : undefined;\n\n    const definition = await ctx.packages.get(packagePath);\n\n    const { result } = await ensurePackageBundled({\n      input: {\n        name: definition.name,\n        version: definition.version,\n        outputPath,\n        disableSourceMaps: options.disableSourceMaps,\n        shouldForce: true,\n        isIncremental: false,\n      },\n      ctx,\n    });\n\n    console.log('Output:', result.outputPath, '\\n');\n\n    if (result.errors?.length) {\n      errorPackagesCount++;\n    } else if (result.warnings?.length) {\n      warnPackagesCount++;\n    } else {\n      successPackagesCount++;\n    }\n  }\n\n  const status = [\n    errorPackagesCount && red(plural(errorPackagesCount, 'package$s failed')),\n    warnPackagesCount && yellow(plural(warnPackagesCount, 'package$s succeeded with warnings')),\n    successPackagesCount && plural(successPackagesCount, 'package$s succeeded'),\n  ]\n    .filter(Boolean)\n    .join(', ');\n\n  return {\n    message: `Bundling ${status}\\n`,\n    hasErrors: !!errorPackagesCount,\n  };\n};\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/bundle/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import { createPartialApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { plural, red, yellow } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\n\nexport const execute: CommandAction<BundleOptions> = async (params) => {\n  const { cwd: appPath, options, reporter, initialize, autoDispose } = params;\n  const apiContextOptions = await initialize({\n    appPath,\n    configOptions: {\n      mode: options.mode,\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  console.log('Bundle mode:', yellow(options.mode));\n\n  const [ctx] = autoDispose(\n    await createPartialApiContext({\n      ...apiContextOptions,\n      items: ['packages', 'watcher', 'session', 'taskRunner', 'bus', 'packageImportPaths', 'packageHashes'],\n    }),\n  );\n\n  const pathsToBundle = options.match ? getFilteredPackages(ctx.session.resolveMap, options.match) : [appPath];\n\n  if (!pathsToBundle.length) {\n    return {\n      message: 'No matching packages found to bundle.',\n      hasErrors: true,\n    };\n  }\n\n  // Show completed bundle tasks so the user knows what's happening.\n  reporter.setOptions({ ...reporter.getOptions(), showCompleted: true });\n\n  let warnPackagesCount = 0;\n  let errorPackagesCount = 0;\n  let successPackagesCount = 0;\n\n  for (const packagePath of pathsToBundle) {\n    // If outdir is set, resolve relative to the package/app path.\n    // Otherwise, use the default path under the cloudpack cache to stay consistent with init and start,\n    // and to avoid potentially messing with the package's original output.\n    const outputPath = options.outdir ? path.resolve(packagePath, options.outdir) : undefined;\n\n    const definition = await ctx.packages.get(packagePath);\n\n    const { result } = await ensurePackageBundled({\n      input: {\n        name: definition.name,\n        version: definition.version,\n        outputPath,\n        disableSourceMaps: options.disableSourceMaps,\n        shouldForce: true,\n        isIncremental: false,\n      },\n      ctx,\n    });\n\n    console.log('Output:', result.outputPath, '\\n');\n\n    if (result.errors?.length) {\n      errorPackagesCount++;\n    } else if (result.warnings?.length) {\n      warnPackagesCount++;\n    } else {\n      successPackagesCount++;\n    }\n  }\n\n  const status = [\n    errorPackagesCount && red(plural(errorPackagesCount, 'package$s failed')),\n    warnPackagesCount && yellow(plural(warnPackagesCount, 'package$s succeeded with warnings')),\n    successPackagesCount && plural(successPackagesCount, 'package$s succeeded'),\n  ]\n    .filter(Boolean)\n    .join(', ');\n\n  return {\n    message: `Bundling ${status}\\n`,\n    hasErrors: !!errorPackagesCount,\n  };\n};\n"]}

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

@@ -1,7 +1,7 @@
 import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server';
 import type { CloudpackConfig, PackageImporterContext } from '@ms-cloudpack/common-types';
 import type { ResolveMap } from '@ms-cloudpack/package-utilities';
-import type { TelemetryClient } from '@ms-cloudpack/telemetry';
+import type { Span } from '@ms-cloudpack/telemetry';
 import type { InitSummaryData } from './InitSummaryData.js';
 import type { InitOptions } from './types/InitOptions.js';
 /**
@@ -18,7 +18,7 @@ export declare function evaluatePath(options: {
     config: CloudpackConfig;
     appPath: string;
     resolveMap: ResolveMap;
-    telemetryClient: TelemetryClient;
+    span: Span;
     initOptions: InitOptions;
     summaryData: InitSummaryData;
     ctx: EnsurePackageBundledContext;

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

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAO1D;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,eAAe,CAAC;IAC7B,GAAG,EAAE,2BAA2B,CAAC;IACjC,uDAAuD;IACvD,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,kFAAkF;IAClF,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IACV,4EAA4E;IAC5E,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IAClE,6FAA6F;IAC7F,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,6CAA6C;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC,CAqHD"}
+{"version":3,"file":"evaluatePath.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAO1D;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,IAAI,CAAC;IACX,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,eAAe,CAAC;IAC7B,GAAG,EAAE,2BAA2B,CAAC;IACjC,uDAAuD;IACvD,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,kFAAkF;IAClF,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IACV,4EAA4E;IAC5E,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IAClE,6FAA6F;IAC7F,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,6CAA6C;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC,CAqHD"}

package/lib/commands/init/evaluatePath.js

@@ -7,7 +7,7 @@ import { evaluateDynamicImports } from './evaluateDynamicImports.js';
  * in the generated config.
  */
 export async function evaluatePath(options) {
-    const { packagePath, config, initOptions, telemetryClient, resolveMap, summaryData, ctx, importerContext, shouldForce, isMultiApp, priority, appPath, } = options;
+    const { packagePath, config, initOptions, span, resolveMap, summaryData, ctx, importerContext, shouldForce, isMultiApp, priority, appPath, } = options;
     const { packages } = ctx;
     const { features } = config;
     // This line is the reason we have to track the importerContext for packages to evaluate:
@@ -77,7 +77,7 @@ export async function evaluatePath(options) {
     // importPathsToEvaluate?.forEach((path) => pathsToEvaluate.set(path, importerContext));
     // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));
     if (initOptions.check && (exportsChanges.length || evalErrors.length || dynamicImportsChanges?.length)) {
-        telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {
+        span.addEvent('INIT_CHECK_FAILED', {
             // Don't log the specific errors to telemetry, as they may contain sensitive information.
             reason: exportsChanges || dynamicImportsChanges ? 'Config needs to be updated.' : 'Errors found with imports.',
         });

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

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server';\nimport type { CloudpackConfig, PackageImporterContext } from '@ms-cloudpack/common-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { evaluateDynamicImports } from './evaluateDynamicImports.js';\n\n/**\n * A helper which given the packagePath, tries to evaluate the path by bundling things, finding imports,\n * and cross checking the imports with explicit exports. If any exports are missing, they are documented\n * in the generated config.\n */\nexport async function evaluatePath(options: {\n  /** Path to evaluate. */\n  packagePath: string;\n  /** Info about how the parent package */\n  importerContext: PackageImporterContext | undefined;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  appPath: string;\n  resolveMap: ResolveMap;\n  telemetryClient: TelemetryClient;\n  initOptions: InitOptions;\n  summaryData: InitSummaryData;\n  ctx: EnsurePackageBundledContext;\n  /** Whether init is running in a multi-app scenario. */\n  isMultiApp: boolean;\n  shouldForce: boolean;\n  /** The priority of the package being evaluated. To be used in the task runner. */\n  priority: number;\n}): Promise<{\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate?: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh?: Set<string>;\n  /** Whether a fatal error was encountered. */\n  shouldExit?: boolean;\n}> {\n  const {\n    packagePath,\n    config,\n    initOptions,\n    telemetryClient,\n    resolveMap,\n    summaryData,\n    ctx,\n    importerContext,\n    shouldForce,\n    isMultiApp,\n    priority,\n    appPath,\n  } = options;\n  const { packages } = ctx;\n  const { features } = config;\n\n  // This line is the reason we have to track the importerContext for packages to evaluate:\n  // otherwise if a non-semver package is read here, we'd lose the modifications from the initial\n  // time the package was read (and getNonSemverTransform was called) when building the resolve map.\n  const definition = await packages.get(packagePath, { refresh: true, importerContext });\n  const { name, version } = definition;\n\n  console.debug(`Evaluating ${packagePath} with context ${JSON.stringify(importerContext)}`);\n\n  // Bundle the package and find the imports it depends on.\n  const { result } = await ensurePackageBundled({\n    input: {\n      name,\n      version,\n      isIncremental: false,\n      shouldGetBundleInfo: true,\n      shouldForce,\n      shouldRerun: shouldForce,\n      useHashAsId: isMultiApp,\n      priority,\n      disableCache: !initOptions.cache,\n    },\n    ctx,\n  });\n\n  const { errors, warnings, info, outputPath } = result;\n\n  // Record the results for the summary.\n  summaryData.recordResult({ name, version, path: packagePath, errors, warnings, info, outputPath });\n\n  // If there were errors or no imports, return early.\n  if (errors?.length || !info) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    exportsChanges,\n    includedDependenciesChanges,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({\n    definition,\n    packagePath,\n    packages,\n    info,\n    config,\n    resolveMap,\n    importerContext,\n    appPath,\n  });\n\n  if (evalErrors.length) {\n    summaryData.addErrors(packagePath, evalErrors);\n  }\n  summaryData.recordGeneratedChanges(exportsChanges);\n  summaryData.recordGeneratedChanges(includedDependenciesChanges);\n\n  let dynamicImportsChanges: undefined | GeneratedPackageChanges[] = undefined;\n  if (features?.evaluateDynamicImports) {\n    const evaluatedDynamicImports = await evaluateDynamicImports({\n      definition,\n      packagePath,\n      info,\n      config,\n      packages,\n      importerContext,\n    });\n\n    const { pathsToEvaluate: dynamicImportPathsToEvaluate, pathsToRefresh: dynamicImportPathsToRefresh } =\n      evaluatedDynamicImports;\n    dynamicImportsChanges = evaluatedDynamicImports.dynamicImportsChanges;\n\n    summaryData.recordGeneratedChanges(dynamicImportsChanges);\n\n    for (const [evalPath, evalContext] of dynamicImportPathsToEvaluate.entries()) {\n      pathsToEvaluate.set(evalPath, evalContext);\n    }\n    dynamicImportPathsToRefresh.forEach((path) => pathsToRefresh.add(path));\n  }\n\n  // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed\n  // and the heap does not reach the limit as almost every package is enqueued.\n  // importPathsToEvaluate?.forEach((path) => pathsToEvaluate.set(path, importerContext));\n  // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));\n\n  if (initOptions.check && (exportsChanges.length || evalErrors.length || dynamicImportsChanges?.length)) {\n    telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {\n      // Don't log the specific errors to telemetry, as they may contain sensitive information.\n      reason: exportsChanges || dynamicImportsChanges ? 'Config needs to be updated.' : 'Errors found with imports.',\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}
+{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server';\nimport type { CloudpackConfig, PackageImporterContext } from '@ms-cloudpack/common-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { Span } from '@ms-cloudpack/telemetry';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { evaluateDynamicImports } from './evaluateDynamicImports.js';\n\n/**\n * A helper which given the packagePath, tries to evaluate the path by bundling things, finding imports,\n * and cross checking the imports with explicit exports. If any exports are missing, they are documented\n * in the generated config.\n */\nexport async function evaluatePath(options: {\n  /** Path to evaluate. */\n  packagePath: string;\n  /** Info about how the parent package */\n  importerContext: PackageImporterContext | undefined;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  appPath: string;\n  resolveMap: ResolveMap;\n  span: Span;\n  initOptions: InitOptions;\n  summaryData: InitSummaryData;\n  ctx: EnsurePackageBundledContext;\n  /** Whether init is running in a multi-app scenario. */\n  isMultiApp: boolean;\n  shouldForce: boolean;\n  /** The priority of the package being evaluated. To be used in the task runner. */\n  priority: number;\n}): Promise<{\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate?: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh?: Set<string>;\n  /** Whether a fatal error was encountered. */\n  shouldExit?: boolean;\n}> {\n  const {\n    packagePath,\n    config,\n    initOptions,\n    span,\n    resolveMap,\n    summaryData,\n    ctx,\n    importerContext,\n    shouldForce,\n    isMultiApp,\n    priority,\n    appPath,\n  } = options;\n  const { packages } = ctx;\n  const { features } = config;\n\n  // This line is the reason we have to track the importerContext for packages to evaluate:\n  // otherwise if a non-semver package is read here, we'd lose the modifications from the initial\n  // time the package was read (and getNonSemverTransform was called) when building the resolve map.\n  const definition = await packages.get(packagePath, { refresh: true, importerContext });\n  const { name, version } = definition;\n\n  console.debug(`Evaluating ${packagePath} with context ${JSON.stringify(importerContext)}`);\n\n  // Bundle the package and find the imports it depends on.\n  const { result } = await ensurePackageBundled({\n    input: {\n      name,\n      version,\n      isIncremental: false,\n      shouldGetBundleInfo: true,\n      shouldForce,\n      shouldRerun: shouldForce,\n      useHashAsId: isMultiApp,\n      priority,\n      disableCache: !initOptions.cache,\n    },\n    ctx,\n  });\n\n  const { errors, warnings, info, outputPath } = result;\n\n  // Record the results for the summary.\n  summaryData.recordResult({ name, version, path: packagePath, errors, warnings, info, outputPath });\n\n  // If there were errors or no imports, return early.\n  if (errors?.length || !info) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    exportsChanges,\n    includedDependenciesChanges,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({\n    definition,\n    packagePath,\n    packages,\n    info,\n    config,\n    resolveMap,\n    importerContext,\n    appPath,\n  });\n\n  if (evalErrors.length) {\n    summaryData.addErrors(packagePath, evalErrors);\n  }\n  summaryData.recordGeneratedChanges(exportsChanges);\n  summaryData.recordGeneratedChanges(includedDependenciesChanges);\n\n  let dynamicImportsChanges: undefined | GeneratedPackageChanges[] = undefined;\n  if (features?.evaluateDynamicImports) {\n    const evaluatedDynamicImports = await evaluateDynamicImports({\n      definition,\n      packagePath,\n      info,\n      config,\n      packages,\n      importerContext,\n    });\n\n    const { pathsToEvaluate: dynamicImportPathsToEvaluate, pathsToRefresh: dynamicImportPathsToRefresh } =\n      evaluatedDynamicImports;\n    dynamicImportsChanges = evaluatedDynamicImports.dynamicImportsChanges;\n\n    summaryData.recordGeneratedChanges(dynamicImportsChanges);\n\n    for (const [evalPath, evalContext] of dynamicImportPathsToEvaluate.entries()) {\n      pathsToEvaluate.set(evalPath, evalContext);\n    }\n    dynamicImportPathsToRefresh.forEach((path) => pathsToRefresh.add(path));\n  }\n\n  // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed\n  // and the heap does not reach the limit as almost every package is enqueued.\n  // importPathsToEvaluate?.forEach((path) => pathsToEvaluate.set(path, importerContext));\n  // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));\n\n  if (initOptions.check && (exportsChanges.length || evalErrors.length || dynamicImportsChanges?.length)) {\n    span.addEvent('INIT_CHECK_FAILED', {\n      // Don't log the specific errors to telemetry, as they may contain sensitive information.\n      reason: exportsChanges || dynamicImportsChanges ? 'Config needs to be updated.' : 'Errors found with imports.',\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}

package/lib/commands/init/init.js

@@ -32,160 +32,162 @@ export async function init(parameters) {
 async function initApp(params) {
     const { appContext, options, autoDispose, summaryData, taskRunner, isMultiApp } = params;
     const { appPath, config, telemetryClient } = appContext;
-    // Run prerequisites for the app.
-    runPrerequisites(appContext);
-    // If --reset is specified, reset the generated config.
-    if (options.reset) {
-        config.generated = {};
-    }
-    const apiContext = await createPartialApiContext({
-        ...appContext,
-        items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],
-        taskRunner,
-    });
-    autoDispose(apiContext);
-    const resolveMap = apiContext.session.resolveMap;
-    // Ensure config.generated.packageSettings is initialized.
-    config.generated.packageSettings ??= [];
-    let isExitingPrematurely = false;
-    await new Promise((resolve) => {
-        let pending = 0;
-        const visitedSet = new Set();
-        const refreshPaths = new Set();
-        const priorityMap = new Map();
-        // Start with the app path or requested matches
-        const initialPaths = options.match ? getFilteredPackages(resolveMap, options.match) : [appPath];
-        if (!initialPaths.length) {
-            summaryData.addErrors(appPath, [{ text: `No packages found matching ${options.match}`, source: 'init' }]);
-            resolve();
+    return telemetryClient.tracer.startActiveSpan('INIT_APP', async (span) => {
+        // Run prerequisites for the app.
+        runPrerequisites(appContext);
+        // If --reset is specified, reset the generated config.
+        if (options.reset) {
+            config.generated = {};
         }
-        enqueuePaths(new Map(initialPaths.map((packagePath) => [packagePath, undefined])));
-        /**
-         * Enqueue more paths.
-         * @param newPaths Mapping from package path to importer context.
-         */
-        function enqueuePaths(newPaths) {
-            if (isExitingPrematurely) {
-                return;
+        const apiContext = await createPartialApiContext({
+            ...appContext,
+            items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],
+            taskRunner,
+        });
+        autoDispose(apiContext);
+        const resolveMap = apiContext.session.resolveMap;
+        // Ensure config.generated.packageSettings is initialized.
+        config.generated.packageSettings ??= [];
+        let isExitingPrematurely = false;
+        await new Promise((resolve) => {
+            let pending = 0;
+            const visitedSet = new Set();
+            const refreshPaths = new Set();
+            const priorityMap = new Map();
+            // Start with the app path or requested matches
+            const initialPaths = options.match ? getFilteredPackages(resolveMap, options.match) : [appPath];
+            if (!initialPaths.length) {
+                summaryData.addErrors(appPath, [{ text: `No packages found matching ${options.match}`, source: 'init' }]);
+                resolve();
             }
-            // Iterate through the given paths.
-            for (const [packagePath, importerContext] of newPaths) {
-                if (visitedSet.has(packagePath)) {
-                    console.debug(`Skipping ${packagePath} as it has already been visited.`);
-                    continue;
+            enqueuePaths(new Map(initialPaths.map((packagePath) => [packagePath, undefined])));
+            /**
+             * Enqueue more paths.
+             * @param newPaths Mapping from package path to importer context.
+             */
+            function enqueuePaths(newPaths) {
+                if (isExitingPrematurely) {
+                    return;
                 }
-                visitedSet.add(packagePath);
-                pending++;
-                const shouldForce = refreshPaths.delete(packagePath);
-                // Get the priority value for this package path, defaults to 0.
-                const priority = priorityMap.get(packagePath) ?? 0;
-                // Lower priority of this package path by 1.
-                priorityMap.set(packagePath, priority - 1);
-                // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.
-                evaluatePath({
-                    appPath,
-                    packagePath,
-                    importerContext,
-                    config,
-                    telemetryClient,
-                    resolveMap,
-                    initOptions: options,
-                    summaryData,
-                    ctx: apiContext,
-                    // No need to force if we're in a multi-app scenario
-                    // as we'll re-evaluate packages if they are different since we use a different task id.
-                    shouldForce: !isMultiApp && shouldForce,
-                    isMultiApp,
-                    priority,
-                })
-                    .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {
-                    pending--;
-                    if (shouldExit) {
-                        isExitingPrematurely = true;
+                // Iterate through the given paths.
+                for (const [packagePath, importerContext] of newPaths) {
+                    if (visitedSet.has(packagePath)) {
+                        console.debug(`Skipping ${packagePath} as it has already been visited.`);
+                        continue;
                     }
-                    else if (pathsToEvaluate?.size) {
-                        // If there are packages that need to be rebuilt, delete them from the visited set to re-enqueue them
-                        // and add them to the refresh set so that on re-enqueuing we pass the `shouldRerun` flag through
-                        // on single app runs.
-                        pathsToRefresh?.forEach((refreshPath) => {
-                            refreshPaths.add(refreshPath);
-                            visitedSet.delete(refreshPath);
-                        });
-                        // Try to enqueue the new paths.
-                        console.debug(`Enqueuing paths found from ${packagePath}:\n` +
-                            bulletedList([...pathsToEvaluate].map(([newPath, newContext]) => `${newPath} ${JSON.stringify(newContext)}`)));
-                        enqueuePaths(pathsToEvaluate);
-                    }
-                    // If nothing is pending after this call, we're complete.
-                    if (!pending) {
-                        resolve();
-                    }
-                })
-                    .catch((error) => {
-                    // Record the exception as an init error for the package.
-                    // This gives better context than a stack trace which could have come from any package.
-                    let prefix = `Error thrown while evaluating package`;
-                    if (importerContext) {
-                        prefix += ` (context: ${JSON.stringify(importerContext, null, 2).replace(/\s+/g, ' ')})`;
-                    }
-                    summaryData.addErrors(packagePath, [
-                        {
-                            text: `${prefix}:\n${error instanceof Error ? error.stack : error}`,
-                            source: 'init',
-                        },
-                    ]);
-                    // Don't immediately stop evaluation, but don't enqueue more paths.
-                    isExitingPrematurely = true;
-                });
+                    visitedSet.add(packagePath);
+                    pending++;
+                    const shouldForce = refreshPaths.delete(packagePath);
+                    // Get the priority value for this package path, defaults to 0.
+                    const priority = priorityMap.get(packagePath) ?? 0;
+                    // Lower priority of this package path by 1.
+                    priorityMap.set(packagePath, priority - 1);
+                    // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.
+                    evaluatePath({
+                        appPath,
+                        packagePath,
+                        importerContext,
+                        config,
+                        span,
+                        resolveMap,
+                        initOptions: options,
+                        summaryData,
+                        ctx: apiContext,
+                        // No need to force if we're in a multi-app scenario
+                        // as we'll re-evaluate packages if they are different since we use a different task id.
+                        shouldForce: !isMultiApp && shouldForce,
+                        isMultiApp,
+                        priority,
+                    })
+                        .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {
+                        pending--;
+                        if (shouldExit) {
+                            isExitingPrematurely = true;
+                        }
+                        else if (pathsToEvaluate?.size) {
+                            // If there are packages that need to be rebuilt, delete them from the visited set to re-enqueue them
+                            // and add them to the refresh set so that on re-enqueuing we pass the `shouldRerun` flag through
+                            // on single app runs.
+                            pathsToRefresh?.forEach((refreshPath) => {
+                                refreshPaths.add(refreshPath);
+                                visitedSet.delete(refreshPath);
+                            });
+                            // Try to enqueue the new paths.
+                            console.debug(`Enqueuing paths found from ${packagePath}:\n` +
+                                bulletedList([...pathsToEvaluate].map(([newPath, newContext]) => `${newPath} ${JSON.stringify(newContext)}`)));
+                            enqueuePaths(pathsToEvaluate);
+                        }
+                        // If nothing is pending after this call, we're complete.
+                        if (!pending) {
+                            resolve();
+                        }
+                    })
+                        .catch((error) => {
+                        // Record the exception as an init error for the package.
+                        // This gives better context than a stack trace which could have come from any package.
+                        let prefix = `Error thrown while evaluating package`;
+                        if (importerContext) {
+                            prefix += ` (context: ${JSON.stringify(importerContext, null, 2).replace(/\s+/g, ' ')})`;
+                        }
+                        summaryData.addErrors(packagePath, [
+                            {
+                                text: `${prefix}:\n${error instanceof Error ? error.stack : error}`,
+                                source: 'init',
+                            },
+                        ]);
+                        // Don't immediately stop evaluation, but don't enqueue more paths.
+                        isExitingPrematurely = true;
+                    });
+                }
             }
+        }).catch((error) => {
+            // If there's an error thrown from some other part of the promise besides evaluatePath (not likely),
+            // record it as an init error for the app instead of allowing it to propagate.
+            // This allows the overall init summary and any other errors to be logged as usual.
+            isExitingPrematurely = true;
+            summaryData.addErrors(appPath, [
+                {
+                    text: `Error thrown during init: ${error instanceof Error ? error.stack : error}`,
+                    source: 'init',
+                },
+            ]);
+        });
+        // Log the resolve map to a file if requested. Do this *after* the main init process in case
+        // any additional deps were discovered and added.
+        if (options.logResolveMap) {
+            console.log('\nWriting resolve map to `resolve-map.json`.');
+            await writeJson(path.join(appPath, 'resolve-map.json'), resolveMap);
         }
-    }).catch((error) => {
-        // If there's an error thrown from some other part of the promise besides evaluatePath (not likely),
-        // record it as an init error for the app instead of allowing it to propagate.
-        // This allows the overall init summary and any other errors to be logged as usual.
-        isExitingPrematurely = true;
-        summaryData.addErrors(appPath, [
-            {
-                text: `Error thrown during init: ${error instanceof Error ? error.stack : error}`,
-                source: 'init',
-            },
-        ]);
-    });
-    // Log the resolve map to a file if requested. Do this *after* the main init process in case
-    // any additional deps were discovered and added.
-    if (options.logResolveMap) {
-        console.log('\nWriting resolve map to `resolve-map.json`.');
-        await writeJson(path.join(appPath, 'resolve-map.json'), resolveMap);
-    }
-    // Only do extra checks if there's not a major error already
-    if (!isExitingPrematurely) {
-        if (config.features?.optimizeDependencies) {
-            // Conditionally scan dependency usage so that we can populate
-            // include/excludeDependencies automatically, ensuring the dep list
-            // is both minimal (remove unused deps) and complete (include
-            // specific devDeps.)
-            const excludedDependenciesChanges = await optimizeDependencies(summaryData.getResults(), apiContext);
-            summaryData.recordGeneratedChanges(excludedDependenciesChanges);
-        }
-        if (config.features?.verifyExports) {
-            const packageResults = await verifyExports(summaryData.getResults(), apiContext);
-            for (const [packagePath, errors] of Object.entries(packageResults)) {
-                summaryData.addErrors(packagePath, errors);
+        // Only do extra checks if there's not a major error already
+        if (!isExitingPrematurely) {
+            if (config.features?.optimizeDependencies) {
+                // Conditionally scan dependency usage so that we can populate
+                // include/excludeDependencies automatically, ensuring the dep list
+                // is both minimal (remove unused deps) and complete (include
+                // specific devDeps.)
+                const excludedDependenciesChanges = await optimizeDependencies(summaryData.getResults(), apiContext);
+                summaryData.recordGeneratedChanges(excludedDependenciesChanges);
+            }
+            if (config.features?.verifyExports) {
+                const packageResults = await verifyExports(summaryData.getResults(), apiContext);
+                for (const [packagePath, errors] of Object.entries(packageResults)) {
+                    summaryData.addErrors(packagePath, errors);
+                }
             }
         }
-    }
-    const summary = summaryData.summarize(options);
-    // The feature "removeUnusedExports" doesn't (yet) write summary changes, but we still
-    // want to write the generated config if that featureFlag is on.
-    const hasSummaryChanges = config.features?.removeUnusedExports || summary.totalChanges;
-    if (!options.check && hasSummaryChanges) {
-        // Update the generated config: either write it if there are settings, or delete it if it
-        // previously existed but is no longer needed.
-        const generatedResult = await writeGeneratedConfig(config.generated, appPath);
-        if (generatedResult === 'deleted') {
-            summary.deletedGeneratedConfig = true;
+        const summary = summaryData.summarize(options);
+        // The feature "removeUnusedExports" doesn't (yet) write summary changes, but we still
+        // want to write the generated config if that featureFlag is on.
+        const hasSummaryChanges = config.features?.removeUnusedExports || summary.totalChanges;
+        if (!options.check && hasSummaryChanges) {
+            // Update the generated config: either write it if there are settings, or delete it if it
+            // previously existed but is no longer needed.
+            const generatedResult = await writeGeneratedConfig(config.generated, appPath);
+            if (generatedResult === 'deleted') {
+                summary.deletedGeneratedConfig = true;
+            }
         }
-    }
-    return summary;
+        return summary;
+    });
 }
 //# sourceMappingURL=init.js.map

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

@@ -1 +1 @@
-{"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';\nimport { bulletedList } from '@ms-cloudpack/task-reporter';\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  // Ensure config.generated.packageSettings is initialized.\n  config.generated.packageSettings ??= [];\n\n  let isExitingPrematurely = false;\n\n  await new Promise<void>((resolve) => {\n    let pending = 0;\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      summaryData.addErrors(appPath, [{ text: `No packages found matching ${options.match}`, source: 'init' }]);\n      resolve();\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          console.debug(`Skipping ${packagePath} as it has already been visited.`);\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              console.debug(\n                `Enqueuing paths found from ${packagePath}:\\n` +\n                  bulletedList(\n                    [...pathsToEvaluate].map(([newPath, newContext]) => `${newPath} ${JSON.stringify(newContext)}`),\n                  ),\n              );\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            // Record the exception as an init error for the package.\n            // This gives better context than a stack trace which could have come from any package.\n            let prefix = `Error thrown while evaluating package`;\n            if (importerContext) {\n              prefix += ` (context: ${JSON.stringify(importerContext, null, 2).replace(/\\s+/g, ' ')})`;\n            }\n\n            summaryData.addErrors(packagePath, [\n              {\n                text: `${prefix}:\\n${error instanceof Error ? error.stack : error}`,\n                source: 'init',\n              },\n            ]);\n\n            // Don't immediately stop evaluation, but don't enqueue more paths.\n            isExitingPrematurely = true;\n          });\n      }\n    }\n  }).catch((error) => {\n    // If there's an error thrown from some other part of the promise besides evaluatePath (not likely),\n    // record it as an init error for the app instead of allowing it to propagate.\n    // This allows the overall init summary and any other errors to be logged as usual.\n    isExitingPrematurely = true;\n    summaryData.addErrors(appPath, [\n      {\n        text: `Error thrown during init: ${error instanceof Error ? error.stack : error}`,\n        source: 'init',\n      },\n    ]);\n  });\n\n  // Log the resolve map to a file if requested. Do this *after* the main init process in case\n  // any additional deps were discovered and added.\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  // Only do extra checks if there's not a major error already\n  if (!isExitingPrematurely) {\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\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';\nimport { bulletedList } from '@ms-cloudpack/task-reporter';\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  return telemetryClient.tracer.startActiveSpan('INIT_APP', async (span) => {\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    // Ensure config.generated.packageSettings is initialized.\n    config.generated.packageSettings ??= [];\n\n    let isExitingPrematurely = false;\n\n    await new Promise<void>((resolve) => {\n      let pending = 0;\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        summaryData.addErrors(appPath, [{ text: `No packages found matching ${options.match}`, source: 'init' }]);\n        resolve();\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            console.debug(`Skipping ${packagePath} as it has already been visited.`);\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            span,\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                console.debug(\n                  `Enqueuing paths found from ${packagePath}:\\n` +\n                    bulletedList(\n                      [...pathsToEvaluate].map(([newPath, newContext]) => `${newPath} ${JSON.stringify(newContext)}`),\n                    ),\n                );\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              // Record the exception as an init error for the package.\n              // This gives better context than a stack trace which could have come from any package.\n              let prefix = `Error thrown while evaluating package`;\n              if (importerContext) {\n                prefix += ` (context: ${JSON.stringify(importerContext, null, 2).replace(/\\s+/g, ' ')})`;\n              }\n\n              summaryData.addErrors(packagePath, [\n                {\n                  text: `${prefix}:\\n${error instanceof Error ? error.stack : error}`,\n                  source: 'init',\n                },\n              ]);\n\n              // Don't immediately stop evaluation, but don't enqueue more paths.\n              isExitingPrematurely = true;\n            });\n        }\n      }\n    }).catch((error) => {\n      // If there's an error thrown from some other part of the promise besides evaluatePath (not likely),\n      // record it as an init error for the app instead of allowing it to propagate.\n      // This allows the overall init summary and any other errors to be logged as usual.\n      isExitingPrematurely = true;\n      summaryData.addErrors(appPath, [\n        {\n          text: `Error thrown during init: ${error instanceof Error ? error.stack : error}`,\n          source: 'init',\n        },\n      ]);\n    });\n\n    // Log the resolve map to a file if requested. Do this *after* the main init process in case\n    // any additional deps were discovered and added.\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    // Only do extra checks if there's not a major error already\n    if (!isExitingPrematurely) {\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\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}\n"]}

package/lib/commands/link/getSessionToLink.js

@@ -41,7 +41,7 @@ export async function getSessionToLink(options) {
         session = response.value;
     }
     if (!session) {
-        return { message: 'Aborting...' };
+        return { isInterrupted: true, message: '' };
     }
     console.debug('Selected session:', session.id);
     if (!session.urls.apiServer) {

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,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAItC;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,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,OAAO;YACL,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,kFAAkF;SAC5F,CAAC;IACJ,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,qCAAqC;IACrC,IAAI,OAA4B,CAAC;IAEjC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,6CAA6C;QAC7C,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,uCAAuC;QACvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;YAC7B,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,iCAAiC;YAC1C,OAAO,EAAE,eAAe;iBACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACX,KAAK,EAAE,CAAC,CAAC,WAAW;gBACpB,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,GAAG,GAAG,GAAG,CAAC,CAAC,EAAE;gBAC1C,KAAK,EAAE,CAAC;aACT,CAAC,CAAC;iBACF,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;SACtD,CAAC,CAAC;QAEH,qDAAqD;QACrD,OAAO,GAAG,QAAQ,CAAC,KAA4B,CAAC;IAClD,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;IACpC,CAAC;IAED,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,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,uDAAuD,EAAE,CAAC;IAC/F,CAAC;IAED,OAAO;QACL,OAAO,EAAE,OAAuC;QAChD,OAAO,EAAE,EAAE,EAAE,oCAAoC;KAClD,CAAC;AACJ,CAAC","sourcesContent":["import type { Session } from '@ms-cloudpack/api-server';\nimport { getCachePath } from '@ms-cloudpack/config';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport prompts from 'prompts';\nimport type { CommandExitParams } from '../../types/CommandAction.js';\nimport { getActiveSessions } from './getActiveSessions.js';\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  /** Cache path from CLI options */\n  cachePath: string | undefined;\n}): Promise<CommandExitParams & { session?: SessionWithRequiredApiServer }> {\n  const { reporter } = 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    return {\n      hasErrors: true,\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  // Select a session to link packages.\n  let session: Session | undefined;\n\n  if (runningSessions.length === 1) {\n    // Only one session, so use it automatically.\n    session = runningSessions[0];\n  } else {\n    // Prompt the user to select a session.\n    const response = await prompts({\n      type: 'select',\n      name: 'value',\n      message: 'Select the app you want to link',\n      choices: runningSessions\n        .map((s) => ({\n          title: s.projectName,\n          description: s.config.appPath + ' ' + s.id,\n          value: s,\n        }))\n        .sort((s1, s2) => s1.title.localeCompare(s2.title)),\n    });\n\n    // value will be undefined if the user presses Ctrl+C\n    session = response.value as Session | undefined;\n  }\n\n  if (!session) {\n    return { message: 'Aborting...' };\n  }\n\n  console.debug('Selected session:', session.id);\n\n  if (!session.urls.apiServer) {\n    // We should never get here, but just in case.\n    return { hasErrors: true, message: 'The selected session does not have an API server URL.' };\n  }\n\n  return {\n    session: session as SessionWithRequiredApiServer,\n    message: '', // required by the type but not used\n  };\n}\n"]}
+{"version":3,"file":"getSessionToLink.js","sourceRoot":"","sources":["../../../src/commands/link/getSessionToLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAItC;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,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,OAAO;YACL,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,kFAAkF;SAC5F,CAAC;IACJ,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,qCAAqC;IACrC,IAAI,OAA4B,CAAC;IAEjC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,6CAA6C;QAC7C,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,uCAAuC;QACvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;YAC7B,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,iCAAiC;YAC1C,OAAO,EAAE,eAAe;iBACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACX,KAAK,EAAE,CAAC,CAAC,WAAW;gBACpB,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,GAAG,GAAG,GAAG,CAAC,CAAC,EAAE;gBAC1C,KAAK,EAAE,CAAC;aACT,CAAC,CAAC;iBACF,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;SACtD,CAAC,CAAC;QAEH,qDAAqD;QACrD,OAAO,GAAG,QAAQ,CAAC,KAA4B,CAAC;IAClD,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAC9C,CAAC;IAED,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,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,uDAAuD,EAAE,CAAC;IAC/F,CAAC;IAED,OAAO;QACL,OAAO,EAAE,OAAuC;QAChD,OAAO,EAAE,EAAE,EAAE,oCAAoC;KAClD,CAAC;AACJ,CAAC","sourcesContent":["import type { Session } from '@ms-cloudpack/api-server';\nimport { getCachePath } from '@ms-cloudpack/config';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport prompts from 'prompts';\nimport type { CommandExitParams } from '../../types/CommandAction.js';\nimport { getActiveSessions } from './getActiveSessions.js';\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  /** Cache path from CLI options */\n  cachePath: string | undefined;\n}): Promise<CommandExitParams & { session?: SessionWithRequiredApiServer }> {\n  const { reporter } = 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    return {\n      hasErrors: true,\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  // Select a session to link packages.\n  let session: Session | undefined;\n\n  if (runningSessions.length === 1) {\n    // Only one session, so use it automatically.\n    session = runningSessions[0];\n  } else {\n    // Prompt the user to select a session.\n    const response = await prompts({\n      type: 'select',\n      name: 'value',\n      message: 'Select the app you want to link',\n      choices: runningSessions\n        .map((s) => ({\n          title: s.projectName,\n          description: s.config.appPath + ' ' + s.id,\n          value: s,\n        }))\n        .sort((s1, s2) => s1.title.localeCompare(s2.title)),\n    });\n\n    // value will be undefined if the user presses Ctrl+C\n    session = response.value as Session | undefined;\n  }\n\n  if (!session) {\n    return { isInterrupted: true, message: '' };\n  }\n\n  console.debug('Selected session:', session.id);\n\n  if (!session.urls.apiServer) {\n    // We should never get here, but just in case.\n    return { hasErrors: true, message: 'The selected session does not have an API server URL.' };\n  }\n\n  return {\n    session: session as SessionWithRequiredApiServer,\n    message: '', // required by the type but not used\n  };\n}\n"]}

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":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAKlE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAG5D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,YAAY,CA6G/C,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAKlE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAG5D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,YAAY,CAsH/C,CAAC"}

package/lib/commands/start/execute.js

@@ -5,7 +5,7 @@ import { makeUrl } from '@ms-cloudpack/path-string-parsing';
 import { cyan, yellow, bold } from '@ms-cloudpack/task-reporter';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';
+import { PerfMarkerCliEntry } from '../../performance/markers.js';
 import { runPrerequisites } from '../../utilities/runPrerequisites.js';
 import { getStartingAppPath } from './getStartingAppPath.js';
 import { openBrowser } from './openBrowser.js';
@@ -16,9 +16,13 @@ import { getCertificate } from '@ms-cloudpack/setup-utilities';
  */
 export const execute = async (params) => {
     const { options, cwd, initialize, autoDispose } = params;
-    const appPath = await getStartingAppPath(cwd, options.app);
+    const appPathResult = await getStartingAppPath(cwd, options.app);
+    if (typeof appPathResult !== 'string') {
+        return appPathResult;
+    }
+    const appPath = appPathResult;
     const apiContextOptions = await initialize({ appPath, configOptions: { mode: options.mode } });
-    const { config } = apiContextOptions;
+    const { config, telemetryClient } = apiContextOptions;
     console.log('App path:', yellow(appPath));
     console.log('Bundle mode:', yellow(options.mode));
     runPrerequisites(apiContextOptions);
@@ -85,7 +89,13 @@ export const execute = async (params) => {
     };
     autoDispose({ dispose: cleanup });
     const defaultUrl = makeUrl(config.server?.defaultPath || '', session.urls.appServer).href;
-    performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);
+    const cliEntryMarker = performance.getEntriesByName(PerfMarkerCliEntry, 'mark')[0];
+    if (cliEntryMarker) {
+        telemetryClient.tracer.startSpan('TIME_TO_OPEN_BROWSER', { startTime: cliEntryMarker.startTime }).end();
+    }
+    else {
+        throw new Error('TIME_TO_OPEN_BROWSER marker not found');
+    }
     // Open the browser.
     if (options.open !== false) {
         openBrowser(defaultUrl).catch((err) => {