@ms-cloudpack/cli 0.72.46 → 0.72.48

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

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/execute.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAI9D,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,aAAa,CA4EhD,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/execute.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAKlE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,aAAa,CA6EhD,CAAC"}

package/lib/commands/bundle/execute.js

@@ -1,10 +1,12 @@
 import { createPartialApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';
-import { plural, red, yellow } from '@ms-cloudpack/task-reporter';
+import { yellow } from '@ms-cloudpack/task-reporter';
 import path from 'path';
-import { getFilteredPackages } from '../../utilities/getFilteredPackages.js';
 import { getConfigOptionsFromCliOptions } from '../../utilities/getConfigOptionsFromCliOptions.js';
+import { getFilteredPackages } from '../../utilities/getFilteredPackages.js';
+import { InitSummaryData } from '../init/InitSummaryData.js';
+import { formatInitSummary } from '../init/formatInitSummary.js';
 export const execute = async (params) => {
-    const { cwd: appPath, options, reporter, initialize, autoDispose } = params;
+    const { cwd: appPath, options, reporter, initialize, autoDispose, setInterruptMessageHandler } = params;
     const apiContextOptions = await initialize({
         appPath,
         // This handles --bundler as a universal package override
@@ -24,47 +26,46 @@ export const execute = async (params) => {
     }
     // Show completed bundle tasks so the user knows what's happening.
     reporter.setOptions({ ...reporter.getOptions(), showCompleted: true });
-    let warnPackagesCount = 0;
-    let errorPackagesCount = 0;
-    let successPackagesCount = 0;
+    // Use InitSummaryData for pretty formatting of errors and warnings at the end.
+    const summaryData = new InitSummaryData(appPath);
     for (const packagePath of pathsToBundle) {
-        // If outdir is set, resolve relative to the package/app path.
-        // Otherwise, use the default path under the cloudpack cache to stay consistent with init and start,
-        // and to avoid potentially messing with the package's original output.
-        const outputPath = options.outdir ? path.resolve(packagePath, options.outdir) : undefined;
-        const 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,
-        });
-        console.log('Output:', result.outputPath, '\n');
-        if (result.errors?.length) {
-            errorPackagesCount++;
-        }
-        else if (result.warnings?.length) {
-            warnPackagesCount++;
+        let definition;
+        try {
+            // If outdir is set, resolve relative to the package/app path.
+            // Otherwise, use the default path under the cloudpack cache to stay consistent with init and start,
+            // and to avoid potentially messing with the package's original output.
+            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,
+            });
+            console.log('Output:', result.outputPath, '\n');
+            summaryData.recordResult(packagePath, result);
         }
-        else {
-            successPackagesCount++;
+        catch (err) {
+            summaryData.recordException({
+                packagePath,
+                error: err,
+                source: 'bundle',
+                context: 'bundling package',
+                name: definition?.name,
+                version: definition?.version,
+            });
         }
     }
-    const status = [
-        errorPackagesCount && red(plural(errorPackagesCount, 'package$s failed')),
-        warnPackagesCount && yellow(plural(warnPackagesCount, 'package$s succeeded with warnings')),
-        successPackagesCount && plural(successPackagesCount, 'package$s succeeded'),
-    ]
-        .filter(Boolean)
-        .join(', ');
+    setInterruptMessageHandler(() => formatInitSummary({ verb: 'bundle', summaries: [summaryData.summarize()] }));
+    const summary = summaryData.summarize();
     return {
-        message: `Bundling ${status}\n`,
-        hasErrors: !!errorPackagesCount,
+        hasErrors: summary.failed,
+        message: formatInitSummary({ verb: 'bundle', summaries: [summary] }),
     };
 };
 //# sourceMappingURL=execute.js.map

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 { plural, red, yellow } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\nimport { getConfigOptionsFromCliOptions } from '../../utilities/getConfigOptionsFromCliOptions.js';\n\nexport const execute: CommandAction<BundleOptions> = async (params) => {\n  const { cwd: appPath, options, reporter, initialize, autoDispose } = params;\n  const apiContextOptions = await initialize({\n    appPath,\n    // This handles --bundler as a universal package override\n    configOptions: getConfigOptionsFromCliOptions(options),\n  });\n\n  console.log('Bundle mode:', yellow(options.mode));\n\n  const [ctx] = autoDispose(\n    await createPartialApiContext({\n      ...apiContextOptions,\n      items: ['packages', 'watcher', 'session', 'taskRunner', 'bus', 'packageImportPaths', 'packageHashes'],\n    }),\n  );\n\n  const pathsToBundle = options.match ? getFilteredPackages(ctx.session.resolveMap, options.match) : [appPath];\n\n  if (!pathsToBundle.length) {\n    return {\n      message: 'No matching packages found to bundle.',\n      hasErrors: true,\n    };\n  }\n\n  // Show completed bundle tasks so the user knows what's happening.\n  reporter.setOptions({ ...reporter.getOptions(), showCompleted: true });\n\n  let warnPackagesCount = 0;\n  let errorPackagesCount = 0;\n  let successPackagesCount = 0;\n\n  for (const packagePath of pathsToBundle) {\n    // If outdir is set, resolve relative to the package/app path.\n    // Otherwise, use the default path under the cloudpack cache to stay consistent with init and start,\n    // and to avoid potentially messing with the package's original output.\n    const outputPath = options.outdir ? path.resolve(packagePath, options.outdir) : undefined;\n\n    const definition = await ctx.packages.get(packagePath);\n\n    const { result } = await ensurePackageBundled({\n      input: {\n        name: definition.name,\n        version: definition.version,\n        outputPath,\n        disableSourceMaps: options.disableSourceMaps,\n        shouldForce: true,\n        isIncremental: false,\n      },\n      ctx,\n    });\n\n    console.log('Output:', result.outputPath, '\\n');\n\n    if (result.errors?.length) {\n      errorPackagesCount++;\n    } else if (result.warnings?.length) {\n      warnPackagesCount++;\n    } else {\n      successPackagesCount++;\n    }\n  }\n\n  const status = [\n    errorPackagesCount && red(plural(errorPackagesCount, 'package$s failed')),\n    warnPackagesCount && yellow(plural(warnPackagesCount, 'package$s succeeded with warnings')),\n    successPackagesCount && plural(successPackagesCount, 'package$s succeeded'),\n  ]\n    .filter(Boolean)\n    .join(', ');\n\n  return {\n    message: `Bundling ${status}\\n`,\n    hasErrors: !!errorPackagesCount,\n  };\n};\n"]}
+{"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 { getConfigOptionsFromCliOptions } from '../../utilities/getConfigOptionsFromCliOptions.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 { cwd: appPath, options, reporter, initialize, autoDispose, setInterruptMessageHandler } = params;\n  const apiContextOptions = await initialize({\n    appPath,\n    // This handles --bundler as a universal package override\n    configOptions: getConfigOptionsFromCliOptions(options),\n  });\n\n  console.log('Bundle mode:', yellow(options.mode));\n\n  const [ctx] = autoDispose(\n    await createPartialApiContext({\n      ...apiContextOptions,\n      items: ['packages', 'watcher', 'session', 'taskRunner', 'bus', 'packageImportPaths', 'packageHashes'],\n    }),\n  );\n\n  const pathsToBundle = options.match ? getFilteredPackages(ctx.session.resolveMap, options.match) : [appPath];\n\n  if (!pathsToBundle.length) {\n    return {\n      message: 'No matching packages found to bundle.',\n      hasErrors: true,\n    };\n  }\n\n  // Show completed bundle tasks so the user knows what's happening.\n  reporter.setOptions({ ...reporter.getOptions(), showCompleted: true });\n\n  // 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', summaries: [summaryData.summarize()] }));\n\n  const summary = summaryData.summarize();\n\n  return {\n    hasErrors: summary.failed,\n    message: formatInitSummary({ verb: 'bundle', summaries: [summary] }),\n  };\n};\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAI9E,iCAAiC;AACjC,eAAO,MAAM,IAAI,EAAE,mBAoBlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAI9E,iCAAiC;AACjC,eAAO,MAAM,IAAI,EAAE,mBAqBlB,CAAC"}

package/lib/commands/bundle/index.js

@@ -16,6 +16,7 @@ export const init = (program) => {
             outdir: new Option('--outdir <path>', 'Path for the bundle output, relative to current path (or the resolved path to --package if specified). ' +
                 'Default is a path under the cloudpack cache.'),
             disableSourceMaps: new Option('--disable-source-maps', 'Disable source maps.'),
+            logBundleInfo: reusedOptions.logBundleInfo(),
         },
         getExecutor: () => import('./execute.js'),
     });

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/bundle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGzD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,iCAAiC;AACjC,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAgB;QACnC,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE;YACP,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;YAC9C,OAAO,EAAE,IAAI,MAAM,CAAC,kBAAkB,EAAE,iCAAiC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;YAChG,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,4BAA4B,CAAC;YACxD,OAAO,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE;gBACnE,MAAM,IAAI,oBAAoB,CAAC,kCAAkC,CAAC,CAAC;YACrE,CAAC,CAAC;YACF,MAAM,EAAE,IAAI,MAAM,CAChB,iBAAiB,EACjB,yGAAyG;gBACvG,8CAA8C,CACjD;YACD,iBAAiB,EAAE,IAAI,MAAM,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;SAC/E;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { bundlerNames } from '@ms-cloudpack/bundler';\nimport { InvalidArgumentError, Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport { reusedOptions } from '../../utilities/reusedOptions.js';\n\n/** Defines the \"bundle\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  program.addSubCommand<BundleOptions>({\n    name: 'bundle',\n    description: 'Bundles a package.',\n    options: {\n      mode: reusedOptions.mode({ action: 'bundle' }),\n      bundler: new Option('--bundler <name>', 'Force using a specific bundler.').choices(bundlerNames),\n      match: reusedOptions.match('Bundle specific package(s)'),\n      package: new Option('--package <package>').hideHelp().argParser(() => {\n        throw new InvalidArgumentError('Use --match instead of --package');\n      }),\n      outdir: new Option(\n        '--outdir <path>',\n        'Path for the bundle output, relative to current path (or the resolved path to --package if specified). ' +\n          'Default is a path under the cloudpack cache.',\n      ),\n      disableSourceMaps: new Option('--disable-source-maps', 'Disable source maps.'),\n    },\n    getExecutor: () => import('./execute.js'),\n  });\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/bundle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGzD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,iCAAiC;AACjC,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAgB;QACnC,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE;YACP,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;YAC9C,OAAO,EAAE,IAAI,MAAM,CAAC,kBAAkB,EAAE,iCAAiC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;YAChG,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,4BAA4B,CAAC;YACxD,OAAO,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE;gBACnE,MAAM,IAAI,oBAAoB,CAAC,kCAAkC,CAAC,CAAC;YACrE,CAAC,CAAC;YACF,MAAM,EAAE,IAAI,MAAM,CAChB,iBAAiB,EACjB,yGAAyG;gBACvG,8CAA8C,CACjD;YACD,iBAAiB,EAAE,IAAI,MAAM,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;YAC9E,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;SAC7C;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { bundlerNames } from '@ms-cloudpack/bundler';\nimport { InvalidArgumentError, Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport { reusedOptions } from '../../utilities/reusedOptions.js';\n\n/** Defines the \"bundle\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  program.addSubCommand<BundleOptions>({\n    name: 'bundle',\n    description: 'Bundles a package.',\n    options: {\n      mode: reusedOptions.mode({ action: 'bundle' }),\n      bundler: new Option('--bundler <name>', 'Force using a specific bundler.').choices(bundlerNames),\n      match: reusedOptions.match('Bundle specific package(s)'),\n      package: new Option('--package <package>').hideHelp().argParser(() => {\n        throw new InvalidArgumentError('Use --match instead of --package');\n      }),\n      outdir: new Option(\n        '--outdir <path>',\n        'Path for the bundle output, relative to current path (or the resolved path to --package if specified). ' +\n          'Default is a path under the cloudpack cache.',\n      ),\n      disableSourceMaps: new Option('--disable-source-maps', 'Disable source maps.'),\n      logBundleInfo: reusedOptions.logBundleInfo(),\n    },\n    getExecutor: () => import('./execute.js'),\n  });\n};\n"]}

package/lib/commands/bundle/types/BundleOptions.d.ts

@@ -1,5 +1,8 @@
-import type { BundleMode, PackageSettingsMatch } from '@ms-cloudpack/common-types';
-export interface BundleOptions {
+import type { ReusedOptions } from '../../../types/ReusedOptions.js';
+/**
+ * Options for the `cloudpack bundle` command.
+ */
+export interface BundleOptions extends Pick<ReusedOptions, 'logBundleInfo' | 'match' | 'mode'> {
     /**
      * Force using a specific bundler (ori/rollup/rspack/webpack).
      *
@@ -22,11 +25,5 @@ export interface BundleOptions {
      * @deprecated Removed in favor of `match`.
      */
     package?: string;
-    /**
-     * If set, only evaluate matching packages.
-     */
-    match?: PackageSettingsMatch[];
-    /** The mode to bundle in. */
-    mode: BundleMode;
 }
 //# sourceMappingURL=BundleOptions.d.ts.map

package/lib/commands/bundle/types/BundleOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BundleOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/bundle/types/BundleOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEnF,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,KAAK,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAE/B,6BAA6B;IAC7B,IAAI,EAAE,UAAU,CAAC;CAClB"}
+{"version":3,"file":"BundleOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/bundle/types/BundleOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,aAAa,EAAE,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;IAC5F;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}

package/lib/commands/bundle/types/BundleOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"BundleOptions.js","sourceRoot":"","sources":["../../../../src/commands/bundle/types/BundleOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleMode, PackageSettingsMatch } from '@ms-cloudpack/common-types';\n\nexport interface BundleOptions {\n  /**\n   * Force using a specific bundler (ori/rollup/rspack/webpack).\n   *\n   * Default is automatically choosing the bundler based on package contents, unless there any\n   * relevant package settings specify a bundler.\n   */\n  bundler?: string;\n\n  /**\n   * Disables source maps.\n   */\n  disableSourceMaps?: boolean;\n\n  /**\n   * Path for the bundle output. This is usually relative to the app path.\n   * If `package` is set, it's relative to the package path.\n   *\n   * If not set, the bundle output is dropped in the default path under the cloudpack cache.\n   */\n  outdir?: string;\n\n  /**\n   * @deprecated Removed in favor of `match`.\n   */\n  package?: string;\n\n  /**\n   * If set, only evaluate matching packages.\n   */\n  match?: PackageSettingsMatch[];\n\n  /** The mode to bundle in. */\n  mode: BundleMode;\n}\n"]}
+{"version":3,"file":"BundleOptions.js","sourceRoot":"","sources":["../../../../src/commands/bundle/types/BundleOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { ReusedOptions } from '../../../types/ReusedOptions.js';\n\n/**\n * Options for the `cloudpack bundle` command.\n */\nexport interface BundleOptions extends Pick<ReusedOptions, 'logBundleInfo' | 'match' | 'mode'> {\n  /**\n   * Force using a specific bundler (ori/rollup/rspack/webpack).\n   *\n   * Default is automatically choosing the bundler based on package contents, unless there any\n   * relevant package settings specify a bundler.\n   */\n  bundler?: string;\n\n  /**\n   * Disables source maps.\n   */\n  disableSourceMaps?: boolean;\n\n  /**\n   * Path for the bundle output. This is usually relative to the app path.\n   * If `package` is set, it's relative to the package path.\n   *\n   * If not set, the bundle output is dropped in the default path under the cloudpack cache.\n   */\n  outdir?: string;\n\n  /**\n   * @deprecated Removed in favor of `match`.\n   */\n  package?: string;\n}\n"]}

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

@@ -3,13 +3,12 @@ import type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js
 import type { InitPackageResult } from './types/InitPackageResult.js';
 import type { InitOptions } from './types/InitOptions.js';
 import type { BundleMessage } from '@ms-cloudpack/common-types';
+import type { EnsurePackageBundledResult } from '@ms-cloudpack/api-server';
 /**
  * Creates a summary tracking helper for the `init` verb to use to record statistics about results and needed
  * changes. The `record*` methods of the returned object will be used within init to add the stats, and the
- * `get` method will return the final tally. The resulting `InitSummary` object can be used in the `formatInitSummary`
- * helper to convert it to a string for the user.
- *
- * The `getMissingExportsMessage` method can be used to check that the imports/exports of packages match.
+ * `summarize` method will return the final tally. The resulting `InitSummary` object can be used in the
+ * `formatInitSummary` helper to convert it to a string for the user.
  */
 export declare class InitSummaryData {
     private _packageResults;
@@ -20,7 +19,23 @@ export declare class InitSummaryData {
     /**
      * Saves a package result.
      */
-    recordResult(result: InitPackageResult): void;
+    recordResult(packagePath: string, result: Pick<EnsurePackageBundledResult, 'name' | 'version' | 'info' | 'outputPath' | 'errors' | 'warnings'>): void;
+    /**
+     * Record an exception for a given package path.
+     * This creates a bundle message like "Error thrown while (context): (error)".
+     * (Unlike `addErrors`, this will create an overall package result if one doesn't exist yet.)
+     */
+    recordException(params: {
+        packagePath: string;
+        error: unknown;
+        source: string;
+        /** Description of the context in which the error was thrown, e.g. "evaluating package" */
+        context: string;
+        /** Package name in case no result has been recorded for this package yet */
+        name?: string;
+        /** Package version in case no result has been recorded for this package yet */
+        version?: string;
+    }): void;
     /**
      * Record more errors for a given package path.
      */
@@ -33,13 +48,11 @@ export declare class InitSummaryData {
     /**
      * Saves a generated file update.
      * @param allChanges - The generated file update to save.
-     * @returns void.
      */
     recordGeneratedChanges(allChanges: GeneratedPackageChanges[]): void;
     /**
      * Returns the summary of the results.
-     * @returns The summary of the results.
      */
-    summarize(options: Pick<InitOptions, 'check'>): InitSummary;
+    summarize(options?: Pick<InitOptions, 'check'>): InitSummary;
 }
 //# sourceMappingURL=InitSummaryData.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"InitSummaryData.d.ts","sourceRoot":"","sources":["../../../src/commands/init/InitSummaryData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAGlF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGhE;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,eAAe,CAAoC;IAC3D,OAAO,CAAC,iBAAiB,CAA0C;IACnE,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAS;gBAEb,OAAO,EAAE,MAAM;IAO3B;;OAEG;IACI,YAAY,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;IAIpD;;OAEG;IACI,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI;IASpE;;;OAGG;IACI,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAItD;;;;OAIG;IACI,sBAAsB,CAAC,UAAU,EAAE,uBAAuB,EAAE,GAAG,IAAI;IAS1E;;;OAGG;IACI,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,WAAW;CA+CnE"}
+{"version":3,"file":"InitSummaryData.d.ts","sourceRoot":"","sources":["../../../src/commands/init/InitSummaryData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAClF,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAE3E;;;;;GAKG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,eAAe,CAAoC;IAC3D,OAAO,CAAC,iBAAiB,CAA0C;IACnE,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAS;gBAEb,OAAO,EAAE,MAAM;IAO3B;;OAEG;IACI,YAAY,CACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,IAAI,CAAC,0BAA0B,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,YAAY,GAAG,QAAQ,GAAG,UAAU,CAAC,GAC3G,IAAI;IAYP;;;;OAIG;IACI,eAAe,CAAC,MAAM,EAAE;QAC7B,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,0FAA0F;QAC1F,OAAO,EAAE,MAAM,CAAC;QAChB,4EAA4E;QAC5E,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,+EAA+E;QAC/E,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,IAAI;IAUR;;OAEG;IACI,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI;IASpE;;;OAGG;IACI,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAItD;;;OAGG;IACI,sBAAsB,CAAC,UAAU,EAAE,uBAAuB,EAAE,GAAG,IAAI;IAS1E;;OAEG;IACI,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,WAAW;CA+CpE"}

package/lib/commands/init/InitSummaryData.js

@@ -2,10 +2,8 @@ import { requiredChangeTypes } from './types/GeneratedChange.js';
 /**
  * Creates a summary tracking helper for the `init` verb to use to record statistics about results and needed
  * changes. The `record*` methods of the returned object will be used within init to add the stats, and the
- * `get` method will return the final tally. The resulting `InitSummary` object can be used in the `formatInitSummary`
- * helper to convert it to a string for the user.
- *
- * The `getMissingExportsMessage` method can be used to check that the imports/exports of packages match.
+ * `summarize` method will return the final tally. The resulting `InitSummary` object can be used in the
+ * `formatInitSummary` helper to convert it to a string for the user.
  */
 export class InitSummaryData {
     constructor(appPath) {
@@ -17,8 +15,29 @@ export class InitSummaryData {
     /**
      * Saves a package result.
      */
-    recordResult(result) {
-        this._packageResults[result.path] = result;
+    recordResult(packagePath, result) {
+        this._packageResults[packagePath] = {
+            path: packagePath,
+            name: result.name,
+            version: result.version,
+            info: result.info,
+            outputPath: result.outputPath,
+            errors: result.errors,
+            warnings: result.warnings,
+        };
+    }
+    /**
+     * Record an exception for a given package path.
+     * This creates a bundle message like "Error thrown while (context): (error)".
+     * (Unlike `addErrors`, this will create an overall package result if one doesn't exist yet.)
+     */
+    recordException(params) {
+        const { packagePath, error, source, context, name = '<unknown>', version = '<unknown>' } = params;
+        if (!this._packageResults[packagePath]) {
+            this.recordResult(packagePath, { name, version });
+        }
+        const text = `Error thrown while ${context}: ${error.stack || error}`;
+        this.addErrors(packagePath, [{ text, source }]);
     }
     /**
      * Record more errors for a given package path.
@@ -40,7 +59,6 @@ export class InitSummaryData {
     /**
      * Saves a generated file update.
      * @param allChanges - The generated file update to save.
-     * @returns void.
      */
     recordGeneratedChanges(allChanges) {
         for (const update of allChanges) {
@@ -51,7 +69,6 @@ export class InitSummaryData {
     }
     /**
      * Returns the summary of the results.
-     * @returns The summary of the results.
      */
     summarize(options) {
         const duration = Date.now() - this._startTime;
@@ -78,7 +95,7 @@ export class InitSummaryData {
         const sortedUpdates = Object.values(this._generatedUpdates).sort((a, b) => a.path.localeCompare(b.path));
         for (const updates of sortedUpdates) {
             totalChanges += updates.changes.length;
-            totalRequiredChanges += updates.changes.filter((u) => requiredChangeTypes.includes(u.type)).length;
+            totalRequiredChanges += updates.changes.filter((u) => requiredChangeTypes[u.type]).length;
             updates.changes = updates.changes.sort((a, b) => a.change.localeCompare(b.change));
         }
         return {
@@ -90,7 +107,7 @@ export class InitSummaryData {
             totalWarnings,
             totalChanges,
             totalRequiredChanges,
-            failed: totalErrors > 0 || (!!options.check && totalRequiredChanges > 0),
+            failed: totalErrors > 0 || (!!options?.check && totalRequiredChanges > 0),
             packagesWithErrors,
             packagesWithWarnings,
             generatedFileUpdates: sortedUpdates,

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

@@ -1 +1 @@
-{"version":3,"file":"InitSummaryData.js","sourceRoot":"","sources":["../../../src/commands/init/InitSummaryData.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,OAAO,eAAe;IAM1B,YAAY,OAAe;QACzB,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED;;OAEG;IACI,YAAY,CAAC,MAAyB;QAC3C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;IAC7C,CAAC;IAED;;OAEG;IACI,SAAS,CAAC,WAAmB,EAAE,MAAuB;QAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACxD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,qCAAqC,WAAW,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,aAAa,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IACtE,CAAC;IAED;;;OAGG;IACI,UAAU;QACf,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACI,sBAAsB,CAAC,UAAqC;QACjE,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;YAChC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;YAChD,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YAElG,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,SAAS,CAAC,OAAmC;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;QAC9C,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,oBAAoB,GAAG,CAAC,CAAC;QAC7B,MAAM,kBAAkB,GAA8B,EAAE,CAAC;QACzD,MAAM,oBAAoB,GAAgC,EAAE,CAAC;QAE7D,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YAChE,IAAI,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;gBACjC,kBAAkB,CAAC,IAAI,CAAC,aAAwC,CAAC,CAAC;gBAClE,WAAW,IAAI,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,YAAY,EAAE,CAAC;YACjB,CAAC;YAED,IAAI,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;gBACnC,oBAAoB,CAAC,IAAI,CAAC,aAA0C,CAAC,CAAC;gBACtE,aAAa,IAAI,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC;YACjD,CAAC;QACH,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAEzG,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;YACpC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YACvC,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;YACnG,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACrF,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,QAAQ;YACR,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM;YACvD,YAAY;YACZ,WAAW;YACX,aAAa;YACb,YAAY;YACZ,oBAAoB;YACpB,MAAM,EAAE,WAAW,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,oBAAoB,GAAG,CAAC,CAAC;YACxE,kBAAkB;YAClB,oBAAoB;YACpB,oBAAoB,EAAE,aAAa;SACpC,CAAC;IACJ,CAAC;CACF","sourcesContent":["import type { InitSummary } from './types/InitSummary.js';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\nimport type { InitPackageResultWarnings } from './types/InitPackageResultWarnings.js';\nimport type { InitPackageResultErrors } from './types/InitPackageResultErrors.js';\nimport type { InitPackageResult } from './types/InitPackageResult.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { BundleMessage } from '@ms-cloudpack/common-types';\nimport { requiredChangeTypes } from './types/GeneratedChange.js';\n\n/**\n * Creates a summary tracking helper for the `init` verb to use to record statistics about results and needed\n * changes. The `record*` methods of the returned object will be used within init to add the stats, and the\n * `get` method will return the final tally. The resulting `InitSummary` object can be used in the `formatInitSummary`\n * helper to convert it to a string for the user.\n *\n * The `getMissingExportsMessage` method can be used to check that the imports/exports of packages match.\n */\nexport class InitSummaryData {\n  private _packageResults: Record<string, InitPackageResult>;\n  private _generatedUpdates: Record<string, GeneratedPackageChanges>;\n  private _startTime: number;\n  private _appPath: string;\n\n  constructor(appPath: string) {\n    this._packageResults = {};\n    this._generatedUpdates = {};\n    this._startTime = Date.now();\n    this._appPath = appPath;\n  }\n\n  /**\n   * Saves a package result.\n   */\n  public recordResult(result: InitPackageResult): void {\n    this._packageResults[result.path] = result;\n  }\n\n  /**\n   * Record more errors for a given package path.\n   */\n  public addErrors(packagePath: string, errors: BundleMessage[]): void {\n    const packageResult = this._packageResults[packagePath];\n    if (!packageResult) {\n      throw new Error(`Package result not found for path ${packagePath}`);\n    }\n\n    packageResult.errors = [...(packageResult.errors || []), ...errors];\n  }\n\n  /**\n   * Returns the package results.\n   * @returns The package results.\n   */\n  public getResults(): Record<string, InitPackageResult> {\n    return this._packageResults;\n  }\n\n  /**\n   * Saves a generated file update.\n   * @param allChanges - The generated file update to save.\n   * @returns void.\n   */\n  public recordGeneratedChanges(allChanges: GeneratedPackageChanges[]): void {\n    for (const update of allChanges) {\n      const { name, version, path, changes } = update;\n      const updatesForPackage = (this._generatedUpdates[path] ??= { name, version, path, changes: [] });\n\n      updatesForPackage.changes.push(...changes);\n    }\n  }\n\n  /**\n   * Returns the summary of the results.\n   * @returns The summary of the results.\n   */\n  public summarize(options: Pick<InitOptions, 'check'>): InitSummary {\n    const duration = Date.now() - this._startTime;\n    let totalSuccess = 0;\n    let totalErrors = 0;\n    let totalWarnings = 0;\n    let totalChanges = 0;\n    let totalRequiredChanges = 0;\n    const packagesWithErrors: InitPackageResultErrors[] = [];\n    const packagesWithWarnings: InitPackageResultWarnings[] = [];\n\n    for (const packageResult of Object.values(this._packageResults)) {\n      if (packageResult.errors?.length) {\n        packagesWithErrors.push(packageResult as InitPackageResultErrors);\n        totalErrors += packageResult.errors.length;\n      } else {\n        totalSuccess++;\n      }\n\n      if (packageResult.warnings?.length) {\n        packagesWithWarnings.push(packageResult as InitPackageResultWarnings);\n        totalWarnings += packageResult.warnings.length;\n      }\n    }\n\n    const sortedUpdates = Object.values(this._generatedUpdates).sort((a, b) => a.path.localeCompare(b.path));\n\n    for (const updates of sortedUpdates) {\n      totalChanges += updates.changes.length;\n      totalRequiredChanges += updates.changes.filter((u) => requiredChangeTypes.includes(u.type)).length;\n      updates.changes = updates.changes.sort((a, b) => a.change.localeCompare(b.change));\n    }\n\n    return {\n      appPath: this._appPath,\n      duration,\n      totalPackages: Object.keys(this._packageResults).length,\n      totalSuccess,\n      totalErrors,\n      totalWarnings,\n      totalChanges,\n      totalRequiredChanges,\n      failed: totalErrors > 0 || (!!options.check && totalRequiredChanges > 0),\n      packagesWithErrors,\n      packagesWithWarnings,\n      generatedFileUpdates: sortedUpdates,\n    };\n  }\n}\n"]}
+{"version":3,"file":"InitSummaryData.js","sourceRoot":"","sources":["../../../src/commands/init/InitSummaryData.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGjE;;;;;GAKG;AACH,MAAM,OAAO,eAAe;IAM1B,YAAY,OAAe;QACzB,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED;;OAEG;IACI,YAAY,CACjB,WAAmB,EACnB,MAA4G;QAE5G,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,GAAG;YAClC,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC1B,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,eAAe,CAAC,MAUtB;QACC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,GAAG,WAAW,EAAE,OAAO,GAAG,WAAW,EAAE,GAAG,MAAM,CAAC;QAClG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,IAAI,GAAG,sBAAsB,OAAO,KAAM,KAAe,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;QACjF,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACI,SAAS,CAAC,WAAmB,EAAE,MAAuB;QAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACxD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,qCAAqC,WAAW,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,aAAa,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IACtE,CAAC;IAED;;;OAGG;IACI,UAAU;QACf,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACI,sBAAsB,CAAC,UAAqC;QACjE,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;YAChC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;YAChD,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YAElG,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED;;OAEG;IACI,SAAS,CAAC,OAAoC;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;QAC9C,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,oBAAoB,GAAG,CAAC,CAAC;QAC7B,MAAM,kBAAkB,GAA8B,EAAE,CAAC;QACzD,MAAM,oBAAoB,GAAgC,EAAE,CAAC;QAE7D,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YAChE,IAAI,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;gBACjC,kBAAkB,CAAC,IAAI,CAAC,aAAwC,CAAC,CAAC;gBAClE,WAAW,IAAI,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,YAAY,EAAE,CAAC;YACjB,CAAC;YAED,IAAI,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;gBACnC,oBAAoB,CAAC,IAAI,CAAC,aAA0C,CAAC,CAAC;gBACtE,aAAa,IAAI,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC;YACjD,CAAC;QACH,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAEzG,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;YACpC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YACvC,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1F,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACrF,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,QAAQ;YACR,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM;YACvD,YAAY;YACZ,WAAW;YACX,aAAa;YACb,YAAY;YACZ,oBAAoB;YACpB,MAAM,EAAE,WAAW,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,IAAI,oBAAoB,GAAG,CAAC,CAAC;YACzE,kBAAkB;YAClB,oBAAoB;YACpB,oBAAoB,EAAE,aAAa;SACpC,CAAC;IACJ,CAAC;CACF","sourcesContent":["import type { InitSummary } from './types/InitSummary.js';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\nimport type {\n  InitPackageResult,\n  InitPackageResultErrors,\n  InitPackageResultWarnings,\n} from './types/InitPackageResult.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { BundleMessage } from '@ms-cloudpack/common-types';\nimport { requiredChangeTypes } from './types/GeneratedChange.js';\nimport type { EnsurePackageBundledResult } from '@ms-cloudpack/api-server';\n\n/**\n * Creates a summary tracking helper for the `init` verb to use to record statistics about results and needed\n * changes. The `record*` methods of the returned object will be used within init to add the stats, and the\n * `summarize` method will return the final tally. The resulting `InitSummary` object can be used in the\n * `formatInitSummary` helper to convert it to a string for the user.\n */\nexport class InitSummaryData {\n  private _packageResults: Record<string, InitPackageResult>;\n  private _generatedUpdates: Record<string, GeneratedPackageChanges>;\n  private _startTime: number;\n  private _appPath: string;\n\n  constructor(appPath: string) {\n    this._packageResults = {};\n    this._generatedUpdates = {};\n    this._startTime = Date.now();\n    this._appPath = appPath;\n  }\n\n  /**\n   * Saves a package result.\n   */\n  public recordResult(\n    packagePath: string,\n    result: Pick<EnsurePackageBundledResult, 'name' | 'version' | 'info' | 'outputPath' | 'errors' | 'warnings'>,\n  ): void {\n    this._packageResults[packagePath] = {\n      path: packagePath,\n      name: result.name,\n      version: result.version,\n      info: result.info,\n      outputPath: result.outputPath,\n      errors: result.errors,\n      warnings: result.warnings,\n    };\n  }\n\n  /**\n   * Record an exception for a given package path.\n   * This creates a bundle message like \"Error thrown while (context): (error)\".\n   * (Unlike `addErrors`, this will create an overall package result if one doesn't exist yet.)\n   */\n  public recordException(params: {\n    packagePath: string;\n    error: unknown;\n    source: string;\n    /** Description of the context in which the error was thrown, e.g. \"evaluating package\" */\n    context: string;\n    /** Package name in case no result has been recorded for this package yet */\n    name?: string;\n    /** Package version in case no result has been recorded for this package yet */\n    version?: string;\n  }): void {\n    const { packagePath, error, source, context, name = '<unknown>', version = '<unknown>' } = params;\n    if (!this._packageResults[packagePath]) {\n      this.recordResult(packagePath, { name, version });\n    }\n\n    const text = `Error thrown while ${context}: ${(error as Error).stack || error}`;\n    this.addErrors(packagePath, [{ text, source }]);\n  }\n\n  /**\n   * Record more errors for a given package path.\n   */\n  public addErrors(packagePath: string, errors: BundleMessage[]): void {\n    const packageResult = this._packageResults[packagePath];\n    if (!packageResult) {\n      throw new Error(`Package result not found for path ${packagePath}`);\n    }\n\n    packageResult.errors = [...(packageResult.errors || []), ...errors];\n  }\n\n  /**\n   * Returns the package results.\n   * @returns The package results.\n   */\n  public getResults(): Record<string, InitPackageResult> {\n    return this._packageResults;\n  }\n\n  /**\n   * Saves a generated file update.\n   * @param allChanges - The generated file update to save.\n   */\n  public recordGeneratedChanges(allChanges: GeneratedPackageChanges[]): void {\n    for (const update of allChanges) {\n      const { name, version, path, changes } = update;\n      const updatesForPackage = (this._generatedUpdates[path] ??= { name, version, path, changes: [] });\n\n      updatesForPackage.changes.push(...changes);\n    }\n  }\n\n  /**\n   * Returns the summary of the results.\n   */\n  public summarize(options?: Pick<InitOptions, 'check'>): InitSummary {\n    const duration = Date.now() - this._startTime;\n    let totalSuccess = 0;\n    let totalErrors = 0;\n    let totalWarnings = 0;\n    let totalChanges = 0;\n    let totalRequiredChanges = 0;\n    const packagesWithErrors: InitPackageResultErrors[] = [];\n    const packagesWithWarnings: InitPackageResultWarnings[] = [];\n\n    for (const packageResult of Object.values(this._packageResults)) {\n      if (packageResult.errors?.length) {\n        packagesWithErrors.push(packageResult as InitPackageResultErrors);\n        totalErrors += packageResult.errors.length;\n      } else {\n        totalSuccess++;\n      }\n\n      if (packageResult.warnings?.length) {\n        packagesWithWarnings.push(packageResult as InitPackageResultWarnings);\n        totalWarnings += packageResult.warnings.length;\n      }\n    }\n\n    const sortedUpdates = Object.values(this._generatedUpdates).sort((a, b) => a.path.localeCompare(b.path));\n\n    for (const updates of sortedUpdates) {\n      totalChanges += updates.changes.length;\n      totalRequiredChanges += updates.changes.filter((u) => requiredChangeTypes[u.type]).length;\n      updates.changes = updates.changes.sort((a, b) => a.change.localeCompare(b.change));\n    }\n\n    return {\n      appPath: this._appPath,\n      duration,\n      totalPackages: Object.keys(this._packageResults).length,\n      totalSuccess,\n      totalErrors,\n      totalWarnings,\n      totalChanges,\n      totalRequiredChanges,\n      failed: totalErrors > 0 || (!!options?.check && totalRequiredChanges > 0),\n      packagesWithErrors,\n      packagesWithWarnings,\n      generatedFileUpdates: sortedUpdates,\n    };\n  }\n}\n"]}

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

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

package/lib/commands/init/evaluatePath.js

@@ -31,11 +31,11 @@ export async function evaluatePath(options) {
         },
         ctx,
     });
-    const { errors, warnings, info, outputPath } = result;
     // Record the results for the summary.
-    summaryData.recordResult({ name, version, path: packagePath, errors, warnings, info, outputPath });
+    summaryData.recordResult(packagePath, result);
     // If there were errors or no imports, return early.
-    if (errors?.length || !info) {
+    const { info } = result;
+    if (result.errors?.length || !info) {
         return {};
     }
     // Given the package imports, find the missing exports maps and update packageOverrides.

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

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAkBlC;IAQC,MAAM,EACJ,WAAW,EACX,MAAM,EACN,WAAW,EACX,IAAI,EACJ,UAAU,EACV,WAAW,EACX,GAAG,EACH,eAAe,EACf,WAAW,EACX,UAAU,EACV,QAAQ,EACR,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;IACzB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5B,yFAAyF;IACzF,+FAA+F;IAC/F,kGAAkG;IAClG,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IACvF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAErC,OAAO,CAAC,KAAK,CAAC,cAAc,WAAW,iBAAiB,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAE3F,yDAAyD;IACzD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC;QAC5C,KAAK,EAAE;YACL,IAAI;YACJ,OAAO;YACP,aAAa,EAAE,KAAK;YACpB,mBAAmB,EAAE,IAAI;YACzB,WAAW;YACX,WAAW,EAAE,WAAW;YACxB,WAAW,EAAE,UAAU;YACvB,QAAQ;YACR,YAAY,EAAE,CAAC,WAAW,CAAC,KAAK;SACjC;QACD,GAAG;KACJ,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAEtD,sCAAsC;IACtC,WAAW,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IAEnG,oDAAoD;IACpD,IAAI,MAAM,EAAE,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,wFAAwF;IACxF,MAAM,EACJ,cAAc,EACd,2BAA2B,EAC3B,MAAM,EAAE,UAAU,EAClB,eAAe,EACf,cAAc,GACf,GAAG,MAAM,2BAA2B,CAAC;QACpC,UAAU;QACV,WAAW;QACX,QAAQ;QACR,IAAI;QACJ,MAAM;QACN,UAAU;QACV,eAAe;QACf,OAAO;KACR,CAAC,CAAC;IAEH,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,WAAW,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACjD,CAAC;IACD,WAAW,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;IACnD,WAAW,CAAC,sBAAsB,CAAC,2BAA2B,CAAC,CAAC;IAEhE,IAAI,qBAAqB,GAA0C,SAAS,CAAC;IAC7E,IAAI,QAAQ,EAAE,sBAAsB,EAAE,CAAC;QACrC,MAAM,uBAAuB,GAAG,MAAM,sBAAsB,CAAC;YAC3D,UAAU;YACV,WAAW;YACX,IAAI;YACJ,MAAM;YACN,QAAQ;YACR,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,EAAE,eAAe,EAAE,4BAA4B,EAAE,cAAc,EAAE,2BAA2B,EAAE,GAClG,uBAAuB,CAAC;QAC1B,qBAAqB,GAAG,uBAAuB,CAAC,qBAAqB,CAAC;QAEtE,WAAW,CAAC,sBAAsB,CAAC,qBAAqB,CAAC,CAAC;QAE1D,KAAK,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,4BAA4B,CAAC,OAAO,EAAE,EAAE,CAAC;YAC7E,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC7C,CAAC;QACD,2BAA2B,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,iGAAiG;IACjG,6EAA6E;IAC7E,wFAAwF;IACxF,qEAAqE;IAErE,IAAI,WAAW,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,IAAI,qBAAqB,EAAE,MAAM,CAAC,EAAE,CAAC;QACvG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,EAAE;YACjC,yFAAyF;YACzF,MAAM,EAAE,cAAc,IAAI,qBAAqB,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,4BAA4B;SAC/G,CAAC,CAAC;QAEH,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO;QACL,eAAe;QACf,cAAc;KACf,CAAC;AACJ,CAAC","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  const { errors, warnings, info, outputPath } = result;\n\n  // Record the results for the summary.\n  summaryData.recordResult({ name, version, path: packagePath, errors, warnings, info, outputPath });\n\n  // If there were errors or no imports, return early.\n  if (errors?.length || !info) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    exportsChanges,\n    includedDependenciesChanges,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({\n    definition,\n    packagePath,\n    packages,\n    info,\n    config,\n    resolveMap,\n    importerContext,\n    appPath,\n  });\n\n  if (evalErrors.length) {\n    summaryData.addErrors(packagePath, evalErrors);\n  }\n  summaryData.recordGeneratedChanges(exportsChanges);\n  summaryData.recordGeneratedChanges(includedDependenciesChanges);\n\n  let dynamicImportsChanges: undefined | GeneratedPackageChanges[] = undefined;\n  if (features?.evaluateDynamicImports) {\n    const evaluatedDynamicImports = await evaluateDynamicImports({\n      definition,\n      packagePath,\n      info,\n      config,\n      packages,\n      importerContext,\n    });\n\n    const { pathsToEvaluate: dynamicImportPathsToEvaluate, pathsToRefresh: dynamicImportPathsToRefresh } =\n      evaluatedDynamicImports;\n    dynamicImportsChanges = evaluatedDynamicImports.dynamicImportsChanges;\n\n    summaryData.recordGeneratedChanges(dynamicImportsChanges);\n\n    for (const [evalPath, evalContext] of dynamicImportPathsToEvaluate.entries()) {\n      pathsToEvaluate.set(evalPath, evalContext);\n    }\n    dynamicImportPathsToRefresh.forEach((path) => pathsToRefresh.add(path));\n  }\n\n  // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed\n  // and the heap does not reach the limit as almost every package is enqueued.\n  // importPathsToEvaluate?.forEach((path) => pathsToEvaluate.set(path, importerContext));\n  // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));\n\n  if (initOptions.check && (exportsChanges.length || evalErrors.length || dynamicImportsChanges?.length)) {\n    span.addEvent('INIT_CHECK_FAILED', {\n      // Don't log the specific errors to telemetry, as they may contain sensitive information.\n      reason: exportsChanges || dynamicImportsChanges ? 'Config needs to be updated.' : 'Errors found with imports.',\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}
+{"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"]}

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

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/init/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAMlE,wFAAwF;AACxF,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,WAAW,CA2B9C,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/init/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAOlE,wFAAwF;AACxF,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,WAAW,CAgC9C,CAAC"}

package/lib/commands/init/execute.js

@@ -2,23 +2,28 @@ import { init } from './init.js';
 import { formatInitSummary } from './formatInitSummary.js';
 import { findCloudpackAppPaths } from '../../utilities/findCloudpackAppPaths.js';
 import { InitSummaryData } from './InitSummaryData.js';
+import { getConfigOptionsFromCliOptions } from '../../utilities/getConfigOptionsFromCliOptions.js';
 /** Given the path, updates the Cloudpack config with overrides and project settings. */
 export const execute = async (params) => {
     const { options, cwd, initialize, autoDispose, setInterruptMessageHandler } = params;
     const appPaths = findCloudpackAppPaths(cwd);
     // `findCloudpackAppPaths` will only return an array of paths in which cloudpack.config.json was found.
     // To ensure initialize can be run even if no cloudpack.config.json was found, we use the cwd directory as a fallback.
-    const contexts = await initialize({ appPaths: appPaths.length > 0 ? appPaths : [cwd] });
+    const contexts = await initialize({
+        appPaths: appPaths.length > 0 ? appPaths : [cwd],
+        configOptions: getConfigOptionsFromCliOptions(options),
+    });
     const appSummaries = Object.fromEntries(contexts.map((context) => [context.appPath, new InitSummaryData(context.appPath)]));
+    const summarizeOptions = { check: options.check, verb: 'init' };
     setInterruptMessageHandler(() => formatInitSummary({
         summaries: Object.values(appSummaries).map((s) => s.summarize(options)),
-        options,
         isInterrupted: true,
+        ...summarizeOptions,
     }));
     const summaries = await init({ appSummaries, options, contexts, autoDispose });
     return {
         hasErrors: summaries.some((summary) => summary.failed),
-        message: formatInitSummary({ summaries, options }),
+        message: formatInitSummary({ summaries, ...summarizeOptions }),
     };
 };
 //# sourceMappingURL=execute.js.map

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

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

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

@@ -1,12 +1,14 @@
 import type { InitOptions } from './types/InitOptions.js';
 import type { InitSummary } from './types/InitSummary.js';
-interface FormatInitSummaryParams {
+interface FormatInitSummaryParams extends Pick<InitOptions, 'check'> {
     summaries: InitSummary[];
-    options: InitOptions;
+    verb: 'init' | 'bundle';
     isInterrupted?: boolean;
 }
 /**
- * Given init summaries and init options, returns a formatted string message to display to the user via console.
+ * Given summaries and options, returns a formatted string message to display to the user via console.
+ *
+ * TODO rename to formatSummary
  */
 export declare function formatInitSummary(params: FormatInitSummaryParams): string;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"formatInitSummary.d.ts","sourceRoot":"","sources":["../../../src/commands/init/formatInitSummary.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK1D,UAAU,uBAAuB;IAC/B,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,OAAO,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,GAAG,MAAM,CAUzE"}
+{"version":3,"file":"formatInitSummary.d.ts","sourceRoot":"","sources":["../../../src/commands/init/formatInitSummary.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,UAAU,uBAAwB,SAAQ,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC;IAClE,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAYD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,GAAG,MAAM,CAUzE"}