@ms-cloudpack/cli 0.54.2 → 0.54.4

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

@@ -6,14 +6,38 @@ import type { InitPackageResult } from './types/InitPackageResult.js';
  * changes. The `record*` methods of the returned object will be used within init to add the stats, and the
  * `get` method will return the final tally. The resulting `InitSummary` object can be used in the `formatInitSummary`
  * helper to convert it to a string for the user.
+ *
+ * The `getMissingExportsMessage` method can be used to check that the imports/exports of packages match.
  */
 export declare class InitSummaryData {
     private _packageResults;
     private _generatedUpdates;
     private _startTime;
     constructor();
-    recordResult(packageResult: InitPackageResult): void;
+    /**
+     * Saves a package result.
+     * @param packageResult - The package result to save.
+     * @returns void.
+     */
+    recordResult(options: {
+        packageResult: InitPackageResult;
+        append?: boolean;
+    }): void;
+    /**
+     * Returns the package results.
+     * @returns The package results.
+     */
+    getResults(): Record<string, InitPackageResult>;
+    /**
+     * Saves a generated file update.
+     * @param allChanges - The generated file update to save.
+     * @returns void.
+     */
     recordGeneratedChanges(allChanges: GeneratedPackageChanges[]): void;
+    /**
+     * Returns the summary of the results.
+     * @returns The summary of the results.
+     */
     summarize(): InitSummary;
 }
 //# sourceMappingURL=InitSummaryData.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"InitSummaryData.d.ts","sourceRoot":"","sources":["../../../src/commands/init/InitSummaryData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAGlF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE;;;;;GAKG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,eAAe,CAAoC;IAC3D,OAAO,CAAC,iBAAiB,CAA0C;IACnE,OAAO,CAAC,UAAU,CAAS;;IAQpB,YAAY,CAAC,aAAa,EAAE,iBAAiB;IAgB7C,sBAAsB,CAAC,UAAU,EAAE,uBAAuB,EAAE;IAS5D,SAAS,IAAI,WAAW;CA0ChC"}
+{"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;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,eAAe,CAAoC;IAC3D,OAAO,CAAC,iBAAiB,CAA0C;IACnE,OAAO,CAAC,UAAU,CAAS;;IAQ3B;;;;OAIG;IACI,YAAY,CAAC,OAAO,EAAE;QAAE,aAAa,EAAE,iBAAiB,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;IAiBnF;;;OAGG;IACI,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAItD;;;;OAIG;IACI,sBAAsB,CAAC,UAAU,EAAE,uBAAuB,EAAE;IASnE;;;OAGG;IACI,SAAS,IAAI,WAAW;CA0ChC"}

package/lib/commands/init/InitSummaryData.js

@@ -3,6 +3,8 @@
  * changes. The `record*` methods of the returned object will be used within init to add the stats, and the
  * `get` method will return the final tally. The resulting `InitSummary` object can be used in the `formatInitSummary`
  * helper to convert it to a string for the user.
+ *
+ * The `getMissingExportsMessage` method can be used to check that the imports/exports of packages match.
  */
 export class InitSummaryData {
     constructor() {
@@ -10,9 +12,15 @@ export class InitSummaryData {
         this._generatedUpdates = {};
         this._startTime = Date.now();
     }
-    recordResult(packageResult) {
-        // Merge previous errors and warnings if any.
-        if (this._packageResults[packageResult.path]) {
+    /**
+     * Saves a package result.
+     * @param packageResult - The package result to save.
+     * @returns void.
+     */
+    recordResult(options) {
+        const { packageResult, append } = options;
+        if (append && this._packageResults[packageResult.path]) {
+            // Merge previous errors and warnings if any.
             if (packageResult.errors?.length) {
                 this._packageResults[packageResult.path].errors ??= [];
                 this._packageResults[packageResult.path].errors?.push(...packageResult.errors);
@@ -26,6 +34,18 @@ export class InitSummaryData {
             this._packageResults[packageResult.path] = packageResult;
         }
     }
+    /**
+     * Returns the package results.
+     * @returns The package results.
+     */
+    getResults() {
+        return this._packageResults;
+    }
+    /**
+     * Saves a generated file update.
+     * @param allChanges - The generated file update to save.
+     * @returns void.
+     */
     recordGeneratedChanges(allChanges) {
         for (const update of allChanges) {
             const { name, version, path, changes } = update;
@@ -33,6 +53,10 @@ export class InitSummaryData {
             updatesForPackage.changes.push(...changes);
         }
     }
+    /**
+     * Returns the summary of the results.
+     * @returns The summary of the results.
+     */
     summarize() {
         const duration = Date.now() - this._startTime;
         let totalSuccess = 0;

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

@@ -1 +1 @@
-{"version":3,"file":"InitSummaryData.js","sourceRoot":"","sources":["../../../src/commands/init/InitSummaryData.ts"],"names":[],"mappings":"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","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  private _startTime: number;\n\n  constructor() {\n    this._packageResults = {};\n    this._generatedUpdates = {};\n    this._startTime = Date.now();\n  }\n\n  public recordResult(packageResult: InitPackageResult) {\n    // Merge previous errors and warnings if any.\n    if (this._packageResults[packageResult.path]) {\n      if (packageResult.errors?.length) {\n        this._packageResults[packageResult.path].errors ??= [];\n        this._packageResults[packageResult.path].errors?.push(...packageResult.errors);\n      }\n      if (packageResult.warnings?.length) {\n        this._packageResults[packageResult.path].warnings ??= [];\n        this._packageResults[packageResult.path].warnings?.push(...packageResult.warnings);\n      }\n    } else {\n      this._packageResults[packageResult.path] = packageResult;\n    }\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    const duration = Date.now() - this._startTime;\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    const sortedUpdates = Object.values(this._generatedUpdates).sort((a, b) => a.path.localeCompare(b.path));\n\n    for (const updates of sortedUpdates) {\n      totalChanges += updates.changes.length;\n      updates.changes = updates.changes.sort((a, b) => a.change.localeCompare(b.change));\n    }\n\n    return {\n      duration,\n      totalPackages: Object.keys(this._packageResults).length,\n      totalSuccess,\n      totalErrors,\n      totalWarnings,\n      totalChanges,\n      packagesWithErrors,\n      packagesWithWarnings,\n      generatedFileUpdates: sortedUpdates,\n    };\n  }\n}\n"]}
+{"version":3,"file":"InitSummaryData.js","sourceRoot":"","sources":["../../../src/commands/init/InitSummaryData.ts"],"names":[],"mappings":"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","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 *\n * The `getMissingExportsMessage` method can be used to check that the imports/exports of packages match.\n */\nexport class InitSummaryData {\n  private _packageResults: Record<string, InitPackageResult>;\n  private _generatedUpdates: Record<string, GeneratedPackageChanges>;\n  private _startTime: number;\n\n  constructor() {\n    this._packageResults = {};\n    this._generatedUpdates = {};\n    this._startTime = Date.now();\n  }\n\n  /**\n   * Saves a package result.\n   * @param packageResult - The package result to save.\n   * @returns void.\n   */\n  public recordResult(options: { packageResult: InitPackageResult; append?: boolean }) {\n    const { packageResult, append } = options;\n    if (append && this._packageResults[packageResult.path]) {\n      // Merge previous errors and warnings if any.\n      if (packageResult.errors?.length) {\n        this._packageResults[packageResult.path].errors ??= [];\n        this._packageResults[packageResult.path].errors?.push(...packageResult.errors);\n      }\n      if (packageResult.warnings?.length) {\n        this._packageResults[packageResult.path].warnings ??= [];\n        this._packageResults[packageResult.path].warnings?.push(...packageResult.warnings);\n      }\n    } else {\n      this._packageResults[packageResult.path] = packageResult;\n    }\n  }\n\n  /**\n   * Returns the package results.\n   * @returns The package results.\n   */\n  public getResults(): Record<string, InitPackageResult> {\n    return this._packageResults;\n  }\n\n  /**\n   * Saves a generated file update.\n   * @param allChanges - The generated file update to save.\n   * @returns void.\n   */\n  public recordGeneratedChanges(allChanges: GeneratedPackageChanges[]) {\n    for (const update of allChanges) {\n      const { name, version, path, changes } = update;\n      const updatesForPackage = (this._generatedUpdates[path] ??= { name, version, path, changes: [] });\n\n      updatesForPackage.changes.push(...changes);\n    }\n  }\n\n  /**\n   * Returns the summary of the results.\n   * @returns The summary of the results.\n   */\n  public summarize(): InitSummary {\n    const duration = Date.now() - this._startTime;\n    let totalSuccess = 0;\n    let totalErrors = 0;\n    let totalWarnings = 0;\n    let totalChanges = 0;\n    const packagesWithErrors: InitPackageResultErrors[] = [];\n    const packagesWithWarnings: InitPackageResultWarnings[] = [];\n\n    for (const packageResult of Object.values(this._packageResults)) {\n      if (packageResult.errors?.length) {\n        packagesWithErrors.push(packageResult as InitPackageResultErrors);\n        totalErrors += packageResult.errors.length;\n      } else {\n        totalSuccess++;\n      }\n\n      if (packageResult.warnings?.length) {\n        packagesWithWarnings.push(packageResult as InitPackageResultWarnings);\n        totalWarnings += packageResult.warnings.length;\n      }\n    }\n\n    const sortedUpdates = Object.values(this._generatedUpdates).sort((a, b) => a.path.localeCompare(b.path));\n\n    for (const updates of sortedUpdates) {\n      totalChanges += updates.changes.length;\n      updates.changes = updates.changes.sort((a, b) => a.change.localeCompare(b.change));\n    }\n\n    return {\n      duration,\n      totalPackages: Object.keys(this._packageResults).length,\n      totalSuccess,\n      totalErrors,\n      totalWarnings,\n      totalChanges,\n      packagesWithErrors,\n      packagesWithWarnings,\n      generatedFileUpdates: sortedUpdates,\n    };\n  }\n}\n"]}

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

@@ -1,4 +1,4 @@
-import type { DetectedImports } from '@ms-cloudpack/api-server';
+import type { BundleInfo } from '@ms-cloudpack/api-server';
 import type { PackageDefinitionsCache, PackageImporterContext } from '@ms-cloudpack/bundler-types';
 import type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';
 import type { ResolveMap } from '@ms-cloudpack/package-utilities';
@@ -9,7 +9,7 @@ import type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js
  */
 export declare function evaluateImportsForOverrides(options: {
     packages: PackageDefinitionsCache;
-    imports: DetectedImports;
+    info: BundleInfo;
     definition: PackageJson;
     packagePath: string;
     /** Config so far. This will be modified if new overrides are needed. */

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,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACnG,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAmB,MAAM,4BAA4B,CAAC;AAEhG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AASlE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACzD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,eAAe,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC;IACV,2CAA2C;IAC3C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,6BAA6B;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IACjE,6FAA6F;IAC7F,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CA+GD"}
+{"version":3,"file":"evaluateImportsForOverrides.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACnG,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAmB,MAAM,4BAA4B,CAAC;AAEhG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AASlE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACzD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC;IACV,2CAA2C;IAC3C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,6BAA6B;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IACjE,6FAA6F;IAC7F,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CAkHD"}

package/lib/commands/init/evaluateImportsForOverrides.js

@@ -6,7 +6,7 @@ import { bulletedList, cyan } from '@ms-cloudpack/task-reporter';
  * If so, updates package overrides in the config.
  */
 export async function evaluateImportsForOverrides(options) {
-    const { packages, imports, definition, packagePath, config, resolveMap } = options;
+    const { packages, info, definition, packagePath, config, resolveMap } = options;
     const displayName = `${definition.name}@${definition.version}`;
     const changes = [];
     const errors = [];
@@ -14,37 +14,40 @@ export async function evaluateImportsForOverrides(options) {
     const pathsToRefresh = new Set();
     const dependencyVersions = getDependencies(definition);
     // Iterate through imports and find their path from the resolve map.
-    for (const [dependencyName, dependencyImportPaths] of Object.entries(imports)) {
-        const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });
-        const dependencyPath = resolveEntry?.path;
-        const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;
-        if (!dependencyPath || !dependencyDefinition) {
-            errors.push(`Package "${displayName}" imports from the package "${dependencyName}" but it couldn't be found. ` +
-                `Ensure that "${dependencyName}" is listed in dependencies of "${displayName}".`);
-            continue;
-        }
-        const { name, version } = dependencyDefinition;
-        if (!name || !version) {
-            throw new Error(`Package "${displayName}" depends on "${dependencyName}" but it is missing a name or version.`);
-        }
-        let importerContext;
-        const versionRequirement = dependencyVersions[dependencyName];
-        if (versionRequirement && definition.name && definition.version) {
-            importerContext = {
-                parentName: definition.name,
-                parentVersion: definition.version,
-                importedName: dependencyName,
-                versionRequirement,
-            };
-        }
-        // Make sure to add the package to the list of packages to evaluate.
-        pathsToEvaluate.set(dependencyPath, importerContext);
-        // 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: dependencyPath }, { packages, config });
-        const flattenedExports = flattenExportsMap(exports);
-        const packageSettings = (config.generated.packageSettings ??= []);
-        let generatedPackageSettings;
-        for (const dependencyImportPath of dependencyImportPaths) {
+    for (const entryInfo of Object.values(info.entry)) {
+        // iterate through all package names of result.info.entry.consumes
+        for (const consume of entryInfo.consumes) {
+            const dependencyName = consume.packageName;
+            const dependencyImportPath = consume.importPath;
+            const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });
+            const dependencyPath = resolveEntry?.path;
+            const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;
+            if (!dependencyPath || !dependencyDefinition) {
+                errors.push(`Package "${displayName}" imports from the package "${dependencyName}" but it couldn't be found. ` +
+                    `Ensure that "${dependencyName}" is listed in dependencies of "${displayName}".`);
+                continue;
+            }
+            const { name, version } = dependencyDefinition;
+            if (!name || !version) {
+                throw new Error(`Package "${displayName}" depends on "${dependencyName}" but it is missing a name or version.`);
+            }
+            let importerContext;
+            const versionRequirement = dependencyVersions[dependencyName];
+            if (versionRequirement && definition.name && definition.version) {
+                importerContext = {
+                    parentName: definition.name,
+                    parentVersion: definition.version,
+                    importedName: dependencyName,
+                    versionRequirement,
+                };
+            }
+            // Make sure to add the package to the list of packages to evaluate.
+            pathsToEvaluate.set(dependencyPath, importerContext);
+            // 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: dependencyPath }, { packages, config });
+            const flattenedExports = flattenExportsMap(exports);
+            const packageSettings = (config.generated.packageSettings ??= []);
+            let generatedPackageSettings;
             if (flattenedExports[dependencyImportPath]) {
                 continue;
             }

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

@@ -1 +1 @@
-{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DetectedImports } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache, PackageImporterContext } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, PackageJson, PackageSettings } from '@ms-cloudpack/config-types';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getDependencies,\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 in the config.\n */\nexport async function evaluateImportsForOverrides(options: {\n  packages: PackageDefinitionsCache;\n  imports: DetectedImports;\n  definition: PackageJson;\n  packagePath: string;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n}): Promise<{\n  /** Changes made to the generated config */\n  changes: GeneratedPackageChanges[];\n  /** Any errors encountered */\n  errors: string[];\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n}> {\n  const { packages, imports, definition, packagePath, config, resolveMap } = options;\n  const displayName = `${definition.name}@${definition.version}`;\n  const changes: GeneratedPackageChanges[] = [];\n  const errors: string[] = [];\n  const pathsToEvaluate = new Map<string, PackageImporterContext | undefined>();\n  const pathsToRefresh = new Set<string>();\n  const dependencyVersions = getDependencies(definition);\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const [dependencyName, dependencyImportPaths] of Object.entries(imports)) {\n    const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n    const dependencyPath = resolveEntry?.path;\n    const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n    if (!dependencyPath || !dependencyDefinition) {\n      errors.push(\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      );\n      continue;\n    }\n\n    const { name, version } = dependencyDefinition as Required<PackageJson>;\n    if (!name || !version) {\n      throw new Error(`Package \"${displayName}\" depends on \"${dependencyName}\" but it is missing a name or version.`);\n    }\n\n    let importerContext: PackageImporterContext | undefined;\n    const versionRequirement = dependencyVersions[dependencyName];\n    if (versionRequirement && definition.name && definition.version) {\n      importerContext = {\n        parentName: definition.name,\n        parentVersion: definition.version,\n        importedName: dependencyName,\n        versionRequirement,\n      };\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    pathsToEvaluate.set(dependencyPath, importerContext);\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, config });\n    const flattenedExports = flattenExportsMap(exports);\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings: PackageSettings | undefined;\n\n    for (const dependencyImportPath of dependencyImportPaths) {\n      if (flattenedExports[dependencyImportPath]) {\n        continue;\n      }\n\n      // We are missing an import path. We need to add this entry to the exports map in package settings.\n      generatedPackageSettings ??= getPackageSettings({\n        config: { generated: { packageSettings } },\n        name,\n        version,\n        firstMatch: true,\n      }).generatedPackageSettings;\n\n      if (!generatedPackageSettings) {\n        generatedPackageSettings = {\n          match: { name, version: `^${version}` },\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        { packages, config },\n      );\n\n      if (addedEntry) {\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        // Since we've found a missing export, we need to re-enqueue the dependency for evaluation.\n        pathsToRefresh.add(dependencyPath);\n      } else {\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        errors.push(errorMessage);\n      }\n    }\n  }\n\n  return { changes, errors, pathsToEvaluate, pathsToRefresh };\n}\n"]}
+{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleInfo } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache, PackageImporterContext } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, PackageJson, PackageSettings } from '@ms-cloudpack/config-types';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getDependencies,\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 in the config.\n */\nexport async function evaluateImportsForOverrides(options: {\n  packages: PackageDefinitionsCache;\n  info: BundleInfo;\n  definition: PackageJson;\n  packagePath: string;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n}): Promise<{\n  /** Changes made to the generated config */\n  changes: GeneratedPackageChanges[];\n  /** Any errors encountered */\n  errors: string[];\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n}> {\n  const { packages, info, definition, packagePath, config, resolveMap } = options;\n  const displayName = `${definition.name}@${definition.version}`;\n  const changes: GeneratedPackageChanges[] = [];\n  const errors: string[] = [];\n  const pathsToEvaluate = new Map<string, PackageImporterContext | undefined>();\n  const pathsToRefresh = new Set<string>();\n  const dependencyVersions = getDependencies(definition);\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info.entry)) {\n    // iterate through all package names of result.info.entry.consumes\n    for (const consume of entryInfo.consumes) {\n      const dependencyName = consume.packageName;\n      const dependencyImportPath = consume.importPath;\n      const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n      const dependencyPath = resolveEntry?.path;\n      const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n      if (!dependencyPath || !dependencyDefinition) {\n        errors.push(\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        );\n        continue;\n      }\n\n      const { name, version } = dependencyDefinition as Required<PackageJson>;\n      if (!name || !version) {\n        throw new Error(`Package \"${displayName}\" depends on \"${dependencyName}\" but it is missing a name or version.`);\n      }\n\n      let importerContext: PackageImporterContext | undefined;\n      const versionRequirement = dependencyVersions[dependencyName];\n      if (versionRequirement && definition.name && definition.version) {\n        importerContext = {\n          parentName: definition.name,\n          parentVersion: definition.version,\n          importedName: dependencyName,\n          versionRequirement,\n        };\n      }\n\n      // Make sure to add the package to the list of packages to evaluate.\n      pathsToEvaluate.set(dependencyPath, importerContext);\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, config });\n      const flattenedExports = flattenExportsMap(exports);\n      const packageSettings = (config.generated.packageSettings ??= []);\n      let generatedPackageSettings: PackageSettings | undefined;\n\n      if (flattenedExports[dependencyImportPath]) {\n        continue;\n      }\n\n      // We are missing an import path. We need to add this entry to the exports map in package settings.\n      generatedPackageSettings ??= getPackageSettings({\n        config: { generated: { packageSettings } },\n        name,\n        version,\n        firstMatch: true,\n      }).generatedPackageSettings;\n\n      if (!generatedPackageSettings) {\n        generatedPackageSettings = {\n          match: { name, version: `^${version}` },\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        { packages, config },\n      );\n\n      if (addedEntry) {\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        // Since we've found a missing export, we need to re-enqueue the dependency for evaluation.\n        pathsToRefresh.add(dependencyPath);\n      } else {\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        errors.push(errorMessage);\n      }\n    }\n  }\n\n  return { changes, errors, pathsToEvaluate, pathsToRefresh };\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAM1D;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,GAAG,EAAE,2BAA2B,CAAC;CAClC,GAAG,OAAO,CAAC;IACV,4EAA4E;IAC5E,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IAClE,6FAA6F;IAC7F,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,6CAA6C;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC,CAoHD"}
+{"version":3,"file":"evaluatePath.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAM1D;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,GAAG,EAAE,2BAA2B,CAAC;CAClC,GAAG,OAAO,CAAC;IACV,4EAA4E;IAC5E,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IAClE,6FAA6F;IAC7F,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,6CAA6C;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC,CAsHD"}

package/lib/commands/init/evaluatePath.js

@@ -25,30 +25,33 @@ export async function evaluatePath(options) {
             name,
             version,
             isIncremental: false,
-            shouldFindImports: true,
+            shouldGetBundleInfo: true,
             shouldForce,
             shouldRerun: shouldForce,
         },
         ctx,
     });
-    const { errors, warnings, imports } = result;
+    const { errors, warnings, info } = result;
     // Record the results for the summary.
     const resultIdentifier = {
         name: definition.name || '',
         version: definition.version || '',
         path: packagePath,
     };
-    summaryData.recordResult({ ...resultIdentifier, errors, warnings });
+    summaryData.recordResult({ packageResult: { ...resultIdentifier, errors, warnings, info } });
     // If there were errors or no imports, return early.
-    if (errors?.length || !imports) {
+    if (errors?.length || !info?.entry) {
         return {};
     }
     // Given the package imports, find the missing exports maps and update packageOverrides.
-    const { changes, errors: evalErrors, pathsToEvaluate, pathsToRefresh, } = await evaluateImportsForOverrides({ definition, packagePath, packages, imports, config, resolveMap });
+    const { changes, errors: evalErrors, pathsToEvaluate, pathsToRefresh, } = await evaluateImportsForOverrides({ definition, packagePath, packages, info, config, resolveMap });
     if (evalErrors.length) {
         summaryData.recordResult({
-            ...resultIdentifier,
-            errors: evalErrors.map((text) => ({ text })),
+            packageResult: {
+                ...resultIdentifier,
+                errors: evalErrors.map((text) => ({ text })),
+            },
+            append: true,
         });
     }
     else {
@@ -61,18 +64,14 @@ export async function evaluatePath(options) {
     let importWarnings = [];
     let importChanges = [];
     if (features?.optimizeDependencies) {
-        ({ warnings: importWarnings, changes: importChanges } = await optimizeDependencies({
-            definition,
-            packagePath,
-            packages,
-            imports,
-            config,
-            resolveMap,
-        }));
+        ({ warnings: importWarnings, changes: importChanges } = await optimizeDependencies({ definition, packagePath, info, resolveMap }, { packages, config }));
         if (importWarnings.length) {
             summaryData.recordResult({
-                ...resultIdentifier,
-                warnings: importWarnings.map((text) => ({ text })),
+                packageResult: {
+                    ...resultIdentifier,
+                    warnings: importWarnings.map((text) => ({ text })),
+                },
+                append: true,
             });
         }
         summaryData.recordGeneratedChanges(importChanges);

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

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAalC;IAQC,MAAM,EACJ,WAAW,EACX,MAAM,EACN,WAAW,EACX,eAAe,EACf,UAAU,EACV,WAAW,EACX,WAAW,EACX,GAAG,EACH,eAAe,GAChB,GAAG,OAAO,CAAC;IACZ,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;IACzB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5B,yFAAyF;IACzF,+FAA+F;IAC/F,kGAAkG;IAClG,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IACvF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;IAE3C,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;QACpC,yGAAyG;QACzG,MAAM,IAAI,KAAK,CACb,GAAG,WAAW,gGAAgG,CAC/G,CAAC;KACH;IAED,yDAAyD;IACzD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC;QAC5C,KAAK,EAAE;YACL,IAAI;YACJ,OAAO;YACP,aAAa,EAAE,KAAK;YACpB,iBAAiB,EAAE,IAAI;YACvB,WAAW;YACX,WAAW,EAAE,WAAW;SACzB;QACD,GAAG;KACJ,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAE7C,sCAAsC;IACtC,MAAM,gBAAgB,GAAG;QACvB,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE;QAC3B,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE;QACjC,IAAI,EAAE,WAAW;KAClB,CAAC;IAEF,WAAW,CAAC,YAAY,CAAC,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEpE,oDAAoD;IACpD,IAAI,MAAM,EAAE,MAAM,IAAI,CAAC,OAAO,EAAE;QAC9B,OAAO,EAAE,CAAC;KACX;IAED,wFAAwF;IACxF,MAAM,EACJ,OAAO,EACP,MAAM,EAAE,UAAU,EAClB,eAAe,EACf,cAAc,GACf,GAAG,MAAM,2BAA2B,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAE1G,IAAI,UAAU,CAAC,MAAM,EAAE;QACrB,WAAW,CAAC,YAAY,CAAC;YACvB,GAAG,gBAAgB;YACnB,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;SAC7C,CAAC,CAAC;KACJ;SAAM;QACL,WAAW,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;KAC7C;IAED,8DAA8D;IAC9D,mEAAmE;IACnE,6DAA6D;IAC7D,qBAAqB;IACrB,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,QAAQ,EAAE,oBAAoB,EAAE;QAClC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,oBAAoB,CAAC;YACjF,UAAU;YACV,WAAW;YACX,QAAQ;YACR,OAAO;YACP,MAAM;YACN,UAAU;SACX,CAAC,CAAC,CAAC;QAEJ,IAAI,cAAc,CAAC,MAAM,EAAE;YACzB,WAAW,CAAC,YAAY,CAAC;gBACvB,GAAG,gBAAgB;gBACnB,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;aACnD,CAAC,CAAC;SACJ;QACD,WAAW,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;KACnD;IAED,iGAAiG;IACjG,6EAA6E;IAC7E,wFAAwF;IACxF,qEAAqE;IAErE,IAAI,WAAW,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;QACtF,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,EAAE;YACrD,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,UAAU;SAC5F,CAAC,CAAC;QAEH,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;KAC7B;IAED,OAAO;QACL,eAAe;QACf,cAAc;KACf,CAAC;AACJ,CAAC","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server/apis';\nimport type { CloudpackConfig } from '@ms-cloudpack/config-types';\nimport type { PackageImporterContext } from '@ms-cloudpack/bundler-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport type { InitOptions } from './types/InitOptions.js';\n\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server/apis';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { optimizeDependencies } from './optimizeDependencies.js';\n\n/**\n * A helper which given the packagePath, tries to evaluate the path by bundling things, finding imports,\n * and cross checking the imports with explicit exports. If any exports are missing, they are documented\n * in the generated config.\n */\nexport async function evaluatePath(options: {\n  /** Path to evaluate. */\n  packagePath: string;\n  /** Info about how the parent package */\n  importerContext: PackageImporterContext | undefined;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n  telemetryClient: TelemetryClient;\n  initOptions: InitOptions;\n  summaryData: InitSummaryData;\n  shouldForce: boolean;\n  ctx: EnsurePackageBundledContext;\n}): Promise<{\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate?: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh?: Set<string>;\n  /** Whether a fatal error was encountered. */\n  shouldExit?: boolean;\n}> {\n  const {\n    packagePath,\n    config,\n    initOptions,\n    telemetryClient,\n    resolveMap,\n    summaryData,\n    shouldForce,\n    ctx,\n    importerContext,\n  } = options;\n  const { packages } = ctx;\n  const { features } = config;\n\n  // This line is the reason we have to track the importerContext for packages to evaluate:\n  // otherwise if a non-semver package is read here, we'd lose the modifications from the initial\n  // time the package was read (and getNonSemverTransform was called) when building the resolve map.\n  const definition = await packages.get(packagePath, { refresh: true, importerContext });\n  const { name, version } = definition || {};\n\n  if (!definition || !name || !version) {\n    // Unsure why a package would be missing a definition/name/version - we've built the resolve map already.\n    throw new Error(\n      `${packagePath} evaluation failed because the package.json with a name/version was not found or not readable.`,\n    );\n  }\n\n  // Bundle the package and find the imports it depends on.\n  const { result } = await ensurePackageBundled({\n    input: {\n      name,\n      version,\n      isIncremental: false,\n      shouldFindImports: true,\n      shouldForce,\n      shouldRerun: shouldForce,\n    },\n    ctx,\n  });\n\n  const { errors, warnings, imports } = result;\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({ ...resultIdentifier, errors, warnings });\n\n  // If there were errors or no imports, return early.\n  if (errors?.length || !imports) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    changes,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({ definition, packagePath, packages, imports, config, resolveMap });\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  // Conditionally scan dependency usage so that we can populate\n  // include/excludeDependencies automatically, ensuring the dep list\n  // is both minimal (remove unused deps) and complete (include\n  // specific devDeps.)\n  let importWarnings = [];\n  let importChanges = [];\n  if (features?.optimizeDependencies) {\n    ({ warnings: importWarnings, changes: importChanges } = await optimizeDependencies({\n      definition,\n      packagePath,\n      packages,\n      imports,\n      config,\n      resolveMap,\n    }));\n\n    if (importWarnings.length) {\n      summaryData.recordResult({\n        ...resultIdentifier,\n        warnings: importWarnings.map((text) => ({ text })),\n      });\n    }\n    summaryData.recordGeneratedChanges(importChanges);\n  }\n\n  // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed\n  // and the heap does not reach the limit as almost every package is enqueued.\n  // importPathsToEvaluate?.forEach((path) => pathsToEvaluate.set(path, importerContext));\n  // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));\n\n  if (initOptions.check && (changes.length || evalErrors.length || importChanges.length)) {\n    telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {\n      reason: changes.length || importChanges.length ? 'Config needs to be updated.' : evalErrors,\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}
+{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server/apis';\nimport type { CloudpackConfig } from '@ms-cloudpack/config-types';\nimport type { PackageImporterContext } from '@ms-cloudpack/bundler-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport type { InitOptions } from './types/InitOptions.js';\n\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server/apis';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { optimizeDependencies } from './optimizeDependencies.js';\n\n/**\n * A helper which given the packagePath, tries to evaluate the path by bundling things, finding imports,\n * and cross checking the imports with explicit exports. If any exports are missing, they are documented\n * in the generated config.\n */\nexport async function evaluatePath(options: {\n  /** Path to evaluate. */\n  packagePath: string;\n  /** Info about how the parent package */\n  importerContext: PackageImporterContext | undefined;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n  telemetryClient: TelemetryClient;\n  initOptions: InitOptions;\n  summaryData: InitSummaryData;\n  shouldForce: boolean;\n  ctx: EnsurePackageBundledContext;\n}): Promise<{\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate?: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh?: Set<string>;\n  /** Whether a fatal error was encountered. */\n  shouldExit?: boolean;\n}> {\n  const {\n    packagePath,\n    config,\n    initOptions,\n    telemetryClient,\n    resolveMap,\n    summaryData,\n    shouldForce,\n    ctx,\n    importerContext,\n  } = options;\n  const { packages } = ctx;\n  const { features } = config;\n\n  // This line is the reason we have to track the importerContext for packages to evaluate:\n  // otherwise if a non-semver package is read here, we'd lose the modifications from the initial\n  // time the package was read (and getNonSemverTransform was called) when building the resolve map.\n  const definition = await packages.get(packagePath, { refresh: true, importerContext });\n  const { name, version } = definition || {};\n\n  if (!definition || !name || !version) {\n    // Unsure why a package would be missing a definition/name/version - we've built the resolve map already.\n    throw new Error(\n      `${packagePath} evaluation failed because the package.json with a name/version was not found or not readable.`,\n    );\n  }\n\n  // Bundle the package and find the imports it depends on.\n  const { result } = await ensurePackageBundled({\n    input: {\n      name,\n      version,\n      isIncremental: false,\n      shouldGetBundleInfo: true,\n      shouldForce,\n      shouldRerun: shouldForce,\n    },\n    ctx,\n  });\n\n  const { errors, warnings, info } = result;\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({ packageResult: { ...resultIdentifier, errors, warnings, info } });\n\n  // If there were errors or no imports, return early.\n  if (errors?.length || !info?.entry) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    changes,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({ definition, packagePath, packages, info, config, resolveMap });\n\n  if (evalErrors.length) {\n    summaryData.recordResult({\n      packageResult: {\n        ...resultIdentifier,\n        errors: evalErrors.map((text) => ({ text })),\n      },\n      append: true,\n    });\n  } else {\n    summaryData.recordGeneratedChanges(changes);\n  }\n\n  // Conditionally scan dependency usage so that we can populate\n  // include/excludeDependencies automatically, ensuring the dep list\n  // is both minimal (remove unused deps) and complete (include\n  // specific devDeps.)\n  let importWarnings = [];\n  let importChanges = [];\n  if (features?.optimizeDependencies) {\n    ({ warnings: importWarnings, changes: importChanges } = await optimizeDependencies(\n      { definition, packagePath, info, resolveMap },\n      { packages, config },\n    ));\n\n    if (importWarnings.length) {\n      summaryData.recordResult({\n        packageResult: {\n          ...resultIdentifier,\n          warnings: importWarnings.map((text) => ({ text })),\n        },\n        append: true,\n      });\n    }\n    summaryData.recordGeneratedChanges(importChanges);\n  }\n\n  // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed\n  // and the heap does not reach the limit as almost every package is enqueued.\n  // importPathsToEvaluate?.forEach((path) => pathsToEvaluate.set(path, importerContext));\n  // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));\n\n  if (initOptions.check && (changes.length || evalErrors.length || importChanges.length)) {\n    telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {\n      reason: changes.length || importChanges.length ? 'Config needs to be updated.' : evalErrors,\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}

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":"AACA,OAAO,KAAK,EAAE,eAAe,EAA6C,MAAM,4BAA4B,CAAC;AAG7G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,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;AAQ1D;;GAEG;AACH,wBAAsB,IAAI,CAAC,UAAU,EAAE;IACrC,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,WAAW,CAAC,CA2GvB"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAA6C,MAAM,4BAA4B,CAAC;AAG7G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,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;AAS1D;;GAEG;AACH,wBAAsB,IAAI,CAAC,UAAU,EAAE;IACrC,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,WAAW,CAAC,CAgHvB"}

package/lib/commands/init/init.js

@@ -3,6 +3,7 @@ import { writeGeneratedConfig } from '@ms-cloudpack/config';
 import { bold, bulletedList, formatPackageName, plural } from '@ms-cloudpack/task-reporter';
 import { InitSummaryData } from './InitSummaryData.js';
 import { evaluatePath } from './evaluatePath.js';
+import { verifyExports } from './verifyExports.js';
 /**
  * Init execution function.
  */
@@ -89,6 +90,10 @@ export async function init(parameters) {
             }
         }
     });
+    if (config.features?.verifyExports) {
+        const warnings = verifyExports(summaryData.getResults(), resolveMap);
+        warnings.forEach((warning) => summaryData.recordResult({ packageResult: warning, append: true }));
+    }
     const summary = summaryData.summarize();
     if (!options.check && summary.totalChanges && config.generated.packageSettings?.length) {
         sortExportKeys(config.generated);

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

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport type { CloudpackConfig, GeneratedConfig, PackageJsonExportsObject } from '@ms-cloudpack/config-types';\nimport type { PackageImporterContext } from '@ms-cloudpack/bundler-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { AutoDispose } from '../../types/AutoDispose.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '@ms-cloudpack/api-server/apis';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { bold, bulletedList, formatPackageName, plural } from '@ms-cloudpack/task-reporter';\nimport { InitSummaryData } from './InitSummaryData.js';\nimport { evaluatePath } from './evaluatePath.js';\n\n/**\n * Init execution function.\n */\nexport async function init(parameters: {\n  options: InitOptions;\n  appPath: string;\n  config: CloudpackConfig;\n  autoDispose: AutoDispose;\n  reporter: TaskReporter;\n  telemetryClient: TelemetryClient;\n}): Promise<InitSummary> {\n  const { options, appPath, config, reporter, autoDispose, telemetryClient } = parameters;\n\n  // Don't allow --check and --reset together.\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  // If --reset is specified, reset the generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const ctx: Context = await createPartialApiContext({\n    appPath,\n    config,\n    reporter,\n    telemetryClient,\n    items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n  });\n  autoDispose(ctx);\n  const resolveMap = ctx.session.resolveMap;\n\n  // Ensure config.generated.packageSettings is initialized.\n  config.generated.packageSettings ??= [];\n\n  const summaryData = new InitSummaryData();\n\n  await new Promise<void>((resolve, reject) => {\n    let pending = 0;\n    let isExitingPrematurely = false;\n    const visitedSet = new Set<string>();\n    const refreshPaths = new Set<string>();\n\n    // Start with the app path or requested matches\n    enqueuePaths(getInitialPaths({ appPath, match: options.match, resolveMap, reporter }));\n\n    /**\n     * Enqueue more paths.\n     * @param newPaths Mapping from package path to importer context.\n     */\n    function enqueuePaths(newPaths: Map<string, PackageImporterContext | undefined>) {\n      if (isExitingPrematurely) {\n        return;\n      }\n\n      // Iterate through the given paths.\n      for (const [packagePath, importerContext] of newPaths) {\n        if (visitedSet.has(packagePath)) {\n          continue;\n        }\n\n        const shouldForce = refreshPaths.delete(packagePath);\n\n        visitedSet.add(packagePath);\n        pending++;\n\n        // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.\n        evaluatePath({\n          packagePath,\n          importerContext,\n          config,\n          telemetryClient,\n          resolveMap,\n          shouldForce,\n          initOptions: options,\n          summaryData,\n          ctx,\n        })\n          .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {\n            pending--;\n\n            if (shouldExit) {\n              isExitingPrematurely = true;\n            } else if (pathsToEvaluate?.size && !options.match) {\n              // If there are paths that need to be rebuilt, add them to the refresh set so that on re-enqueuing\n              // we pass the `shouldRerun` flag through\n              pathsToRefresh?.forEach((refreshPath) => {\n                refreshPaths.add(refreshPath);\n                visitedSet.delete(refreshPath);\n              });\n\n              // Try to enqueue the new paths.\n              enqueuePaths(pathsToEvaluate);\n            }\n\n            // If nothing is pending after this call, we're complete.\n            if (!pending) {\n              resolve();\n            }\n          })\n          .catch((error) => {\n            reject(error);\n          });\n      }\n    }\n  });\n\n  const summary = summaryData.summarize();\n\n  if (!options.check && summary.totalChanges && config.generated.packageSettings?.length) {\n    sortExportKeys(config.generated);\n\n    await writeGeneratedConfig(config.generated, appPath);\n  }\n\n  return summary;\n}\n\n/**\n * Get initial package paths to process: either the app path, or packages matching `match` in the init options.\n */\nfunction getInitialPaths(params: {\n  appPath: string;\n  /** Only evaluate packages matching this string (from init options). */\n  match: string | undefined;\n  resolveMap: ResolveMap;\n  reporter: TaskReporter;\n}): Map<string, PackageImporterContext | undefined> {\n  const { appPath, match, resolveMap, reporter } = params;\n\n  if (!match) {\n    return new Map([[appPath, undefined]]);\n  }\n\n  // Find matching packages in the resolve map\n  const resolveMapEntries = Object.values(resolveMap).filter((entry) => entry.name.includes(match));\n\n  reporter.log(\n    `\\nFound ${plural(resolveMapEntries.length, 'package')} matching \"${bold(match)}\":\\n`,\n    bulletedList(resolveMapEntries.map((entry) => `${formatPackageName(entry)}: ${entry.path}`)),\n  );\n\n  return new Map(resolveMapEntries.map((entry) => [entry.path, undefined]));\n}\n\nfunction sortExportKeys({ packageSettings = [] }: GeneratedConfig) {\n  for (const settings of packageSettings) {\n    if (!settings.exports) {\n      continue;\n    }\n\n    const unsortedExports = settings.exports as PackageJsonExportsObject;\n\n    settings.exports = Object.fromEntries(\n      Object.keys(unsortedExports)\n        .sort()\n        .map((k) => [k, unsortedExports[k]]),\n    );\n  }\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,UAO1B;IACC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC;IAExF,4CAA4C;IAC5C,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,EAAE;QAClC,MAAM,KAAK,CAAC,0CAA0C,CAAC,CAAC;KACzD;IAED,uDAAuD;IACvD,IAAI,OAAO,CAAC,KAAK,EAAE;QACjB,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;KACvB;IAED,MAAM,GAAG,GAAY,MAAM,uBAAuB,CAAC;QACjD,OAAO;QACP,MAAM;QACN,QAAQ;QACR,eAAe;QACf,KAAK,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,eAAe,CAAC;KACtG,CAAC,CAAC;IACH,WAAW,CAAC,GAAG,CAAC,CAAC;IACjB,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC;IAE1C,0DAA0D;IAC1D,MAAM,CAAC,SAAS,CAAC,eAAe,KAAK,EAAE,CAAC;IAExC,MAAM,WAAW,GAAG,IAAI,eAAe,EAAE,CAAC;IAE1C,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,oBAAoB,GAAG,KAAK,CAAC;QACjC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QAEvC,+CAA+C;QAC/C,YAAY,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;QAEvF;;;WAGG;QACH,SAAS,YAAY,CAAC,QAAyD;YAC7E,IAAI,oBAAoB,EAAE;gBACxB,OAAO;aACR;YAED,mCAAmC;YACnC,KAAK,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,IAAI,QAAQ,EAAE;gBACrD,IAAI,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;oBAC/B,SAAS;iBACV;gBAED,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAErD,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAC5B,OAAO,EAAE,CAAC;gBAEV,kGAAkG;gBAClG,YAAY,CAAC;oBACX,WAAW;oBACX,eAAe;oBACf,MAAM;oBACN,eAAe;oBACf,UAAU;oBACV,WAAW;oBACX,WAAW,EAAE,OAAO;oBACpB,WAAW;oBACX,GAAG;iBACJ,CAAC;qBACC,IAAI,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,EAAE,EAAE;oBACxD,OAAO,EAAE,CAAC;oBAEV,IAAI,UAAU,EAAE;wBACd,oBAAoB,GAAG,IAAI,CAAC;qBAC7B;yBAAM,IAAI,eAAe,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;wBAClD,kGAAkG;wBAClG,yCAAyC;wBACzC,cAAc,EAAE,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;4BACtC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;4BAC9B,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;wBACjC,CAAC,CAAC,CAAC;wBAEH,gCAAgC;wBAChC,YAAY,CAAC,eAAe,CAAC,CAAC;qBAC/B;oBAED,yDAAyD;oBACzD,IAAI,CAAC,OAAO,EAAE;wBACZ,OAAO,EAAE,CAAC;qBACX;gBACH,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACf,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;aACN;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE;QAClC,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,UAAU,CAAC,CAAC;QACrE,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;KACnG;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC;IAExC,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,YAAY,IAAI,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE;QACtF,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEjC,MAAM,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KACvD;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAS,eAAe,CAAC,MAMxB;IACC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAExD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;KACxC;IAED,4CAA4C;IAC5C,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAElG,QAAQ,CAAC,GAAG,CACV,WAAW,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,cAAc,IAAI,CAAC,KAAK,CAAC,MAAM,EACrF,YAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAC7F,CAAC;IAEF,OAAO,IAAI,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,cAAc,CAAC,EAAE,eAAe,GAAG,EAAE,EAAmB;IAC/D,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE;QACtC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;YACrB,SAAS;SACV;QAED,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAmC,CAAC;QAErE,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;aACzB,IAAI,EAAE;aACN,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CACvC,CAAC;KACH;AACH,CAAC","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport type { CloudpackConfig, GeneratedConfig, PackageJsonExportsObject } from '@ms-cloudpack/config-types';\nimport type { PackageImporterContext } from '@ms-cloudpack/bundler-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { AutoDispose } from '../../types/AutoDispose.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '@ms-cloudpack/api-server/apis';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { bold, bulletedList, formatPackageName, plural } from '@ms-cloudpack/task-reporter';\nimport { InitSummaryData } from './InitSummaryData.js';\nimport { evaluatePath } from './evaluatePath.js';\nimport { verifyExports } from './verifyExports.js';\n\n/**\n * Init execution function.\n */\nexport async function init(parameters: {\n  options: InitOptions;\n  appPath: string;\n  config: CloudpackConfig;\n  autoDispose: AutoDispose;\n  reporter: TaskReporter;\n  telemetryClient: TelemetryClient;\n}): Promise<InitSummary> {\n  const { options, appPath, config, reporter, autoDispose, telemetryClient } = parameters;\n\n  // Don't allow --check and --reset together.\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  // If --reset is specified, reset the generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const ctx: Context = await createPartialApiContext({\n    appPath,\n    config,\n    reporter,\n    telemetryClient,\n    items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n  });\n  autoDispose(ctx);\n  const resolveMap = ctx.session.resolveMap;\n\n  // Ensure config.generated.packageSettings is initialized.\n  config.generated.packageSettings ??= [];\n\n  const summaryData = new InitSummaryData();\n\n  await new Promise<void>((resolve, reject) => {\n    let pending = 0;\n    let isExitingPrematurely = false;\n    const visitedSet = new Set<string>();\n    const refreshPaths = new Set<string>();\n\n    // Start with the app path or requested matches\n    enqueuePaths(getInitialPaths({ appPath, match: options.match, resolveMap, reporter }));\n\n    /**\n     * Enqueue more paths.\n     * @param newPaths Mapping from package path to importer context.\n     */\n    function enqueuePaths(newPaths: Map<string, PackageImporterContext | undefined>) {\n      if (isExitingPrematurely) {\n        return;\n      }\n\n      // Iterate through the given paths.\n      for (const [packagePath, importerContext] of newPaths) {\n        if (visitedSet.has(packagePath)) {\n          continue;\n        }\n\n        const shouldForce = refreshPaths.delete(packagePath);\n\n        visitedSet.add(packagePath);\n        pending++;\n\n        // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.\n        evaluatePath({\n          packagePath,\n          importerContext,\n          config,\n          telemetryClient,\n          resolveMap,\n          shouldForce,\n          initOptions: options,\n          summaryData,\n          ctx,\n        })\n          .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {\n            pending--;\n\n            if (shouldExit) {\n              isExitingPrematurely = true;\n            } else if (pathsToEvaluate?.size && !options.match) {\n              // If there are paths that need to be rebuilt, add them to the refresh set so that on re-enqueuing\n              // we pass the `shouldRerun` flag through\n              pathsToRefresh?.forEach((refreshPath) => {\n                refreshPaths.add(refreshPath);\n                visitedSet.delete(refreshPath);\n              });\n\n              // Try to enqueue the new paths.\n              enqueuePaths(pathsToEvaluate);\n            }\n\n            // If nothing is pending after this call, we're complete.\n            if (!pending) {\n              resolve();\n            }\n          })\n          .catch((error) => {\n            reject(error);\n          });\n      }\n    }\n  });\n\n  if (config.features?.verifyExports) {\n    const warnings = verifyExports(summaryData.getResults(), resolveMap);\n    warnings.forEach((warning) => summaryData.recordResult({ packageResult: warning, append: true }));\n  }\n\n  const summary = summaryData.summarize();\n\n  if (!options.check && summary.totalChanges && config.generated.packageSettings?.length) {\n    sortExportKeys(config.generated);\n\n    await writeGeneratedConfig(config.generated, appPath);\n  }\n\n  return summary;\n}\n\n/**\n * Get initial package paths to process: either the app path, or packages matching `match` in the init options.\n */\nfunction getInitialPaths(params: {\n  appPath: string;\n  /** Only evaluate packages matching this string (from init options). */\n  match: string | undefined;\n  resolveMap: ResolveMap;\n  reporter: TaskReporter;\n}): Map<string, PackageImporterContext | undefined> {\n  const { appPath, match, resolveMap, reporter } = params;\n\n  if (!match) {\n    return new Map([[appPath, undefined]]);\n  }\n\n  // Find matching packages in the resolve map\n  const resolveMapEntries = Object.values(resolveMap).filter((entry) => entry.name.includes(match));\n\n  reporter.log(\n    `\\nFound ${plural(resolveMapEntries.length, 'package')} matching \"${bold(match)}\":\\n`,\n    bulletedList(resolveMapEntries.map((entry) => `${formatPackageName(entry)}: ${entry.path}`)),\n  );\n\n  return new Map(resolveMapEntries.map((entry) => [entry.path, undefined]));\n}\n\nfunction sortExportKeys({ packageSettings = [] }: GeneratedConfig) {\n  for (const settings of packageSettings) {\n    if (!settings.exports) {\n      continue;\n    }\n\n    const unsortedExports = settings.exports as PackageJsonExportsObject;\n\n    settings.exports = Object.fromEntries(\n      Object.keys(unsortedExports)\n        .sort()\n        .map((k) => [k, unsortedExports[k]]),\n    );\n  }\n}\n"]}

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

@@ -1,5 +1,5 @@
 import { type ResolveMap } from '@ms-cloudpack/package-utilities';
-import type { DetectedImports } from '@ms-cloudpack/api-server';
+import type { BundleInfo } from '@ms-cloudpack/api-server';
 import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
 import type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';
 import type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';
@@ -8,12 +8,13 @@ import type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js
  * If so, adds the the missing dependencies to included and the unused dependencies to excluded.
  */
 export declare function optimizeDependencies(options: {
-    packages: PackageDefinitionsCache;
-    imports: DetectedImports;
+    info: BundleInfo;
     definition: PackageJson;
     packagePath: string;
-    config: CloudpackConfig;
     resolveMap: ResolveMap;
+}, context: {
+    packages: PackageDefinitionsCache;
+    config: CloudpackConfig;
 }): Promise<{
     /** Changes made to the generated config */
     changes: GeneratedPackageChanges[];

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

@@ -1 +1 @@
-{"version":3,"file":"optimizeDependencies.d.ts","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE;IAClD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,eAAe,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC;IACV,2CAA2C;IAC3C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,8GAA8G;IAC9G,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CA6ID"}
+{"version":3,"file":"optimizeDependencies.d.ts","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CACxB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;CACzB,GACA,OAAO,CAAC;IACT,2CAA2C;IAC3C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,8GAA8G;IAC9G,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CAuJD"}

package/lib/commands/init/optimizeDependencies.js

@@ -4,8 +4,9 @@ import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';
  * Optimizes the dependencies of a package to determine if there are any missing or unused.
  * If so, adds the the missing dependencies to included and the unused dependencies to excluded.
  */
-export async function optimizeDependencies(options) {
-    const { packages, imports, definition, packagePath, config, resolveMap } = options;
+export async function optimizeDependencies(options, context) {
+    const { info, definition, packagePath, resolveMap } = options;
+    const { packages, config } = context;
     const displayName = `${definition.name}@${definition.version}`;
     const changes = [];
     const warnings = [];
@@ -15,8 +16,16 @@ export async function optimizeDependencies(options) {
     if (!name || !version) {
         throw new Error(`Package "${displayName}" is missing a name or version.`);
     }
+    const consumedDependencies = new Set();
     // Iterate through imports and find their path from the resolve map.
-    for (const dependencyName of Object.keys(imports)) {
+    for (const entryInfo of Object.values(info.entry)) {
+        // iterate through all package names of result.info.entry.consumes
+        for (const consume of entryInfo.consumes) {
+            consumedDependencies.add(consume.packageName);
+        }
+    }
+    // Iterate through imports and find their path from the resolve map.
+    for (const dependencyName of consumedDependencies) {
         // Add to includedDependencies if it is not listed as a dependency or peer dependency in the package.json.
         if (definition.dependencies?.[dependencyName] ||
             definition.peerDependencies?.[dependencyName] ||
@@ -83,7 +92,7 @@ export async function optimizeDependencies(options) {
     ]);
     // Iterate through dependencies and find unused.
     for (const dependencyName of dependencies) {
-        if (imports[dependencyName]) {
+        if (consumedDependencies.has(dependencyName)) {
             continue;
         }
         pathsToEvaluate.add(packagePath);

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

@@ -1 +1 @@
-{"version":3,"file":"optimizeDependencies.js","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import { getPackageSettings } from '@ms-cloudpack/config';\nimport { findResolveMapEntry, type ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { DetectedImports } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\n/**\n * Optimizes the dependencies of a package to determine if there are any missing or unused.\n * If so, adds the the missing dependencies to included and the unused dependencies to excluded.\n */\nexport async function optimizeDependencies(options: {\n  packages: PackageDefinitionsCache;\n  imports: DetectedImports;\n  definition: PackageJson;\n  packagePath: string;\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n}): Promise<{\n  /** Changes made to the generated config */\n  changes: GeneratedPackageChanges[];\n  /** Any warnings encountered */\n  warnings: string[];\n  /** Set from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Set<string>;\n  /** Package paths for which dependencies where included or excluded, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n}> {\n  const { packages, imports, definition, packagePath, config, resolveMap } = options;\n  const displayName = `${definition.name}@${definition.version}`;\n  const changes: GeneratedPackageChanges[] = [];\n  const warnings: string[] = [];\n  const pathsToEvaluate = new Set<string>();\n  const pathsToRefresh = new Set<string>();\n\n  const { name, version } = definition;\n  if (!name || !version) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const dependencyName of Object.keys(imports)) {\n    // Add to includedDependencies if it is not listed as a dependency or peer dependency in the package.json.\n    if (\n      definition.dependencies?.[dependencyName] ||\n      definition.peerDependencies?.[dependencyName] ||\n      dependencyName === name\n    ) {\n      // Skip if it is listed as a dependency, peer dependency or it is importing itself.\n      continue;\n    }\n\n    // If the dependency is not listed in the package.json, add an error or warning.\n    if (!definition.devDependencies?.[dependencyName]) {\n      const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n      const dependencyPath = resolveEntry?.path;\n      const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n      const message =\n        `Optimize Dependencies: Package \"${displayName}\" imports from the package \"${dependencyName}\" but it is not listed in dependencies. ` +\n        `Ensure that \"${dependencyName}\" is listed in dependencies of \"${displayName}\".`;\n      if (!dependencyPath || !dependencyDefinition) {\n        // If the dependency is not found in the resolve map, add an error.\n        // Error is already caught by evaluateImportsForOverrides.\n        continue;\n      } else {\n        // If the dependency is found in the resolve map, add a warning.\n        warnings.push(message);\n      }\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    pathsToEvaluate.add(packagePath);\n\n    // Add to includedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.includedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.includedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.includedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'included-dependency',\n          change: dependencyName,\n          reason: `Imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n\n  const dependencies = new Set([\n    ...Object.keys(definition.dependencies ?? {}),\n    ...Object.keys(definition.peerDependencies ?? {}),\n  ]);\n\n  // Iterate through dependencies and find unused.\n  for (const dependencyName of dependencies) {\n    if (imports[dependencyName]) {\n      continue;\n    }\n\n    pathsToEvaluate.add(packagePath);\n\n    // Add to excludedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.excludedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.excludedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.excludedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'excluded-dependency',\n          change: dependencyName,\n          reason: `Not imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n  return { warnings, changes, pathsToEvaluate, pathsToRefresh };\n}\n"]}
+{"version":3,"file":"optimizeDependencies.js","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import { getPackageSettings } from '@ms-cloudpack/config';\nimport { findResolveMapEntry, type ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { BundleInfo } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\n/**\n * Optimizes the dependencies of a package to determine if there are any missing or unused.\n * If so, adds the the missing dependencies to included and the unused dependencies to excluded.\n */\nexport async function optimizeDependencies(\n  options: {\n    info: BundleInfo;\n    definition: PackageJson;\n    packagePath: string;\n    resolveMap: ResolveMap;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n    config: CloudpackConfig;\n  },\n): Promise<{\n  /** Changes made to the generated config */\n  changes: GeneratedPackageChanges[];\n  /** Any warnings encountered */\n  warnings: string[];\n  /** Set from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Set<string>;\n  /** Package paths for which dependencies where included or excluded, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n}> {\n  const { info, definition, packagePath, resolveMap } = options;\n  const { packages, config } = context;\n  const displayName = `${definition.name}@${definition.version}`;\n  const changes: GeneratedPackageChanges[] = [];\n  const warnings: string[] = [];\n  const pathsToEvaluate = new Set<string>();\n  const pathsToRefresh = new Set<string>();\n\n  const { name, version } = definition;\n  if (!name || !version) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  const consumedDependencies = new Set<string>();\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info.entry)) {\n    // iterate through all package names of result.info.entry.consumes\n    for (const consume of entryInfo.consumes) {\n      consumedDependencies.add(consume.packageName);\n    }\n  }\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const dependencyName of consumedDependencies) {\n    // Add to includedDependencies if it is not listed as a dependency or peer dependency in the package.json.\n    if (\n      definition.dependencies?.[dependencyName] ||\n      definition.peerDependencies?.[dependencyName] ||\n      dependencyName === name\n    ) {\n      // Skip if it is listed as a dependency, peer dependency or it is importing itself.\n      continue;\n    }\n\n    // If the dependency is not listed in the package.json, add an error or warning.\n    if (!definition.devDependencies?.[dependencyName]) {\n      const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n      const dependencyPath = resolveEntry?.path;\n      const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n      const message =\n        `Optimize Dependencies: Package \"${displayName}\" imports from the package \"${dependencyName}\" but it is not listed in dependencies. ` +\n        `Ensure that \"${dependencyName}\" is listed in dependencies of \"${displayName}\".`;\n      if (!dependencyPath || !dependencyDefinition) {\n        // If the dependency is not found in the resolve map, add an error.\n        // Error is already caught by evaluateImportsForOverrides.\n        continue;\n      } else {\n        // If the dependency is found in the resolve map, add a warning.\n        warnings.push(message);\n      }\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    pathsToEvaluate.add(packagePath);\n\n    // Add to includedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.includedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.includedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.includedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'included-dependency',\n          change: dependencyName,\n          reason: `Imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n\n  const dependencies = new Set([\n    ...Object.keys(definition.dependencies ?? {}),\n    ...Object.keys(definition.peerDependencies ?? {}),\n  ]);\n\n  // Iterate through dependencies and find unused.\n  for (const dependencyName of dependencies) {\n    if (consumedDependencies.has(dependencyName)) {\n      continue;\n    }\n\n    pathsToEvaluate.add(packagePath);\n\n    // Add to excludedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.excludedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.excludedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.excludedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'excluded-dependency',\n          change: dependencyName,\n          reason: `Not imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n  return { warnings, changes, pathsToEvaluate, pathsToRefresh };\n}\n"]}

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

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

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

@@ -1 +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"}
+{"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;AACxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,MAAM,WAAW,iBAAkB,SAAQ,qBAAqB;IAC9D,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB"}

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

@@ -1 +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"]}
+{"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';\nimport type { BundleInfo } from '@ms-cloudpack/api-server';\n\nexport interface InitPackageResult extends InitPackageIdentifier {\n  errors?: BundleMessage[];\n  warnings?: BundleMessage[];\n  info?: BundleInfo;\n}\n"]}

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

@@ -0,0 +1,10 @@
+import { type ResolveMap } from '@ms-cloudpack/package-utilities';
+import type { InitPackageResult } from './types/InitPackageResult.js';
+/**
+ * Checks that the imports/exports of packages match.
+ * To be called before `summarize`.
+ * @param packageResults - The package results to check.
+ * @param resolveMap - The resolve map used to find the imported packages.
+ */
+export declare function verifyExports(packageResults: Record<string, InitPackageResult>, resolveMap: ResolveMap): InitPackageResult[];
+//# sourceMappingURL=verifyExports.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"verifyExports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/verifyExports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAuB,MAAM,iCAAiC,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,UAAU,EAAE,UAAU,GACrB,iBAAiB,EAAE,CA+HrB"}

package/lib/commands/init/verifyExports.js

@@ -0,0 +1,110 @@
+import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';
+/**
+ * Checks that the imports/exports of packages match.
+ * To be called before `summarize`.
+ * @param packageResults - The package results to check.
+ * @param resolveMap - The resolve map used to find the imported packages.
+ */
+export function verifyExports(packageResults, resolveMap) {
+    const allWarnings = [];
+    const packageResultsArray = Object.values(packageResults);
+    // Iterate through each package
+    for (const packagePath in packageResults) {
+        const result = packageResults[packagePath];
+        // Skip packages with errors
+        if (!result || result.errors?.length) {
+            continue;
+        }
+        const { info } = result;
+        const definition = {
+            name: result.name,
+            version: result.version,
+            path: result.path,
+        };
+        const packageWarning = {
+            ...definition,
+        };
+        // Makes sure that the warnings array is initialized and typescript happy.
+        packageWarning.warnings = [];
+        // Skip packages with no info
+        if (!info) {
+            packageWarning.warnings.push({ text: `Can't find bundle info` });
+            allWarnings.push(packageWarning);
+            continue;
+        }
+        // Iterate through each entry
+        for (const required of Object.values(info.entry ?? {})) {
+            const { consumes, bundlePath } = required;
+            // Skip entries with no imports
+            if (!consumes?.length) {
+                continue;
+            }
+            const namedExports = [];
+            let missingExport = false;
+            // Iterate through each imported package
+            for (const { packageName, importPath, names } of consumes) {
+                let prettyImportPath = importPath;
+                const entry = findResolveMapEntry({ packageName, definition, resolveMap });
+                // Remove leading dot from import path
+                if (importPath.startsWith('.')) {
+                    prettyImportPath = importPath.substring(1);
+                }
+                // Warn if we can't find the imported package in the resolve map
+                if (!entry) {
+                    packageWarning.warnings.push({
+                        text: `Can't find entry in resolve map for ${packageName}`,
+                    });
+                    continue;
+                }
+                const packageResult = packageResultsArray.find((r) => r.name === entry.name && r.version === entry.version);
+                // Warn if we can't find the imported package in the package results
+                if (!packageResult) {
+                    packageWarning.warnings.push({
+                        text: `In ${bundlePath} can't find package result of ${packageName}@${entry.version}`,
+                    });
+                    continue;
+                }
+                // Warn if the imported package has no entry for the import path
+                if (!packageResult.info?.entry?.[importPath] && !packageResult.info?.entry?.[importPath + '.js']) {
+                    packageWarning.warnings.push({
+                        text: `In ${bundlePath} can't find entry ${importPath} for ${packageName}@${entry.version})`,
+                    });
+                    continue;
+                }
+                const { bundlePath: importBundlePath, produces: importProduces } = packageResult.info.entry[importPath] || packageResult.info?.entry?.[importPath + '.js'] || {};
+                const location = `${packageName}@${entry.version}${prettyImportPath} ${importBundlePath}`;
+                const missingNamedExports = [];
+                const catchAll = [];
+                if (importProduces.includes('*')) {
+                    catchAll.push('*');
+                }
+                if (importProduces.includes('default')) {
+                    catchAll.push('default');
+                }
+                // Iterate through each imported name
+                for (const name of names) {
+                    // Warn if the imported name is not exported
+                    if ((name !== '*' && !importProduces.includes(name)) || (name === '*' && importProduces.length === 0)) {
+                        missingExport = true;
+                        // Warn if the imported name is not exported
+                        missingNamedExports.push(name);
+                    }
+                }
+                if (missingNamedExports.length) {
+                    namedExports.push(`${missingNamedExports.join(', ')} from ${location}${catchAll.length ? `, but it exports ${catchAll.join(', ')} which might be dynamically generated` : ''}`);
+                }
+            }
+            // Warn if the entry has missing exports
+            if (missingExport) {
+                packageWarning.warnings.push({
+                    text: `In ${bundlePath} can't find exports:\n` + namedExports.join('\n'),
+                });
+            }
+        }
+        if (packageWarning.warnings?.length) {
+            allWarnings.push(packageWarning);
+        }
+    }
+    return allWarnings;
+}
+//# sourceMappingURL=verifyExports.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"verifyExports.js","sourceRoot":"","sources":["../../../src/commands/init/verifyExports.ts"],"names":[],"mappings":"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","sourcesContent":["import { type ResolveMap, findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport type { InitPackageResult } from './types/InitPackageResult.js';\n\n/**\n * Checks that the imports/exports of packages match.\n * To be called before `summarize`.\n * @param packageResults - The package results to check.\n * @param resolveMap - The resolve map used to find the imported packages.\n */\nexport function verifyExports(\n  packageResults: Record<string, InitPackageResult>,\n  resolveMap: ResolveMap,\n): InitPackageResult[] {\n  const allWarnings: InitPackageResult[] = [];\n  const packageResultsArray = Object.values(packageResults);\n\n  // Iterate through each package\n  for (const packagePath in packageResults) {\n    const result = packageResults[packagePath];\n\n    // Skip packages with errors\n    if (!result || result.errors?.length) {\n      continue;\n    }\n\n    const { info } = result;\n    const definition = {\n      name: result.name,\n      version: result.version,\n      path: result.path,\n    };\n\n    const packageWarning: InitPackageResult = {\n      ...definition,\n    };\n    // Makes sure that the warnings array is initialized and typescript happy.\n    packageWarning.warnings = [];\n\n    // Skip packages with no info\n    if (!info) {\n      packageWarning.warnings.push({ text: `Can't find bundle info` });\n      allWarnings.push(packageWarning);\n      continue;\n    }\n\n    // Iterate through each entry\n    for (const required of Object.values(info.entry ?? {})) {\n      const { consumes, bundlePath } = required;\n\n      // Skip entries with no imports\n      if (!consumes?.length) {\n        continue;\n      }\n\n      const namedExports: string[] = [];\n      let missingExport = false;\n\n      // Iterate through each imported package\n      for (const { packageName, importPath, names } of consumes) {\n        let prettyImportPath = importPath;\n        const entry = findResolveMapEntry({ packageName, definition, resolveMap });\n\n        // Remove leading dot from import path\n        if (importPath.startsWith('.')) {\n          prettyImportPath = importPath.substring(1);\n        }\n\n        // Warn if we can't find the imported package in the resolve map\n        if (!entry) {\n          packageWarning.warnings.push({\n            text: `Can't find entry in resolve map for ${packageName}`,\n          });\n          continue;\n        }\n\n        const packageResult = packageResultsArray.find((r) => r.name === entry.name && r.version === entry.version);\n\n        // Warn if we can't find the imported package in the package results\n        if (!packageResult) {\n          packageWarning.warnings.push({\n            text: `In ${bundlePath} can't find package result of ${packageName}@${entry.version}`,\n          });\n          continue;\n        }\n\n        // Warn if the imported package has no entry for the import path\n        if (!packageResult.info?.entry?.[importPath] && !packageResult.info?.entry?.[importPath + '.js']) {\n          packageWarning.warnings.push({\n            text: `In ${bundlePath} can't find entry ${importPath} for ${packageName}@${entry.version})`,\n          });\n          continue;\n        }\n\n        const { bundlePath: importBundlePath, produces: importProduces } =\n          packageResult.info.entry[importPath] || packageResult.info?.entry?.[importPath + '.js'] || {};\n\n        const location = `${packageName}@${entry.version}${prettyImportPath} ${importBundlePath}`;\n        const missingNamedExports = [];\n\n        const catchAll = [];\n        if (importProduces.includes('*')) {\n          catchAll.push('*');\n        }\n        if (importProduces.includes('default')) {\n          catchAll.push('default');\n        }\n\n        // Iterate through each imported name\n        for (const name of names) {\n          // Warn if the imported name is not exported\n          if ((name !== '*' && !importProduces.includes(name)) || (name === '*' && importProduces.length === 0)) {\n            missingExport = true;\n            // Warn if the imported name is not exported\n            missingNamedExports.push(name);\n          }\n        }\n\n        if (missingNamedExports.length) {\n          namedExports.push(\n            `${missingNamedExports.join(', ')} from ${location}${\n              catchAll.length ? `, but it exports ${catchAll.join(', ')} which might be dynamically generated` : ''\n            }`,\n          );\n        }\n      }\n\n      // Warn if the entry has missing exports\n      if (missingExport) {\n        packageWarning.warnings.push({\n          text: `In ${bundlePath} can't find exports:\\n` + namedExports.join('\\n'),\n        });\n      }\n    }\n    if (packageWarning.warnings?.length) {\n      allWarnings.push(packageWarning);\n    }\n  }\n\n  return allWarnings;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.54.2",
+  "version": "0.54.4",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -10,15 +10,15 @@
     "cloudpack": "./bin/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.28.3",
-    "@ms-cloudpack/config": "^0.17.10",
-    "@ms-cloudpack/config-types": "^0.3.1",
-    "@ms-cloudpack/create-express-app": "^1.3.15",
+    "@ms-cloudpack/api-server": "^0.29.1",
+    "@ms-cloudpack/config": "^0.17.12",
+    "@ms-cloudpack/config-types": "^0.3.3",
+    "@ms-cloudpack/create-express-app": "^1.3.16",
     "@ms-cloudpack/json-utilities": "^0.1.3",
-    "@ms-cloudpack/overlay": "^0.16.39",
-    "@ms-cloudpack/package-hashes": "^0.3.4",
-    "@ms-cloudpack/package-utilities": "^5.7.4",
-    "@ms-cloudpack/path-string-parsing": "^1.1.2",
+    "@ms-cloudpack/overlay": "^0.16.41",
+    "@ms-cloudpack/package-hashes": "^0.3.6",
+    "@ms-cloudpack/package-utilities": "^5.7.6",
+    "@ms-cloudpack/path-string-parsing": "^1.1.3",
     "@ms-cloudpack/remote-cache": "^0.3.0",
     "@ms-cloudpack/task-reporter": "^0.10.2",
     "@ms-cloudpack/telemetry": "^0.4.4",