@ms-cloudpack/cli 0.42.3 → 0.43.0

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

@@ -0,0 +1,18 @@
+import type { InitSummary } from './types/InitSummary.js';
+import type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';
+import type { InitPackageResult } from './types/InitPackageResult.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.
+ */
+export declare class InitSummaryData {
+    private _packageResults;
+    private _generatedUpdates;
+    constructor();
+    recordResult(packageResult: InitPackageResult): void;
+    recordGeneratedChanges(allChanges: GeneratedPackageChanges[]): void;
+    summarize(): InitSummary;
+}
+//# sourceMappingURL=InitSummaryData.d.ts.map

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

@@ -0,0 +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;AAEtE;;;;;GAKG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,eAAe,CAAoC;IAC3D,OAAO,CAAC,iBAAiB,CAA0C;;IAO5D,YAAY,CAAC,aAAa,EAAE,iBAAiB;IAI7C,sBAAsB,CAAC,UAAU,EAAE,uBAAuB,EAAE;IAS5D,SAAS,IAAI,WAAW;CAqChC"}

package/lib/commands/init/InitSummaryData.js

@@ -0,0 +1,57 @@
+/**
+ * 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.
+ */
+export class InitSummaryData {
+    constructor() {
+        this._packageResults = {};
+        this._generatedUpdates = {};
+    }
+    recordResult(packageResult) {
+        this._packageResults[packageResult.path] = packageResult;
+    }
+    recordGeneratedChanges(allChanges) {
+        for (const update of allChanges) {
+            const { name, version, path, changes } = update;
+            const updatesForPackage = (this._generatedUpdates[path] ??= { name, version, path, changes: [] });
+            updatesForPackage.changes.push(...changes);
+        }
+    }
+    summarize() {
+        let totalSuccess = 0;
+        let totalErrors = 0;
+        let totalWarnings = 0;
+        let totalChanges = 0;
+        const packagesWithErrors = [];
+        const packagesWithWarnings = [];
+        for (const packageResult of Object.values(this._packageResults)) {
+            if (packageResult.errors?.length) {
+                packagesWithErrors.push(packageResult);
+                totalErrors += packageResult.errors.length;
+            }
+            else {
+                totalSuccess++;
+            }
+            if (packageResult.warnings?.length) {
+                packagesWithWarnings.push(packageResult);
+                totalWarnings += packageResult.warnings.length;
+            }
+        }
+        for (const updates of Object.values(this._generatedUpdates)) {
+            totalChanges += updates.changes.length;
+        }
+        return {
+            totalPackages: Object.keys(this._packageResults).length,
+            totalSuccess,
+            totalErrors,
+            totalWarnings,
+            totalChanges,
+            packagesWithErrors,
+            packagesWithWarnings,
+            generatedFileUpdates: Object.values(this._generatedUpdates),
+        };
+    }
+}
+//# sourceMappingURL=InitSummaryData.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitSummaryData.js","sourceRoot":"","sources":["../../../src/commands/init/InitSummaryData.ts"],"names":[],"mappings":"AAMA;;;;;GAKG;AACH,MAAM,OAAO,eAAe;IAI1B;QACE,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;IAC9B,CAAC;IAEM,YAAY,CAAC,aAAgC;QAClD,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC;IAC3D,CAAC;IAEM,sBAAsB,CAAC,UAAqC;QACjE,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAC/B,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;SAC5C;IACH,CAAC;IAEM,SAAS;QACd,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,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;YAC/D,IAAI,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE;gBAChC,kBAAkB,CAAC,IAAI,CAAC,aAAwC,CAAC,CAAC;gBAClE,WAAW,IAAI,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC;aAC5C;iBAAM;gBACL,YAAY,EAAE,CAAC;aAChB;YAED,IAAI,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE;gBAClC,oBAAoB,CAAC,IAAI,CAAC,aAA0C,CAAC,CAAC;gBACtE,aAAa,IAAI,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC;aAChD;SACF;QAED,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE;YAC3D,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;SACxC;QAED,OAAO;YACL,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM;YACvD,YAAY;YACZ,WAAW;YACX,aAAa;YACb,YAAY;YACZ,kBAAkB;YAClB,oBAAoB;YACpB,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;SAC5D,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';\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 */\nexport class InitSummaryData {\n  private _packageResults: Record<string, InitPackageResult>;\n  private _generatedUpdates: Record<string, GeneratedPackageChanges>;\n\n  constructor() {\n    this._packageResults = {};\n    this._generatedUpdates = {};\n  }\n\n  public recordResult(packageResult: InitPackageResult) {\n    this._packageResults[packageResult.path] = packageResult;\n  }\n\n  public recordGeneratedChanges(allChanges: GeneratedPackageChanges[]) {\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  public summarize(): InitSummary {\n    let totalSuccess = 0;\n    let totalErrors = 0;\n    let totalWarnings = 0;\n    let totalChanges = 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    for (const updates of Object.values(this._generatedUpdates)) {\n      totalChanges += updates.changes.length;\n    }\n\n    return {\n      totalPackages: Object.keys(this._packageResults).length,\n      totalSuccess,\n      totalErrors,\n      totalWarnings,\n      totalChanges,\n      packagesWithErrors,\n      packagesWithWarnings,\n      generatedFileUpdates: Object.values(this._generatedUpdates),\n    };\n  }\n}\n"]}

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

@@ -1,4 +1,4 @@
-import type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
+import type { PackageJson, PackageDefinitionsCache, BundleMessage } from '@ms-cloudpack/bundler-types';
 import { type TaskReporter } from '@ms-cloudpack/task-reporter';
 import type { CloudpackConfig } from '@ms-cloudpack/config';
 /**
@@ -11,9 +11,9 @@ export declare function bundleAndGetImports(options: {
     packagePath: string;
     definition: PackageJson;
 }): Promise<{
-    hasWarnings: boolean;
-    hasErrors: boolean;
+    warnings: BundleMessage[];
+    errors: BundleMessage[];
     /** Map from package name to set of required relative paths */
-    imports?: Map<string, Set<string>>;
+    imports: Map<string, Set<string>>;
 }>;
 //# sourceMappingURL=bundleAndGetImports.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundleAndGetImports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IACjD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,WAAW,CAAC;CACzB,GAAG,OAAO,CAAC;IACV,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CACpC,CAAC,CA4DD"}
+{"version":3,"file":"bundleAndGetImports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACvG,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IACjD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,WAAW,CAAC;CACzB,GAAG,OAAO,CAAC;IACV,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,8DAA8D;IAC9D,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CACnC,CAAC,CAiED"}

package/lib/commands/init/bundleAndGetImports.js

@@ -18,10 +18,15 @@ export async function bundleAndGetImports(options) {
     // Determine entries.
     const entriesMap = await getEntriesMapFromPackage({ inputPath: packagePath }, { packages });
     if (!Object.keys(entriesMap).length) {
-        console.warn(`${path.join(packagePath, 'package.json')} does not specify any entry points.`, isExternal
-            ? ''
-            : 'If this package contains code imported by other packages, please consider adding an "exports" field.');
-        return { hasWarnings: true, hasErrors: false };
+        return {
+            imports: new Map(),
+            errors: [],
+            warnings: [
+                {
+                    text: `No valid entry points were found when evaluating ${path.join(packagePath, 'package.json')}. Check that has an exports, main, or module entry and the referenced files exist.`,
+                },
+            ],
+        };
     }
     const bundleRequest = {
         id: packagePath,
@@ -43,9 +48,9 @@ export async function bundleAndGetImports(options) {
         };
     });
     return {
-        hasWarnings: !!bundleRequest.result?.warnings?.length,
-        hasErrors: !!bundleRequest.result?.errors?.length,
-        imports,
+        warnings: bundleRequest.result?.warnings || [],
+        errors: bundleRequest.result?.errors || [],
+        imports: imports || new Map(),
     };
 }
 //# sourceMappingURL=bundleAndGetImports.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundleAndGetImports.js","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAsB,MAAM,0BAA0B,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAqB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGnF;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAMzC;IAMC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACxE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC7F,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC;IAEvC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;QACtC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,oCAAoC,CAAC,CAAC;KAC9F;IAED,yCAAyC;IACzC,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAEpC,qBAAqB;IACrB,MAAM,UAAU,GAAG,MAAM,wBAAwB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE5F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;QACnC,OAAO,CAAC,IAAI,CACV,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,qCAAqC,EAC9E,UAAU;YACR,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,sGAAsG,CAC3G,CAAC;QACF,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;KAChD;IAED,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,WAAW;QACf,WAAW,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE;QAClC,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE;QACjC,WAAW;QACX,UAAU;QACV,UAAU;QACV,QAAQ;QACR,MAAM;KACP,CAAC;IAEF,MAAM,UAAU,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAExE,yCAAyC;IACzC,IAAI,OAA6C,CAAC;IAElD,MAAM,QAAQ,CAAC,OAAO,CAAC,YAAY,iBAAiB,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE;QAC7E,OAAO,GAAG,IAAI,GAAG,CACf,MAAM,CAAC,OAAO,CACZ,CAAC,MAAM,WAAW,CAChB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAClG,CAAC,IAAI,EAAE,CACT,CACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,WAAW,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM;QACrD,SAAS,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM;QACjD,OAAO;KACR,CAAC;AACJ,CAAC","sourcesContent":["import path from 'path';\nimport { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';\nimport { bundleTask, getBundleDetails, findImports, type BundleRequest } from '@ms-cloudpack/api-server';\nimport { prepareOutputPath } from '../../common/prepareOutputPath.js';\nimport type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { type TaskReporter, formatPackageName } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\n/**\n * Bundle the package and return the imports it depends on.\n */\nexport async function bundleAndGetImports(options: {\n  packages: PackageDefinitionsCache;\n  config: CloudpackConfig;\n  reporter: TaskReporter;\n  packagePath: string;\n  definition: PackageJson;\n}): Promise<{\n  hasWarnings: boolean;\n  hasErrors: boolean;\n  /** Map from package name to set of required relative paths */\n  imports?: Map<string, Set<string>>;\n}> {\n  const { packagePath, definition, packages, reporter, config } = options;\n  const { outputLocation, isExternal } = await getBundleDetails({ packagePath }, { packages });\n  const outputPath = outputLocation.path;\n\n  if (!isExternal && !definition.exports) {\n    console.debug(`${path.join(packagePath, 'package.json')} does not have an \"exports\" field.`);\n  }\n\n  // Ensure outputPath exists and is empty.\n  await prepareOutputPath(outputPath);\n\n  // Determine entries.\n  const entriesMap = await getEntriesMapFromPackage({ inputPath: packagePath }, { packages });\n\n  if (!Object.keys(entriesMap).length) {\n    console.warn(\n      `${path.join(packagePath, 'package.json')} does not specify any entry points.`,\n      isExternal\n        ? ''\n        : 'If this package contains code imported by other packages, please consider adding an \"exports\" field.',\n    );\n    return { hasWarnings: true, hasErrors: false };\n  }\n\n  const bundleRequest: BundleRequest = {\n    id: packagePath,\n    packageName: definition.name || '',\n    version: definition.version || '',\n    packagePath,\n    outputPath,\n    isExternal,\n    packages,\n    config,\n  };\n\n  await bundleTask({ bundleRequest, reporter, options: { force: true } });\n\n  // For each outputFile, find all imports.\n  let imports: Map<string, Set<string>> | undefined;\n\n  await reporter.runTask(`Evaluate ${formatPackageName(definition)}`, async () => {\n    imports = new Map(\n      Object.entries(\n        (await findImports(\n          bundleRequest.result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [],\n        )) || {},\n      ),\n    );\n\n    return {\n      status: 'complete',\n    };\n  });\n\n  return {\n    hasWarnings: !!bundleRequest.result?.warnings?.length,\n    hasErrors: !!bundleRequest.result?.errors?.length,\n    imports,\n  };\n}\n"]}
+{"version":3,"file":"bundleAndGetImports.js","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAsB,MAAM,0BAA0B,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAqB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGnF;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAMzC;IAMC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACxE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC7F,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC;IAEvC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;QACtC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,oCAAoC,CAAC,CAAC;KAC9F;IAED,yCAAyC;IACzC,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAEpC,qBAAqB;IACrB,MAAM,UAAU,GAAG,MAAM,wBAAwB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE5F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;QACnC,OAAO;YACL,OAAO,EAAE,IAAI,GAAG,EAAuB;YACvC,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,oDAAoD,IAAI,CAAC,IAAI,CACjE,WAAW,EACX,cAAc,CACf,oFAAoF;iBACtF;aACF;SACF,CAAC;KACH;IAED,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,WAAW;QACf,WAAW,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE;QAClC,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE;QACjC,WAAW;QACX,UAAU;QACV,UAAU;QACV,QAAQ;QACR,MAAM;KACP,CAAC;IAEF,MAAM,UAAU,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAExE,yCAAyC;IACzC,IAAI,OAA6C,CAAC;IAElD,MAAM,QAAQ,CAAC,OAAO,CAAC,YAAY,iBAAiB,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE;QAC7E,OAAO,GAAG,IAAI,GAAG,CACf,MAAM,CAAC,OAAO,CACZ,CAAC,MAAM,WAAW,CAChB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAClG,CAAC,IAAI,EAAE,CACT,CACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,MAAM,EAAE,QAAQ,IAAI,EAAE;QAC9C,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE;QAC1C,OAAO,EAAE,OAAO,IAAI,IAAI,GAAG,EAAuB;KACnD,CAAC;AACJ,CAAC","sourcesContent":["import path from 'path';\nimport { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';\nimport { bundleTask, getBundleDetails, findImports, type BundleRequest } from '@ms-cloudpack/api-server';\nimport { prepareOutputPath } from '../../common/prepareOutputPath.js';\nimport type { PackageJson, PackageDefinitionsCache, BundleMessage } from '@ms-cloudpack/bundler-types';\nimport { type TaskReporter, formatPackageName } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\n/**\n * Bundle the package and return the imports it depends on.\n */\nexport async function bundleAndGetImports(options: {\n  packages: PackageDefinitionsCache;\n  config: CloudpackConfig;\n  reporter: TaskReporter;\n  packagePath: string;\n  definition: PackageJson;\n}): Promise<{\n  warnings: BundleMessage[];\n  errors: BundleMessage[];\n  /** Map from package name to set of required relative paths */\n  imports: Map<string, Set<string>>;\n}> {\n  const { packagePath, definition, packages, reporter, config } = options;\n  const { outputLocation, isExternal } = await getBundleDetails({ packagePath }, { packages });\n  const outputPath = outputLocation.path;\n\n  if (!isExternal && !definition.exports) {\n    console.debug(`${path.join(packagePath, 'package.json')} does not have an \"exports\" field.`);\n  }\n\n  // Ensure outputPath exists and is empty.\n  await prepareOutputPath(outputPath);\n\n  // Determine entries.\n  const entriesMap = await getEntriesMapFromPackage({ inputPath: packagePath }, { packages });\n\n  if (!Object.keys(entriesMap).length) {\n    return {\n      imports: new Map<string, Set<string>>(),\n      errors: [],\n      warnings: [\n        {\n          text: `No valid entry points were found when evaluating ${path.join(\n            packagePath,\n            'package.json',\n          )}. Check that has an exports, main, or module entry and the referenced files exist.`,\n        },\n      ],\n    };\n  }\n\n  const bundleRequest: BundleRequest = {\n    id: packagePath,\n    packageName: definition.name || '',\n    version: definition.version || '',\n    packagePath,\n    outputPath,\n    isExternal,\n    packages,\n    config,\n  };\n\n  await bundleTask({ bundleRequest, reporter, options: { force: true } });\n\n  // For each outputFile, find all imports.\n  let imports: Map<string, Set<string>> | undefined;\n\n  await reporter.runTask(`Evaluate ${formatPackageName(definition)}`, async () => {\n    imports = new Map(\n      Object.entries(\n        (await findImports(\n          bundleRequest.result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [],\n        )) || {},\n      ),\n    );\n\n    return {\n      status: 'complete',\n    };\n  });\n\n  return {\n    warnings: bundleRequest.result?.warnings || [],\n    errors: bundleRequest.result?.errors || [],\n    imports: imports || new Map<string, Set<string>>(),\n  };\n}\n"]}

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

@@ -1,6 +1,7 @@
 import type { PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/bundler-types';
 import type { GeneratedConfig } from '@ms-cloudpack/config';
 import type { ResolveMap } from '@ms-cloudpack/package-utilities';
+import type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';
 /**
  * Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.
  * If so, updates package overrides to the given packageOverrides array.
@@ -9,12 +10,13 @@ export declare function evaluateImportsForOverrides(options: {
     packages: PackageDefinitionsCache;
     imports: Map<string, Set<string>>;
     definition: PackageJson;
+    packagePath: string;
     generatedConfig: GeneratedConfig;
     packagePathsToEvaluate: Set<string>;
     evaluatedPackages: Set<string>;
     resolveMap: ResolveMap;
 }): Promise<{
-    changeCount: number;
+    changes: GeneratedPackageChanges[];
     errors: string[];
 }>;
 //# sourceMappingURL=evaluateImportsForOverrides.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"evaluateImportsForOverrides.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAA4B,MAAM,6BAA6B,CAAC;AAClH,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,sBAAsB,CAAC;AAE7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAQlE;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACzD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAClC,UAAU,EAAE,WAAW,CAAC;IACxB,eAAe,EAAE,eAAe,CAAC;IACjC,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAoGrD"}
+{"version":3,"file":"evaluateImportsForOverrides.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAA4B,MAAM,6BAA6B,CAAC;AAClH,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,sBAAsB,CAAC;AAE7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAQlE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACzD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAClC,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,eAAe,CAAC;IACjC,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAuHpE"}

package/lib/commands/init/evaluateImportsForOverrides.js

@@ -1,37 +1,31 @@
 import { getPackageSettings } from '@ms-cloudpack/config';
 import { addExportsMapEntry, findResolveMapEntry, flattenExportsMap, getExportsMap, } from '@ms-cloudpack/package-utilities';
+import { bulletedList, cyan } from '@ms-cloudpack/task-reporter';
 /**
  * Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.
  * If so, updates package overrides to the given packageOverrides array.
  */
 export async function evaluateImportsForOverrides(options) {
-    const { packages, imports, definition, generatedConfig, packagePathsToEvaluate, evaluatedPackages, resolveMap } = options;
+    const { packages, imports, definition, packagePath, generatedConfig, packagePathsToEvaluate, evaluatedPackages, resolveMap, } = options;
     const displayName = `${definition.name}@${definition.version}`;
-    let changeCount = 0;
+    const changes = [];
     const errors = [];
     // Iterate through imports and find their path from the resolve map.
     for (const [dependencyName, dependencyImportPaths] of imports.entries()) {
         const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });
-        if (!resolveEntry) {
-            const errorMessage = `Package "${displayName}" depends on "${dependencyName}" but it was not found in the resolve map. ` +
+        const { path: dependencyPath } = resolveEntry || {};
+        const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;
+        if (!dependencyPath || !dependencyDefinition) {
+            const errorMessage = `Package "${displayName}" imports from the package "${dependencyName}" but it couldn't be found. ` +
                 `Ensure that "${dependencyName}" is listed in dependencies of "${displayName}".`;
             console.error(errorMessage);
             errors.push(errorMessage);
             continue;
         }
-        // Load the dependency definition.
-        const dependencyDefinition = await packages.get(resolveEntry.path);
-        if (!dependencyDefinition) {
-            const errorMessage = `Package "${displayName}" depends on "${dependencyName}" at "${resolveEntry.path}" ` +
-                `but its definition couldn't be loaded.`;
-            console.error(errorMessage);
-            errors.push(errorMessage);
-            continue;
-        }
         // Make sure to add the package to the list of packages to evaluate.
-        packagePathsToEvaluate.add(resolveEntry.path);
+        packagePathsToEvaluate.add(dependencyPath);
         // Get the flattened bundle-able exports map for this dependency and iterate through our import paths to ensure nothing is missing.
-        const exports = await getExportsMap({ packagePath: resolveEntry.path }, { packages });
+        const exports = await getExportsMap({ packagePath: dependencyPath }, { packages });
         const flattenedExports = flattenExportsMap(exports);
         const packageSettings = (generatedConfig.packageSettings ??= []);
         const { name, version } = dependencyDefinition;
@@ -59,23 +53,41 @@ export async function evaluateImportsForOverrides(options) {
                     packageSettings.push(generatedPackageSettings);
                 }
                 generatedPackageSettings.exports ??= {};
-                await addExportsMapEntry({
+                const addedEntry = await addExportsMapEntry({
                     exports: generatedPackageSettings.exports,
-                    packagePath: resolveEntry.path,
+                    packagePath: dependencyPath,
                     importPath: dependencyImportPath,
                 }, {
                     packages,
                 });
-                console.info(`"${name}@${version}": Added missing export "${dependencyImportPath}" (imported by "${displayName}")`);
+                if (!addedEntry) {
+                    const errorMessage = `Imported "${cyan(dependencyImportPath.replace('.', dependencyName))}" but a corresponding file couldn't be found. Either correct the import or adjust the "${cyan(dependencyName)}" package version to one that supports this import path.\n${bulletedList([`${cyan(displayName)}: ${packagePath}`, `${cyan(dependencyName)}: ${dependencyPath}`], 2)}`;
+                    console.error(errorMessage);
+                    errors.push(errorMessage);
+                    continue;
+                }
+                else {
+                    changes.push({
+                        name: dependencyName,
+                        version: dependencyDefinition.version || '',
+                        path: dependencyPath,
+                        changes: [
+                            {
+                                type: 'added-export',
+                                change: dependencyImportPath,
+                                reason: `Imported by "${displayName}"`,
+                            },
+                        ],
+                    });
+                }
                 generatedPackageSettings.exports = alphabetizeObject(generatedPackageSettings.exports);
-                changeCount++;
                 // Since we've found a missing exports, we need to re-enqueue the dependency for evaluation.
-                packagePathsToEvaluate.add(resolveEntry.path);
-                evaluatedPackages.delete(resolveEntry.path);
+                packagePathsToEvaluate.add(dependencyPath);
+                evaluatedPackages.delete(dependencyPath);
             }
         }
     }
-    return { changeCount, errors };
+    return { changes, errors };
 }
 /** Quick helper to alphabetize the exports. */
 function alphabetizeObject(obj) {

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

@@ -1 +1 @@
-{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,GACd,MAAM,iCAAiC,CAAC;AAEzC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OAQjD;IACC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAC7G,OAAO,CAAC;IACV,MAAM,WAAW,GAAG,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;IAC/D,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,oEAAoE;IACpE,KAAK,MAAM,CAAC,cAAc,EAAE,qBAAqB,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE;QACvE,MAAM,YAAY,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;QAElG,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,YAAY,GAChB,YAAY,WAAW,iBAAiB,cAAc,6CAA6C;gBACnG,gBAAgB,cAAc,mCAAmC,WAAW,IAAI,CAAC;YACnF,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAE1B,SAAS;SACV;QAED,kCAAkC;QAClC,MAAM,oBAAoB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnE,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,YAAY,GAChB,YAAY,WAAW,iBAAiB,cAAc,SAAS,YAAY,CAAC,IAAI,IAAI;gBACpF,wCAAwC,CAAC;YAC3C,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAE1B,SAAS;SACV;QAED,oEAAoE;QACpE,sBAAsB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE9C,mIAAmI;QACnI,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtF,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,eAAe,GAAG,CAAC,eAAe,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC;QACjE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,oBAAoB,CAAC;QAC/C,IAAI,wBAAqD,CAAC;QAE1D,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,iBAAiB,cAAc,wCAAwC,CAAC,CAAC;SACjH;QAED,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,EAAE;YACxD,mGAAmG;YACnG,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAAE;gBAC3C,wBAAwB,KAAK,kBAAkB,CAAC;oBAC9C,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,eAAe,EAAE,EAAE;oBAC1C,IAAI;oBACJ,OAAO;oBACP,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC,wBAAwB,CAAC;gBAE5B,IAAI,CAAC,wBAAwB,EAAE;oBAC7B,wBAAwB,GAAG;wBACzB,KAAK,EAAE;4BACL,IAAI;4BACJ,OAAO,EAAE,IAAI,OAAO,EAAE;yBACvB;wBACD,OAAO,EAAE,EAAE;qBACZ,CAAC;oBACF,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;iBAChD;gBAED,wBAAwB,CAAC,OAAO,KAAK,EAAE,CAAC;gBAExC,MAAM,kBAAkB,CACtB;oBACE,OAAO,EAAE,wBAAwB,CAAC,OAAO;oBACzC,WAAW,EAAE,YAAY,CAAC,IAAI;oBAC9B,UAAU,EAAE,oBAAoB;iBACjC,EACD;oBACE,QAAQ;iBACT,CACF,CAAC;gBAEF,OAAO,CAAC,IAAI,CACV,IAAI,IAAI,IAAI,OAAO,4BAA4B,oBAAoB,mBAAmB,WAAW,IAAI,CACtG,CAAC;gBAEF,wBAAwB,CAAC,OAAO,GAAG,iBAAiB,CAClD,wBAAwB,CAAC,OAAmC,CAC7D,CAAC;gBAEF,WAAW,EAAE,CAAC;gBAEd,4FAA4F;gBAC5F,sBAAsB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBAC9C,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aAC7C;SACF;KACF;IAED,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;AACjC,CAAC;AAED,+CAA+C;AAC/C,SAAS,iBAAiB,CAAuC,GAAM;IACrE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,MAAM,eAAe,GAA+B,EAAE,CAAC;IAEvD,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;QAC5B,eAAe,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;KACjC;IAED,OAAO,eAAoB,CAAC;AAC9B,CAAC","sourcesContent":["import type { PackageDefinitionsCache, PackageJson, PackageJsonExportsObject } from '@ms-cloudpack/bundler-types';\nimport type { GeneratedConfig, PackageSettings } from '@ms-cloudpack/config';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getExportsMap,\n} from '@ms-cloudpack/package-utilities';\n\n/**\n * Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.\n * If so, updates package overrides to the given packageOverrides array.\n */\nexport async function evaluateImportsForOverrides(options: {\n  packages: PackageDefinitionsCache;\n  imports: Map<string, Set<string>>;\n  definition: PackageJson;\n  generatedConfig: GeneratedConfig;\n  packagePathsToEvaluate: Set<string>;\n  evaluatedPackages: Set<string>;\n  resolveMap: ResolveMap;\n}): Promise<{ changeCount: number; errors: string[] }> {\n  const { packages, imports, definition, generatedConfig, packagePathsToEvaluate, evaluatedPackages, resolveMap } =\n    options;\n  const displayName = `${definition.name}@${definition.version}`;\n  let changeCount = 0;\n  const errors: string[] = [];\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const [dependencyName, dependencyImportPaths] of imports.entries()) {\n    const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n\n    if (!resolveEntry) {\n      const errorMessage =\n        `Package \"${displayName}\" depends on \"${dependencyName}\" but it was not found in the resolve map. ` +\n        `Ensure that \"${dependencyName}\" is listed in dependencies of \"${displayName}\".`;\n      console.error(errorMessage);\n      errors.push(errorMessage);\n\n      continue;\n    }\n\n    // Load the dependency definition.\n    const dependencyDefinition = await packages.get(resolveEntry.path);\n\n    if (!dependencyDefinition) {\n      const errorMessage =\n        `Package \"${displayName}\" depends on \"${dependencyName}\" at \"${resolveEntry.path}\" ` +\n        `but its definition couldn't be loaded.`;\n      console.error(errorMessage);\n      errors.push(errorMessage);\n\n      continue;\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    packagePathsToEvaluate.add(resolveEntry.path);\n\n    // Get the flattened bundle-able exports map for this dependency and iterate through our import paths to ensure nothing is missing.\n    const exports = await getExportsMap({ packagePath: resolveEntry.path }, { packages });\n    const flattenedExports = flattenExportsMap(exports);\n    const packageSettings = (generatedConfig.packageSettings ??= []);\n    const { name, version } = dependencyDefinition;\n    let generatedPackageSettings: PackageSettings | undefined;\n\n    if (!name || !version) {\n      throw new Error(`Package \"${displayName}\" depends on \"${dependencyName}\" but it is missing a name or version.`);\n    }\n\n    for (const dependencyImportPath of dependencyImportPaths) {\n      // We are missing an import path. We need to add this entry to the exports map in package settings.\n      if (!flattenedExports[dependencyImportPath]) {\n        generatedPackageSettings ??= getPackageSettings({\n          config: { generated: { packageSettings } },\n          name,\n          version,\n          firstMatch: true,\n        }).generatedPackageSettings;\n\n        if (!generatedPackageSettings) {\n          generatedPackageSettings = {\n            match: {\n              name,\n              version: `^${version}`,\n            },\n            exports: {},\n          };\n          packageSettings.push(generatedPackageSettings);\n        }\n\n        generatedPackageSettings.exports ??= {};\n\n        await addExportsMapEntry(\n          {\n            exports: generatedPackageSettings.exports,\n            packagePath: resolveEntry.path,\n            importPath: dependencyImportPath,\n          },\n          {\n            packages,\n          },\n        );\n\n        console.info(\n          `\"${name}@${version}\": Added missing export \"${dependencyImportPath}\" (imported by \"${displayName}\")`,\n        );\n\n        generatedPackageSettings.exports = alphabetizeObject<PackageJsonExportsObject>(\n          generatedPackageSettings.exports as PackageJsonExportsObject,\n        );\n\n        changeCount++;\n\n        // Since we've found a missing exports, we need to re-enqueue the dependency for evaluation.\n        packagePathsToEvaluate.add(resolveEntry.path);\n        evaluatedPackages.delete(resolveEntry.path);\n      }\n    }\n  }\n\n  return { changeCount, errors };\n}\n\n/** Quick helper to alphabetize the exports. */\nfunction alphabetizeObject<T extends { [key: string]: unknown }>(obj: T): T {\n  const sortedKeys = Object.keys(obj).sort();\n  const alphabetizedObj: { [key: string]: unknown } = {};\n\n  for (const key of sortedKeys) {\n    alphabetizedObj[key] = obj[key];\n  }\n\n  return alphabetizedObj as T;\n}\n"]}
+{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache, PackageJson, PackageJsonExportsObject } from '@ms-cloudpack/bundler-types';\nimport type { GeneratedConfig, PackageSettings } from '@ms-cloudpack/config';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getExportsMap,\n} from '@ms-cloudpack/package-utilities';\nimport { bulletedList, cyan } from '@ms-cloudpack/task-reporter';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\n/**\n * Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.\n * If so, updates package overrides to the given packageOverrides array.\n */\nexport async function evaluateImportsForOverrides(options: {\n  packages: PackageDefinitionsCache;\n  imports: Map<string, Set<string>>;\n  definition: PackageJson;\n  packagePath: string;\n  generatedConfig: GeneratedConfig;\n  packagePathsToEvaluate: Set<string>;\n  evaluatedPackages: Set<string>;\n  resolveMap: ResolveMap;\n}): Promise<{ changes: GeneratedPackageChanges[]; errors: string[] }> {\n  const {\n    packages,\n    imports,\n    definition,\n    packagePath,\n    generatedConfig,\n    packagePathsToEvaluate,\n    evaluatedPackages,\n    resolveMap,\n  } = options;\n  const displayName = `${definition.name}@${definition.version}`;\n  const changes: GeneratedPackageChanges[] = [];\n  const errors: string[] = [];\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const [dependencyName, dependencyImportPaths] of imports.entries()) {\n    const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n    const { path: dependencyPath } = resolveEntry || {};\n    const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n    if (!dependencyPath || !dependencyDefinition) {\n      const errorMessage =\n        `Package \"${displayName}\" imports from the package \"${dependencyName}\" but it couldn't be found. ` +\n        `Ensure that \"${dependencyName}\" is listed in dependencies of \"${displayName}\".`;\n      console.error(errorMessage);\n      errors.push(errorMessage);\n\n      continue;\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    packagePathsToEvaluate.add(dependencyPath);\n\n    // Get the flattened bundle-able exports map for this dependency and iterate through our import paths to ensure nothing is missing.\n    const exports = await getExportsMap({ packagePath: dependencyPath }, { packages });\n    const flattenedExports = flattenExportsMap(exports);\n    const packageSettings = (generatedConfig.packageSettings ??= []);\n    const { name, version } = dependencyDefinition;\n    let generatedPackageSettings: PackageSettings | undefined;\n\n    if (!name || !version) {\n      throw new Error(`Package \"${displayName}\" depends on \"${dependencyName}\" but it is missing a name or version.`);\n    }\n\n    for (const dependencyImportPath of dependencyImportPaths) {\n      // We are missing an import path. We need to add this entry to the exports map in package settings.\n      if (!flattenedExports[dependencyImportPath]) {\n        generatedPackageSettings ??= getPackageSettings({\n          config: { generated: { packageSettings } },\n          name,\n          version,\n          firstMatch: true,\n        }).generatedPackageSettings;\n\n        if (!generatedPackageSettings) {\n          generatedPackageSettings = {\n            match: {\n              name,\n              version: `^${version}`,\n            },\n            exports: {},\n          };\n          packageSettings.push(generatedPackageSettings);\n        }\n\n        generatedPackageSettings.exports ??= {};\n\n        const addedEntry = await addExportsMapEntry(\n          {\n            exports: generatedPackageSettings.exports,\n            packagePath: dependencyPath,\n            importPath: dependencyImportPath,\n          },\n          {\n            packages,\n          },\n        );\n\n        if (!addedEntry) {\n          const errorMessage = `Imported \"${cyan(\n            dependencyImportPath.replace('.', dependencyName),\n          )}\" but a corresponding file couldn't be found. Either correct the import or adjust the \"${cyan(\n            dependencyName,\n          )}\" package version to one that supports this import path.\\n${bulletedList(\n            [`${cyan(displayName)}: ${packagePath}`, `${cyan(dependencyName)}: ${dependencyPath}`],\n            2,\n          )}`;\n          console.error(errorMessage);\n          errors.push(errorMessage);\n\n          continue;\n        } else {\n          changes.push({\n            name: dependencyName,\n            version: dependencyDefinition.version || '',\n            path: dependencyPath,\n            changes: [\n              {\n                type: 'added-export',\n                change: dependencyImportPath,\n                reason: `Imported by \"${displayName}\"`,\n              },\n            ],\n          });\n        }\n\n        generatedPackageSettings.exports = alphabetizeObject<PackageJsonExportsObject>(\n          generatedPackageSettings.exports as PackageJsonExportsObject,\n        );\n\n        // Since we've found a missing exports, we need to re-enqueue the dependency for evaluation.\n        packagePathsToEvaluate.add(dependencyPath);\n        evaluatedPackages.delete(dependencyPath);\n      }\n    }\n  }\n\n  return { changes, errors };\n}\n\n/** Quick helper to alphabetize the exports. */\nfunction alphabetizeObject<T extends { [key: string]: unknown }>(obj: T): T {\n  const sortedKeys = Object.keys(obj).sort();\n  const alphabetizedObj: { [key: string]: unknown } = {};\n\n  for (const key of sortedKeys) {\n    alphabetizedObj[key] = obj[key];\n  }\n\n  return alphabetizedObj as T;\n}\n"]}

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

@@ -0,0 +1,7 @@
+import type { InitOptions } from './types/InitOptions.js';
+import type { InitSummary } from './types/InitSummary.js';
+/**
+ * Given an init summary and init options, returns a formatted string message to display to the user via console.
+ */
+export declare function formatInitSummary(summary: InitSummary, options?: InitOptions): string;
+//# sourceMappingURL=formatInitSummary.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"formatInitSummary.d.ts","sourceRoot":"","sources":["../../../src/commands/init/formatInitSummary.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,UAyF5E"}

package/lib/commands/init/formatInitSummary.js

@@ -0,0 +1,77 @@
+import { slash } from '@ms-cloudpack/path-string-parsing';
+import { bold, bulletedList, cyan, green, lightCyan, plural, red, yellow } from '@ms-cloudpack/task-reporter';
+import path from 'path';
+/**
+ * Given an init summary and init options, returns a formatted string message to display to the user via console.
+ */
+export function formatInitSummary(summary, options) {
+    const { totalPackages, totalErrors, totalWarnings, totalChanges, packagesWithErrors, packagesWithWarnings, generatedFileUpdates, } = summary;
+    const { check } = options || {};
+    const summaryString = [];
+    // Report the "Summary" title if no errors or warnings are listed (seems redundant otherwise.
+    if (!packagesWithErrors.length && !packagesWithWarnings.length) {
+        summaryString.push('Summary:\n');
+    }
+    // Report work done to the generated file.
+    if (!packagesWithErrors.length && generatedFileUpdates.length) {
+        summaryString.push(`${plural(totalChanges, 'change')} ${check ? 'needed for' : 'made to'} ${cyan(`cloudpack.generated.json`)}:\n`);
+        for (const packageUpdates of generatedFileUpdates) {
+            const exportsUpdates = packageUpdates.changes.filter((u) => u.type === 'added-export');
+            if (exportsUpdates.length) {
+                summaryString.push(`${formatPackageName(packageUpdates)} - ${yellow(plural(exportsUpdates.length, 'path'))} missing from exports map`);
+                summaryString.push(bulletedList(exportsUpdates.map((u) => `${cyan(u.change)}${u.reason ? ` - ${u.reason}` : ``}`)), '');
+            }
+        }
+    }
+    // Report packages with warnings.
+    if (packagesWithWarnings.length) {
+        summaryString.push(`${plural(packagesWithWarnings.length, 'package')} with ${yellow('warnings')}:\n`);
+        for (const packageWithWarnings of packagesWithWarnings) {
+            summaryString.push(`${formatPackageName(packageWithWarnings)} - ${yellow(plural(packageWithWarnings.warnings.length, 'warning'))}, ${packageWithWarnings.path}:`);
+            summaryString.push(formatBundleMessages(packageWithWarnings, false), '');
+        }
+    }
+    // Report packages with errors.
+    if (packagesWithErrors.length) {
+        summaryString.push(`${plural(packagesWithErrors.length, 'package')} ${red('failed')}:\n`);
+        for (const packageWithErrors of packagesWithErrors) {
+            summaryString.push(`${formatPackageName(packageWithErrors)} - ${red(plural(packageWithErrors.errors.length, 'error'))}, ${packageWithErrors.path}:`);
+            summaryString.push(formatBundleMessages(packageWithErrors, true), '');
+        }
+    }
+    const generatedUpdateCount = (check && !!generatedFileUpdates.length) || 0;
+    const blockingIssueCount = packagesWithErrors.length || generatedUpdateCount;
+    // Add summary.
+    summaryString.push(`${cyan(plural(totalPackages, 'package'))} evaluated, ${blockingIssueCount
+        ? `${blockingIssueCount} with ${red('blocking issues')}`
+        : `${green('no blocking issues found')}`}. (Total: ${plural(totalErrors, 'error')}, ${plural(totalWarnings, 'warning')})`, '');
+    if (generatedUpdateCount) {
+        summaryString.push(`Run "${yellow('cloudpack init')}" in your application folder to apply changes to the ${cyan('cloudpack.generated.json')} file.`);
+    }
+    return summaryString.filter((a) => a !== undefined).join('\n');
+}
+/** Helper to format bundle messages. */
+function formatBundleMessages(result, formatErrors) {
+    const messages = [];
+    const unformattedMessages = (formatErrors ? result.errors : result.warnings) || [];
+    for (const message of unformattedMessages) {
+        const { location, text } = message;
+        if (!location?.file) {
+            messages.push(text);
+        }
+        else {
+            const relativeFilePath = cyan(slash(path.relative(result.path, location.file)));
+            const characterLocation = location.line !== undefined && location.column !== undefined
+                ? yellow(`:${location.line}:${location.column}`)
+                : ``;
+            messages.push(`${relativeFilePath}${characterLocation} - ${text}`);
+        }
+    }
+    return messages.length ? bulletedList(messages) : undefined;
+}
+/** Helper to format package names. */
+function formatPackageName(packageIdentifier) {
+    const { name, version } = packageIdentifier;
+    return bold(lightCyan(`${name}@${version || `<no-version>`}`));
+}
+//# sourceMappingURL=formatInitSummary.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"formatInitSummary.js","sourceRoot":"","sources":["../../../src/commands/init/formatInitSummary.ts"],"names":[],"mappings":"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","sourcesContent":["import { slash } from '@ms-cloudpack/path-string-parsing';\nimport { bold, bulletedList, cyan, green, lightCyan, plural, red, yellow } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitPackageIdentifier } from './types/InitPackageIdentifier.js';\nimport type { InitPackageResult } from './types/InitPackageResult.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\n/**\n * Given an init summary and init options, returns a formatted string message to display to the user via console.\n */\nexport function formatInitSummary(summary: InitSummary, options?: InitOptions) {\n  const {\n    totalPackages,\n    totalErrors,\n    totalWarnings,\n    totalChanges,\n    packagesWithErrors,\n    packagesWithWarnings,\n    generatedFileUpdates,\n  } = summary;\n  const { check } = options || {};\n  const summaryString: (string | undefined)[] = [];\n\n  // Report the \"Summary\" title if no errors or warnings are listed (seems redundant otherwise.\n  if (!packagesWithErrors.length && !packagesWithWarnings.length) {\n    summaryString.push('Summary:\\n');\n  }\n\n  // Report work done to the generated file.\n  if (!packagesWithErrors.length && generatedFileUpdates.length) {\n    summaryString.push(\n      `${plural(totalChanges, 'change')} ${check ? 'needed for' : 'made to'} ${cyan(`cloudpack.generated.json`)}:\\n`,\n    );\n\n    for (const packageUpdates of generatedFileUpdates) {\n      const exportsUpdates = packageUpdates.changes.filter((u) => u.type === 'added-export');\n\n      if (exportsUpdates.length) {\n        summaryString.push(\n          `${formatPackageName(packageUpdates)} - ${yellow(\n            plural(exportsUpdates.length, 'path'),\n          )} missing from exports map`,\n        );\n        summaryString.push(\n          bulletedList(exportsUpdates.map((u) => `${cyan(u.change)}${u.reason ? ` - ${u.reason}` : ``}`)),\n          '',\n        );\n      }\n    }\n  }\n\n  // Report packages with warnings.\n  if (packagesWithWarnings.length) {\n    summaryString.push(`${plural(packagesWithWarnings.length, 'package')} with ${yellow('warnings')}:\\n`);\n    for (const packageWithWarnings of packagesWithWarnings) {\n      summaryString.push(\n        `${formatPackageName(packageWithWarnings)} - ${yellow(\n          plural(packageWithWarnings.warnings.length, 'warning'),\n        )}, ${packageWithWarnings.path}:`,\n      );\n      summaryString.push(formatBundleMessages(packageWithWarnings as InitPackageResult, false), '');\n    }\n  }\n\n  // Report packages with errors.\n  if (packagesWithErrors.length) {\n    summaryString.push(`${plural(packagesWithErrors.length, 'package')} ${red('failed')}:\\n`);\n    for (const packageWithErrors of packagesWithErrors) {\n      summaryString.push(\n        `${formatPackageName(packageWithErrors)} - ${red(plural(packageWithErrors.errors.length, 'error'))}, ${\n          packageWithErrors.path\n        }:`,\n      );\n      summaryString.push(formatBundleMessages(packageWithErrors as InitPackageResult, true), '');\n    }\n  }\n\n  const generatedUpdateCount = (check && !!generatedFileUpdates.length) || 0;\n  const blockingIssueCount = packagesWithErrors.length || generatedUpdateCount;\n\n  // Add summary.\n  summaryString.push(\n    `${cyan(plural(totalPackages, 'package'))} evaluated, ${\n      blockingIssueCount\n        ? `${blockingIssueCount} with ${red('blocking issues')}`\n        : `${green('no blocking issues found')}`\n    }. (Total: ${plural(totalErrors, 'error')}, ${plural(totalWarnings, 'warning')})`,\n    '',\n  );\n\n  if (generatedUpdateCount) {\n    summaryString.push(\n      `Run \"${yellow('cloudpack init')}\" in your application folder to apply changes to the ${cyan(\n        'cloudpack.generated.json',\n      )} file.`,\n    );\n  }\n\n  return summaryString.filter((a) => a !== undefined).join('\\n');\n}\n\n/** Helper to format bundle messages. */\nfunction formatBundleMessages(result: InitPackageResult, formatErrors: boolean) {\n  const messages: string[] = [];\n  const unformattedMessages = (formatErrors ? result.errors : result.warnings) || [];\n\n  for (const message of unformattedMessages) {\n    const { location, text } = message;\n\n    if (!location?.file) {\n      messages.push(text);\n    } else {\n      const relativeFilePath = cyan(slash(path.relative(result.path, location.file)));\n      const characterLocation =\n        location.line !== undefined && location.column !== undefined\n          ? yellow(`:${location.line}:${location.column}`)\n          : ``;\n\n      messages.push(`${relativeFilePath}${characterLocation} - ${text}`);\n    }\n  }\n\n  return messages.length ? bulletedList(messages) : undefined;\n}\n\n/** Helper to format package names. */\nfunction formatPackageName(packageIdentifier: InitPackageIdentifier) {\n  const { name, version } = packageIdentifier;\n\n  return bold(lightCyan(`${name}@${version || `<no-version>`}`));\n}\n"]}

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

@@ -1,15 +1,11 @@
-import type { InitOptions } from './types/InitOptions.js';
 import type { TaskContext } from '../../types/TaskContext.js';
+import type { InitOptions } from './types/InitOptions.js';
+import type { InitSummary } from './types/InitSummary.js';
 /** Given the path, updates the Cloudpack config with overrides and project settings. */
 export declare function init(options: InitOptions, context: TaskContext): Promise<void>;
 /**
  * Actual init operation (minus the completion logging).
  * Exported for testing only.
  */
-export declare function initInternal(options: InitOptions, context: TaskContext): Promise<{
-    changeCount: number;
-    errorPkgCount: number;
-    warningPkgCount: number;
-    successPkgCount: number;
-}>;
+export declare function initInternal(options: InitOptions, context: TaskContext): Promise<InitSummary>;
 //# sourceMappingURL=init.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D,wFAAwF;AACxF,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA0CpF;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC;IACT,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC,CA0HD"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAW1D,wFAAwF;AACxF,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBpF;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAiHnG"}

package/lib/commands/init/init.js

@@ -1,46 +1,26 @@
-import { createPackageDefinitions, generatedConfigFileName, readConfig, userConfigFileName, writeGeneratedConfig, } from '@ms-cloudpack/config';
-import { plural, red, yellow } from '@ms-cloudpack/task-reporter';
+import { createPackageDefinitions, readConfig, writeGeneratedConfig } from '@ms-cloudpack/config';
 import { rootSpan, stopTelemetry } from '../../initTelemetry.js';
+import { setupReporting } from '../../setupReporting.js';
 import { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';
-import { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';
 import { bundleAndGetImports } from './bundleAndGetImports.js';
-import { setupReporting } from '../../setupReporting.js';
+import { InitSummaryData } from './InitSummaryData.js';
+import { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';
+import { formatInitSummary } from './formatInitSummary.js';
 /** Given the path, updates the Cloudpack config with overrides and project settings. */
 export async function init(options, context) {
     const { reporter } = context;
-    await setupReporting(context);
-    let completeReason;
     let hasErrors = false;
-    let hasWarnings = false;
+    await setupReporting(context);
     try {
-        const { changeCount, errorPkgCount, warningPkgCount, successPkgCount } = await initInternal(options, context);
-        hasErrors = errorPkgCount > 0;
-        hasWarnings = warningPkgCount > 0;
-        const totalCount = errorPkgCount + successPkgCount;
-        if (hasErrors || hasWarnings) {
-            const successPct = ((successPkgCount / totalCount) * 100).toFixed(1);
-            completeReason =
-                [
-                    `${successPkgCount}/${totalCount} (${successPct}%) packages bundled successfully`,
-                    hasErrors && `${errorPkgCount} packages with errors`,
-                    hasWarnings && `${warningPkgCount} packages with warnings`,
-                ]
-                    .filter(Boolean)
-                    .join('\n') + '\n';
-        }
-        else {
-            completeReason = `All ${totalCount} packages bundled successfully`;
-        }
-        if (changeCount) {
-            completeReason += `\n\nUpdated "${userConfigFileName}" with ${plural(changeCount, 'change')}.`;
-        }
+        const summary = await initInternal(options, context);
+        reporter.complete(formatInitSummary(summary, options));
+        hasErrors = summary.totalErrors > 0;
     }
     catch (error) {
+        reporter.complete(`Unexpected error: ${error.stack || error}`);
         hasErrors = true;
-        completeReason = `Unexpected error: ${error.stack || error}`;
     }
     await stopTelemetry();
-    reporter.complete(hasErrors ? red(completeReason) : hasWarnings ? yellow(completeReason) : completeReason);
     process.exit(hasErrors ? 1 : 0);
 }
 /**
@@ -49,6 +29,7 @@ export async function init(options, context) {
  */
 export async function initInternal(options, context) {
     const { appPath, reporter } = context;
+    const summaryData = new InitSummaryData();
     if (options.check && options.reset) {
         throw Error('Cannot use --check and --reset together.');
     }
@@ -67,10 +48,7 @@ export async function initInternal(options, context) {
     }
     const packagePathsToEvaluate = new Set([appPath]);
     const evaluatedPackages = new Set();
-    let changeCount = 0;
-    let errorPkgCount = 0;
-    let warningPkgCount = 0;
-    let successPkgCount = 0;
+    let totalChangeCount = 0;
     while (packagePathsToEvaluate.size) {
         const packagePath = packagePathsToEvaluate.values().next().value;
         packagePathsToEvaluate.delete(packagePath);
@@ -83,64 +61,61 @@ export async function initInternal(options, context) {
         if (!definition) {
             // This is very weird and probably won't happen.
             console.error(`Skipping ${packagePath} evaluation because the package.json was not found or not readable.`);
-            errorPkgCount++;
             continue;
         }
         // Bundle the package and find the imports it depends on.
-        const bundleResult = await bundleAndGetImports({ packagePath, definition, packages, reporter, config });
-        if (!bundleResult.imports?.size) {
-            if (bundleResult.hasErrors) {
-                errorPkgCount++;
-            }
-            else {
-                successPkgCount++;
-            }
-            if (bundleResult.hasWarnings) {
-                warningPkgCount++;
-            }
-            continue;
-        }
-        // Given the package imports, find the missing exports maps and update packageOverrides.
-        const overridesResult = await evaluateImportsForOverrides({
+        const { errors, warnings, imports } = await bundleAndGetImports({
+            packagePath,
             definition,
             packages,
-            packagePathsToEvaluate,
-            evaluatedPackages,
-            imports: bundleResult.imports,
-            generatedConfig,
-            resolveMap,
+            reporter,
+            config,
         });
-        if (options.check && (overridesResult.changeCount || overridesResult.errors.length)) {
-            rootSpan?.addEvent('INIT_CHECK_FAILED', {
-                reason: overridesResult.changeCount ? 'Config needs to be updated.' : overridesResult.errors,
+        // Record the results for the summary.
+        const resultIdentifier = {
+            name: definition.name || '',
+            version: definition.version || '',
+            path: packagePath,
+        };
+        summaryData.recordResult({
+            ...resultIdentifier,
+            errors,
+            warnings,
+        });
+        // If no errors came from the bundle attempt, move on to evaluating the imports.
+        if (errors.length === 0) {
+            // Given the package imports, find the missing exports maps and update packageOverrides.
+            const { changes, errors: evalErrors } = await evaluateImportsForOverrides({
+                definition,
+                packagePath,
+                packages,
+                packagePathsToEvaluate,
+                evaluatedPackages,
+                imports,
+                generatedConfig,
+                resolveMap,
             });
-            throw Error(overridesResult.changeCount
-                ? 'Run "cloudpack init --reset" to update the config.'
-                : overridesResult.errors.map((e) => e).join('\n'));
-        }
-        changeCount += overridesResult.changeCount;
-        if (bundleResult.hasErrors || overridesResult.errors.length) {
-            errorPkgCount++;
-        }
-        else {
-            successPkgCount++;
-        }
-        if (bundleResult.hasWarnings) {
-            warningPkgCount++;
+            if (evalErrors.length) {
+                summaryData.recordResult({
+                    ...resultIdentifier,
+                    errors: evalErrors.map((text) => ({ text })),
+                });
+            }
+            else {
+                summaryData.recordGeneratedChanges(changes);
+            }
+            if (options.check && (changes.length || evalErrors.length)) {
+                rootSpan?.addEvent('INIT_CHECK_FAILED', {
+                    reason: changes.length ? 'Config needs to be updated.' : evalErrors,
+                });
+                return summaryData.summarize();
+            }
+            totalChangeCount += changes.length;
         }
     }
-    if (changeCount) {
-        // Log the results to a file.
-        console.log(`Writing updates to "${generatedConfigFileName}". If you're in a git repo, this file should be committed with your project.`);
-        if (generatedConfig.packageSettings?.length) {
-            await writeGeneratedConfig(generatedConfig, appPath);
-        }
+    if (totalChangeCount && generatedConfig.packageSettings?.length) {
+        await writeGeneratedConfig(generatedConfig, appPath);
     }
-    return {
-        changeCount,
-        errorPkgCount,
-        warningPkgCount,
-        successPkgCount,
-    };
+    return summaryData.summarize();
 }
 //# sourceMappingURL=init.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,UAAU,EACV,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,wFAAwF;AACxF,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,OAAoB,EAAE,OAAoB;IACnE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;IAE9B,IAAI,cAAkC,CAAC;IACvC,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,IAAI;QACF,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE9G,SAAS,GAAG,aAAa,GAAG,CAAC,CAAC;QAC9B,WAAW,GAAG,eAAe,GAAG,CAAC,CAAC;QAElC,MAAM,UAAU,GAAG,aAAa,GAAG,eAAe,CAAC;QAEnD,IAAI,SAAS,IAAI,WAAW,EAAE;YAC5B,MAAM,UAAU,GAAG,CAAC,CAAC,eAAe,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACrE,cAAc;gBACZ;oBACE,GAAG,eAAe,IAAI,UAAU,KAAK,UAAU,kCAAkC;oBACjF,SAAS,IAAI,GAAG,aAAa,uBAAuB;oBACpD,WAAW,IAAI,GAAG,eAAe,yBAAyB;iBAC3D;qBACE,MAAM,CAAC,OAAO,CAAC;qBACf,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;SACxB;aAAM;YACL,cAAc,GAAG,OAAO,UAAU,gCAAgC,CAAC;SACpE;QAED,IAAI,WAAW,EAAE;YACf,cAAc,IAAI,gBAAgB,kBAAkB,UAAU,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC;SAChG;KACF;IAAC,OAAO,KAAK,EAAE;QACd,SAAS,GAAG,IAAI,CAAC;QACjB,cAAc,GAAG,qBAAsB,KAAe,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;KACzE;IAED,MAAM,aAAa,EAAE,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;IAE3G,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAoB,EACpB,OAAoB;IAOpB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAEtC,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,EAAE;QAClC,MAAM,KAAK,CAAC,0CAA0C,CAAC,CAAC;KACzD;IAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;IAEzC,sDAAsD;IACtD,IAAI,OAAO,CAAC,KAAK,EAAE;QACjB,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;KACvB;IAED,MAAM,QAAQ,GAAG,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACtD,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC;IAEzC,eAAe,CAAC,eAAe,KAAK,EAAE,CAAC;IAEvC,+BAA+B;IAC/B,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtF,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;KACnD;IAED,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5C,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,eAAe,GAAG,CAAC,CAAC;IACxB,IAAI,eAAe,GAAG,CAAC,CAAC;IAExB,OAAO,sBAAsB,CAAC,IAAI,EAAE;QAClC,MAAM,WAAW,GAAG,sBAAsB,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAe,CAAC;QAE3E,sBAAsB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAE3C,iCAAiC;QACjC,IAAI,CAAC,WAAW,IAAI,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACtD,SAAS;SACV;QAED,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEnC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtE,IAAI,CAAC,UAAU,EAAE;YACf,gDAAgD;YAChD,OAAO,CAAC,KAAK,CAAC,YAAY,WAAW,qEAAqE,CAAC,CAAC;YAC5G,aAAa,EAAE,CAAC;YAChB,SAAS;SACV;QAED,yDAAyD;QACzD,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAExG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE;YAC/B,IAAI,YAAY,CAAC,SAAS,EAAE;gBAC1B,aAAa,EAAE,CAAC;aACjB;iBAAM;gBACL,eAAe,EAAE,CAAC;aACnB;YAED,IAAI,YAAY,CAAC,WAAW,EAAE;gBAC5B,eAAe,EAAE,CAAC;aACnB;YAED,SAAS;SACV;QAED,wFAAwF;QACxF,MAAM,eAAe,GAAG,MAAM,2BAA2B,CAAC;YACxD,UAAU;YACV,QAAQ;YACR,sBAAsB;YACtB,iBAAiB;YACjB,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,eAAe;YACf,UAAU;SACX,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,KAAK,IAAI,CAAC,eAAe,CAAC,WAAW,IAAI,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACnF,QAAQ,EAAE,QAAQ,CAAC,mBAAmB,EAAE;gBACtC,MAAM,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM;aAC7F,CAAC,CAAC;YACH,MAAM,KAAK,CACT,eAAe,CAAC,WAAW;gBACzB,CAAC,CAAC,oDAAoD;gBACtD,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CACpD,CAAC;SACH;QAED,WAAW,IAAI,eAAe,CAAC,WAAW,CAAC;QAE3C,IAAI,YAAY,CAAC,SAAS,IAAI,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE;YAC3D,aAAa,EAAE,CAAC;SACjB;aAAM;YACL,eAAe,EAAE,CAAC;SACnB;QACD,IAAI,YAAY,CAAC,WAAW,EAAE;YAC5B,eAAe,EAAE,CAAC;SACnB;KACF;IAED,IAAI,WAAW,EAAE;QACf,6BAA6B;QAC7B,OAAO,CAAC,GAAG,CACT,uBAAuB,uBAAuB,8EAA8E,CAC7H,CAAC;QAEF,IAAI,eAAe,CAAC,eAAe,EAAE,MAAM,EAAE;YAC3C,MAAM,oBAAoB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;SACtD;KACF;IAED,OAAO;QACL,WAAW;QACX,aAAa;QACb,eAAe;QACf,eAAe;KAChB,CAAC;AACJ,CAAC","sourcesContent":["import {\n  createPackageDefinitions,\n  generatedConfigFileName,\n  readConfig,\n  userConfigFileName,\n  writeGeneratedConfig,\n} from '@ms-cloudpack/config';\nimport { plural, red, yellow } from '@ms-cloudpack/task-reporter';\nimport { rootSpan, stopTelemetry } from '../../initTelemetry.js';\nimport { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { bundleAndGetImports } from './bundleAndGetImports.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport { setupReporting } from '../../setupReporting.js';\n\n/** Given the path, updates the Cloudpack config with overrides and project settings. */\nexport async function init(options: InitOptions, context: TaskContext): Promise<void> {\n  const { reporter } = context;\n\n  await setupReporting(context);\n\n  let completeReason: string | undefined;\n  let hasErrors = false;\n  let hasWarnings = false;\n  try {\n    const { changeCount, errorPkgCount, warningPkgCount, successPkgCount } = await initInternal(options, context);\n\n    hasErrors = errorPkgCount > 0;\n    hasWarnings = warningPkgCount > 0;\n\n    const totalCount = errorPkgCount + successPkgCount;\n\n    if (hasErrors || hasWarnings) {\n      const successPct = ((successPkgCount / totalCount) * 100).toFixed(1);\n      completeReason =\n        [\n          `${successPkgCount}/${totalCount} (${successPct}%) packages bundled successfully`,\n          hasErrors && `${errorPkgCount} packages with errors`,\n          hasWarnings && `${warningPkgCount} packages with warnings`,\n        ]\n          .filter(Boolean)\n          .join('\\n') + '\\n';\n    } else {\n      completeReason = `All ${totalCount} packages bundled successfully`;\n    }\n\n    if (changeCount) {\n      completeReason += `\\n\\nUpdated \"${userConfigFileName}\" with ${plural(changeCount, 'change')}.`;\n    }\n  } catch (error) {\n    hasErrors = true;\n    completeReason = `Unexpected error: ${(error as Error).stack || error}`;\n  }\n\n  await stopTelemetry();\n  reporter.complete(hasErrors ? red(completeReason) : hasWarnings ? yellow(completeReason) : completeReason);\n\n  process.exit(hasErrors ? 1 : 0);\n}\n\n/**\n * Actual init operation (minus the completion logging).\n * Exported for testing only.\n */\nexport async function initInternal(\n  options: InitOptions,\n  context: TaskContext,\n): Promise<{\n  changeCount: number;\n  errorPkgCount: number;\n  warningPkgCount: number;\n  successPkgCount: number;\n}> {\n  const { appPath, reporter } = context;\n\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  const config = await readConfig(appPath);\n\n  // If --reset is specified we ignore generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const packages = createPackageDefinitions({ config });\n  const generatedConfig = config.generated;\n\n  generatedConfig.packageSettings ??= [];\n\n  // Try to resolve dependencies.\n  const resolveMap = await resolveDependenciesTask({ appPath }, { packages, reporter });\n\n  if (!resolveMap) {\n    throw new Error(\"Couldn't resolve dependencies.\");\n  }\n\n  const packagePathsToEvaluate = new Set<string>([appPath]);\n  const evaluatedPackages = new Set<string>();\n  let changeCount = 0;\n  let errorPkgCount = 0;\n  let warningPkgCount = 0;\n  let successPkgCount = 0;\n\n  while (packagePathsToEvaluate.size) {\n    const packagePath = packagePathsToEvaluate.values().next().value as string;\n\n    packagePathsToEvaluate.delete(packagePath);\n\n    // Skip already-visited packages.\n    if (!packagePath || evaluatedPackages.has(packagePath)) {\n      continue;\n    }\n\n    evaluatedPackages.add(packagePath);\n\n    const definition = await packages.get(packagePath, { refresh: true });\n\n    if (!definition) {\n      // This is very weird and probably won't happen.\n      console.error(`Skipping ${packagePath} evaluation because the package.json was not found or not readable.`);\n      errorPkgCount++;\n      continue;\n    }\n\n    // Bundle the package and find the imports it depends on.\n    const bundleResult = await bundleAndGetImports({ packagePath, definition, packages, reporter, config });\n\n    if (!bundleResult.imports?.size) {\n      if (bundleResult.hasErrors) {\n        errorPkgCount++;\n      } else {\n        successPkgCount++;\n      }\n\n      if (bundleResult.hasWarnings) {\n        warningPkgCount++;\n      }\n\n      continue;\n    }\n\n    // Given the package imports, find the missing exports maps and update packageOverrides.\n    const overridesResult = await evaluateImportsForOverrides({\n      definition,\n      packages,\n      packagePathsToEvaluate,\n      evaluatedPackages,\n      imports: bundleResult.imports,\n      generatedConfig,\n      resolveMap,\n    });\n\n    if (options.check && (overridesResult.changeCount || overridesResult.errors.length)) {\n      rootSpan?.addEvent('INIT_CHECK_FAILED', {\n        reason: overridesResult.changeCount ? 'Config needs to be updated.' : overridesResult.errors,\n      });\n      throw Error(\n        overridesResult.changeCount\n          ? 'Run \"cloudpack init --reset\" to update the config.'\n          : overridesResult.errors.map((e) => e).join('\\n'),\n      );\n    }\n\n    changeCount += overridesResult.changeCount;\n\n    if (bundleResult.hasErrors || overridesResult.errors.length) {\n      errorPkgCount++;\n    } else {\n      successPkgCount++;\n    }\n    if (bundleResult.hasWarnings) {\n      warningPkgCount++;\n    }\n  }\n\n  if (changeCount) {\n    // Log the results to a file.\n    console.log(\n      `Writing updates to \"${generatedConfigFileName}\". If you're in a git repo, this file should be committed with your project.`,\n    );\n\n    if (generatedConfig.packageSettings?.length) {\n      await writeGeneratedConfig(generatedConfig, appPath);\n    }\n  }\n\n  return {\n    changeCount,\n    errorPkgCount,\n    warningPkgCount,\n    successPkgCount,\n  };\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TaskContext } from '../../types/TaskContext.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPackageDefinitions, readConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { rootSpan, stopTelemetry } from '../../initTelemetry.js';\nimport { setupReporting } from '../../setupReporting.js';\nimport { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';\nimport { bundleAndGetImports } from './bundleAndGetImports.js';\nimport { InitSummaryData } from './InitSummaryData.js';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { formatInitSummary } from './formatInitSummary.js';\n\n/** Given the path, updates the Cloudpack config with overrides and project settings. */\nexport async function init(options: InitOptions, context: TaskContext): Promise<void> {\n  const { reporter } = context;\n  let hasErrors = false;\n\n  await setupReporting(context);\n\n  try {\n    const summary = await initInternal(options, context);\n\n    reporter.complete(formatInitSummary(summary, options));\n    hasErrors = summary.totalErrors > 0;\n  } catch (error) {\n    reporter.complete(`Unexpected error: ${(error as Error).stack || error}`);\n    hasErrors = true;\n  }\n\n  await stopTelemetry();\n\n  process.exit(hasErrors ? 1 : 0);\n}\n\n/**\n * Actual init operation (minus the completion logging).\n * Exported for testing only.\n */\nexport async function initInternal(options: InitOptions, context: TaskContext): Promise<InitSummary> {\n  const { appPath, reporter } = context;\n  const summaryData = new InitSummaryData();\n\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  const config = await readConfig(appPath);\n\n  // If --reset is specified we ignore generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const packages = createPackageDefinitions({ config });\n  const generatedConfig = config.generated;\n\n  generatedConfig.packageSettings ??= [];\n\n  // Try to resolve dependencies.\n  const resolveMap = await resolveDependenciesTask({ appPath }, { packages, reporter });\n\n  if (!resolveMap) {\n    throw new Error(\"Couldn't resolve dependencies.\");\n  }\n\n  const packagePathsToEvaluate = new Set<string>([appPath]);\n  const evaluatedPackages = new Set<string>();\n  let totalChangeCount = 0;\n\n  while (packagePathsToEvaluate.size) {\n    const packagePath = packagePathsToEvaluate.values().next().value as string;\n\n    packagePathsToEvaluate.delete(packagePath);\n\n    // Skip already-visited packages.\n    if (!packagePath || evaluatedPackages.has(packagePath)) {\n      continue;\n    }\n\n    evaluatedPackages.add(packagePath);\n\n    const definition = await packages.get(packagePath, { refresh: true });\n\n    if (!definition) {\n      // This is very weird and probably won't happen.\n      console.error(`Skipping ${packagePath} evaluation because the package.json was not found or not readable.`);\n      continue;\n    }\n\n    // Bundle the package and find the imports it depends on.\n    const { errors, warnings, imports } = await bundleAndGetImports({\n      packagePath,\n      definition,\n      packages,\n      reporter,\n      config,\n    });\n\n    // Record the results for the summary.\n    const resultIdentifier = {\n      name: definition.name || '',\n      version: definition.version || '',\n      path: packagePath,\n    };\n\n    summaryData.recordResult({\n      ...resultIdentifier,\n      errors,\n      warnings,\n    });\n\n    // If no errors came from the bundle attempt, move on to evaluating the imports.\n    if (errors.length === 0) {\n      // Given the package imports, find the missing exports maps and update packageOverrides.\n      const { changes, errors: evalErrors } = await evaluateImportsForOverrides({\n        definition,\n        packagePath,\n        packages,\n        packagePathsToEvaluate,\n        evaluatedPackages,\n        imports,\n        generatedConfig,\n        resolveMap,\n      });\n\n      if (evalErrors.length) {\n        summaryData.recordResult({\n          ...resultIdentifier,\n          errors: evalErrors.map((text) => ({ text })),\n        });\n      } else {\n        summaryData.recordGeneratedChanges(changes);\n      }\n\n      if (options.check && (changes.length || evalErrors.length)) {\n        rootSpan?.addEvent('INIT_CHECK_FAILED', {\n          reason: changes.length ? 'Config needs to be updated.' : evalErrors,\n        });\n\n        return summaryData.summarize();\n      }\n\n      totalChangeCount += changes.length;\n    }\n  }\n\n  if (totalChangeCount && generatedConfig.packageSettings?.length) {\n    await writeGeneratedConfig(generatedConfig, appPath);\n  }\n\n  return summaryData.summarize();\n}\n"]}

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

@@ -0,0 +1,6 @@
+export interface GeneratedChange {
+    type: 'added-export' | 'included-dependency' | 'excluded-dependency';
+    change: string;
+    reason?: string;
+}
+//# sourceMappingURL=GeneratedChange.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GeneratedChange.d.ts","sourceRoot":"","sources":["../../../../src/commands/init/types/GeneratedChange.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,cAAc,GAAG,qBAAqB,GAAG,qBAAqB,CAAC;IACrE,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}

package/lib/commands/init/types/GeneratedChange.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=GeneratedChange.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GeneratedChange.js","sourceRoot":"","sources":["../../../../src/commands/init/types/GeneratedChange.ts"],"names":[],"mappings":"","sourcesContent":["export interface GeneratedChange {\n  type: 'added-export' | 'included-dependency' | 'excluded-dependency';\n  change: string;\n  reason?: string;\n}\n"]}

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

@@ -0,0 +1,6 @@
+import type { InitPackageIdentifier } from './InitPackageIdentifier.js';
+import type { GeneratedChange } from './GeneratedChange.js';
+export interface GeneratedPackageChanges extends InitPackageIdentifier {
+    changes: GeneratedChange[];
+}
+//# sourceMappingURL=GeneratedPackageChanges.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GeneratedPackageChanges.d.ts","sourceRoot":"","sources":["../../../../src/commands/init/types/GeneratedPackageChanges.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,WAAW,uBAAwB,SAAQ,qBAAqB;IACpE,OAAO,EAAE,eAAe,EAAE,CAAC;CAC5B"}

package/lib/commands/init/types/GeneratedPackageChanges.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=GeneratedPackageChanges.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GeneratedPackageChanges.js","sourceRoot":"","sources":["../../../../src/commands/init/types/GeneratedPackageChanges.ts"],"names":[],"mappings":"","sourcesContent":["import type { InitPackageIdentifier } from './InitPackageIdentifier.js';\nimport type { GeneratedChange } from './GeneratedChange.js';\n\nexport interface GeneratedPackageChanges extends InitPackageIdentifier {\n  changes: GeneratedChange[];\n}\n"]}

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

@@ -0,0 +1,6 @@
+export interface InitPackageIdentifier {
+    name: string;
+    version: string;
+    path: string;
+}
+//# sourceMappingURL=InitPackageIdentifier.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitPackageIdentifier.d.ts","sourceRoot":"","sources":["../../../../src/commands/init/types/InitPackageIdentifier.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd"}

package/lib/commands/init/types/InitPackageIdentifier.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=InitPackageIdentifier.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitPackageIdentifier.js","sourceRoot":"","sources":["../../../../src/commands/init/types/InitPackageIdentifier.ts"],"names":[],"mappings":"","sourcesContent":["export interface InitPackageIdentifier {\n  name: string;\n  version: string;\n  path: string;\n}\n"]}

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

@@ -0,0 +1,7 @@
+import type { BundleMessage } from '@ms-cloudpack/bundler-types';
+import type { InitPackageIdentifier } from './InitPackageIdentifier.js';
+export interface InitPackageResult extends InitPackageIdentifier {
+    errors?: BundleMessage[];
+    warnings?: BundleMessage[];
+}
+//# sourceMappingURL=InitPackageResult.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitPackageResult.d.ts","sourceRoot":"","sources":["../../../../src/commands/init/types/InitPackageResult.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,WAAW,iBAAkB,SAAQ,qBAAqB;IAC9D,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;CAC5B"}

package/lib/commands/init/types/InitPackageResult.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=InitPackageResult.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitPackageResult.js","sourceRoot":"","sources":["../../../../src/commands/init/types/InitPackageResult.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleMessage } from '@ms-cloudpack/bundler-types';\nimport type { InitPackageIdentifier } from './InitPackageIdentifier.js';\n\nexport interface InitPackageResult extends InitPackageIdentifier {\n  errors?: BundleMessage[];\n  warnings?: BundleMessage[];\n}\n"]}

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

@@ -0,0 +1,6 @@
+import type { BundleMessage } from '@ms-cloudpack/bundler-types';
+import type { InitPackageIdentifier } from './InitPackageIdentifier.js';
+export interface InitPackageResultErrors extends InitPackageIdentifier {
+    errors: BundleMessage[];
+}
+//# sourceMappingURL=InitPackageResultErrors.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitPackageResultErrors.d.ts","sourceRoot":"","sources":["../../../../src/commands/init/types/InitPackageResultErrors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,WAAW,uBAAwB,SAAQ,qBAAqB;IACpE,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB"}

package/lib/commands/init/types/InitPackageResultErrors.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=InitPackageResultErrors.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitPackageResultErrors.js","sourceRoot":"","sources":["../../../../src/commands/init/types/InitPackageResultErrors.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleMessage } from '@ms-cloudpack/bundler-types';\nimport type { InitPackageIdentifier } from './InitPackageIdentifier.js';\n\nexport interface InitPackageResultErrors extends InitPackageIdentifier {\n  errors: BundleMessage[];\n}\n"]}

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

@@ -0,0 +1,6 @@
+import type { BundleMessage } from '@ms-cloudpack/bundler-types';
+import type { InitPackageIdentifier } from './InitPackageIdentifier.js';
+export interface InitPackageResultWarnings extends InitPackageIdentifier {
+    warnings: BundleMessage[];
+}
+//# sourceMappingURL=InitPackageResultWarnings.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitPackageResultWarnings.d.ts","sourceRoot":"","sources":["../../../../src/commands/init/types/InitPackageResultWarnings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,WAAW,yBAA0B,SAAQ,qBAAqB;IACtE,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B"}

package/lib/commands/init/types/InitPackageResultWarnings.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=InitPackageResultWarnings.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitPackageResultWarnings.js","sourceRoot":"","sources":["../../../../src/commands/init/types/InitPackageResultWarnings.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleMessage } from '@ms-cloudpack/bundler-types';\nimport type { InitPackageIdentifier } from './InitPackageIdentifier.js';\n\nexport interface InitPackageResultWarnings extends InitPackageIdentifier {\n  warnings: BundleMessage[];\n}\n"]}

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

@@ -0,0 +1,14 @@
+import type { InitPackageResultErrors } from './InitPackageResultErrors.js';
+import type { InitPackageResultWarnings } from './InitPackageResultWarnings.js';
+import type { GeneratedPackageChanges } from './GeneratedPackageChanges.js';
+export interface InitSummary {
+    totalPackages: number;
+    totalSuccess: number;
+    totalErrors: number;
+    totalWarnings: number;
+    totalChanges: number;
+    generatedFileUpdates: GeneratedPackageChanges[];
+    packagesWithErrors: InitPackageResultErrors[];
+    packagesWithWarnings: InitPackageResultWarnings[];
+}
+//# sourceMappingURL=InitSummary.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitSummary.d.ts","sourceRoot":"","sources":["../../../../src/commands/init/types/InitSummary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAE5E,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IAErB,oBAAoB,EAAE,uBAAuB,EAAE,CAAC;IAChD,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;IAC9C,oBAAoB,EAAE,yBAAyB,EAAE,CAAC;CACnD"}

package/lib/commands/init/types/InitSummary.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=InitSummary.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitSummary.js","sourceRoot":"","sources":["../../../../src/commands/init/types/InitSummary.ts"],"names":[],"mappings":"","sourcesContent":["import type { InitPackageResultErrors } from './InitPackageResultErrors.js';\nimport type { InitPackageResultWarnings } from './InitPackageResultWarnings.js';\nimport type { GeneratedPackageChanges } from './GeneratedPackageChanges.js';\n\nexport interface InitSummary {\n  totalPackages: number;\n  totalSuccess: number;\n  totalErrors: number;\n  totalWarnings: number;\n  totalChanges: number;\n\n  generatedFileUpdates: GeneratedPackageChanges[];\n  packagesWithErrors: InitPackageResultErrors[];\n  packagesWithWarnings: InitPackageResultWarnings[];\n}\n"]}

package/lib/commands/start/appServer/getHtmlResponse.js

@@ -83,9 +83,9 @@ function addScript(parentElement, url) {
         parentElement.appendChild(script);
     }
 }
-function isHtml(path) {
+function isHtml(scriptPath) {
     // path has an .htm or .html extension; case insensitive.
-    return path.toLowerCase().match(/\.htm(l)?$/) !== null;
+    return scriptPath.toLowerCase().match(/\.htm(l)?$/) !== null;
 }
 async function readStaticHtml(options) {
     const { route } = options;

package/lib/commands/start/appServer/getHtmlResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"getHtmlResponse.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getHtmlResponse.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { pathToFileURL } from 'url';\nimport type { CreateHtmlScript } from '../../../types/CreateHtmlScript.js';\nimport type { CreateHtmlFunction } from '../../../types/CreateHtmlFunction.js';\nimport type { CreateHtmlResult } from '../../../types/CreateHtmlResult.js';\nimport type { CreateHtmlOptions } from '../../../types/CreateHtmlOptions.js';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { JSDOM } from 'jsdom';\nimport fsPromises from 'fs/promises';\n\n/**\n * Get the HTML response for the given route. If the route has a custom render script, use that.\n */\nexport async function getHtmlResponse(options: CreateHtmlOptions): Promise<Exclude<CreateHtmlResult, string>> {\n  const { route, session, overlayScript, entryScript, inlineScripts } = options;\n  let createHtml: CreateHtmlFunction = getDefaultHtmlResponse;\n\n  if (route.renderScript) {\n    const renderScriptPath = path.resolve(session.appPath, route.renderScript);\n    let cacheBreakerQueryParam = `?t=${Date.now()}`;\n\n    try {\n      const { mtime } = await fsPromises.stat(path.resolve(session.appPath, route.renderScript));\n\n      cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n    } catch {\n      /* no-op */\n    }\n\n    if (isHtml(renderScriptPath)) {\n      createHtml = readStaticHtml;\n    } else {\n      // Get the html factory function from a script default export.\n      const renderScriptUrl = pathToFileURL(renderScriptPath).toString();\n\n      // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the\n      // script path to ensure we get the latest version of the script. This could be improved by using the git hash of\n      // the file if it exists, or a hash of the content, or even the timestamp of the file.\n      try {\n        createHtml = ((await import(renderScriptUrl + cacheBreakerQueryParam)) as CreateHtmlScript).default;\n      } catch (e) {\n        console.error(`Error importing render script at \"${renderScriptUrl}\":`, e);\n      }\n    }\n\n    if (!createHtml) {\n      console.error(`The render script at \"${renderScriptPath}\" does not export a default function.`);\n    }\n  }\n\n  const htmlResult = await createHtml(options);\n  let html = typeof htmlResult === 'string' ? htmlResult : htmlResult.html;\n  const statusCode = typeof htmlResult === 'string' ? 200 : htmlResult.statusCode || 200;\n\n  try {\n    const htmlDocument = new JSDOM(html);\n    const { document } = htmlDocument.window;\n\n    // inject the import map.\n    if (entryScript || overlayScript) {\n      const script = document.createElement('script');\n      script.type = 'importmap';\n      script.innerHTML = JSON.stringify(session.getImportMap(), null, 2);\n      document.head.prepend(script);\n    }\n\n    for (const inlineScript of inlineScripts) {\n      const script = document.createElement('script');\n      script.type = 'module';\n      script.innerHTML = inlineScript;\n      document.head.appendChild(script);\n    }\n\n    // inject the overlay script.\n    addScript(document.head, overlayScript);\n\n    // inject the entry script.\n    addScript(document.head, entryScript);\n\n    html = htmlDocument.serialize();\n  } catch (e) {\n    console.error(`Error parsing html response for rendering route \"${route.match}\"`, e);\n  }\n\n  return {\n    html,\n    statusCode,\n  };\n}\n\n/**\n * Helper function to add a script to the document.\n */\nfunction addScript(parentElement: HTMLElement, url: string | undefined) {\n  if (url) {\n    const script = parentElement.ownerDocument.createElement('script');\n\n    script.type = 'module';\n    script.src = url;\n    parentElement.appendChild(script);\n  }\n}\n\nfunction isHtml(path: string): boolean {\n  // path has an .htm or .html extension; case insensitive.\n  return path.toLowerCase().match(/\\.htm(l)?$/) !== null;\n}\n\nasync function readStaticHtml(options: CreateHtmlOptions): Promise<string> {\n  const { route } = options;\n  let html = '';\n\n  if (route.renderScript) {\n    const htmlPath = path.resolve(options.session.appPath, route.renderScript);\n\n    try {\n      html = (await fsPromises.readFile(htmlPath, 'utf8')) || '';\n    } catch (e) {\n      console.error(`Error reading HTML file at \"${htmlPath}\".`, e);\n    }\n  }\n\n  return html;\n}\n"]}
+{"version":3,"file":"getHtmlResponse.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getHtmlResponse.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { pathToFileURL } from 'url';\nimport type { CreateHtmlScript } from '../../../types/CreateHtmlScript.js';\nimport type { CreateHtmlFunction } from '../../../types/CreateHtmlFunction.js';\nimport type { CreateHtmlResult } from '../../../types/CreateHtmlResult.js';\nimport type { CreateHtmlOptions } from '../../../types/CreateHtmlOptions.js';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { JSDOM } from 'jsdom';\nimport fsPromises from 'fs/promises';\n\n/**\n * Get the HTML response for the given route. If the route has a custom render script, use that.\n */\nexport async function getHtmlResponse(options: CreateHtmlOptions): Promise<Exclude<CreateHtmlResult, string>> {\n  const { route, session, overlayScript, entryScript, inlineScripts } = options;\n  let createHtml: CreateHtmlFunction = getDefaultHtmlResponse;\n\n  if (route.renderScript) {\n    const renderScriptPath = path.resolve(session.appPath, route.renderScript);\n    let cacheBreakerQueryParam = `?t=${Date.now()}`;\n\n    try {\n      const { mtime } = await fsPromises.stat(path.resolve(session.appPath, route.renderScript));\n\n      cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n    } catch {\n      /* no-op */\n    }\n\n    if (isHtml(renderScriptPath)) {\n      createHtml = readStaticHtml;\n    } else {\n      // Get the html factory function from a script default export.\n      const renderScriptUrl = pathToFileURL(renderScriptPath).toString();\n\n      // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the\n      // script path to ensure we get the latest version of the script. This could be improved by using the git hash of\n      // the file if it exists, or a hash of the content, or even the timestamp of the file.\n      try {\n        createHtml = ((await import(renderScriptUrl + cacheBreakerQueryParam)) as CreateHtmlScript).default;\n      } catch (e) {\n        console.error(`Error importing render script at \"${renderScriptUrl}\":`, e);\n      }\n    }\n\n    if (!createHtml) {\n      console.error(`The render script at \"${renderScriptPath}\" does not export a default function.`);\n    }\n  }\n\n  const htmlResult = await createHtml(options);\n  let html = typeof htmlResult === 'string' ? htmlResult : htmlResult.html;\n  const statusCode = typeof htmlResult === 'string' ? 200 : htmlResult.statusCode || 200;\n\n  try {\n    const htmlDocument = new JSDOM(html);\n    const { document } = htmlDocument.window;\n\n    // inject the import map.\n    if (entryScript || overlayScript) {\n      const script = document.createElement('script');\n      script.type = 'importmap';\n      script.innerHTML = JSON.stringify(session.getImportMap(), null, 2);\n      document.head.prepend(script);\n    }\n\n    for (const inlineScript of inlineScripts) {\n      const script = document.createElement('script');\n      script.type = 'module';\n      script.innerHTML = inlineScript;\n      document.head.appendChild(script);\n    }\n\n    // inject the overlay script.\n    addScript(document.head, overlayScript);\n\n    // inject the entry script.\n    addScript(document.head, entryScript);\n\n    html = htmlDocument.serialize();\n  } catch (e) {\n    console.error(`Error parsing html response for rendering route \"${route.match}\"`, e);\n  }\n\n  return {\n    html,\n    statusCode,\n  };\n}\n\n/**\n * Helper function to add a script to the document.\n */\nfunction addScript(parentElement: HTMLElement, url: string | undefined) {\n  if (url) {\n    const script = parentElement.ownerDocument.createElement('script');\n\n    script.type = 'module';\n    script.src = url;\n    parentElement.appendChild(script);\n  }\n}\n\nfunction isHtml(scriptPath: string): boolean {\n  // path has an .htm or .html extension; case insensitive.\n  return scriptPath.toLowerCase().match(/\\.htm(l)?$/) !== null;\n}\n\nasync function readStaticHtml(options: CreateHtmlOptions): Promise<string> {\n  const { route } = options;\n  let html = '';\n\n  if (route.renderScript) {\n    const htmlPath = path.resolve(options.session.appPath, route.renderScript);\n\n    try {\n      html = (await fsPromises.readFile(htmlPath, 'utf8')) || '';\n    } catch (e) {\n      console.error(`Error reading HTML file at \"${htmlPath}\".`, e);\n    }\n  }\n\n  return html;\n}\n"]}

package/lib/commands/start/appServer/startAppServer.js

@@ -26,9 +26,9 @@ export async function startAppServer({ session, bundleServer, apiServer, definit
             hostname: devServer?.domain,
             sslOptions: config.devServer?.https,
             //  publicDir,
-            setupCallback: (app, url) => createRoutes({
+            setupCallback: (app, appUrl) => createRoutes({
                 app,
-                url,
+                url: appUrl,
                 session,
                 definition,
                 bundleServer,

package/lib/commands/start/appServer/startAppServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAqB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAItE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,EAC9B,QAAQ,EACR,QAAQ,GAST;IACC,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,IAAK,EAAsB,CAAC;IAE7D,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,EAAE,IAAI,KAAK,SAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1D,mEAAmE;IACnE,+EAA+E;IAC/E,oEAAoE;IAEpE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,4BAA4B,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;IAE9E,IAAI;QACF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC;YAClD,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK;YACnC,cAAc;YACd,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAC1B,YAAY,CAAC;gBACX,GAAG;gBACH,GAAG;gBACH,OAAO;gBACP,UAAU;gBACV,YAAY;gBACZ,SAAS;gBACT,MAAM;gBACN,QAAQ;aACT,CAAC;SACL,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,OAAO;YACL,KAAK;YACL,IAAI;YACJ,GAAG;SACJ,CAAC;KACH;IAAC,OAAO,GAAY,EAAE;QACrB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAEvD,MAAM,GAAG,CAAC;KACX;AACH,CAAC","sourcesContent":["import { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport type { BundleServer } from '../../../types/BundleServer.js';\nimport type { PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/bundler-types';\nimport { createRoutes } from './createRoutes.js';\nimport { exitIfPortUnavailable } from './exitIfPortUnavailable.js';\nimport { type TaskReporter, cyan } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\n\n/**\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n */\nexport async function startAppServer({\n  session,\n  bundleServer,\n  apiServer,\n  definition,\n  config = {} as CloudpackConfig,\n  packages,\n  reporter,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  packages: PackageDefinitionsCache;\n  reporter: TaskReporter;\n}) {\n  const { devServer = {} } = config || ({} as CloudpackConfig);\n\n  // Read the port from the config file or default to array of ports.\n  const requireSpecifiedPort = devServer?.port !== undefined;\n  const ports = devServer?.port ?? [5000, 5001, 5002, 5003];\n\n  // Directory to serve as plain static assets. Defaults to \"public\".\n  // Can be overridden by setting the 'publicDir' option in the cloudpack config.\n  // const publicDir = path.resolve(devServer.publicPath ?? 'public');\n\n  const task = reporter.addTask(`Starting app server for \"${definition.name}\"`);\n\n  try {\n    const { close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort,\n      hostname: devServer?.domain,\n      sslOptions: config.devServer?.https,\n      //  publicDir,\n      setupCallback: (app, url) =>\n        createRoutes({\n          app,\n          url,\n          session,\n          definition,\n          bundleServer,\n          apiServer,\n          config,\n          packages,\n        }),\n    });\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      close,\n      port,\n      url,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    exitIfPortUnavailable(err, session.projectName, ports);\n\n    throw err;\n  }\n}\n"]}
+{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAqB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAItE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,EAC9B,QAAQ,EACR,QAAQ,GAST;IACC,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,IAAK,EAAsB,CAAC;IAE7D,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,EAAE,IAAI,KAAK,SAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1D,mEAAmE;IACnE,+EAA+E;IAC/E,oEAAoE;IAEpE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,4BAA4B,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;IAE9E,IAAI;QACF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC;YAClD,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK;YACnC,cAAc;YACd,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAC7B,YAAY,CAAC;gBACX,GAAG;gBACH,GAAG,EAAE,MAAM;gBACX,OAAO;gBACP,UAAU;gBACV,YAAY;gBACZ,SAAS;gBACT,MAAM;gBACN,QAAQ;aACT,CAAC;SACL,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,OAAO;YACL,KAAK;YACL,IAAI;YACJ,GAAG;SACJ,CAAC;KACH;IAAC,OAAO,GAAY,EAAE;QACrB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAEvD,MAAM,GAAG,CAAC;KACX;AACH,CAAC","sourcesContent":["import { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport type { BundleServer } from '../../../types/BundleServer.js';\nimport type { PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/bundler-types';\nimport { createRoutes } from './createRoutes.js';\nimport { exitIfPortUnavailable } from './exitIfPortUnavailable.js';\nimport { type TaskReporter, cyan } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\n\n/**\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n */\nexport async function startAppServer({\n  session,\n  bundleServer,\n  apiServer,\n  definition,\n  config = {} as CloudpackConfig,\n  packages,\n  reporter,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  packages: PackageDefinitionsCache;\n  reporter: TaskReporter;\n}) {\n  const { devServer = {} } = config || ({} as CloudpackConfig);\n\n  // Read the port from the config file or default to array of ports.\n  const requireSpecifiedPort = devServer?.port !== undefined;\n  const ports = devServer?.port ?? [5000, 5001, 5002, 5003];\n\n  // Directory to serve as plain static assets. Defaults to \"public\".\n  // Can be overridden by setting the 'publicDir' option in the cloudpack config.\n  // const publicDir = path.resolve(devServer.publicPath ?? 'public');\n\n  const task = reporter.addTask(`Starting app server for \"${definition.name}\"`);\n\n  try {\n    const { close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort,\n      hostname: devServer?.domain,\n      sslOptions: config.devServer?.https,\n      //  publicDir,\n      setupCallback: (app, appUrl) =>\n        createRoutes({\n          app,\n          url: appUrl,\n          session,\n          definition,\n          bundleServer,\n          apiServer,\n          config,\n          packages,\n        }),\n    });\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      close,\n      port,\n      url,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    exitIfPortUnavailable(err, session.projectName, ports);\n\n    throw err;\n  }\n}\n"]}

package/lib/tasks/resolveDependenciesTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveDependenciesTask.d.ts","sourceRoot":"","sources":["../../src/tasks/resolveDependenciesTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAmB,MAAM,iCAAiC,CAAC;AAE/F,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGlG;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAA;CAAE,uBA0CvE"}
+{"version":3,"file":"resolveDependenciesTask.d.ts","sourceRoot":"","sources":["../../src/tasks/resolveDependenciesTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAmB,MAAM,iCAAiC,CAAC;AAE/F,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGlG;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAA;CAAE,uBAyCvE"}

package/lib/tasks/resolveDependenciesTask.js

@@ -18,7 +18,6 @@ export async function resolveDependenciesTask(options, context) {
             appPath,
             additionalPaths,
             linkedPaths,
-            useStrictVersioning: false,
         }, {
             packages,
         });

package/lib/tasks/resolveDependenciesTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveDependenciesTask.js","sourceRoot":"","sources":["../../src/tasks/resolveDependenciesTask.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { LinkedPath, ResolveMap, ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { createResolveMap } from '@ms-cloudpack/package-utilities';\nimport { bold, bulletedList, cyan, yellow, type TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { PerfMarkerCliEntry, PerfMeasurementTimeToResolveDependencies } from '../performance/markers.js';\n\n/**\n * Resolves the locations of dependencies and returns the resolve map, logging results\n * to the task reporter.\n */\nexport async function resolveDependenciesTask(\n  options: {\n    appPath: string;\n    additionalPaths?: string[];\n    linkedPaths?: LinkedPath[];\n  },\n  context: { reporter: TaskReporter; packages: PackageDefinitionsCache },\n) {\n  const { appPath, additionalPaths, linkedPaths } = options;\n  const { reporter, packages } = context;\n  let resolveMap: ResolveMap | undefined;\n\n  if (performance.getEntriesByName(PerfMarkerCliEntry).length) {\n    performance.measure(PerfMeasurementTimeToResolveDependencies, PerfMarkerCliEntry);\n  }\n  // Grab the installed dependency locations.\n  await reporter.runTask('Resolving dependencies', async () => {\n    resolveMap = await createResolveMap(\n      {\n        appPath,\n        additionalPaths,\n        linkedPaths,\n        useStrictVersioning: false,\n      },\n      {\n        packages,\n      },\n    );\n\n    const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);\n    const message = `Found ${cyan(allPackages.size)} total packages, ${\n      duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`\n    }`;\n    const extended = bulletedList(\n      Array.from(duplicatedPackages.entries()).map(\n        ([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`,\n      ),\n    );\n\n    return {\n      message,\n      extended,\n      forceShow: true,\n    };\n  });\n\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- will be defined after the task runs\n  return resolveMap!;\n}\n\n/**\n * Given a resolveMap, returns a map of all packages and a map of packages with multiple versions.\n * This is used to log the results of the resolve task.\n */\nfunction getPackagesFromResolveMap(resolveMap: ResolveMap) {\n  const allPackages = new Map<string, ResolveMapEntry>();\n  const duplicatedPackages = new Map<string, Set<string>>();\n\n  function addEntry(entry: ResolveMapEntry) {\n    if (allPackages.has(entry.name)) {\n      if (!duplicatedPackages.has(entry.name)) {\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        duplicatedPackages.set(entry.name, new Set([allPackages.get(entry.name)!.version]));\n      }\n      const dupeSet = duplicatedPackages.get(entry.name);\n\n      dupeSet?.add(entry.version);\n    } else {\n      allPackages.set(entry.name, entry);\n    }\n  }\n\n  for (const currentEntry of Object.values(resolveMap)) {\n    addEntry(currentEntry);\n\n    if (currentEntry.scopedVersions) {\n      for (const scopedEntry of Object.values(currentEntry.scopedVersions)) {\n        addEntry(scopedEntry);\n      }\n    }\n  }\n\n  return {\n    allPackages,\n    duplicatedPackages,\n  };\n}\n"]}
+{"version":3,"file":"resolveDependenciesTask.js","sourceRoot":"","sources":["../../src/tasks/resolveDependenciesTask.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAqB,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,kBAAkB,EAAE,wCAAwC,EAAE,MAAM,2BAA2B,CAAC;AAEzG;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,OAIC,EACD,OAAsE;IAEtE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC1D,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACvC,IAAI,UAAkC,CAAC;IAEvC,IAAI,WAAW,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC,MAAM,EAAE;QAC3D,WAAW,CAAC,OAAO,CAAC,wCAAwC,EAAE,kBAAkB,CAAC,CAAC;KACnF;IACD,2CAA2C;IAC3C,MAAM,QAAQ,CAAC,OAAO,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;QAC1D,UAAU,GAAG,MAAM,gBAAgB,CACjC;YACE,OAAO;YACP,eAAe;YACf,WAAW;SACZ,EACD;YACE,QAAQ;SACT,CACF,CAAC;QAEF,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;QAClF,MAAM,OAAO,GAAG,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,oBAC7C,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,gBAC3F,EAAE,CAAC;QACH,MAAM,QAAQ,GAAG,YAAY,CAC3B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAC1C,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC1E,CACF,CAAC;QAEF,OAAO;YACL,OAAO;YACP,QAAQ;YACR,SAAS,EAAE,IAAI;SAChB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,2GAA2G;IAC3G,OAAO,UAAW,CAAC;AACrB,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAC,UAAsB;IACvD,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;IACvD,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE1D,SAAS,QAAQ,CAAC,KAAsB;QACtC,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBACvC,oEAAoE;gBACpE,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;aACrF;YACD,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEnD,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC7B;aAAM;YACL,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACpC;IACH,CAAC;IAED,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACpD,QAAQ,CAAC,YAAY,CAAC,CAAC;QAEvB,IAAI,YAAY,CAAC,cAAc,EAAE;YAC/B,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;gBACpE,QAAQ,CAAC,WAAW,CAAC,CAAC;aACvB;SACF;KACF;IAED,OAAO;QACL,WAAW;QACX,kBAAkB;KACnB,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { LinkedPath, ResolveMap, ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { createResolveMap } from '@ms-cloudpack/package-utilities';\nimport { bold, bulletedList, cyan, yellow, type TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { PerfMarkerCliEntry, PerfMeasurementTimeToResolveDependencies } from '../performance/markers.js';\n\n/**\n * Resolves the locations of dependencies and returns the resolve map, logging results\n * to the task reporter.\n */\nexport async function resolveDependenciesTask(\n  options: {\n    appPath: string;\n    additionalPaths?: string[];\n    linkedPaths?: LinkedPath[];\n  },\n  context: { reporter: TaskReporter; packages: PackageDefinitionsCache },\n) {\n  const { appPath, additionalPaths, linkedPaths } = options;\n  const { reporter, packages } = context;\n  let resolveMap: ResolveMap | undefined;\n\n  if (performance.getEntriesByName(PerfMarkerCliEntry).length) {\n    performance.measure(PerfMeasurementTimeToResolveDependencies, PerfMarkerCliEntry);\n  }\n  // Grab the installed dependency locations.\n  await reporter.runTask('Resolving dependencies', async () => {\n    resolveMap = await createResolveMap(\n      {\n        appPath,\n        additionalPaths,\n        linkedPaths,\n      },\n      {\n        packages,\n      },\n    );\n\n    const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);\n    const message = `Found ${cyan(allPackages.size)} total packages, ${\n      duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`\n    }`;\n    const extended = bulletedList(\n      Array.from(duplicatedPackages.entries()).map(\n        ([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`,\n      ),\n    );\n\n    return {\n      message,\n      extended,\n      forceShow: true,\n    };\n  });\n\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- will be defined after the task runs\n  return resolveMap!;\n}\n\n/**\n * Given a resolveMap, returns a map of all packages and a map of packages with multiple versions.\n * This is used to log the results of the resolve task.\n */\nfunction getPackagesFromResolveMap(resolveMap: ResolveMap) {\n  const allPackages = new Map<string, ResolveMapEntry>();\n  const duplicatedPackages = new Map<string, Set<string>>();\n\n  function addEntry(entry: ResolveMapEntry) {\n    if (allPackages.has(entry.name)) {\n      if (!duplicatedPackages.has(entry.name)) {\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        duplicatedPackages.set(entry.name, new Set([allPackages.get(entry.name)!.version]));\n      }\n      const dupeSet = duplicatedPackages.get(entry.name);\n\n      dupeSet?.add(entry.version);\n    } else {\n      allPackages.set(entry.name, entry);\n    }\n  }\n\n  for (const currentEntry of Object.values(resolveMap)) {\n    addEntry(currentEntry);\n\n    if (currentEntry.scopedVersions) {\n      for (const scopedEntry of Object.values(currentEntry.scopedVersions)) {\n        addEntry(scopedEntry);\n      }\n    }\n  }\n\n  return {\n    allPackages,\n    duplicatedPackages,\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.42.3",
+  "version": "0.43.0",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -11,16 +11,16 @@
   },
   "dependencies": {
     "@lage-run/target-graph": "^0.8.6",
-    "@ms-cloudpack/api-server": "^0.13.0",
-    "@ms-cloudpack/bundler": "^0.14.6",
-    "@ms-cloudpack/config": "^0.11.0",
+    "@ms-cloudpack/api-server": "^0.13.2",
+    "@ms-cloudpack/bundler": "^0.14.8",
+    "@ms-cloudpack/config": "^0.11.1",
     "@ms-cloudpack/create-express-app": "^1.3.9",
     "@ms-cloudpack/json-utilities": "^0.0.7",
-    "@ms-cloudpack/overlay": "^0.14.4",
-    "@ms-cloudpack/package-utilities": "^5.1.0",
+    "@ms-cloudpack/overlay": "^0.14.6",
+    "@ms-cloudpack/package-utilities": "^5.1.1",
     "@ms-cloudpack/path-string-parsing": "^1.0.3",
     "@ms-cloudpack/path-utilities": "^2.3.2",
-    "@ms-cloudpack/task-reporter": "^0.7.1",
+    "@ms-cloudpack/task-reporter": "^0.7.2",
     "@ms-cloudpack/telemetry": "^0.3.6",
     "commander": "^11.0.0",
     "cross-spawn": "^7.0.3",