@ms-cloudpack/cli 0.72.88 → 0.73.1

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

@@ -1,17 +1,17 @@
-import type { BundleInfo } from '@ms-cloudpack/api-server';
-import type { CloudpackConfig, PackageJson, PackageImporterContext, PackageDefinitionsCache } from '@ms-cloudpack/common-types';
+import type { BundleInfo, PartialContext } from '@ms-cloudpack/api-server';
+import type { PackageJson } from '@ms-cloudpack/common-types';
 import type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';
+/**
+ * Check for dynamic `import()` statements of relative paths, and add any files where those are
+ * found to `GeneratedPackageSettings.dynamicImports`.
+ */
 export declare function evaluateDynamicImports(options: {
     info: BundleInfo;
     definition: PackageJson;
     packagePath: string;
-    /** Config so far. This will be modified if new overrides are needed. */
-    config: Pick<CloudpackConfig, 'generated'>;
-    packages: PackageDefinitionsCache;
-    importerContext: PackageImporterContext | undefined;
-}): Promise<{
+}, context: PartialContext<'packages', 'config'>): Promise<{
     dynamicImportsChanges: GeneratedPackageChanges[];
-    pathsToEvaluate: Map<string, PackageImporterContext | undefined>;
-    pathsToRefresh: Set<string>;
+    shouldReevaluate: boolean;
+    shouldRefresh: boolean;
 }>;
 //# sourceMappingURL=evaluateDynamicImports.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"evaluateDynamicImports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluateDynamicImports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EAEX,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IACpD,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC3C,QAAQ,EAAE,uBAAuB,CAAC;IAClC,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;CACrD,GAAG,OAAO,CAAC;IACV,qBAAqB,EAAE,uBAAuB,EAAE,CAAC;IACjD,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IACjE,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CAgDD"}
+{"version":3,"file":"evaluateDynamicImports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluateDynamicImports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAA4B,MAAM,4BAA4B,CAAC;AAExF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE;IACP,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;CACrB,EACD,OAAO,EAAE,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,GAC5C,OAAO,CAAC;IACT,qBAAqB,EAAE,uBAAuB,EAAE,CAAC;IACjD,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC,CAmDD"}

package/lib/commands/init/evaluateDynamicImports.js

@@ -1,14 +1,20 @@
 import { ensureGeneratedSettingsForPackage } from '@ms-cloudpack/config';
-export async function evaluateDynamicImports(options) {
-    const { info, definition, packagePath, config, packages, importerContext } = options;
+/**
+ * Check for dynamic `import()` statements of relative paths, and add any files where those are
+ * found to `GeneratedPackageSettings.dynamicImports`.
+ */
+export async function evaluateDynamicImports(options, context) {
+    const { info, definition, packagePath } = options;
+    const { packages, session } = context;
+    const { config } = session;
     const { name: packageName, version: packageVersion } = definition;
     const displayName = `${packageName}@${packageVersion}`;
     if (!packageName || !packageVersion) {
         throw new Error(`Package "${displayName}" is missing a name or version.`);
     }
     const dynamicImportsChanges = [];
-    const pathsToEvaluate = new Map();
-    const pathsToRefresh = new Set();
+    let shouldReevaluate = false;
+    let shouldRefresh = false;
     let generatedPackageSettings;
     for (const entryInfo of Object.values(info)) {
         for (const dynamicImport of entryInfo.dynamicImports || []) {
@@ -16,15 +22,16 @@ export async function evaluateDynamicImports(options) {
                 continue;
             }
             const { importOrigin } = dynamicImport;
-            pathsToEvaluate.set(packagePath, importerContext);
+            // TODO: does this actually need to re-evaluate if there are no new imports?
+            shouldReevaluate = true;
             generatedPackageSettings ??= await ensureGeneratedSettingsForPackage({ packagePath }, { config, packages });
-            // We are missing an import path. We need to add this entry to the exports map in package settings.
             if (generatedPackageSettings?.dynamicImports?.includes(importOrigin)) {
                 continue;
             }
+            // We are missing an import path. We need to add this entry to the exports map in package settings.
             generatedPackageSettings.dynamicImports ??= [];
             generatedPackageSettings.dynamicImports.push(importOrigin);
-            pathsToRefresh.add(packagePath);
+            shouldRefresh = true;
             dynamicImportsChanges.push({
                 name: packageName,
                 version: packageVersion,
@@ -39,6 +46,6 @@ export async function evaluateDynamicImports(options) {
             });
         }
     }
-    return { dynamicImportsChanges, pathsToEvaluate, pathsToRefresh };
+    return { dynamicImportsChanges, shouldReevaluate, shouldRefresh };
 }
 //# sourceMappingURL=evaluateDynamicImports.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"evaluateDynamicImports.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateDynamicImports.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iCAAiC,EAAE,MAAM,sBAAsB,CAAC;AAGzE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,OAQ5C;IAKC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAErF,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC;IAClE,MAAM,WAAW,GAAG,GAAG,WAAW,IAAI,cAAc,EAAE,CAAC;IACvD,IAAI,CAAC,WAAW,IAAI,CAAC,cAAc,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,iCAAiC,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,qBAAqB,GAA8B,EAAE,CAAC;IAC5D,MAAM,eAAe,GAAG,IAAI,GAAG,EAA8C,CAAC;IAC9E,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,IAAI,wBAA8D,CAAC;IAEnE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,KAAK,MAAM,aAAa,IAAI,SAAS,CAAC,cAAc,IAAI,EAAE,EAAE,CAAC;YAC3D,IAAI,aAAa,CAAC,WAAW,KAAK,GAAG,EAAE,CAAC;gBACtC,SAAS;YACX,CAAC;YAED,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC;YACvC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;YAClD,wBAAwB,KAAK,MAAM,iCAAiC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5G,mGAAmG;YACnG,IAAI,wBAAwB,EAAE,cAAc,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACrE,SAAS;YACX,CAAC;YAED,wBAAwB,CAAC,cAAc,KAAK,EAAE,CAAC;YAC/C,wBAAwB,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC3D,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAEhC,qBAAqB,CAAC,IAAI,CAAC;gBACzB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,cAAc;gBACvB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,sBAAsB;wBAC5B,MAAM,EAAE,YAAY;wBACpB,MAAM,EAAE,qCAAqC;qBAC9C;iBACF;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC;AACpE,CAAC","sourcesContent":["import type { BundleInfo } from '@ms-cloudpack/api-server';\nimport type {\n  CloudpackConfig,\n  PackageJson,\n  GeneratedPackageSettings,\n  PackageImporterContext,\n  PackageDefinitionsCache,\n} from '@ms-cloudpack/common-types';\nimport { ensureGeneratedSettingsForPackage } from '@ms-cloudpack/config';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\nexport async function evaluateDynamicImports(options: {\n  info: BundleInfo;\n  definition: PackageJson;\n  packagePath: string;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: Pick<CloudpackConfig, 'generated'>;\n  packages: PackageDefinitionsCache;\n  importerContext: PackageImporterContext | undefined;\n}): Promise<{\n  dynamicImportsChanges: GeneratedPackageChanges[];\n  pathsToEvaluate: Map<string, PackageImporterContext | undefined>;\n  pathsToRefresh: Set<string>;\n}> {\n  const { info, definition, packagePath, config, packages, importerContext } = options;\n\n  const { name: packageName, version: packageVersion } = definition;\n  const displayName = `${packageName}@${packageVersion}`;\n  if (!packageName || !packageVersion) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  const dynamicImportsChanges: GeneratedPackageChanges[] = [];\n  const pathsToEvaluate = new Map<string, PackageImporterContext | undefined>();\n  const pathsToRefresh = new Set<string>();\n  let generatedPackageSettings: GeneratedPackageSettings | undefined;\n\n  for (const entryInfo of Object.values(info)) {\n    for (const dynamicImport of entryInfo.dynamicImports || []) {\n      if (dynamicImport.packageName !== '.') {\n        continue;\n      }\n\n      const { importOrigin } = dynamicImport;\n      pathsToEvaluate.set(packagePath, importerContext);\n      generatedPackageSettings ??= await ensureGeneratedSettingsForPackage({ packagePath }, { config, packages });\n      // We are missing an import path. We need to add this entry to the exports map in package settings.\n      if (generatedPackageSettings?.dynamicImports?.includes(importOrigin)) {\n        continue;\n      }\n\n      generatedPackageSettings.dynamicImports ??= [];\n      generatedPackageSettings.dynamicImports.push(importOrigin);\n      pathsToRefresh.add(packagePath);\n\n      dynamicImportsChanges.push({\n        name: packageName,\n        version: packageVersion,\n        path: packagePath,\n        changes: [\n          {\n            type: 'added-dynamic-import',\n            change: importOrigin,\n            reason: `Found non-literal path in import().`,\n          },\n        ],\n      });\n    }\n  }\n\n  return { dynamicImportsChanges, pathsToEvaluate, pathsToRefresh };\n}\n"]}
+{"version":3,"file":"evaluateDynamicImports.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateDynamicImports.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,sBAAsB,CAAC;AAGzE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAIC,EACD,OAA6C;IAM7C,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC;IAClE,MAAM,WAAW,GAAG,GAAG,WAAW,IAAI,cAAc,EAAE,CAAC;IACvD,IAAI,CAAC,WAAW,IAAI,CAAC,cAAc,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,iCAAiC,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,qBAAqB,GAA8B,EAAE,CAAC;IAC5D,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,wBAA8D,CAAC;IAEnE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,KAAK,MAAM,aAAa,IAAI,SAAS,CAAC,cAAc,IAAI,EAAE,EAAE,CAAC;YAC3D,IAAI,aAAa,CAAC,WAAW,KAAK,GAAG,EAAE,CAAC;gBACtC,SAAS;YACX,CAAC;YAED,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC;YACvC,4EAA4E;YAC5E,gBAAgB,GAAG,IAAI,CAAC;YACxB,wBAAwB,KAAK,MAAM,iCAAiC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5G,IAAI,wBAAwB,EAAE,cAAc,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACrE,SAAS;YACX,CAAC;YAED,mGAAmG;YACnG,wBAAwB,CAAC,cAAc,KAAK,EAAE,CAAC;YAC/C,wBAAwB,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC3D,aAAa,GAAG,IAAI,CAAC;YAErB,qBAAqB,CAAC,IAAI,CAAC;gBACzB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,cAAc;gBACvB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,sBAAsB;wBAC5B,MAAM,EAAE,YAAY;wBACpB,MAAM,EAAE,qCAAqC;qBAC9C;iBACF;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,aAAa,EAAE,CAAC;AACpE,CAAC","sourcesContent":["import type { BundleInfo, PartialContext } from '@ms-cloudpack/api-server';\nimport type { PackageJson, GeneratedPackageSettings } from '@ms-cloudpack/common-types';\nimport { ensureGeneratedSettingsForPackage } from '@ms-cloudpack/config';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\n/**\n * Check for dynamic `import()` statements of relative paths, and add any files where those are\n * found to `GeneratedPackageSettings.dynamicImports`.\n */\nexport async function evaluateDynamicImports(\n  options: {\n    info: BundleInfo;\n    definition: PackageJson;\n    packagePath: string;\n  },\n  context: PartialContext<'packages', 'config'>,\n): Promise<{\n  dynamicImportsChanges: GeneratedPackageChanges[];\n  shouldReevaluate: boolean;\n  shouldRefresh: boolean;\n}> {\n  const { info, definition, packagePath } = options;\n  const { packages, session } = context;\n  const { config } = session;\n\n  const { name: packageName, version: packageVersion } = definition;\n  const displayName = `${packageName}@${packageVersion}`;\n  if (!packageName || !packageVersion) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  const dynamicImportsChanges: GeneratedPackageChanges[] = [];\n  let shouldReevaluate = false;\n  let shouldRefresh = false;\n  let generatedPackageSettings: GeneratedPackageSettings | undefined;\n\n  for (const entryInfo of Object.values(info)) {\n    for (const dynamicImport of entryInfo.dynamicImports || []) {\n      if (dynamicImport.packageName !== '.') {\n        continue;\n      }\n\n      const { importOrigin } = dynamicImport;\n      // TODO: does this actually need to re-evaluate if there are no new imports?\n      shouldReevaluate = true;\n      generatedPackageSettings ??= await ensureGeneratedSettingsForPackage({ packagePath }, { config, packages });\n      if (generatedPackageSettings?.dynamicImports?.includes(importOrigin)) {\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.dynamicImports ??= [];\n      generatedPackageSettings.dynamicImports.push(importOrigin);\n      shouldRefresh = true;\n\n      dynamicImportsChanges.push({\n        name: packageName,\n        version: packageVersion,\n        path: packagePath,\n        changes: [\n          {\n            type: 'added-dynamic-import',\n            change: importOrigin,\n            reason: `Found non-literal path in import().`,\n          },\n        ],\n      });\n    }\n  }\n\n  return { dynamicImportsChanges, shouldReevaluate, shouldRefresh };\n}\n"]}

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,UAAU,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EACV,aAAa,EACb,sBAAsB,EACtB,WAAW,EAEZ,MAAM,4BAA4B,CAAC;AAepC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAMlF,MAAM,WAAW,kCAAkC;IACjD,2BAA2B;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,IAAI,EAAE,UAAU,CAAC;IACjB,2CAA2C;IAC3C,UAAU,EAAE,WAAW,CAAC;IACxB,uFAAuF;IACvF,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;CACrD;AAED,MAAM,MAAM,kCAAkC,GAAG,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,YAAY,CAAC,CAAC;AAErG,MAAM,WAAW,iCAAiC;IAChD,kDAAkD;IAClD,cAAc,EAAE,uBAAuB,EAAE,CAAC;IAC1C,iEAAiE;IACjE,2BAA2B,EAAE,uBAAuB,EAAE,CAAC;IACvD,6BAA6B;IAC7B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,6BAA6B;IAC7B,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IACjE,6FAA6F;IAC7F,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,kCAAkC,EAC3C,OAAO,EAAE,kCAAkC,GAC1C,OAAO,CAAC,iCAAiC,CAAC,CAsR5C"}
+{"version":3,"file":"evaluateImportsForOverrides.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EACV,aAAa,EACb,sBAAsB,EACtB,WAAW,EAEZ,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAMlF,MAAM,WAAW,kCAAkC;IACjD,2BAA2B;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,IAAI,EAAE,UAAU,CAAC;IACjB,2CAA2C;IAC3C,UAAU,EAAE,WAAW,CAAC;IACxB,uFAAuF;IACvF,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;CACrD;AAED,MAAM,MAAM,kCAAkC,GAAG,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,YAAY,CAAC,CAAC;AAErG,MAAM,WAAW,iCAAiC;IAChD,kDAAkD;IAClD,cAAc,EAAE,uBAAuB,EAAE,CAAC;IAC1C,iEAAiE;IACjE,2BAA2B,EAAE,uBAAuB,EAAE,CAAC;IACvD,6BAA6B;IAC7B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,6BAA6B;IAC7B,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IACjE,6FAA6F;IAC7F,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,kCAAkC,EAC3C,OAAO,EAAE,kCAAkC,GAC1C,OAAO,CAAC,iCAAiC,CAAC,CAyR5C"}

package/lib/commands/init/evaluateImportsForOverrides.js

@@ -1,5 +1,5 @@
 import { ensureGeneratedSettingsForPackage, getGeneratedPackageSettings, getPackageSettings, } from '@ms-cloudpack/config';
-import { addExportsMapEntry, ensureResolveMapEntry, flattenExportsMap, getDependencies, getUnusedDependencies, getExportsMap, } from '@ms-cloudpack/package-utilities';
+import { addExportsMapEntry, ensureResolveMapEntry, flattenExportsMap, getDependencies, getExportsMap, } from '@ms-cloudpack/package-utilities';
 import { bulletedList, cyan } from '@ms-cloudpack/task-reporter';
 import { isBuiltin } from 'module';
 import { getConsumedPaths } from '@ms-cloudpack/api-server';
@@ -28,8 +28,7 @@ export async function evaluateImportsForOverrides(options, context) {
     const pathsToEvaluate = new Map();
     const pathsToRefresh = new Set();
     const dependencies = getDependencies(definition);
-    // TODO: this line will return nothing due to https://github.com/microsoft/cloudpack/issues/2389, https://github.com/microsoft/cloudpack/issues/2391
-    const unusedDependencies = getUnusedDependencies(definition);
+    const allDependencies = getDependencies(definition, { includeAll: true });
     const consumedPaths = getConsumedPaths(info);
     const userExcludedDependencies = getPackageSettings({
         name: packageName,
@@ -45,15 +44,16 @@ export async function evaluateImportsForOverrides(options, context) {
             continue;
         }
         // Check if we can resolve the dependency.
-        // If we included or removed an excluded dependency, we need to ensure it is in the resolve map.
-        // TODO: this is somewhat broken https://github.com/microsoft/cloudpack/issues/2390
-        const { dependencyPath, updatedResolution } = await ensureResolveMapEntry({
-            definition,
-            packagePath,
-            dependencyName,
-            resolveMap,
-            appPath,
-        }, { packages });
+        let dependencyPath;
+        let updatedResolution = false;
+        if (dependencyName === packageName) {
+            dependencyPath = packagePath;
+        }
+        else {
+            // If we included or removed an excluded dependency, we need to ensure it is in the resolve map.
+            // TODO: this is somewhat broken https://github.com/microsoft/cloudpack/issues/2390
+            ({ dependencyPath, updatedResolution } = await ensureResolveMapEntry({ definition, packagePath, dependencyName, resolveMap, appPath }, { packages }));
+        }
         // If the dependency is not resolved, add an error.
         if (!dependencyPath) {
             errors.push(getMissingDepMessage({ dependencyName, displayName, issueType: 'not-found', packagePath }));
@@ -66,14 +66,16 @@ export async function evaluateImportsForOverrides(options, context) {
         // eslint-disable-next-line etc/no-deprecated
         bundlerCapabilities?.['resolve-web-extensions'] ?? Boolean(config.features?.resolveWebExtensions);
         // If the dependency is not listed, add to includedDependencies.
-        if (!dependencies[dependencyName] && dependencyName !== definition.name && !neverExclude(dependencyName, config)) {
+        if (!dependencies[dependencyName] && dependencyName !== packageName && !neverExclude(dependencyName, config)) {
             // Survive from the case where it is not a dependency in the package.json
             // and it is resolvable, but warn the user.
-            // TODO: this won't work as expected due to https://github.com/microsoft/cloudpack/issues/2391
-            if (!unusedDependencies[dependencyName]) {
+            if (!allDependencies[dependencyName]) {
                 warnings.push(getMissingDepMessage({ dependencyName, displayName, issueType: 'undeclared', packagePath }));
             }
             // Make sure to add the package to the list of packages to evaluate.
+            // This ensures its PackageJson.cloudpack is updated accounting for the new dependency.
+            // TODO could we just refresh the package definition here and skip this step?
+            // (does it do anything else besides refreshing the package definition?)
             pathsToEvaluate.set(packagePath, importerContext);
             // Add to includedDependencies if appropriate.
             generatedPackageSettings ??= await ensureGeneratedSettingsForPackage({ packagePath }, { config, packages });
@@ -105,12 +107,14 @@ export async function evaluateImportsForOverrides(options, context) {
             // Self-import (we may still need to evaluate the paths). Use the importer context from options.
             dependencyImporterContext = importerContext;
         }
-        else if (dependencies[dependencyName]) {
+        else if (allDependencies[dependencyName]) {
             dependencyImporterContext = {
                 parentName: packageName,
                 parentVersion: packageVersion,
                 importedName: dependencyName,
-                versionRequirement: dependencies[dependencyName],
+                // TODO should this use the original version requirement even for dev deps (which might not
+                // be installed at that version)?
+                versionRequirement: allDependencies[dependencyName],
             };
         }
         // Add the dependency to the list of packages to evaluate.

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 { BundleInfo, PartialContext } from '@ms-cloudpack/api-server';\nimport type {\n  BundleMessage,\n  PackageImporterContext,\n  PackageJson,\n  GeneratedPackageSettings,\n} from '@ms-cloudpack/common-types';\nimport {\n  ensureGeneratedSettingsForPackage,\n  getGeneratedPackageSettings,\n  getPackageSettings,\n} from '@ms-cloudpack/config';\nimport {\n  addExportsMapEntry,\n  ensureResolveMapEntry,\n  flattenExportsMap,\n  getDependencies,\n  getUnusedDependencies,\n  getExportsMap,\n} from '@ms-cloudpack/package-utilities';\nimport { bulletedList, cyan } from '@ms-cloudpack/task-reporter';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\nimport { isBuiltin } from 'module';\nimport { getConsumedPaths } from '@ms-cloudpack/api-server';\nimport { neverExclude } from './neverExclude.js';\nimport path from 'path';\n\nexport interface EvaluateImportsForOverridesOptions {\n  /** Path being evaluated */\n  packagePath: string;\n  /** Bundle result info for `packagePath` */\n  info: BundleInfo;\n  /** Package definition for `packagePath` */\n  definition: PackageJson;\n  /** Info about how the parent package imported `packagePath` (name and version used) */\n  importerContext: PackageImporterContext | undefined;\n}\n\nexport type EvaluateImportsForOverridesContext = PartialContext<'packages', 'config' | 'resolveMap'>;\n\nexport interface EvaluateImportsForOverridesResult {\n  /** Export changes made to the generated config */\n  exportsChanges: GeneratedPackageChanges[];\n  /** Included dependencies changes made to the generated config */\n  includedDependenciesChanges: GeneratedPackageChanges[];\n  /** Any errors encountered */\n  errors: BundleMessage[];\n  /** Any warnings generated */\n  warnings: BundleMessage[];\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\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 *\n * **Mutates `context.session.config.generated.packageSettings` and potentially `context.session.resolveMap`.**\n */\nexport async function evaluateImportsForOverrides(\n  options: EvaluateImportsForOverridesOptions,\n  context: EvaluateImportsForOverridesContext,\n): Promise<EvaluateImportsForOverridesResult> {\n  const { info, definition, packagePath, importerContext } = options;\n  const { packages, session } = context;\n  const { config, resolveMap } = session;\n  const { appPath } = config;\n\n  const { name: packageName, version: packageVersion } = definition;\n  const displayName = `${packageName}@${packageVersion}`;\n  if (!packageName || !packageVersion) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  const exportsChanges: GeneratedPackageChanges[] = [];\n  const includedDependenciesChanges: GeneratedPackageChanges[] = [];\n  const errors: BundleMessage[] = [];\n  const warnings: BundleMessage[] = [];\n  const pathsToEvaluate = new Map<string, PackageImporterContext | undefined>();\n  const pathsToRefresh = new Set<string>();\n  const dependencies = getDependencies(definition);\n  // TODO: this line will return nothing due to https://github.com/microsoft/cloudpack/issues/2389, https://github.com/microsoft/cloudpack/issues/2391\n  const unusedDependencies = getUnusedDependencies(definition);\n  const consumedPaths = getConsumedPaths(info);\n  const userExcludedDependencies = getPackageSettings({\n    name: packageName,\n    version: packageVersion,\n    userPackageSettings: config.packageSettings,\n    generatedPackageSettings: undefined,\n  }).userPackageSettings?.excludedDependencies;\n\n  let generatedPackageSettings: GeneratedPackageSettings | undefined;\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const [dependencyName, dependencyImportPaths] of Object.entries(consumedPaths)) {\n    // If the dependency is excluded in the user settings, entirely ignore it.\n    if (userExcludedDependencies?.includes(dependencyName)) {\n      continue;\n    }\n\n    // Check if we can resolve the dependency.\n    // If we included or removed an excluded dependency, we need to ensure it is in the resolve map.\n    // TODO: this is somewhat broken https://github.com/microsoft/cloudpack/issues/2390\n    const { dependencyPath, updatedResolution } = await ensureResolveMapEntry(\n      {\n        definition,\n        packagePath,\n        dependencyName,\n        resolveMap,\n        appPath,\n      },\n      { packages },\n    );\n\n    // If the dependency is not resolved, add an error.\n    if (!dependencyPath) {\n      errors.push(getMissingDepMessage({ dependencyName, displayName, issueType: 'not-found', packagePath }));\n      // If the dependency is not resolved, we can't continue to evaluate it.\n      continue;\n    }\n\n    const dependencyDefinition = await packages.get(dependencyPath);\n\n    const { bundlerCapabilities } = dependencyDefinition.cloudpack || {};\n    const dependencyResolveWebExtensions =\n      // eslint-disable-next-line etc/no-deprecated\n      bundlerCapabilities?.['resolve-web-extensions'] ?? Boolean(config.features?.resolveWebExtensions);\n\n    // If the dependency is not listed, add to includedDependencies.\n    if (!dependencies[dependencyName] && dependencyName !== definition.name && !neverExclude(dependencyName, config)) {\n      // Survive from the case where it is not a dependency in the package.json\n      // and it is resolvable, but warn the user.\n      // TODO: this won't work as expected due to https://github.com/microsoft/cloudpack/issues/2391\n      if (!unusedDependencies[dependencyName]) {\n        warnings.push(getMissingDepMessage({ dependencyName, displayName, issueType: 'undeclared', packagePath }));\n      }\n      // Make sure to add the package to the list of packages to evaluate.\n      pathsToEvaluate.set(packagePath, importerContext);\n\n      // Add to includedDependencies if appropriate.\n      generatedPackageSettings ??= await ensureGeneratedSettingsForPackage({ packagePath }, { config, packages });\n\n      // We can skip including the dependency if it is already excluded.\n      // This will be handled later during optimize dependencies.\n      const handledByOptimize = generatedPackageSettings.excludedDependencies?.includes(dependencyName);\n\n      // Add to includedDependencies if it is not already included.\n      if (!handledByOptimize && !generatedPackageSettings.includedDependencies?.includes(dependencyName)) {\n        generatedPackageSettings.includedDependencies ??= [];\n        generatedPackageSettings.includedDependencies.push(dependencyName);\n\n        includedDependenciesChanges.push({\n          name: packageName,\n          version: packageVersion,\n          path: packagePath,\n          changes: [\n            {\n              type: `included-dependency${updatedResolution ? '-required' : '-optional'}`,\n              change: dependencyName,\n              reason: `Imported by \"${displayName}\"`,\n            },\n          ],\n        });\n      }\n    }\n\n    const { version } = dependencyDefinition;\n\n    // Ensure we use the correct context when evaluating this dependency.\n    let dependencyImporterContext: PackageImporterContext | undefined;\n    if (dependencyName === packageName) {\n      // Self-import (we may still need to evaluate the paths). Use the importer context from options.\n      dependencyImporterContext = importerContext;\n    } else if (dependencies[dependencyName]) {\n      dependencyImporterContext = {\n        parentName: packageName,\n        parentVersion: packageVersion,\n        importedName: dependencyName,\n        versionRequirement: dependencies[dependencyName],\n      };\n    }\n\n    // Add the dependency to the list of packages to evaluate.\n    pathsToEvaluate.set(dependencyPath, dependencyImporterContext);\n\n    // A flattened, bundle-able exports map for this dependency, which is \"built up\" over the course of bundling.\n    const workingDependencyExportsList = flattenExportsMap(\n      await getExportsMap({ packagePath: dependencyPath }, { packages, config }),\n    );\n    // The official list of exports claimed by this dependency -- used to determine which exports are never used, so we can drop them.\n    const canonicalDependencyExports = flattenExportsMap(\n      await getExportsMap(\n        { packagePath: dependencyPath, disableTransforms: true, resolveWebExtensions: dependencyResolveWebExtensions },\n        { packages, config },\n      ),\n    );\n\n    const initiallyNullExports = getGeneratedPackageSettings({\n      name: dependencyName,\n      version,\n      // Use the generated snapshot to get the previous package settings.\n      generatedPackageSettings: config.generatedSnapshot?.packageSettings,\n    })?.exports;\n\n    let dependencyGeneratedPackageSettings: GeneratedPackageSettings | undefined;\n    // iterate through all the import paths.\n    for (const dependencyImportPath of dependencyImportPaths) {\n      // Imports from paths with trailing slashes are not supported in the exports map.\n      if (dependencyImportPath.endsWith('/')) {\n        errors.push({\n          text: `The import path \"${dependencyImportPath}\" from \"${dependencyName}\" has a trailing slash, which is not supported.`,\n          source: 'evaluate imports',\n          location: { file: packagePath },\n        });\n        continue;\n      }\n\n      if (!config.features?.removeUnusedExports) {\n        const dependencyAlreadyBundled = workingDependencyExportsList[dependencyImportPath];\n        if (dependencyAlreadyBundled) {\n          continue;\n        }\n      }\n\n      if (!dependencyGeneratedPackageSettings) {\n        // Start with the package's exports all set to null (indicating they are never imported)\n        // If this changes, we'll update the generatedPackageSetting accordingly later.\n        const nullifiedExports = config.features?.removeUnusedExports\n          ? Object.fromEntries(Object.keys(canonicalDependencyExports).map((k) => [k, null]))\n          : {};\n\n        dependencyGeneratedPackageSettings = await ensureGeneratedSettingsForPackage(\n          {\n            packagePath: dependencyPath,\n            defaultExportsMap: Object.keys(nullifiedExports).length > 0 ? nullifiedExports : undefined,\n          },\n          { config, packages },\n        );\n      }\n\n      if (config.features?.removeUnusedExports) {\n        const importHasCorrespondingExport = !!canonicalDependencyExports[dependencyImportPath];\n        if (importHasCorrespondingExport) {\n          // We're about to remove a null export. Before we do, check if it was initially null in\n          // the generated config; if so, we need to track the change so that --check exits correctly\n          if (dependencyImportPath in (initiallyNullExports || {})) {\n            exportsChanges.push({\n              name: dependencyName,\n              version: dependencyDefinition.version,\n              path: dependencyPath,\n              changes: [\n                {\n                  type: 'changed-export',\n                  change: dependencyImportPath,\n                  reason: `\"${dependencyImportPath}\" was previously an unused export; is now used.`,\n                },\n              ],\n            });\n          }\n\n          // Since dependencyImportPath is used (and presently set to null),\n          // and since we now know it has a corresponding export,\n          // delete it from generatePackageSettings.exports so it doesn't get dropped from the bundle\n          let deleteSucceeded = false;\n          if (\n            dependencyGeneratedPackageSettings.exports &&\n            dependencyImportPath in dependencyGeneratedPackageSettings.exports\n          ) {\n            deleteSucceeded = true;\n            delete dependencyGeneratedPackageSettings.exports[dependencyImportPath];\n          }\n\n          if (deleteSucceeded) {\n            // If there was actually an export to delete, mark this path for re-evaluation.\n            pathsToRefresh.add(dependencyPath);\n\n            // Delete the entire exports key if it now has zero entries\n            if (Object.keys(dependencyGeneratedPackageSettings.exports ?? {}).length === 0) {\n              delete dependencyGeneratedPackageSettings.exports;\n            }\n          }\n          continue;\n        }\n      }\n\n      const dependencyAlreadyBundled = workingDependencyExportsList[dependencyImportPath];\n      if (dependencyAlreadyBundled) {\n        continue;\n      }\n\n      dependencyGeneratedPackageSettings.exports ??= {};\n\n      const addedEntry = await addExportsMapEntry(\n        {\n          exports: dependencyGeneratedPackageSettings.exports,\n          packagePath: dependencyPath,\n          importPath: dependencyImportPath,\n          resolveWebExtensions: dependencyResolveWebExtensions,\n        },\n        { packages, config },\n      );\n\n      if (addedEntry) {\n        exportsChanges.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 text =\n          `An import couldn't be resolved to a physical file. ` +\n          `Check that the import refers to a file that's exported by the package or adjust the \"${cyan(\n            dependencyName,\n          )}\" package version to one that supports this import path.\\n${bulletedList(\n            [\n              `Import: ${cyan(dependencyImportPath.replace('.', dependencyName))}`,\n              `Resolved to: ${dependencyName}@${version} (${dependencyImportPath})`,\n            ],\n            2,\n          )}`;\n        errors.push({\n          text,\n          source: 'evaluate imports',\n          location: { file: packagePath },\n        });\n      }\n    }\n  }\n\n  return { exportsChanges, includedDependenciesChanges, errors, warnings, pathsToEvaluate, pathsToRefresh };\n}\n\nfunction getMissingDepMessage(params: {\n  dependencyName: string;\n  displayName: string;\n  issueType: 'not-found' | 'undeclared';\n  packagePath: string;\n}): BundleMessage {\n  const { dependencyName, displayName, issueType, packagePath } = params;\n\n  let text: string;\n  if (isBuiltin(dependencyName)) {\n    text =\n      `The node built-in \"${dependencyName}\" is being imported by \"${displayName}\", ` +\n      `but no browser-friendly version was found in the package's dependencies. ` +\n      `This can be fixed by forcing \"${displayName}\" to use \"bundler\": \"rollup\" in package settings, ` +\n      `or by adding a polyfill browser-friendly dependency.`;\n  } else {\n    text = `The package \"${dependencyName}\" is imported by \"${displayName}\", but ${\n      issueType === 'not-found' ? \"it couldn't be found\" : \"it's not included in the package's dependencies\"\n    }. Please ensure that \"${dependencyName}\" is listed in the dependencies of \"${displayName}\"${\n      issueType === 'undeclared' ? ` or add it to \"includedDependencies\" for \"${displayName}\" in package settings.` : ''\n    }.`;\n  }\n\n  return {\n    text,\n    source: 'evaluate imports',\n    location: { file: path.join(packagePath, 'package.json') },\n  };\n}\n"]}
+{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleInfo, PartialContext } from '@ms-cloudpack/api-server';\nimport type {\n  BundleMessage,\n  PackageImporterContext,\n  PackageJson,\n  GeneratedPackageSettings,\n} from '@ms-cloudpack/common-types';\nimport {\n  ensureGeneratedSettingsForPackage,\n  getGeneratedPackageSettings,\n  getPackageSettings,\n} from '@ms-cloudpack/config';\nimport {\n  addExportsMapEntry,\n  ensureResolveMapEntry,\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';\nimport { isBuiltin } from 'module';\nimport { getConsumedPaths } from '@ms-cloudpack/api-server';\nimport { neverExclude } from './neverExclude.js';\nimport path from 'path';\n\nexport interface EvaluateImportsForOverridesOptions {\n  /** Path being evaluated */\n  packagePath: string;\n  /** Bundle result info for `packagePath` */\n  info: BundleInfo;\n  /** Package definition for `packagePath` */\n  definition: PackageJson;\n  /** Info about how the parent package imported `packagePath` (name and version used) */\n  importerContext: PackageImporterContext | undefined;\n}\n\nexport type EvaluateImportsForOverridesContext = PartialContext<'packages', 'config' | 'resolveMap'>;\n\nexport interface EvaluateImportsForOverridesResult {\n  /** Export changes made to the generated config */\n  exportsChanges: GeneratedPackageChanges[];\n  /** Included dependencies changes made to the generated config */\n  includedDependenciesChanges: GeneratedPackageChanges[];\n  /** Any errors encountered */\n  errors: BundleMessage[];\n  /** Any warnings generated */\n  warnings: BundleMessage[];\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\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 *\n * **Mutates `context.session.config.generated.packageSettings` and potentially `context.session.resolveMap`.**\n */\nexport async function evaluateImportsForOverrides(\n  options: EvaluateImportsForOverridesOptions,\n  context: EvaluateImportsForOverridesContext,\n): Promise<EvaluateImportsForOverridesResult> {\n  const { info, definition, packagePath, importerContext } = options;\n  const { packages, session } = context;\n  const { config, resolveMap } = session;\n  const { appPath } = config;\n\n  const { name: packageName, version: packageVersion } = definition;\n  const displayName = `${packageName}@${packageVersion}`;\n  if (!packageName || !packageVersion) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  const exportsChanges: GeneratedPackageChanges[] = [];\n  const includedDependenciesChanges: GeneratedPackageChanges[] = [];\n  const errors: BundleMessage[] = [];\n  const warnings: BundleMessage[] = [];\n  const pathsToEvaluate = new Map<string, PackageImporterContext | undefined>();\n  const pathsToRefresh = new Set<string>();\n  const dependencies = getDependencies(definition);\n  const allDependencies = getDependencies(definition, { includeAll: true });\n  const consumedPaths = getConsumedPaths(info);\n  const userExcludedDependencies = getPackageSettings({\n    name: packageName,\n    version: packageVersion,\n    userPackageSettings: config.packageSettings,\n    generatedPackageSettings: undefined,\n  }).userPackageSettings?.excludedDependencies;\n\n  let generatedPackageSettings: GeneratedPackageSettings | undefined;\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const [dependencyName, dependencyImportPaths] of Object.entries(consumedPaths)) {\n    // If the dependency is excluded in the user settings, entirely ignore it.\n    if (userExcludedDependencies?.includes(dependencyName)) {\n      continue;\n    }\n\n    // Check if we can resolve the dependency.\n    let dependencyPath: string | undefined;\n    let updatedResolution = false;\n    if (dependencyName === packageName) {\n      dependencyPath = packagePath;\n    } else {\n      // If we included or removed an excluded dependency, we need to ensure it is in the resolve map.\n      // TODO: this is somewhat broken https://github.com/microsoft/cloudpack/issues/2390\n      ({ dependencyPath, updatedResolution } = await ensureResolveMapEntry(\n        { definition, packagePath, dependencyName, resolveMap, appPath },\n        { packages },\n      ));\n    }\n\n    // If the dependency is not resolved, add an error.\n    if (!dependencyPath) {\n      errors.push(getMissingDepMessage({ dependencyName, displayName, issueType: 'not-found', packagePath }));\n      // If the dependency is not resolved, we can't continue to evaluate it.\n      continue;\n    }\n\n    const dependencyDefinition = await packages.get(dependencyPath);\n\n    const { bundlerCapabilities } = dependencyDefinition.cloudpack || {};\n    const dependencyResolveWebExtensions =\n      // eslint-disable-next-line etc/no-deprecated\n      bundlerCapabilities?.['resolve-web-extensions'] ?? Boolean(config.features?.resolveWebExtensions);\n\n    // If the dependency is not listed, add to includedDependencies.\n    if (!dependencies[dependencyName] && dependencyName !== packageName && !neverExclude(dependencyName, config)) {\n      // Survive from the case where it is not a dependency in the package.json\n      // and it is resolvable, but warn the user.\n      if (!allDependencies[dependencyName]) {\n        warnings.push(getMissingDepMessage({ dependencyName, displayName, issueType: 'undeclared', packagePath }));\n      }\n      // Make sure to add the package to the list of packages to evaluate.\n      // This ensures its PackageJson.cloudpack is updated accounting for the new dependency.\n      // TODO could we just refresh the package definition here and skip this step?\n      // (does it do anything else besides refreshing the package definition?)\n      pathsToEvaluate.set(packagePath, importerContext);\n\n      // Add to includedDependencies if appropriate.\n      generatedPackageSettings ??= await ensureGeneratedSettingsForPackage({ packagePath }, { config, packages });\n\n      // We can skip including the dependency if it is already excluded.\n      // This will be handled later during optimize dependencies.\n      const handledByOptimize = generatedPackageSettings.excludedDependencies?.includes(dependencyName);\n\n      // Add to includedDependencies if it is not already included.\n      if (!handledByOptimize && !generatedPackageSettings.includedDependencies?.includes(dependencyName)) {\n        generatedPackageSettings.includedDependencies ??= [];\n        generatedPackageSettings.includedDependencies.push(dependencyName);\n\n        includedDependenciesChanges.push({\n          name: packageName,\n          version: packageVersion,\n          path: packagePath,\n          changes: [\n            {\n              type: `included-dependency${updatedResolution ? '-required' : '-optional'}`,\n              change: dependencyName,\n              reason: `Imported by \"${displayName}\"`,\n            },\n          ],\n        });\n      }\n    }\n\n    const { version } = dependencyDefinition;\n\n    // Ensure we use the correct context when evaluating this dependency.\n    let dependencyImporterContext: PackageImporterContext | undefined;\n    if (dependencyName === packageName) {\n      // Self-import (we may still need to evaluate the paths). Use the importer context from options.\n      dependencyImporterContext = importerContext;\n    } else if (allDependencies[dependencyName]) {\n      dependencyImporterContext = {\n        parentName: packageName,\n        parentVersion: packageVersion,\n        importedName: dependencyName,\n        // TODO should this use the original version requirement even for dev deps (which might not\n        // be installed at that version)?\n        versionRequirement: allDependencies[dependencyName],\n      };\n    }\n\n    // Add the dependency to the list of packages to evaluate.\n    pathsToEvaluate.set(dependencyPath, dependencyImporterContext);\n\n    // A flattened, bundle-able exports map for this dependency, which is \"built up\" over the course of bundling.\n    const workingDependencyExportsList = flattenExportsMap(\n      await getExportsMap({ packagePath: dependencyPath }, { packages, config }),\n    );\n    // The official list of exports claimed by this dependency -- used to determine which exports are never used, so we can drop them.\n    const canonicalDependencyExports = flattenExportsMap(\n      await getExportsMap(\n        { packagePath: dependencyPath, disableTransforms: true, resolveWebExtensions: dependencyResolveWebExtensions },\n        { packages, config },\n      ),\n    );\n\n    const initiallyNullExports = getGeneratedPackageSettings({\n      name: dependencyName,\n      version,\n      // Use the generated snapshot to get the previous package settings.\n      generatedPackageSettings: config.generatedSnapshot?.packageSettings,\n    })?.exports;\n\n    let dependencyGeneratedPackageSettings: GeneratedPackageSettings | undefined;\n    // iterate through all the import paths.\n    for (const dependencyImportPath of dependencyImportPaths) {\n      // Imports from paths with trailing slashes are not supported in the exports map.\n      if (dependencyImportPath.endsWith('/')) {\n        errors.push({\n          text: `The import path \"${dependencyImportPath}\" from \"${dependencyName}\" has a trailing slash, which is not supported.`,\n          source: 'evaluate imports',\n          location: { file: packagePath },\n        });\n        continue;\n      }\n\n      if (!config.features?.removeUnusedExports) {\n        const dependencyAlreadyBundled = workingDependencyExportsList[dependencyImportPath];\n        if (dependencyAlreadyBundled) {\n          continue;\n        }\n      }\n\n      if (!dependencyGeneratedPackageSettings) {\n        // Start with the package's exports all set to null (indicating they are never imported)\n        // If this changes, we'll update the generatedPackageSetting accordingly later.\n        const nullifiedExports = config.features?.removeUnusedExports\n          ? Object.fromEntries(Object.keys(canonicalDependencyExports).map((k) => [k, null]))\n          : {};\n\n        dependencyGeneratedPackageSettings = await ensureGeneratedSettingsForPackage(\n          {\n            packagePath: dependencyPath,\n            defaultExportsMap: Object.keys(nullifiedExports).length > 0 ? nullifiedExports : undefined,\n          },\n          { config, packages },\n        );\n      }\n\n      if (config.features?.removeUnusedExports) {\n        const importHasCorrespondingExport = !!canonicalDependencyExports[dependencyImportPath];\n        if (importHasCorrespondingExport) {\n          // We're about to remove a null export. Before we do, check if it was initially null in\n          // the generated config; if so, we need to track the change so that --check exits correctly\n          if (dependencyImportPath in (initiallyNullExports || {})) {\n            exportsChanges.push({\n              name: dependencyName,\n              version: dependencyDefinition.version,\n              path: dependencyPath,\n              changes: [\n                {\n                  type: 'changed-export',\n                  change: dependencyImportPath,\n                  reason: `\"${dependencyImportPath}\" was previously an unused export; is now used.`,\n                },\n              ],\n            });\n          }\n\n          // Since dependencyImportPath is used (and presently set to null),\n          // and since we now know it has a corresponding export,\n          // delete it from generatePackageSettings.exports so it doesn't get dropped from the bundle\n          let deleteSucceeded = false;\n          if (\n            dependencyGeneratedPackageSettings.exports &&\n            dependencyImportPath in dependencyGeneratedPackageSettings.exports\n          ) {\n            deleteSucceeded = true;\n            delete dependencyGeneratedPackageSettings.exports[dependencyImportPath];\n          }\n\n          if (deleteSucceeded) {\n            // If there was actually an export to delete, mark this path for re-evaluation.\n            pathsToRefresh.add(dependencyPath);\n\n            // Delete the entire exports key if it now has zero entries\n            if (Object.keys(dependencyGeneratedPackageSettings.exports ?? {}).length === 0) {\n              delete dependencyGeneratedPackageSettings.exports;\n            }\n          }\n          continue;\n        }\n      }\n\n      const dependencyAlreadyBundled = workingDependencyExportsList[dependencyImportPath];\n      if (dependencyAlreadyBundled) {\n        continue;\n      }\n\n      dependencyGeneratedPackageSettings.exports ??= {};\n\n      const addedEntry = await addExportsMapEntry(\n        {\n          exports: dependencyGeneratedPackageSettings.exports,\n          packagePath: dependencyPath,\n          importPath: dependencyImportPath,\n          resolveWebExtensions: dependencyResolveWebExtensions,\n        },\n        { packages, config },\n      );\n\n      if (addedEntry) {\n        exportsChanges.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 text =\n          `An import couldn't be resolved to a physical file. ` +\n          `Check that the import refers to a file that's exported by the package or adjust the \"${cyan(\n            dependencyName,\n          )}\" package version to one that supports this import path.\\n${bulletedList(\n            [\n              `Import: ${cyan(dependencyImportPath.replace('.', dependencyName))}`,\n              `Resolved to: ${dependencyName}@${version} (${dependencyImportPath})`,\n            ],\n            2,\n          )}`;\n        errors.push({\n          text,\n          source: 'evaluate imports',\n          location: { file: packagePath },\n        });\n      }\n    }\n  }\n\n  return { exportsChanges, includedDependenciesChanges, errors, warnings, pathsToEvaluate, pathsToRefresh };\n}\n\nfunction getMissingDepMessage(params: {\n  dependencyName: string;\n  displayName: string;\n  issueType: 'not-found' | 'undeclared';\n  packagePath: string;\n}): BundleMessage {\n  const { dependencyName, displayName, issueType, packagePath } = params;\n\n  let text: string;\n  if (isBuiltin(dependencyName)) {\n    text =\n      `The node built-in \"${dependencyName}\" is being imported by \"${displayName}\", ` +\n      `but no browser-friendly version was found in the package's dependencies. ` +\n      `This can be fixed by forcing \"${displayName}\" to use \"bundler\": \"rollup\" in package settings, ` +\n      `or by adding a polyfill browser-friendly dependency.`;\n  } else {\n    text = `The package \"${dependencyName}\" is imported by \"${displayName}\", but ${\n      issueType === 'not-found' ? \"it couldn't be found\" : \"it's not included in the package's dependencies\"\n    }. Please ensure that \"${dependencyName}\" is listed in the dependencies of \"${displayName}\"${\n      issueType === 'undeclared' ? ` or add it to \"includedDependencies\" for \"${displayName}\" in package settings.` : ''\n    }.`;\n  }\n\n  return {\n    text,\n    source: 'evaluate imports',\n    location: { file: path.join(packagePath, 'package.json') },\n  };\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAI5E,OAAO,EAEL,KAAK,kCAAkC,EACvC,KAAK,iCAAiC,EACvC,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE;;;;GAIG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,cAAc,GACrB,IAAI,CAAC,kCAAkC,EAAE,aAAa,GAAG,iBAAiB,CAAC,GAAG;IAC5E,WAAW,EAAE,OAAO,CAAC;IACrB,kFAAkF;IAClF,QAAQ,EAAE,MAAM,CAAC;CAClB,EACH,GAAG,EAAE,2BAA2B,GAC/B,OAAO,CACR,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,iBAAiB,GAAG,gBAAgB,CAAC,CAAC,GAAG;IACvF,6CAA6C;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CACF,CA+FA"}
+{"version":3,"file":"evaluatePath.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAI5E,OAAO,EAEL,KAAK,kCAAkC,EACvC,KAAK,iCAAiC,EACvC,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE;;;;GAIG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,cAAc,GACrB,IAAI,CAAC,kCAAkC,EAAE,aAAa,GAAG,iBAAiB,CAAC,GAAG;IAC5E,WAAW,EAAE,OAAO,CAAC;IACrB,kFAAkF;IAClF,QAAQ,EAAE,MAAM,CAAC;CAClB,EACH,GAAG,EAAE,2BAA2B,GAC/B,OAAO,CACR,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,iBAAiB,GAAG,gBAAgB,CAAC,CAAC,GAAG;IACvF,6CAA6C;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CACF,CAwFA"}

package/lib/commands/init/evaluatePath.js

@@ -45,21 +45,15 @@ export async function evaluatePath(options, ctx) {
     summaryData.recordGeneratedChanges(includedDependenciesChanges);
     let dynamicImportsChanges = undefined;
     if (features?.evaluateDynamicImports) {
-        const evaluatedDynamicImports = await evaluateDynamicImports({
-            definition,
-            packagePath,
-            info,
-            config,
-            packages,
-            importerContext,
-        });
-        const { pathsToEvaluate: dynamicImportPathsToEvaluate, pathsToRefresh: dynamicImportPathsToRefresh } = evaluatedDynamicImports;
-        dynamicImportsChanges = evaluatedDynamicImports.dynamicImportsChanges;
+        const dynamicImportsResult = await evaluateDynamicImports({ definition, packagePath, info }, ctx);
+        dynamicImportsChanges = dynamicImportsResult.dynamicImportsChanges;
         summaryData.recordGeneratedChanges(dynamicImportsChanges);
-        for (const [evalPath, evalContext] of dynamicImportPathsToEvaluate.entries()) {
-            pathsToEvaluate.set(evalPath, evalContext);
+        if (dynamicImportsResult.shouldReevaluate) {
+            pathsToEvaluate.set(packagePath, importerContext);
+        }
+        if (dynamicImportsResult.shouldRefresh) {
+            pathsToRefresh.add(packagePath);
         }
-        dynamicImportPathsToRefresh.forEach((path) => pathsToRefresh.add(path));
     }
     // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed
     // and the heap does not reach the limit as almost every package is enqueued.

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

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport {\n  evaluateImportsForOverrides,\n  type EvaluateImportsForOverridesOptions,\n  type EvaluateImportsForOverridesResult,\n} from './evaluateImportsForOverrides.js';\nimport { evaluateDynamicImports } from './evaluateDynamicImports.js';\nimport type { InitAppOptions } from './types/InitAppOptions.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(\n  options: InitAppOptions &\n    Pick<EvaluateImportsForOverridesOptions, 'packagePath' | 'importerContext'> & {\n      shouldForce: boolean;\n      /** The priority of the package being evaluated. To be used in the task runner. */\n      priority: number;\n    },\n  ctx: EnsurePackageBundledContext,\n): Promise<\n  Partial<Pick<EvaluateImportsForOverridesResult, 'pathsToEvaluate' | 'pathsToRefresh'>> & {\n    /** Whether a fatal error was encountered. */\n    shouldExit?: boolean;\n  }\n> {\n  const { packagePath, initOptions, span, summaryData, importerContext, shouldForce, isMultiApp, priority } = options;\n  const { packages, session } = ctx;\n  const { config } = session;\n  const { features } = config;\n\n  // This line is the reason we have to track the importerContext for packages to evaluate:\n  // otherwise if a non-semver package is read here, we'd lose the modifications from the initial\n  // time the package was read (and getNonSemverTransform was called) when building the resolve map.\n  const definition = await packages.get(packagePath, { refresh: true, importerContext });\n  const { name, version } = definition;\n\n  console.debug(`Evaluating ${packagePath} with context ${JSON.stringify(importerContext)}`);\n\n  // Bundle the package and find the imports it depends on.\n  const { result } = await ensurePackageBundled(\n    {\n      name,\n      version,\n      isIncremental: false,\n      shouldGetBundleInfo: true,\n      shouldForce,\n      shouldRerun: shouldForce,\n      useHashAsId: isMultiApp,\n      priority,\n      disableCache: !initOptions.cache,\n    },\n    ctx,\n  );\n\n  // Record the results for the summary.\n  summaryData.recordResult(packagePath, result);\n\n  // If there were errors or no imports, return early.\n  const { info } = result;\n  if (result.errors?.length || !info) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    exportsChanges,\n    includedDependenciesChanges,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({ definition, packagePath, info, importerContext }, ctx);\n\n  if (evalErrors.length) {\n    summaryData.addErrors(packagePath, evalErrors);\n  }\n  summaryData.recordGeneratedChanges(exportsChanges);\n  summaryData.recordGeneratedChanges(includedDependenciesChanges);\n\n  let dynamicImportsChanges: undefined | GeneratedPackageChanges[] = undefined;\n  if (features?.evaluateDynamicImports) {\n    const evaluatedDynamicImports = await evaluateDynamicImports({\n      definition,\n      packagePath,\n      info,\n      config,\n      packages,\n      importerContext,\n    });\n\n    const { pathsToEvaluate: dynamicImportPathsToEvaluate, pathsToRefresh: dynamicImportPathsToRefresh } =\n      evaluatedDynamicImports;\n    dynamicImportsChanges = evaluatedDynamicImports.dynamicImportsChanges;\n\n    summaryData.recordGeneratedChanges(dynamicImportsChanges);\n\n    for (const [evalPath, evalContext] of dynamicImportPathsToEvaluate.entries()) {\n      pathsToEvaluate.set(evalPath, evalContext);\n    }\n    dynamicImportPathsToRefresh.forEach((path) => pathsToRefresh.add(path));\n  }\n\n  // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed\n  // and the heap does not reach the limit as almost every package is enqueued.\n  // importPathsToEvaluate?.forEach((path) => pathsToEvaluate.set(path, importerContext));\n  // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));\n\n  if (initOptions.check && (exportsChanges.length || evalErrors.length || dynamicImportsChanges?.length)) {\n    span.addEvent('INIT_CHECK_FAILED', {\n      // Don't log the specific errors to telemetry, as they may contain sensitive information.\n      reason: exportsChanges || dynamicImportsChanges ? 'Config needs to be updated.' : 'Errors found with imports.',\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}
+{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EACL,2BAA2B,GAG5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAKG,EACH,GAAgC;IAOhC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACpH,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;IAClC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5B,yFAAyF;IACzF,+FAA+F;IAC/F,kGAAkG;IAClG,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IACvF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAErC,OAAO,CAAC,KAAK,CAAC,cAAc,WAAW,iBAAiB,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAE3F,yDAAyD;IACzD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAC3C;QACE,IAAI;QACJ,OAAO;QACP,aAAa,EAAE,KAAK;QACpB,mBAAmB,EAAE,IAAI;QACzB,WAAW;QACX,WAAW,EAAE,WAAW;QACxB,WAAW,EAAE,UAAU;QACvB,QAAQ;QACR,YAAY,EAAE,CAAC,WAAW,CAAC,KAAK;KACjC,EACD,GAAG,CACJ,CAAC;IAEF,sCAAsC;IACtC,WAAW,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAE9C,oDAAoD;IACpD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,wFAAwF;IACxF,MAAM,EACJ,cAAc,EACd,2BAA2B,EAC3B,MAAM,EAAE,UAAU,EAClB,eAAe,EACf,cAAc,GACf,GAAG,MAAM,2BAA2B,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;IAE/F,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,WAAW,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACjD,CAAC;IACD,WAAW,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;IACnD,WAAW,CAAC,sBAAsB,CAAC,2BAA2B,CAAC,CAAC;IAEhE,IAAI,qBAAqB,GAA0C,SAAS,CAAC;IAC7E,IAAI,QAAQ,EAAE,sBAAsB,EAAE,CAAC;QACrC,MAAM,oBAAoB,GAAG,MAAM,sBAAsB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAElG,qBAAqB,GAAG,oBAAoB,CAAC,qBAAqB,CAAC;QAEnE,WAAW,CAAC,sBAAsB,CAAC,qBAAqB,CAAC,CAAC;QAE1D,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;YAC1C,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,oBAAoB,CAAC,aAAa,EAAE,CAAC;YACvC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,iGAAiG;IACjG,6EAA6E;IAC7E,wFAAwF;IACxF,qEAAqE;IAErE,IAAI,WAAW,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,IAAI,qBAAqB,EAAE,MAAM,CAAC,EAAE,CAAC;QACvG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,EAAE;YACjC,yFAAyF;YACzF,MAAM,EAAE,cAAc,IAAI,qBAAqB,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,4BAA4B;SAC/G,CAAC,CAAC;QAEH,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO;QACL,eAAe;QACf,cAAc;KACf,CAAC;AACJ,CAAC","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport {\n  evaluateImportsForOverrides,\n  type EvaluateImportsForOverridesOptions,\n  type EvaluateImportsForOverridesResult,\n} from './evaluateImportsForOverrides.js';\nimport { evaluateDynamicImports } from './evaluateDynamicImports.js';\nimport type { InitAppOptions } from './types/InitAppOptions.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(\n  options: InitAppOptions &\n    Pick<EvaluateImportsForOverridesOptions, 'packagePath' | 'importerContext'> & {\n      shouldForce: boolean;\n      /** The priority of the package being evaluated. To be used in the task runner. */\n      priority: number;\n    },\n  ctx: EnsurePackageBundledContext,\n): Promise<\n  Partial<Pick<EvaluateImportsForOverridesResult, 'pathsToEvaluate' | 'pathsToRefresh'>> & {\n    /** Whether a fatal error was encountered. */\n    shouldExit?: boolean;\n  }\n> {\n  const { packagePath, initOptions, span, summaryData, importerContext, shouldForce, isMultiApp, priority } = options;\n  const { packages, session } = ctx;\n  const { config } = session;\n  const { features } = config;\n\n  // This line is the reason we have to track the importerContext for packages to evaluate:\n  // otherwise if a non-semver package is read here, we'd lose the modifications from the initial\n  // time the package was read (and getNonSemverTransform was called) when building the resolve map.\n  const definition = await packages.get(packagePath, { refresh: true, importerContext });\n  const { name, version } = definition;\n\n  console.debug(`Evaluating ${packagePath} with context ${JSON.stringify(importerContext)}`);\n\n  // Bundle the package and find the imports it depends on.\n  const { result } = await ensurePackageBundled(\n    {\n      name,\n      version,\n      isIncremental: false,\n      shouldGetBundleInfo: true,\n      shouldForce,\n      shouldRerun: shouldForce,\n      useHashAsId: isMultiApp,\n      priority,\n      disableCache: !initOptions.cache,\n    },\n    ctx,\n  );\n\n  // Record the results for the summary.\n  summaryData.recordResult(packagePath, result);\n\n  // If there were errors or no imports, return early.\n  const { info } = result;\n  if (result.errors?.length || !info) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    exportsChanges,\n    includedDependenciesChanges,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({ definition, packagePath, info, importerContext }, ctx);\n\n  if (evalErrors.length) {\n    summaryData.addErrors(packagePath, evalErrors);\n  }\n  summaryData.recordGeneratedChanges(exportsChanges);\n  summaryData.recordGeneratedChanges(includedDependenciesChanges);\n\n  let dynamicImportsChanges: undefined | GeneratedPackageChanges[] = undefined;\n  if (features?.evaluateDynamicImports) {\n    const dynamicImportsResult = await evaluateDynamicImports({ definition, packagePath, info }, ctx);\n\n    dynamicImportsChanges = dynamicImportsResult.dynamicImportsChanges;\n\n    summaryData.recordGeneratedChanges(dynamicImportsChanges);\n\n    if (dynamicImportsResult.shouldReevaluate) {\n      pathsToEvaluate.set(packagePath, importerContext);\n    }\n    if (dynamicImportsResult.shouldRefresh) {\n      pathsToRefresh.add(packagePath);\n    }\n  }\n\n  // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed\n  // and the heap does not reach the limit as almost every package is enqueued.\n  // importPathsToEvaluate?.forEach((path) => pathsToEvaluate.set(path, importerContext));\n  // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));\n\n  if (initOptions.check && (exportsChanges.length || evalErrors.length || dynamicImportsChanges?.length)) {\n    span.addEvent('INIT_CHECK_FAILED', {\n      // Don't log the specific errors to telemetry, as they may contain sensitive information.\n      reason: exportsChanges || dynamicImportsChanges ? 'Config needs to be updated.' : 'Errors found with imports.',\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}

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

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

package/lib/commands/init/optimizeDependencies.js

@@ -23,13 +23,19 @@ export async function optimizeDependencies(packageResults, context) {
         // as that is the one that will be used in the generated config.
         const { name, version } = definition;
         // We need the non-transformed definition to catch inclusions/exclusions on retries.
-        const nonTransformedDefinition = await packages.get(packagePath, { disableTransforms: true });
+        const originalDefinition = await packages.get(packagePath, { disableTransforms: true });
         const displayName = `${name}@${version}`;
-        const nonTransformedDependencies = getDependencies(nonTransformedDefinition);
+        const originalDependencies = getDependencies(originalDefinition);
         const consumedDependencies = getConsumedDependencies(result.info);
         let generatedPackageSettings;
         // Iterate through dependencies and find unused.
-        for (const dependencyName of Object.keys(nonTransformedDependencies)) {
+        for (const dependencyName of Object.keys(originalDependencies)) {
+            if (dependencyName.startsWith('@types/')) {
+                // @types dependencies are never relevant to cloudpack (and getTypesTransform removes them
+                // from consideration in other parts of the code), so adding them to the generated config
+                // excludedDependencies would just add bloat.
+                continue;
+            }
             generatedPackageSettings ||= getGeneratedPackageSettings({
                 generatedPackageSettings: (config.generated.packageSettings ??= []),
                 name,

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 { ensureGeneratedSettingsForPackage, getGeneratedPackageSettings } from '@ms-cloudpack/config';\nimport { getDependencies } from '@ms-cloudpack/package-utilities';\nimport { getConsumedDependencies } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache, GeneratedPackageSettings, Session } from '@ms-cloudpack/common-types';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\nimport { neverExclude } from './neverExclude.js';\nimport type { InitPackageResult } from './types/InitPackageResult.js';\n\n/**\n * Optimizes the dependencies of a package to determine if there are any missing or unused.\n * If so, adds the the missing dependencies to included and the unused dependencies to excluded.\n *\n * Returns the list of excluded dependencies added to the generated config.\n */\nexport async function optimizeDependencies(\n  packageResults: Record<string, InitPackageResult>,\n  context: {\n    packages: PackageDefinitionsCache;\n    session: Session;\n  },\n): Promise<GeneratedPackageChanges[]> {\n  const { packages, session } = context;\n  const { config } = session;\n  const dependenciesChanges: GeneratedPackageChanges[] = [];\n\n  // Iterate through each package\n  for (const [packagePath, result] of Object.entries(packageResults)) {\n    // Skip packages with build errors or no info\n    if (!result?.info || result.errors?.length) {\n      continue;\n    }\n\n    const definition = await packages.get(packagePath);\n\n    // We must use the name and version of the transformed definition,\n    // as that is the one that will be used in the generated config.\n    const { name, version } = definition;\n    // We need the non-transformed definition to catch inclusions/exclusions on retries.\n    const nonTransformedDefinition = await packages.get(packagePath, { disableTransforms: true });\n\n    const displayName = `${name}@${version}`;\n    const nonTransformedDependencies = getDependencies(nonTransformedDefinition);\n    const consumedDependencies = getConsumedDependencies(result.info);\n    let generatedPackageSettings: GeneratedPackageSettings | undefined;\n\n    // Iterate through dependencies and find unused.\n    for (const dependencyName of Object.keys(nonTransformedDependencies)) {\n      generatedPackageSettings ||= getGeneratedPackageSettings({\n        generatedPackageSettings: (config.generated.packageSettings ??= []),\n        name,\n        version,\n      });\n\n      // If this dependency is consumed, make sure it's not excluded and continue.\n      if (consumedDependencies.has(dependencyName) || neverExclude(dependencyName, config)) {\n        // Remove from excluded dependencies if it's there.\n        if (generatedPackageSettings?.excludedDependencies?.includes(dependencyName)) {\n          const indexOfDependency = generatedPackageSettings.excludedDependencies.indexOf(dependencyName);\n          generatedPackageSettings.excludedDependencies.splice(indexOfDependency, 1);\n\n          // Report that we removed a dependency from excluded as it is now imported by the package.\n          dependenciesChanges.push({\n            name,\n            version,\n            path: packagePath,\n            changes: [\n              {\n                type: 'removed-excluded-dependency',\n                change: dependencyName,\n                reason: `Imported by \"${displayName}\"`,\n              },\n            ],\n          });\n\n          // Clean up excluded dependencies if it's empty.\n          // We don't need to delete the setting if it's empty, as it will be cleaned up later.\n          if (generatedPackageSettings.excludedDependencies.length === 0) {\n            delete generatedPackageSettings.excludedDependencies;\n          }\n        }\n\n        continue;\n      }\n\n      // The dep is not consumed. If this dependency is already excluded, continue.\n      if (generatedPackageSettings?.excludedDependencies?.includes(dependencyName)) {\n        continue;\n      }\n\n      // Ensure there is a generated settings entry.\n      generatedPackageSettings = await ensureGeneratedSettingsForPackage({ packagePath }, { config, packages });\n\n      // Ensure there are excluded dependencies.\n      generatedPackageSettings.excludedDependencies ??= [];\n      generatedPackageSettings.excludedDependencies.push(dependencyName);\n\n      dependenciesChanges.push({\n        name,\n        version,\n        path: packagePath,\n        changes: [\n          {\n            type: 'excluded-dependency',\n            change: dependencyName,\n            reason: `Not imported by \"${displayName}\"`,\n          },\n        ],\n      });\n    }\n  }\n\n  return dependenciesChanges;\n}\n"]}
+{"version":3,"file":"optimizeDependencies.js","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import { ensureGeneratedSettingsForPackage, getGeneratedPackageSettings } from '@ms-cloudpack/config';\nimport { getDependencies } from '@ms-cloudpack/package-utilities';\nimport { getConsumedDependencies } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache, GeneratedPackageSettings, Session } from '@ms-cloudpack/common-types';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\nimport { neverExclude } from './neverExclude.js';\nimport type { InitPackageResult } from './types/InitPackageResult.js';\n\n/**\n * Optimizes the dependencies of a package to determine if there are any missing or unused.\n * If so, adds the the missing dependencies to included and the unused dependencies to excluded.\n *\n * Returns the list of excluded dependencies added to the generated config.\n */\nexport async function optimizeDependencies(\n  packageResults: Record<string, InitPackageResult>,\n  context: {\n    packages: PackageDefinitionsCache;\n    session: Session;\n  },\n): Promise<GeneratedPackageChanges[]> {\n  const { packages, session } = context;\n  const { config } = session;\n  const dependenciesChanges: GeneratedPackageChanges[] = [];\n\n  // Iterate through each package\n  for (const [packagePath, result] of Object.entries(packageResults)) {\n    // Skip packages with build errors or no info\n    if (!result?.info || result.errors?.length) {\n      continue;\n    }\n\n    const definition = await packages.get(packagePath);\n\n    // We must use the name and version of the transformed definition,\n    // as that is the one that will be used in the generated config.\n    const { name, version } = definition;\n    // We need the non-transformed definition to catch inclusions/exclusions on retries.\n    const originalDefinition = await packages.get(packagePath, { disableTransforms: true });\n\n    const displayName = `${name}@${version}`;\n    const originalDependencies = getDependencies(originalDefinition);\n    const consumedDependencies = getConsumedDependencies(result.info);\n    let generatedPackageSettings: GeneratedPackageSettings | undefined;\n\n    // Iterate through dependencies and find unused.\n    for (const dependencyName of Object.keys(originalDependencies)) {\n      if (dependencyName.startsWith('@types/')) {\n        // @types dependencies are never relevant to cloudpack (and getTypesTransform removes them\n        // from consideration in other parts of the code), so adding them to the generated config\n        // excludedDependencies would just add bloat.\n        continue;\n      }\n\n      generatedPackageSettings ||= getGeneratedPackageSettings({\n        generatedPackageSettings: (config.generated.packageSettings ??= []),\n        name,\n        version,\n      });\n\n      // If this dependency is consumed, make sure it's not excluded and continue.\n      if (consumedDependencies.has(dependencyName) || neverExclude(dependencyName, config)) {\n        // Remove from excluded dependencies if it's there.\n        if (generatedPackageSettings?.excludedDependencies?.includes(dependencyName)) {\n          const indexOfDependency = generatedPackageSettings.excludedDependencies.indexOf(dependencyName);\n          generatedPackageSettings.excludedDependencies.splice(indexOfDependency, 1);\n\n          // Report that we removed a dependency from excluded as it is now imported by the package.\n          dependenciesChanges.push({\n            name,\n            version,\n            path: packagePath,\n            changes: [\n              {\n                type: 'removed-excluded-dependency',\n                change: dependencyName,\n                reason: `Imported by \"${displayName}\"`,\n              },\n            ],\n          });\n\n          // Clean up excluded dependencies if it's empty.\n          // We don't need to delete the setting if it's empty, as it will be cleaned up later.\n          if (generatedPackageSettings.excludedDependencies.length === 0) {\n            delete generatedPackageSettings.excludedDependencies;\n          }\n        }\n\n        continue;\n      }\n\n      // The dep is not consumed. If this dependency is already excluded, continue.\n      if (generatedPackageSettings?.excludedDependencies?.includes(dependencyName)) {\n        continue;\n      }\n\n      // Ensure there is a generated settings entry.\n      generatedPackageSettings = await ensureGeneratedSettingsForPackage({ packagePath }, { config, packages });\n\n      // Ensure there are excluded dependencies.\n      generatedPackageSettings.excludedDependencies ??= [];\n      generatedPackageSettings.excludedDependencies.push(dependencyName);\n\n      dependenciesChanges.push({\n        name,\n        version,\n        path: packagePath,\n        changes: [\n          {\n            type: 'excluded-dependency',\n            change: dependencyName,\n            reason: `Not imported by \"${displayName}\"`,\n          },\n        ],\n      });\n    }\n  }\n\n  return dependenciesChanges;\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"verifyExports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/verifyExports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EACV,aAAa,EAMd,MAAM,4BAA4B,CAAC;AAQpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAMtE;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,OAAO,EAAE,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,YAAY,CAAC,GAC3D,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,CA+K1C"}
+{"version":3,"file":"verifyExports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/verifyExports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EACV,aAAa,EAMd,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAMtE;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,OAAO,EAAE,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,YAAY,CAAC,GAC3D,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,CA8K1C"}

package/lib/commands/init/verifyExports.js

@@ -1,4 +1,4 @@
-import { findResolveMapEntry, getDependencies, getUnusedDependencies, getSourceEntry, } from '@ms-cloudpack/package-utilities';
+import { findResolveMapEntry, getDependencies, getSourceEntry } from '@ms-cloudpack/package-utilities';
 import path from 'path';
 import { bulletedList, formatPackageName } from '@ms-cloudpack/task-reporter';
 import { getPackageSettings } from '@ms-cloudpack/config';
@@ -36,6 +36,7 @@ export async function verifyExports(packageResults, context) {
             continue;
         }
         const parentDefinition = await packages.get(parentPath);
+        const allParentDependencies = getDependencies(parentDefinition, { includeAll: true });
         /**
          * Mapping from imported dependency package ID (`name@version`) to import path
          * to an object with export names missing from that file, the importString, and bundledFile.
@@ -104,8 +105,7 @@ export async function verifyExports(packageResults, context) {
                 };
                 missing.forEach((m) => depsMissingExports[depKey][filePath].missingNames.add(m));
                 // Check if the package satisfies the parent semver requirement.
-                const requiredVersion = !invalidSemver[depKey] &&
-                    (getDependencies(parentDefinition)[depName] || getUnusedDependencies(parentDefinition)[depName]);
+                const requiredVersion = !invalidSemver[depKey] && allParentDependencies[depName];
                 if (requiredVersion && !semver.satisfies(depResolveMapEntry.version, requiredVersion)) {
                     invalidSemver[depKey] = requiredVersion;
                 }

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.72.88",
+  "version": "0.73.1",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -10,21 +10,22 @@
     "cloudpack": "./bin/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.61.28",
-    "@ms-cloudpack/app-server": "^0.17.81",
-    "@ms-cloudpack/bundler": "^0.24.23",
-    "@ms-cloudpack/common-types": "^0.24.15",
-    "@ms-cloudpack/config": "^0.33.31",
+    "@ms-cloudpack/api-server": "^0.61.30",
+    "@ms-cloudpack/app-server": "^0.17.83",
+    "@ms-cloudpack/bundler": "^0.24.25",
+    "@ms-cloudpack/common-types": "^0.24.16",
+    "@ms-cloudpack/config": "^0.34.0",
     "@ms-cloudpack/environment": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.1.10",
-    "@ms-cloudpack/overlay": "^0.17.161",
-    "@ms-cloudpack/package-utilities": "^12.2.3",
+    "@ms-cloudpack/link-proxy": "^0.1.2",
+    "@ms-cloudpack/overlay": "^0.17.163",
+    "@ms-cloudpack/package-utilities": "^12.3.0",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.0.12",
-    "@ms-cloudpack/remote-cache": "^0.11.6",
-    "@ms-cloudpack/setup-utilities": "^0.5.22",
+    "@ms-cloudpack/path-utilities": "^3.0.13",
+    "@ms-cloudpack/remote-cache": "^0.11.8",
+    "@ms-cloudpack/setup-utilities": "^0.5.23",
     "@ms-cloudpack/task-reporter": "^0.16.1",
-    "@ms-cloudpack/telemetry": "^0.11.10",
+    "@ms-cloudpack/telemetry": "^0.11.12",
     "@yarnpkg/lockfile": "^1.1.0",
     "commander": "^13.0.0",
     "cross-spawn": "^7.0.3",
@@ -37,8 +38,8 @@
     "workspace-tools": "^0.38.0"
   },
   "devDependencies": {
-    "@ms-cloudpack/common-types": "^0.24.15",
-    "@ms-cloudpack/common-types-browser": "^0.5.5",
+    "@ms-cloudpack/common-types": "^0.24.16",
+    "@ms-cloudpack/common-types-browser": "^0.5.6",
     "@ms-cloudpack/eslint-plugin-internal": "^0.0.1",
     "@ms-cloudpack/scripts": "^0.0.1",
     "@ms-cloudpack/test-utilities": "^0.5.0",