@ms-cloudpack/cli 0.72.55 → 0.72.57

package/lib/commands/bundle/execute.js

@@ -28,16 +28,13 @@ export const execute = async (params) => {
             const outputPath = options.outdir ? path.resolve(packagePath, options.outdir) : undefined;
             definition = await ctx.packages.get(packagePath);
             const { result } = await ensurePackageBundled({
-                input: {
-                    name: definition.name,
-                    version: definition.version,
-                    outputPath,
-                    disableSourceMaps: options.disableSourceMaps,
-                    shouldForce: true,
-                    isIncremental: false,
-                },
-                ctx,
-            });
+                name: definition.name,
+                version: definition.version,
+                outputPath,
+                disableSourceMaps: options.disableSourceMaps,
+                shouldForce: true,
+                isIncremental: false,
+            }, ctx);
             console.log('Output:', result.outputPath, '\n');
             summaryData.recordResult(packagePath, result);
         }

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

@@ -1 +1 @@
-{"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 type { PackageJson } from '@ms-cloudpack/common-types';\nimport { yellow } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\nimport { InitSummaryData } from '../init/InitSummaryData.js';\nimport { formatInitSummary } from '../init/formatInitSummary.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\n\nexport const execute: CommandAction<BundleOptions> = async (params) => {\n  const { appPath, options, reporter, setInterruptMessageHandler } = params;\n\n  console.log('Bundle mode:', yellow(options.mode));\n\n  const ctx = await createPartialApiContext(params);\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  // Use InitSummaryData for pretty formatting of errors and warnings at the end.\n  const summaryData = new InitSummaryData({ appPath });\n\n  for (const packagePath of pathsToBundle) {\n    let definition: PackageJson | undefined;\n    try {\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      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      summaryData.recordResult(packagePath, result);\n    } catch (err) {\n      summaryData.recordException({\n        packagePath,\n        error: err,\n        source: 'bundle',\n        context: 'bundling package',\n        name: definition?.name,\n        version: definition?.version,\n      });\n    }\n  }\n\n  setInterruptMessageHandler(() => formatInitSummary({ verb: 'bundle', summary: summaryData.summarize() }));\n\n  const summary = summaryData.summarize();\n\n  return {\n    hasErrors: summary.failed,\n    message: formatInitSummary({ verb: 'bundle', summary: summary }),\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 type { PackageJson } from '@ms-cloudpack/common-types';\nimport { yellow } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\nimport { InitSummaryData } from '../init/InitSummaryData.js';\nimport { formatInitSummary } from '../init/formatInitSummary.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\n\nexport const execute: CommandAction<BundleOptions> = async (params) => {\n  const { appPath, options, reporter, setInterruptMessageHandler } = params;\n\n  console.log('Bundle mode:', yellow(options.mode));\n\n  const ctx = await createPartialApiContext(params);\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  // Use InitSummaryData for pretty formatting of errors and warnings at the end.\n  const summaryData = new InitSummaryData({ appPath });\n\n  for (const packagePath of pathsToBundle) {\n    let definition: PackageJson | undefined;\n    try {\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      definition = await ctx.packages.get(packagePath);\n\n      const { result } = await ensurePackageBundled(\n        {\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      summaryData.recordResult(packagePath, result);\n    } catch (err) {\n      summaryData.recordException({\n        packagePath,\n        error: err,\n        source: 'bundle',\n        context: 'bundling package',\n        name: definition?.name,\n        version: definition?.version,\n      });\n    }\n  }\n\n  setInterruptMessageHandler(() => formatInitSummary({ verb: 'bundle', summary: summaryData.summarize() }));\n\n  const summary = summaryData.summarize();\n\n  return {\n    hasErrors: summary.failed,\n    message: formatInitSummary({ verb: 'bundle', summary: summary }),\n  };\n};\n"]}

package/lib/commands/init/evaluatePath.js

@@ -18,19 +18,16 @@ export async function evaluatePath(options) {
     console.debug(`Evaluating ${packagePath} with context ${JSON.stringify(importerContext)}`);
     // Bundle the package and find the imports it depends on.
     const { result } = await ensurePackageBundled({
-        input: {
-            name,
-            version,
-            isIncremental: false,
-            shouldGetBundleInfo: true,
-            shouldForce,
-            shouldRerun: shouldForce,
-            useHashAsId: isMultiApp,
-            priority,
-            disableCache: !initOptions.cache,
-        },
-        ctx,
-    });
+        name,
+        version,
+        isIncremental: false,
+        shouldGetBundleInfo: true,
+        shouldForce,
+        shouldRerun: shouldForce,
+        useHashAsId: isMultiApp,
+        priority,
+        disableCache: !initOptions.cache,
+    }, ctx);
     // Record the results for the summary.
     summaryData.recordResult(packagePath, result);
     // If there were errors or no imports, return early.

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, ResolveMap } from '@ms-cloudpack/common-types';\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  // Record the results for the summary.\n  summaryData.recordResult(packagePath, result);\n\n  // If there were errors or no imports, return early.\n  const { info } = result;\n  if (result.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"]}
+{"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, ResolveMap } from '@ms-cloudpack/common-types';\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    {\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  // Record the results for the summary.\n  summaryData.recordResult(packagePath, result);\n\n  // If there were errors or no imports, return early.\n  const { info } = result;\n  if (result.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/optimizeDependencies.d.ts

@@ -1,5 +1,4 @@
-import { type Session } from '@ms-cloudpack/api-server';
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
+import type { PackageDefinitionsCache, Session } from '@ms-cloudpack/common-types';
 import type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';
 import type { InitPackageResult } from './types/InitPackageResult.js';
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"optimizeDependencies.d.ts","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,KAAK,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACjF,OAAO,KAAK,EAAE,uBAAuB,EAA4B,MAAM,4BAA4B,CAAC;AACpG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,uBAAuB,EAAE,CAAC,CA4FpC"}
+{"version":3,"file":"optimizeDependencies.d.ts","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAA4B,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC7G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,uBAAuB,EAAE,CAAC,CA4FpC"}

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

@@ -1 +1 @@
-{"version":3,"file":"optimizeDependencies.js","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACtG,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAgB,MAAM,0BAA0B,CAAC;AAGjF,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,cAAiD,EACjD,OAGC;IAED,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,mBAAmB,GAA8B,EAAE,CAAC;IAE1D,+BAA+B;IAC/B,KAAK,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;QACnE,6CAA6C;QAC7C,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YAC3C,SAAS;QACX,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEnD,kEAAkE;QAClE,gEAAgE;QAChE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;QACrC,oFAAoF;QACpF,MAAM,wBAAwB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;QAE9F,MAAM,WAAW,GAAG,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC;QACzC,MAAM,0BAA0B,GAAG,eAAe,CAAC,wBAAwB,CAAC,CAAC;QAC7E,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,wBAA8D,CAAC;QAEnE,gDAAgD;QAChD,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACrE,wBAAwB,KAAK,2BAA2B,CAAC;gBACvD,wBAAwB,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,KAAK,EAAE,CAAC;gBACnE,IAAI;gBACJ,OAAO;aACR,CAAC,CAAC;YAEH,4EAA4E;YAC5E,IAAI,oBAAoB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,EAAE,CAAC;gBACrF,mDAAmD;gBACnD,IAAI,wBAAwB,EAAE,oBAAoB,EAAE,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;oBAC7E,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,oBAAoB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;oBAChG,wBAAwB,CAAC,oBAAoB,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;oBAE3E,0FAA0F;oBAC1F,mBAAmB,CAAC,IAAI,CAAC;wBACvB,IAAI;wBACJ,OAAO;wBACP,IAAI,EAAE,WAAW;wBACjB,OAAO,EAAE;4BACP;gCACE,IAAI,EAAE,6BAA6B;gCACnC,MAAM,EAAE,cAAc;gCACtB,MAAM,EAAE,gBAAgB,WAAW,GAAG;6BACvC;yBACF;qBACF,CAAC,CAAC;oBAEH,gDAAgD;oBAChD,qFAAqF;oBACrF,IAAI,wBAAwB,CAAC,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBAC/D,OAAO,wBAAwB,CAAC,oBAAoB,CAAC;oBACvD,CAAC;gBACH,CAAC;gBAED,SAAS;YACX,CAAC;YAED,6EAA6E;YAC7E,IAAI,wBAAwB,EAAE,oBAAoB,EAAE,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC7E,SAAS;YACX,CAAC;YAED,8CAA8C;YAC9C,wBAAwB,GAAG,MAAM,iCAAiC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YAE1G,0CAA0C;YAC1C,wBAAwB,CAAC,oBAAoB,KAAK,EAAE,CAAC;YACrD,wBAAwB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAEnE,mBAAmB,CAAC,IAAI,CAAC;gBACvB,IAAI;gBACJ,OAAO;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,qBAAqB;wBAC3B,MAAM,EAAE,cAAc;wBACtB,MAAM,EAAE,oBAAoB,WAAW,GAAG;qBAC3C;iBACF;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC","sourcesContent":["import { ensureGeneratedSettingsForPackage, getGeneratedPackageSettings } from '@ms-cloudpack/config';\nimport { getDependencies } from '@ms-cloudpack/package-utilities';\nimport { getConsumedDependencies, type Session } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache, GeneratedPackageSettings } from '@ms-cloudpack/common-types';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\nimport { neverExclude } from './neverExclude.js';\nimport type { InitPackageResult } from './types/InitPackageResult.js';\n\n/**\n * Optimizes the dependencies of a package to determine if there are any missing or unused.\n * If so, adds the the missing dependencies to included and the unused dependencies to excluded.\n *\n * Returns the list of excluded dependencies added to the generated config.\n */\nexport async function optimizeDependencies(\n  packageResults: Record<string, InitPackageResult>,\n  context: {\n    packages: PackageDefinitionsCache;\n    session: Session;\n  },\n): Promise<GeneratedPackageChanges[]> {\n  const { packages, session } = context;\n  const { config } = session;\n  const dependenciesChanges: GeneratedPackageChanges[] = [];\n\n  // Iterate through each package\n  for (const [packagePath, result] of Object.entries(packageResults)) {\n    // Skip packages with build errors or no info\n    if (!result?.info || result.errors?.length) {\n      continue;\n    }\n\n    const definition = await packages.get(packagePath);\n\n    // We must use the name and version of the transformed definition,\n    // as that is the one that will be used in the generated config.\n    const { name, version } = definition;\n    // We need the non-transformed definition to catch inclusions/exclusions on retries.\n    const nonTransformedDefinition = await packages.get(packagePath, { disableTransforms: true });\n\n    const displayName = `${name}@${version}`;\n    const nonTransformedDependencies = getDependencies(nonTransformedDefinition);\n    const consumedDependencies = getConsumedDependencies(result.info);\n    let generatedPackageSettings: GeneratedPackageSettings | undefined;\n\n    // Iterate through dependencies and find unused.\n    for (const dependencyName of Object.keys(nonTransformedDependencies)) {\n      generatedPackageSettings ||= getGeneratedPackageSettings({\n        generatedPackageSettings: (config.generated.packageSettings ??= []),\n        name,\n        version,\n      });\n\n      // If this dependency is consumed, make sure it's not excluded and continue.\n      if (consumedDependencies.has(dependencyName) || neverExclude(dependencyName, config)) {\n        // Remove from excluded dependencies if it's there.\n        if (generatedPackageSettings?.excludedDependencies?.includes(dependencyName)) {\n          const indexOfDependency = generatedPackageSettings.excludedDependencies.indexOf(dependencyName);\n          generatedPackageSettings.excludedDependencies.splice(indexOfDependency, 1);\n\n          // Report that we removed a dependency from excluded as it is now imported by the package.\n          dependenciesChanges.push({\n            name,\n            version,\n            path: packagePath,\n            changes: [\n              {\n                type: 'removed-excluded-dependency',\n                change: dependencyName,\n                reason: `Imported by \"${displayName}\"`,\n              },\n            ],\n          });\n\n          // Clean up excluded dependencies if it's empty.\n          // We don't need to delete the setting if it's empty, as it will be cleaned up later.\n          if (generatedPackageSettings.excludedDependencies.length === 0) {\n            delete generatedPackageSettings.excludedDependencies;\n          }\n        }\n\n        continue;\n      }\n\n      // The dep is not consumed. If this dependency is already excluded, continue.\n      if (generatedPackageSettings?.excludedDependencies?.includes(dependencyName)) {\n        continue;\n      }\n\n      // Ensure there is a generated settings entry.\n      generatedPackageSettings = await ensureGeneratedSettingsForPackage({ packagePath }, { config, packages });\n\n      // Ensure there are excluded dependencies.\n      generatedPackageSettings.excludedDependencies ??= [];\n      generatedPackageSettings.excludedDependencies.push(dependencyName);\n\n      dependenciesChanges.push({\n        name,\n        version,\n        path: packagePath,\n        changes: [\n          {\n            type: 'excluded-dependency',\n            change: dependencyName,\n            reason: `Not imported by \"${displayName}\"`,\n          },\n        ],\n      });\n    }\n  }\n\n  return dependenciesChanges;\n}\n"]}
+{"version":3,"file":"optimizeDependencies.js","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import { ensureGeneratedSettingsForPackage, getGeneratedPackageSettings } from '@ms-cloudpack/config';\nimport { getDependencies } from '@ms-cloudpack/package-utilities';\nimport { getConsumedDependencies } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache, GeneratedPackageSettings, Session } from '@ms-cloudpack/common-types';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\nimport { neverExclude } from './neverExclude.js';\nimport type { InitPackageResult } from './types/InitPackageResult.js';\n\n/**\n * Optimizes the dependencies of a package to determine if there are any missing or unused.\n * If so, adds the the missing dependencies to included and the unused dependencies to excluded.\n *\n * Returns the list of excluded dependencies added to the generated config.\n */\nexport async function optimizeDependencies(\n  packageResults: Record<string, InitPackageResult>,\n  context: {\n    packages: PackageDefinitionsCache;\n    session: Session;\n  },\n): Promise<GeneratedPackageChanges[]> {\n  const { packages, session } = context;\n  const { config } = session;\n  const dependenciesChanges: GeneratedPackageChanges[] = [];\n\n  // Iterate through each package\n  for (const [packagePath, result] of Object.entries(packageResults)) {\n    // Skip packages with build errors or no info\n    if (!result?.info || result.errors?.length) {\n      continue;\n    }\n\n    const definition = await packages.get(packagePath);\n\n    // We must use the name and version of the transformed definition,\n    // as that is the one that will be used in the generated config.\n    const { name, version } = definition;\n    // We need the non-transformed definition to catch inclusions/exclusions on retries.\n    const nonTransformedDefinition = await packages.get(packagePath, { disableTransforms: true });\n\n    const displayName = `${name}@${version}`;\n    const nonTransformedDependencies = getDependencies(nonTransformedDefinition);\n    const consumedDependencies = getConsumedDependencies(result.info);\n    let generatedPackageSettings: GeneratedPackageSettings | undefined;\n\n    // Iterate through dependencies and find unused.\n    for (const dependencyName of Object.keys(nonTransformedDependencies)) {\n      generatedPackageSettings ||= getGeneratedPackageSettings({\n        generatedPackageSettings: (config.generated.packageSettings ??= []),\n        name,\n        version,\n      });\n\n      // If this dependency is consumed, make sure it's not excluded and continue.\n      if (consumedDependencies.has(dependencyName) || neverExclude(dependencyName, config)) {\n        // Remove from excluded dependencies if it's there.\n        if (generatedPackageSettings?.excludedDependencies?.includes(dependencyName)) {\n          const indexOfDependency = generatedPackageSettings.excludedDependencies.indexOf(dependencyName);\n          generatedPackageSettings.excludedDependencies.splice(indexOfDependency, 1);\n\n          // Report that we removed a dependency from excluded as it is now imported by the package.\n          dependenciesChanges.push({\n            name,\n            version,\n            path: packagePath,\n            changes: [\n              {\n                type: 'removed-excluded-dependency',\n                change: dependencyName,\n                reason: `Imported by \"${displayName}\"`,\n              },\n            ],\n          });\n\n          // Clean up excluded dependencies if it's empty.\n          // We don't need to delete the setting if it's empty, as it will be cleaned up later.\n          if (generatedPackageSettings.excludedDependencies.length === 0) {\n            delete generatedPackageSettings.excludedDependencies;\n          }\n        }\n\n        continue;\n      }\n\n      // The dep is not consumed. If this dependency is already excluded, continue.\n      if (generatedPackageSettings?.excludedDependencies?.includes(dependencyName)) {\n        continue;\n      }\n\n      // Ensure there is a generated settings entry.\n      generatedPackageSettings = await ensureGeneratedSettingsForPackage({ packagePath }, { config, packages });\n\n      // Ensure there are excluded dependencies.\n      generatedPackageSettings.excludedDependencies ??= [];\n      generatedPackageSettings.excludedDependencies.push(dependencyName);\n\n      dependenciesChanges.push({\n        name,\n        version,\n        path: packagePath,\n        changes: [\n          {\n            type: 'excluded-dependency',\n            change: dependencyName,\n            reason: `Not imported by \"${displayName}\"`,\n          },\n        ],\n      });\n    }\n  }\n\n  return dependenciesChanges;\n}\n"]}

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

@@ -1,5 +1,4 @@
-import type { Session } from '@ms-cloudpack/api-server';
-import type { BundleMessage, PackageDefinitionsCache } from '@ms-cloudpack/common-types';
+import type { BundleMessage, PackageDefinitionsCache, Session } from '@ms-cloudpack/common-types';
 import type { InitPackageResult } from './types/InitPackageResult.js';
 /**
  * Checks that the imports/exports of packages match.

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

@@ -1 +1 @@
-{"version":3,"file":"verifyExports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/verifyExports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EAKxB,MAAM,4BAA4B,CAAC;AAQpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAMtE;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,CA+K1C"}
+{"version":3,"file":"verifyExports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/verifyExports.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EAIvB,OAAO,EAER,MAAM,4BAA4B,CAAC;AAQpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAMtE;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,CA+K1C"}

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

@@ -1 +1 @@
-{"version":3,"file":"verifyExports.js","sourceRoot":"","sources":["../../../src/commands/init/verifyExports.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleInfo, Session } from '@ms-cloudpack/api-server';\nimport type {\n  BundleMessage,\n  PackageDefinitionsCache,\n  PackageJson,\n  ResolveMap,\n  ResolveMapEntry,\n  WithRequired,\n} from '@ms-cloudpack/common-types';\nimport {\n  findResolveMapEntry,\n  getDependencies,\n  getUnusedDependencies,\n  getSourceEntry,\n} from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport type { InitPackageResult } from './types/InitPackageResult.js';\nimport { bulletedList, formatPackageName, type BulletList } from '@ms-cloudpack/task-reporter';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport semver from 'semver';\nimport { parseImportString } from '@ms-cloudpack/path-string-parsing';\n\n/**\n * Checks that the imports/exports of packages match.\n * To be called before `summarize`.\n * @param packageResults - The package results to check.\n * @param context - The context to use.\n * @returns Mapping from absolute package path to errors.\n */\nexport async function verifyExports(\n  packageResults: Record<string, InitPackageResult>,\n  context: {\n    packages: PackageDefinitionsCache;\n    session: Session;\n  },\n): Promise<Record<string, BundleMessage[]>> {\n  const { packages, session } = context;\n  const { config, resolveMap } = session;\n  const allErrors: Record<string, BundleMessage[]> = {};\n  const packageResultsArray = Object.values(packageResults);\n  const importsCache: Record<string, string[]> = {};\n\n  // Iterate through each package\n  for (const parentResult of packageResultsArray) {\n    // Skip packages with build errors or no info\n    if (!parentResult?.info || !parentResult.outputPath || parentResult.errors?.length) {\n      continue;\n    }\n\n    // Skip packages with `ignoreMissingExports` set to true.\n    const { name, version, path: parentPath } = parentResult;\n    const ignoreMissingExports =\n      getPackageSettings({\n        name,\n        version,\n        userPackageSettings: config.packageSettings,\n        includeBuiltIn: true,\n        generatedPackageSettings: undefined,\n      }).userPackageSettings?.ignoreMissingExports || {};\n\n    if (ignoreMissingExports === true) {\n      continue;\n    }\n\n    const parentDefinition = await packages.get(parentPath);\n\n    /**\n     * Mapping from imported dependency package ID (`name@version`) to import path\n     * to an object with export names missing from that file, the importString, and bundledFile.\n     */\n    const depsMissingExports: Record<\n      string,\n      Record<\n        string,\n        {\n          missingNames: Set<string>;\n          importName: string;\n          importPath: string;\n          importVersion: string;\n          bundledFile: string;\n        }\n      >\n    > = {};\n    const invalidSemver: Record<string, string> = {};\n\n    // Find the main entry point for the parent package to list as the importing bundle.\n    const importingBundle = path.join(parentResult.outputPath, parentResult.info?.['.']?.bundlePath || '');\n\n    // Find the main entry point for the parent package to list as the importing source.\n    const sourceMainEntry = await getSourceEntry({ entry: '.', inputPath: parentPath }, { packages, config });\n    const importingSource = path.join(parentPath, sourceMainEntry || '.');\n\n    // Iterate through each entry path from the parent package\n    for (const { consumes } of Object.values(parentResult.info)) {\n      // Skip entries with no imports\n      if (!consumes?.length) {\n        continue;\n      }\n\n      // Iterate through each imported package\n      for (const { packageName: depName, importPath: depImportPath, names: consumedNames } of consumes) {\n        const dependencyInfo = getDependencyInfo({\n          packageName: depName,\n          definition: parentDefinition,\n          resolveMap,\n          packageResultsArray,\n        });\n        // We don't have enough info to check this dependency, so skip it.\n        if (!dependencyInfo) {\n          continue;\n        }\n\n        const { depResolveMapEntry, depResult } = dependencyInfo;\n        const { outputPath: depOutputPath, info: depEntries } = depResult;\n\n        const importProduces = depEntries[depImportPath]?.produces;\n        if (!importProduces) {\n          // Skip if the imported package has no entry for the import path. (If the path is missing,\n          // evaluateImportsForOverrides has already run and tried to fix it or reported an error.)\n          continue;\n        }\n\n        const importProducesStarResult = await importProducesStar({\n          packagePath: depResolveMapEntry.path,\n          importPath: depImportPath,\n          info: depEntries,\n          context: { packages, resolveMap, packageResultsArray },\n          cache: importsCache,\n        });\n\n        // Find any missing names.\n        const missing = consumedNames.filter(\n          (namedImport) =>\n            namedImport !== '*' &&\n            !importProducesStarResult.includes(namedImport) &&\n            !ignoreMissingExports[depImportPath]?.includes(namedImport),\n        );\n        if (!missing.length) {\n          continue;\n        }\n\n        // Figure out which actual file the exports appear to be missing from.\n        const relativePath =\n          (await getSourceEntry({ entry: depImportPath, inputPath: depResolveMapEntry.path }, { packages, config })) ||\n          // If the package is missing an exports map, assume the import path is the real path.\n          depImportPath;\n        const filePath = path.join(depResolveMapEntry.path, relativePath);\n\n        // Save the missing names for this path within the package.\n        const depKey = `${depResolveMapEntry.name}@${depResolveMapEntry.version}`;\n        depsMissingExports[depKey] ??= {};\n        depsMissingExports[depKey][filePath] ??= {\n          missingNames: new Set(),\n          importName: depName,\n          importPath: depImportPath,\n          importVersion: depResolveMapEntry.version,\n          bundledFile: path.join(depOutputPath ?? '', depEntries[depImportPath]?.bundlePath),\n        };\n        missing.forEach((m) => depsMissingExports[depKey][filePath].missingNames.add(m));\n\n        // Check if the package satisfies the parent semver requirement.\n        const requiredVersion =\n          !invalidSemver[depKey] &&\n          (getDependencies(parentDefinition)[depName] || getUnusedDependencies(parentDefinition)[depName]);\n        if (requiredVersion && !semver.satisfies(depResolveMapEntry.version, requiredVersion)) {\n          invalidSemver[depKey] = requiredVersion;\n        }\n      }\n    }\n\n    const errors: BundleMessage[] = [];\n\n    for (const [packageId, missing] of Object.entries(depsMissingExports)) {\n      // We want a single error for each package, with a bulleted list of files with missing exports.\n      for (const [sourceFile, errorInfo] of Object.entries(missing)) {\n        const { missingNames, importName, importPath, importVersion, bundledFile } = errorInfo;\n        const error: BulletList = [\n          `Importing bundle: ${importingBundle}`,\n          `Importing source: ${importingSource}`,\n          `Exporting package: ${formatPackageName({ name: importName, version: importVersion })}${importPath === '.' ? '' : ` (imported path: \"${importPath}\")`}`,\n          `Exporting bundle: ${bundledFile}`,\n          `Exporting source: ${sourceFile}`,\n          `Missing export(s): { ${Array.from(missingNames).join(', ')} }`,\n        ];\n\n        if (invalidSemver[packageId]) {\n          // If we have an invalid semver, add a note about that after exporting package.\n          error.splice(\n            3,\n            0,\n            `Incompatible version: ${formatPackageName({ name: importName, version: importVersion })} does not satisfy importer requirement \"${invalidSemver[packageId]}\"`,\n            ['If this was unexpected, make sure you installed dependencies after pulling the latest changes.'],\n          );\n        }\n\n        errors.push({\n          text: `A bundle imported names from another bundle which were not exported:\\n${bulletedList(error)}\\n`,\n          source: 'verify exports',\n          // Don't include a whole-message location here because that doesn't make sense for this error type,\n          // and we already put full paths to individual problem files within the message.\n        });\n      }\n    }\n\n    if (errors.length) {\n      allErrors[parentPath] = errors;\n    }\n  }\n\n  return allErrors;\n}\n\nasync function importProducesStar(params: {\n  packagePath: string;\n  info: BundleInfo;\n  importPath: string;\n  context: {\n    packages: PackageDefinitionsCache;\n    resolveMap: ResolveMap;\n    packageResultsArray: InitPackageResult[];\n  };\n  visited?: Set<string>;\n  cache?: Record<string, string[]>;\n}): Promise<string[]> {\n  const { packagePath, info, importPath, context, visited = new Set(), cache = {} } = params;\n\n  const key = `${packagePath}${importPath}`;\n  // Check if the entry has already been visited to avoid cycles\n  if (visited.has(key)) {\n    return [];\n  }\n\n  // Mark the current entry as visited\n  visited.add(key);\n\n  const cachedResult = cache[key];\n  if (cachedResult) {\n    return cachedResult;\n  }\n\n  const { packages, resolveMap, packageResultsArray } = context;\n  let result: string[] = [];\n\n  // Iterate over the produced names\n  for (const name of info[importPath].produces) {\n    if (name.startsWith('*')) {\n      // Extract the name and path from the format \"*ImportString\"\n      const { packageName: depName, importPath: depImportPath } = parseImportString(name.slice(1));\n\n      const dependencyInfo = getDependencyInfo({\n        packageName: depName,\n        definition: await packages.get(packagePath),\n        resolveMap,\n        packageResultsArray,\n      });\n\n      if (dependencyInfo) {\n        const { depResolveMapEntry, depResult } = dependencyInfo;\n        // Recursively aggregate the produced names from the other package\n        result = result.concat(\n          await importProducesStar({\n            packagePath: depResolveMapEntry.path,\n            info: depResult.info,\n            importPath: depImportPath,\n            context,\n            visited,\n          }),\n        );\n      }\n    } else {\n      // Add the name to the result if it doesn't start with '*'\n      result.push(name);\n    }\n  }\n\n  cache[key] = result;\n  return result;\n}\n\nfunction getDependencyInfo(options: {\n  packageName: string;\n  definition: PackageJson;\n  resolveMap: ResolveMap;\n  packageResultsArray: InitPackageResult[];\n}):\n  | {\n      depResult: WithRequired<InitPackageResult, 'info'>;\n      depResolveMapEntry: ResolveMapEntry;\n    }\n  | undefined {\n  const { packageName, definition, resolveMap, packageResultsArray } = options;\n\n  const depResolveMapEntry = findResolveMapEntry({ packageName, definition, resolveMap });\n  const depResult =\n    depResolveMapEntry &&\n    packageResultsArray.find((r) => r.name === depResolveMapEntry.name && r.version === depResolveMapEntry.version);\n\n  // Skip if we can't find the imported package in the resolve map, or there's no info about\n  // its entries/exports.\n  if (!depResolveMapEntry || !depResult?.info) {\n    return undefined;\n  }\n\n  return { depResolveMapEntry, depResult: depResult as WithRequired<InitPackageResult, 'info'> };\n}\n"]}
+{"version":3,"file":"verifyExports.js","sourceRoot":"","sources":["../../../src/commands/init/verifyExports.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleInfo } from '@ms-cloudpack/api-server';\nimport type {\n  BundleMessage,\n  PackageDefinitionsCache,\n  PackageJson,\n  ResolveMap,\n  ResolveMapEntry,\n  Session,\n  WithRequired,\n} from '@ms-cloudpack/common-types';\nimport {\n  findResolveMapEntry,\n  getDependencies,\n  getUnusedDependencies,\n  getSourceEntry,\n} from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport type { InitPackageResult } from './types/InitPackageResult.js';\nimport { bulletedList, formatPackageName, type BulletList } from '@ms-cloudpack/task-reporter';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport semver from 'semver';\nimport { parseImportString } from '@ms-cloudpack/path-string-parsing';\n\n/**\n * Checks that the imports/exports of packages match.\n * To be called before `summarize`.\n * @param packageResults - The package results to check.\n * @param context - The context to use.\n * @returns Mapping from absolute package path to errors.\n */\nexport async function verifyExports(\n  packageResults: Record<string, InitPackageResult>,\n  context: {\n    packages: PackageDefinitionsCache;\n    session: Session;\n  },\n): Promise<Record<string, BundleMessage[]>> {\n  const { packages, session } = context;\n  const { config, resolveMap } = session;\n  const allErrors: Record<string, BundleMessage[]> = {};\n  const packageResultsArray = Object.values(packageResults);\n  const importsCache: Record<string, string[]> = {};\n\n  // Iterate through each package\n  for (const parentResult of packageResultsArray) {\n    // Skip packages with build errors or no info\n    if (!parentResult?.info || !parentResult.outputPath || parentResult.errors?.length) {\n      continue;\n    }\n\n    // Skip packages with `ignoreMissingExports` set to true.\n    const { name, version, path: parentPath } = parentResult;\n    const ignoreMissingExports =\n      getPackageSettings({\n        name,\n        version,\n        userPackageSettings: config.packageSettings,\n        includeBuiltIn: true,\n        generatedPackageSettings: undefined,\n      }).userPackageSettings?.ignoreMissingExports || {};\n\n    if (ignoreMissingExports === true) {\n      continue;\n    }\n\n    const parentDefinition = await packages.get(parentPath);\n\n    /**\n     * Mapping from imported dependency package ID (`name@version`) to import path\n     * to an object with export names missing from that file, the importString, and bundledFile.\n     */\n    const depsMissingExports: Record<\n      string,\n      Record<\n        string,\n        {\n          missingNames: Set<string>;\n          importName: string;\n          importPath: string;\n          importVersion: string;\n          bundledFile: string;\n        }\n      >\n    > = {};\n    const invalidSemver: Record<string, string> = {};\n\n    // Find the main entry point for the parent package to list as the importing bundle.\n    const importingBundle = path.join(parentResult.outputPath, parentResult.info?.['.']?.bundlePath || '');\n\n    // Find the main entry point for the parent package to list as the importing source.\n    const sourceMainEntry = await getSourceEntry({ entry: '.', inputPath: parentPath }, { packages, config });\n    const importingSource = path.join(parentPath, sourceMainEntry || '.');\n\n    // Iterate through each entry path from the parent package\n    for (const { consumes } of Object.values(parentResult.info)) {\n      // Skip entries with no imports\n      if (!consumes?.length) {\n        continue;\n      }\n\n      // Iterate through each imported package\n      for (const { packageName: depName, importPath: depImportPath, names: consumedNames } of consumes) {\n        const dependencyInfo = getDependencyInfo({\n          packageName: depName,\n          definition: parentDefinition,\n          resolveMap,\n          packageResultsArray,\n        });\n        // We don't have enough info to check this dependency, so skip it.\n        if (!dependencyInfo) {\n          continue;\n        }\n\n        const { depResolveMapEntry, depResult } = dependencyInfo;\n        const { outputPath: depOutputPath, info: depEntries } = depResult;\n\n        const importProduces = depEntries[depImportPath]?.produces;\n        if (!importProduces) {\n          // Skip if the imported package has no entry for the import path. (If the path is missing,\n          // evaluateImportsForOverrides has already run and tried to fix it or reported an error.)\n          continue;\n        }\n\n        const importProducesStarResult = await importProducesStar({\n          packagePath: depResolveMapEntry.path,\n          importPath: depImportPath,\n          info: depEntries,\n          context: { packages, resolveMap, packageResultsArray },\n          cache: importsCache,\n        });\n\n        // Find any missing names.\n        const missing = consumedNames.filter(\n          (namedImport) =>\n            namedImport !== '*' &&\n            !importProducesStarResult.includes(namedImport) &&\n            !ignoreMissingExports[depImportPath]?.includes(namedImport),\n        );\n        if (!missing.length) {\n          continue;\n        }\n\n        // Figure out which actual file the exports appear to be missing from.\n        const relativePath =\n          (await getSourceEntry({ entry: depImportPath, inputPath: depResolveMapEntry.path }, { packages, config })) ||\n          // If the package is missing an exports map, assume the import path is the real path.\n          depImportPath;\n        const filePath = path.join(depResolveMapEntry.path, relativePath);\n\n        // Save the missing names for this path within the package.\n        const depKey = `${depResolveMapEntry.name}@${depResolveMapEntry.version}`;\n        depsMissingExports[depKey] ??= {};\n        depsMissingExports[depKey][filePath] ??= {\n          missingNames: new Set(),\n          importName: depName,\n          importPath: depImportPath,\n          importVersion: depResolveMapEntry.version,\n          bundledFile: path.join(depOutputPath ?? '', depEntries[depImportPath]?.bundlePath),\n        };\n        missing.forEach((m) => depsMissingExports[depKey][filePath].missingNames.add(m));\n\n        // Check if the package satisfies the parent semver requirement.\n        const requiredVersion =\n          !invalidSemver[depKey] &&\n          (getDependencies(parentDefinition)[depName] || getUnusedDependencies(parentDefinition)[depName]);\n        if (requiredVersion && !semver.satisfies(depResolveMapEntry.version, requiredVersion)) {\n          invalidSemver[depKey] = requiredVersion;\n        }\n      }\n    }\n\n    const errors: BundleMessage[] = [];\n\n    for (const [packageId, missing] of Object.entries(depsMissingExports)) {\n      // We want a single error for each package, with a bulleted list of files with missing exports.\n      for (const [sourceFile, errorInfo] of Object.entries(missing)) {\n        const { missingNames, importName, importPath, importVersion, bundledFile } = errorInfo;\n        const error: BulletList = [\n          `Importing bundle: ${importingBundle}`,\n          `Importing source: ${importingSource}`,\n          `Exporting package: ${formatPackageName({ name: importName, version: importVersion })}${importPath === '.' ? '' : ` (imported path: \"${importPath}\")`}`,\n          `Exporting bundle: ${bundledFile}`,\n          `Exporting source: ${sourceFile}`,\n          `Missing export(s): { ${Array.from(missingNames).join(', ')} }`,\n        ];\n\n        if (invalidSemver[packageId]) {\n          // If we have an invalid semver, add a note about that after exporting package.\n          error.splice(\n            3,\n            0,\n            `Incompatible version: ${formatPackageName({ name: importName, version: importVersion })} does not satisfy importer requirement \"${invalidSemver[packageId]}\"`,\n            ['If this was unexpected, make sure you installed dependencies after pulling the latest changes.'],\n          );\n        }\n\n        errors.push({\n          text: `A bundle imported names from another bundle which were not exported:\\n${bulletedList(error)}\\n`,\n          source: 'verify exports',\n          // Don't include a whole-message location here because that doesn't make sense for this error type,\n          // and we already put full paths to individual problem files within the message.\n        });\n      }\n    }\n\n    if (errors.length) {\n      allErrors[parentPath] = errors;\n    }\n  }\n\n  return allErrors;\n}\n\nasync function importProducesStar(params: {\n  packagePath: string;\n  info: BundleInfo;\n  importPath: string;\n  context: {\n    packages: PackageDefinitionsCache;\n    resolveMap: ResolveMap;\n    packageResultsArray: InitPackageResult[];\n  };\n  visited?: Set<string>;\n  cache?: Record<string, string[]>;\n}): Promise<string[]> {\n  const { packagePath, info, importPath, context, visited = new Set(), cache = {} } = params;\n\n  const key = `${packagePath}${importPath}`;\n  // Check if the entry has already been visited to avoid cycles\n  if (visited.has(key)) {\n    return [];\n  }\n\n  // Mark the current entry as visited\n  visited.add(key);\n\n  const cachedResult = cache[key];\n  if (cachedResult) {\n    return cachedResult;\n  }\n\n  const { packages, resolveMap, packageResultsArray } = context;\n  let result: string[] = [];\n\n  // Iterate over the produced names\n  for (const name of info[importPath].produces) {\n    if (name.startsWith('*')) {\n      // Extract the name and path from the format \"*ImportString\"\n      const { packageName: depName, importPath: depImportPath } = parseImportString(name.slice(1));\n\n      const dependencyInfo = getDependencyInfo({\n        packageName: depName,\n        definition: await packages.get(packagePath),\n        resolveMap,\n        packageResultsArray,\n      });\n\n      if (dependencyInfo) {\n        const { depResolveMapEntry, depResult } = dependencyInfo;\n        // Recursively aggregate the produced names from the other package\n        result = result.concat(\n          await importProducesStar({\n            packagePath: depResolveMapEntry.path,\n            info: depResult.info,\n            importPath: depImportPath,\n            context,\n            visited,\n          }),\n        );\n      }\n    } else {\n      // Add the name to the result if it doesn't start with '*'\n      result.push(name);\n    }\n  }\n\n  cache[key] = result;\n  return result;\n}\n\nfunction getDependencyInfo(options: {\n  packageName: string;\n  definition: PackageJson;\n  resolveMap: ResolveMap;\n  packageResultsArray: InitPackageResult[];\n}):\n  | {\n      depResult: WithRequired<InitPackageResult, 'info'>;\n      depResolveMapEntry: ResolveMapEntry;\n    }\n  | undefined {\n  const { packageName, definition, resolveMap, packageResultsArray } = options;\n\n  const depResolveMapEntry = findResolveMapEntry({ packageName, definition, resolveMap });\n  const depResult =\n    depResolveMapEntry &&\n    packageResultsArray.find((r) => r.name === depResolveMapEntry.name && r.version === depResolveMapEntry.version);\n\n  // Skip if we can't find the imported package in the resolve map, or there's no info about\n  // its entries/exports.\n  if (!depResolveMapEntry || !depResult?.info) {\n    return undefined;\n  }\n\n  return { depResolveMapEntry, depResult: depResult as WithRequired<InitPackageResult, 'info'> };\n}\n"]}

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

@@ -1,5 +1,4 @@
-import type { Session } from '@ms-cloudpack/api-server';
-import type { LinkedPath, ResolveMap } from '@ms-cloudpack/common-types';
+import type { LinkedPath, ResolveMap, Session } from '@ms-cloudpack/common-types';
 export declare function formatLinkSummary(options: {
     session: Session;
     resolveMap: ResolveMap;

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

@@ -1 +1 @@
-{"version":3,"file":"formatLinkSummary.d.ts","sourceRoot":"","sources":["../../../src/commands/link/formatLinkSummary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAmB,MAAM,4BAA4B,CAAC;AAS1F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,eAAe,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;CAC1C,GAAG,MAAM,CA4BT"}
+{"version":3,"file":"formatLinkSummary.d.ts","sourceRoot":"","sources":["../../../src/commands/link/formatLinkSummary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAmB,OAAO,EAAE,MAAM,4BAA4B,CAAC;AASnG,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,eAAe,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;CAC1C,GAAG,MAAM,CA4BT"}

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

@@ -1 +1 @@
-{"version":3,"file":"formatLinkSummary.js","sourceRoot":"","sources":["../../../src/commands/link/formatLinkSummary.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Session } from '@ms-cloudpack/api-server';\nimport type { LinkedPath, ResolveMap, ResolveMapEntry } from '@ms-cloudpack/common-types';\nimport { bulletedList, cyan, type BulletList } from '@ms-cloudpack/task-reporter';\nimport {\n  diffResolveMaps,\n  findResolveMapEntry,\n  type DiffResolveMapsChanges,\n  type DiffResolveMapsStats,\n} from '@ms-cloudpack/package-utilities';\n\nexport function formatLinkSummary(options: {\n  session: Session;\n  resolveMap: ResolveMap;\n  linkedPaths: LinkedPath[];\n  resolveStrategy?: 'dedupe' | 'duplicate';\n}): string {\n  const { session, linkedPaths, resolveMap, resolveStrategy } = options;\n  const differences = diffResolveMaps({ before: session.resolveMap, after: resolveMap });\n\n  const linkedPathsMessage = linkedPaths.length\n    ? [\n        'Linked paths:',\n        bulletedList(\n          linkedPaths\n            .map((p) => p.path)\n            .sort()\n            .map((p) => cyan(p)),\n        ),\n      ]\n    : ['No paths linked.'];\n\n  const messages = [\n    `Finished linking session: \"${session.projectName}\" (${session.id})`,\n    '',\n    ...linkedPathsMessage,\n    '',\n    `Resolve map differences:`,\n    bulletedList(formatDiff(differences)),\n    ...duplicatedMessages({ session, differences, resolveStrategy }),\n    '',\n  ];\n\n  return messages.join('\\n');\n}\n\nfunction formatDiff(diff: DiffResolveMapsStats): BulletList {\n  const messages = [];\n  const added = formatDiffChanges(diff.added);\n  const removed = formatDiffChanges(diff.removed);\n\n  if (!added.length && !removed.length) {\n    messages.push('No differences found');\n  }\n\n  if (added.length) {\n    messages.push('Added:', added);\n  }\n\n  if (removed.length) {\n    messages.push('Removed:', removed);\n  }\n\n  return messages;\n}\n\nfunction formatDiffChanges(changes: DiffResolveMapsChanges): BulletList {\n  const messages = [];\n  if (changes.linked.length) {\n    messages.push('Linked:', changes.linked.map(formatEntry).sort());\n  }\n\n  if (changes.internal.length) {\n    messages.push('Internal:', changes.internal.map(formatEntry).sort());\n  }\n\n  if (changes.external.length) {\n    messages.push('External:', changes.external.map(formatEntry).sort());\n  }\n\n  return messages;\n}\n\nfunction formatEntry(entry: ResolveMapEntry): string {\n  return `${entry.name}@${entry.version} (${entry.path})`;\n}\n\nfunction duplicatedMessages(options: {\n  session: Session;\n  differences: DiffResolveMapsStats;\n  resolveStrategy?: 'dedupe' | 'duplicate';\n}): string[] {\n  const { session, differences, resolveStrategy } = options;\n  const duplicated = findDuplicates({ session, differences });\n\n  return duplicated.length\n    ? [\n        '',\n        `Warning:`,\n        'The following packages were duplicated by linking:',\n        duplicated.join(', '),\n        '',\n        'This could lead to unexpected behavior. Please review the linked paths and resolve map to ensure correctness.',\n        ...(resolveStrategy == 'duplicate'\n          ? ['Consider running link with `cloudpack link --resolve-strategy dedupe` to resolve these duplicates.']\n          : []),\n      ]\n    : [];\n}\n\n/**\n * Find entries that were duplicated by linking.\n * This means that the package already existed in the resolve map,\n * and now there are more versions of the package than there were before.\n */\nfunction findDuplicates(options: { session: Session; differences: DiffResolveMapsStats }): string[] {\n  const { session, differences } = options;\n  const duplicated = new Map<string, number>();\n\n  for (const packageType of Object.values(differences.added)) {\n    for (const change of packageType as ResolveMapEntry[]) {\n      const { name } = change;\n      const entry = findResolveMapEntry({ packageName: name, resolveMap: session.resolveMap });\n      if (entry) {\n        duplicated.set(name, (duplicated.get(name) || 0) + 1);\n      }\n    }\n  }\n\n  for (const packageType of Object.values(differences.removed)) {\n    for (const change of packageType as ResolveMapEntry[]) {\n      const { name } = change;\n      if (duplicated.has(name)) {\n        // We already checked for existence in the resolve map, so we know this will be a number.\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        duplicated.set(name, duplicated.get(name)! - 1);\n      }\n    }\n  }\n\n  return Array.from(duplicated.entries())\n    .filter(([, value]) => value > 0)\n    .map(([key]) => key)\n    .sort();\n}\n"]}
+{"version":3,"file":"formatLinkSummary.js","sourceRoot":"","sources":["../../../src/commands/link/formatLinkSummary.ts"],"names":[],"mappings":"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","sourcesContent":["import type { LinkedPath, ResolveMap, ResolveMapEntry, Session } from '@ms-cloudpack/common-types';\nimport { bulletedList, cyan, type BulletList } from '@ms-cloudpack/task-reporter';\nimport {\n  diffResolveMaps,\n  findResolveMapEntry,\n  type DiffResolveMapsChanges,\n  type DiffResolveMapsStats,\n} from '@ms-cloudpack/package-utilities';\n\nexport function formatLinkSummary(options: {\n  session: Session;\n  resolveMap: ResolveMap;\n  linkedPaths: LinkedPath[];\n  resolveStrategy?: 'dedupe' | 'duplicate';\n}): string {\n  const { session, linkedPaths, resolveMap, resolveStrategy } = options;\n  const differences = diffResolveMaps({ before: session.resolveMap, after: resolveMap });\n\n  const linkedPathsMessage = linkedPaths.length\n    ? [\n        'Linked paths:',\n        bulletedList(\n          linkedPaths\n            .map((p) => p.path)\n            .sort()\n            .map((p) => cyan(p)),\n        ),\n      ]\n    : ['No paths linked.'];\n\n  const messages = [\n    `Finished linking session: \"${session.projectName}\" (${session.id})`,\n    '',\n    ...linkedPathsMessage,\n    '',\n    `Resolve map differences:`,\n    bulletedList(formatDiff(differences)),\n    ...duplicatedMessages({ session, differences, resolveStrategy }),\n    '',\n  ];\n\n  return messages.join('\\n');\n}\n\nfunction formatDiff(diff: DiffResolveMapsStats): BulletList {\n  const messages = [];\n  const added = formatDiffChanges(diff.added);\n  const removed = formatDiffChanges(diff.removed);\n\n  if (!added.length && !removed.length) {\n    messages.push('No differences found');\n  }\n\n  if (added.length) {\n    messages.push('Added:', added);\n  }\n\n  if (removed.length) {\n    messages.push('Removed:', removed);\n  }\n\n  return messages;\n}\n\nfunction formatDiffChanges(changes: DiffResolveMapsChanges): BulletList {\n  const messages = [];\n  if (changes.linked.length) {\n    messages.push('Linked:', changes.linked.map(formatEntry).sort());\n  }\n\n  if (changes.internal.length) {\n    messages.push('Internal:', changes.internal.map(formatEntry).sort());\n  }\n\n  if (changes.external.length) {\n    messages.push('External:', changes.external.map(formatEntry).sort());\n  }\n\n  return messages;\n}\n\nfunction formatEntry(entry: ResolveMapEntry): string {\n  return `${entry.name}@${entry.version} (${entry.path})`;\n}\n\nfunction duplicatedMessages(options: {\n  session: Session;\n  differences: DiffResolveMapsStats;\n  resolveStrategy?: 'dedupe' | 'duplicate';\n}): string[] {\n  const { session, differences, resolveStrategy } = options;\n  const duplicated = findDuplicates({ session, differences });\n\n  return duplicated.length\n    ? [\n        '',\n        `Warning:`,\n        'The following packages were duplicated by linking:',\n        duplicated.join(', '),\n        '',\n        'This could lead to unexpected behavior. Please review the linked paths and resolve map to ensure correctness.',\n        ...(resolveStrategy == 'duplicate'\n          ? ['Consider running link with `cloudpack link --resolve-strategy dedupe` to resolve these duplicates.']\n          : []),\n      ]\n    : [];\n}\n\n/**\n * Find entries that were duplicated by linking.\n * This means that the package already existed in the resolve map,\n * and now there are more versions of the package than there were before.\n */\nfunction findDuplicates(options: { session: Session; differences: DiffResolveMapsStats }): string[] {\n  const { session, differences } = options;\n  const duplicated = new Map<string, number>();\n\n  for (const packageType of Object.values(differences.added)) {\n    for (const change of packageType as ResolveMapEntry[]) {\n      const { name } = change;\n      const entry = findResolveMapEntry({ packageName: name, resolveMap: session.resolveMap });\n      if (entry) {\n        duplicated.set(name, (duplicated.get(name) || 0) + 1);\n      }\n    }\n  }\n\n  for (const packageType of Object.values(differences.removed)) {\n    for (const change of packageType as ResolveMapEntry[]) {\n      const { name } = change;\n      if (duplicated.has(name)) {\n        // We already checked for existence in the resolve map, so we know this will be a number.\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        duplicated.set(name, duplicated.get(name)! - 1);\n      }\n    }\n  }\n\n  return Array.from(duplicated.entries())\n    .filter(([, value]) => value > 0)\n    .map(([key]) => key)\n    .sort();\n}\n"]}

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

@@ -1,4 +1,4 @@
-import { type Session } from '@ms-cloudpack/api-server';
+import type { Session } from '@ms-cloudpack/common-types';
 import type { TaskReporter } from '@ms-cloudpack/task-reporter';
 /**
  * Get array of active sessions.

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

@@ -1 +1 @@
-{"version":3,"file":"getActiveSessions.d.ts","sourceRoot":"","sources":["../../../src/commands/link/getActiveSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,KAAK,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEtG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,YAAY,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAoBlH"}
+{"version":3,"file":"getActiveSessions.d.ts","sourceRoot":"","sources":["../../../src/commands/link/getActiveSessions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,YAAY,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAoBlH"}

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

@@ -1 +1 @@
-{"version":3,"file":"getActiveSessions.js","sourceRoot":"","sources":["../../../src/commands/link/getActiveSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAgB,MAAM,0BAA0B,CAAC;AACtG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAsD;IAC5F,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IACvC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAC5D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC7D,MAAM,sBAAsB,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE;QAChF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAU,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAC1F,IAAI,OAAO,IAAI,CAAC,MAAM,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;YAC1D,OAAO,OAAO,CAAC;QACjB,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,kCAAkC,iBAAiB,EAAE,CAAC,CAAC;YACrE,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACxE,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC;AACrE,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,OAAgB,EAAE,QAAuB;IACtE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEnC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,qBAAqB,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAEjD,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzE,mDAAmD;IACnD,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,CAAC;QACH,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC;IAChE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,WAAW;IACb,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import { createCloudpackClient, getActiveSessionsPath, type Session } from '@ms-cloudpack/api-server';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { readdir, rm } from 'fs/promises';\nimport path from 'path';\nimport fs from 'fs';\n\n/**\n * Get array of active sessions.\n * An active session is one that has a valid session file and the api server is still active.\n * This function will also delete inactive session files.\n */\nexport async function getActiveSessions(params: { cachePath: string; reporter?: TaskReporter }): Promise<Session[]> {\n  const { reporter, cachePath } = params;\n  const activeSessionPaths = getActiveSessionsPath(cachePath);\n  if (!fs.existsSync(activeSessionPaths)) {\n    return [];\n  }\n  const activeSessionFiles = await readdir(activeSessionPaths);\n  const activeSessionsPromises = activeSessionFiles.map(async (activeSessionFile) => {\n    const session = await readJson<Session>(path.join(activeSessionPaths, activeSessionFile));\n    if (session && (await isSessionActive(session, reporter))) {\n      return session;\n    } else {\n      console.debug(`Deleting invalid session file: ${activeSessionFile}`);\n      await rm(path.join(activeSessionPaths, activeSessionFile));\n      return null;\n    }\n  });\n\n  const activeSessionsResults = await Promise.all(activeSessionsPromises);\n  return activeSessionsResults.filter((session) => session !== null);\n}\n\nasync function isSessionActive(session: Session, reporter?: TaskReporter): Promise<boolean> {\n  const { apiServer } = session.urls;\n\n  if (!apiServer) {\n    return false;\n  }\n\n  console.debug(`Checking session: ${session.id}`);\n\n  const client = await createCloudpackClient({ url: apiServer, reporter });\n  // Ping the api server to see if it is still active\n  let isActive = false;\n  try {\n    isActive = (await client.getSessionId.query()) === session.id;\n  } catch (e) {\n    /* no-op */\n  } finally {\n    await client.close();\n  }\n\n  return isActive;\n}\n"]}
+{"version":3,"file":"getActiveSessions.js","sourceRoot":"","sources":["../../../src/commands/link/getActiveSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAExF,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAsD;IAC5F,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IACvC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAC5D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC7D,MAAM,sBAAsB,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE;QAChF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAU,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAC1F,IAAI,OAAO,IAAI,CAAC,MAAM,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;YAC1D,OAAO,OAAO,CAAC;QACjB,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,kCAAkC,iBAAiB,EAAE,CAAC,CAAC;YACrE,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACxE,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC;AACrE,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,OAAgB,EAAE,QAAuB;IACtE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEnC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,qBAAqB,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAEjD,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzE,mDAAmD;IACnD,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,CAAC;QACH,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC;IAChE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,WAAW;IACb,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import { createCloudpackClient, getActiveSessionsPath } from '@ms-cloudpack/api-server';\nimport type { Session } from '@ms-cloudpack/common-types';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { readdir, rm } from 'fs/promises';\nimport path from 'path';\nimport fs from 'fs';\n\n/**\n * Get array of active sessions.\n * An active session is one that has a valid session file and the api server is still active.\n * This function will also delete inactive session files.\n */\nexport async function getActiveSessions(params: { cachePath: string; reporter?: TaskReporter }): Promise<Session[]> {\n  const { reporter, cachePath } = params;\n  const activeSessionPaths = getActiveSessionsPath(cachePath);\n  if (!fs.existsSync(activeSessionPaths)) {\n    return [];\n  }\n  const activeSessionFiles = await readdir(activeSessionPaths);\n  const activeSessionsPromises = activeSessionFiles.map(async (activeSessionFile) => {\n    const session = await readJson<Session>(path.join(activeSessionPaths, activeSessionFile));\n    if (session && (await isSessionActive(session, reporter))) {\n      return session;\n    } else {\n      console.debug(`Deleting invalid session file: ${activeSessionFile}`);\n      await rm(path.join(activeSessionPaths, activeSessionFile));\n      return null;\n    }\n  });\n\n  const activeSessionsResults = await Promise.all(activeSessionsPromises);\n  return activeSessionsResults.filter((session) => session !== null);\n}\n\nasync function isSessionActive(session: Session, reporter?: TaskReporter): Promise<boolean> {\n  const { apiServer } = session.urls;\n\n  if (!apiServer) {\n    return false;\n  }\n\n  console.debug(`Checking session: ${session.id}`);\n\n  const client = await createCloudpackClient({ url: apiServer, reporter });\n  // Ping the api server to see if it is still active\n  let isActive = false;\n  try {\n    isActive = (await client.getSessionId.query()) === session.id;\n  } catch (e) {\n    /* no-op */\n  } finally {\n    await client.close();\n  }\n\n  return isActive;\n}\n"]}

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

@@ -1,4 +1,4 @@
-import type { Session } from '@ms-cloudpack/api-server';
+import type { Session } from '@ms-cloudpack/common-types';
 import type { TaskReporter } from '@ms-cloudpack/task-reporter';
 import type { CommandExitParams } from '../../types/CommandAction.js';
 type SessionWithRequiredApiServer = Session & {

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,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,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,kCAAkC;IAClC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,GAAG,OAAO,CAAC,iBAAiB,GAAG;IAAE,OAAO,CAAC,EAAE,4BAA4B,CAAA;CAAE,CAAC,CAwD1E"}
+{"version":3,"file":"getSessionToLink.d.ts","sourceRoot":"","sources":["../../../src/commands/link/getSessionToLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,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,kCAAkC;IAClC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,GAAG,OAAO,CAAC,iBAAiB,GAAG;IAAE,OAAO,CAAC,EAAE,4BAA4B,CAAA;CAAE,CAAC,CAwD1E"}

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,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"]}
+{"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/common-types';\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":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAIlE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAI5D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,YAAY,CA2H/C,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAIlE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAI5D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,YAAY,CAwH/C,CAAC"}

package/lib/commands/start/execute.js

@@ -50,10 +50,7 @@ export const execute = async (params) => {
     }
     const { apiServer } = apiServerResult;
     // Kick off bundling app package as soon as api server is ready.
-    void ensurePackageBundled({
-        input: { name: definition.name, version: definition.version },
-        ctx: apiContext,
-    });
+    void ensurePackageBundled({ name: definition.name, version: definition.version }, apiContext);
     // Then start bundle and app servers for hosting the app.
     const { startServers } = await import('@ms-cloudpack/app-server');
     const servers = await startServers({
@@ -103,7 +100,7 @@ export const execute = async (params) => {
                 // Use the default path from the config with the first domain.
                 urlToOpen = defaultUrl;
             }
-            void openBrowser({ options: { url: urlToOpen }, context: apiContext }).catch((err) => {
+            void openBrowser({ url: urlToOpen }, apiContext).catch((err) => {
                 console.warn('Error opening browser:', err?.stack || err);
                 console.warn('Please open the browser manually to:', defaultUrl);
             });

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 { createApiContext, ensurePackageBundled, type CloudpackServer, type Context } from '@ms-cloudpack/api-server';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { isExternalPackage, resolve } from '@ms-cloudpack/path-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 type { CommandAction } from '../../types/CommandAction.js';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.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 { getCliStartTime } from '../../utilities/getCliStartTime.js';\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport const execute: CommandAction<StartOptions> = async (params) => {\n  const { appPath, config, options, autoDispose } = params;\n\n  console.log('App path:', yellow(appPath));\n  console.log('Bundle mode:', yellow(options.mode));\n\n  await runPrerequisites(params);\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 shouldUseRemoteCache = config.features?.enableCloudHosted || config.features?.enableRemoteCacheDownloads;\n  const apiContext = autoDispose(\n    await createApiContext({\n      ...params,\n      remoteCacheClientLoginMethod: shouldUseRemoteCache ? options.login : undefined,\n      overlayPath,\n    }),\n  );\n  const { packages, session, telemetryClient } = 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  if (options.logResolveMap) {\n    // Write the resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n  }\n\n  // Start api server for tracking status and handling remote requests.\n  const apiServerResult = await createApiServer(options, apiContext);\n  if (apiServerResult.hasErrors) {\n    return apiServerResult;\n  }\n  const { apiServer } = apiServerResult;\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.server?.defaultPath || '', session.urls.appServer).href;\n\n  // Log the time elapsed from when the CLI started until the browser is ready to be opened.\n  await telemetryClient.tracer.startActiveSpan(\n    'TIME_TO_OPEN_BROWSER',\n    { startTime: getCliStartTime(), attributes: { open: options.open } },\n    () => {\n      // Open the browser.\n      if (options.open === false) {\n        console.log('Please open the browser manually to:', defaultUrl);\n      } else {\n        let urlToOpen: string;\n        if (typeof options.open === 'string') {\n          // If the string doesn't start with http or https, pick a protocol based on config.server.https\n          if (!options.open.startsWith('http://') && !options.open.startsWith('https://')) {\n            urlToOpen = `${config.server?.https ? 'https' : 'http'}://${options.open}`;\n          } else {\n            urlToOpen = options.open;\n          }\n        } else {\n          // Use the default path from the config with the first domain.\n          urlToOpen = defaultUrl;\n        }\n\n        void openBrowser({ options: { url: urlToOpen }, context: apiContext }).catch((err: unknown) => {\n          console.warn('Error opening browser:', (err as Error | undefined)?.stack || err);\n          console.warn('Please open the browser manually to:', defaultUrl);\n        });\n      }\n    },\n  );\n\n  return null; // the command should keep running\n};\n\n/**\n * Create the API server, or return an error message if the server could not be created.\n */\nasync function createApiServer(\n  options: StartOptions,\n  apiContext: Context,\n): Promise<{ hasErrors: false; apiServer: CloudpackServer } | { hasErrors: true; message: string }> {\n  const { session } = apiContext;\n  const { config } = session;\n  const { server, appPath } = config;\n\n  // If a cert is needed, check that it exists.\n  if (server?.https === true && !(await getCertificate({ domain: server.domain, cwd: appPath }))) {\n    return {\n      hasErrors: true,\n      message:\n        `The local site is configured to use https in cloudpack.config.json, but is missing a cert.\\n\\n` +\n        `Run \"${cyan(bold('cloudpack setup'))}\" to create the required certificate and try start again.\\n`,\n    };\n  }\n\n  const { createCloudpackServer } = await import('@ms-cloudpack/api-server');\n\n  try {\n    const apiServer = await createCloudpackServer({ port: options.apiServerPort }, apiContext);\n    return { hasErrors: false, apiServer };\n  } catch (err) {\n    let message: string;\n    if ((err as { code: string }).code === 'EADDRNOTAVAIL' && server?.domain) {\n      const primaryDomain = (Array.isArray(server.domain) ? server.domain : [server.domain])[0];\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    } else {\n      message = `Error creating API server: ${(err as Error).stack || err}`;\n    }\n    return { hasErrors: true, message };\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 { createApiContext, ensurePackageBundled, type CloudpackServer, type Context } from '@ms-cloudpack/api-server';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { isExternalPackage, resolve } from '@ms-cloudpack/path-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 type { CommandAction } from '../../types/CommandAction.js';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.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 { getCliStartTime } from '../../utilities/getCliStartTime.js';\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport const execute: CommandAction<StartOptions> = async (params) => {\n  const { appPath, config, options, autoDispose } = params;\n\n  console.log('App path:', yellow(appPath));\n  console.log('Bundle mode:', yellow(options.mode));\n\n  await runPrerequisites(params);\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 shouldUseRemoteCache = config.features?.enableCloudHosted || config.features?.enableRemoteCacheDownloads;\n  const apiContext = autoDispose(\n    await createApiContext({\n      ...params,\n      remoteCacheClientLoginMethod: shouldUseRemoteCache ? options.login : undefined,\n      overlayPath,\n    }),\n  );\n  const { packages, session, telemetryClient } = 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  if (options.logResolveMap) {\n    // Write the resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n  }\n\n  // Start api server for tracking status and handling remote requests.\n  const apiServerResult = await createApiServer(options, apiContext);\n  if (apiServerResult.hasErrors) {\n    return apiServerResult;\n  }\n  const { apiServer } = apiServerResult;\n\n  // Kick off bundling app package as soon as api server is ready.\n  void ensurePackageBundled({ name: definition.name, version: definition.version }, apiContext);\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.server?.defaultPath || '', session.urls.appServer).href;\n\n  // Log the time elapsed from when the CLI started until the browser is ready to be opened.\n  await telemetryClient.tracer.startActiveSpan(\n    'TIME_TO_OPEN_BROWSER',\n    { startTime: getCliStartTime(), attributes: { open: options.open } },\n    () => {\n      // Open the browser.\n      if (options.open === false) {\n        console.log('Please open the browser manually to:', defaultUrl);\n      } else {\n        let urlToOpen: string;\n        if (typeof options.open === 'string') {\n          // If the string doesn't start with http or https, pick a protocol based on config.server.https\n          if (!options.open.startsWith('http://') && !options.open.startsWith('https://')) {\n            urlToOpen = `${config.server?.https ? 'https' : 'http'}://${options.open}`;\n          } else {\n            urlToOpen = options.open;\n          }\n        } else {\n          // Use the default path from the config with the first domain.\n          urlToOpen = defaultUrl;\n        }\n\n        void openBrowser({ url: urlToOpen }, apiContext).catch((err: unknown) => {\n          console.warn('Error opening browser:', (err as Error | undefined)?.stack || err);\n          console.warn('Please open the browser manually to:', defaultUrl);\n        });\n      }\n    },\n  );\n\n  return null; // the command should keep running\n};\n\n/**\n * Create the API server, or return an error message if the server could not be created.\n */\nasync function createApiServer(\n  options: StartOptions,\n  apiContext: Context,\n): Promise<{ hasErrors: false; apiServer: CloudpackServer } | { hasErrors: true; message: string }> {\n  const { session } = apiContext;\n  const { config } = session;\n  const { server, appPath } = config;\n\n  // If a cert is needed, check that it exists.\n  if (server?.https === true && !(await getCertificate({ domain: server.domain, cwd: appPath }))) {\n    return {\n      hasErrors: true,\n      message:\n        `The local site is configured to use https in cloudpack.config.json, but is missing a cert.\\n\\n` +\n        `Run \"${cyan(bold('cloudpack setup'))}\" to create the required certificate and try start again.\\n`,\n    };\n  }\n\n  const { createCloudpackServer } = await import('@ms-cloudpack/api-server');\n\n  try {\n    const apiServer = await createCloudpackServer({ port: options.apiServerPort }, apiContext);\n    return { hasErrors: false, apiServer };\n  } catch (err) {\n    let message: string;\n    if ((err as { code: string }).code === 'EADDRNOTAVAIL' && server?.domain) {\n      const primaryDomain = (Array.isArray(server.domain) ? server.domain : [server.domain])[0];\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    } else {\n      message = `Error creating API server: ${(err as Error).stack || err}`;\n    }\n    return { hasErrors: true, message };\n  }\n}\n\n// cspell:ignore Prereqs\n"]}

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

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

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

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

package/lib/commands/start/openBrowser.js

@@ -2,11 +2,14 @@ import open from 'open';
 let lastOpenedUrl;
 let altOpenBrowser;
 /** Open the browser. */
-export async function openBrowser(params) {
-    const { context: { telemetryClient }, options: { url }, } = params;
+export async function openBrowser(options, 
+// urls aren't used directly in the function, but are used in a test via overrideOpenBrowser
+context) {
+    const { url } = options;
+    const { telemetryClient } = context;
     lastOpenedUrl = url;
     if (altOpenBrowser) {
-        await altOpenBrowser(params);
+        await altOpenBrowser(options, context);
     }
     else if (altOpenBrowser !== null) {
         // This span measures the time required to create a process for the browser, but it does not imply that the browser is fully open.

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

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

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

@@ -1,4 +1,4 @@
-import type { Session } from '@ms-cloudpack/api-server';
+import type { Session } from '@ms-cloudpack/common-types';
 /**
  * Tracks active sessions to disk as they are started. This gives us a way to enumerate
  * all active sessions for scenarios like better error messages when sessions are already