@ms-cloudpack/cli 0.59.0 → 0.59.2

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

@@ -1,5 +1,5 @@
 import type { BundleInfo } from '@ms-cloudpack/api-server';
-import type { CloudpackConfig, PackageDefinitionsCache, PackageImporterContext, PackageJson } from '@ms-cloudpack/common-types';
+import type { BundleMessage, CloudpackConfig, PackageDefinitionsCache, PackageImporterContext, PackageJson } from '@ms-cloudpack/common-types';
 import type { ResolveMap } from '@ms-cloudpack/package-utilities';
 import type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';
 /**
@@ -21,9 +21,9 @@ export declare function evaluateImportsForOverrides(options: {
     /** Included dependencies changes made to the generated config */
     includedDependenciesChanges: GeneratedPackageChanges[];
     /** Any errors encountered */
-    errors: string[];
+    errors: BundleMessage[];
     /** Any warnings generated */
-    warnings: string[];
+    warnings: BundleMessage[];
     /** Map from new package path (to be evaluated) to info about the parent. */
     pathsToEvaluate: Map<string, PackageImporterContext | undefined>;
     /** Package paths for which new exports were added, so the package should be re-processed. */

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,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EACV,eAAe,EACf,uBAAuB,EACvB,sBAAsB,EACtB,WAAW,EAEZ,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAWlE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAKlF;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACzD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;CACrD,GAAG,OAAO,CAAC;IACV,kDAAkD;IAClD,cAAc,EAAE,uBAAuB,EAAE,CAAC;IAC1C,iEAAiE;IACjE,2BAA2B,EAAE,uBAAuB,EAAE,CAAC;IACvD,6BAA6B;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,6BAA6B;IAC7B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IACjE,6FAA6F;IAC7F,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CAiMD"}
+{"version":3,"file":"evaluateImportsForOverrides.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EACf,uBAAuB,EACvB,sBAAsB,EACtB,WAAW,EAEZ,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAWlE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAMlF;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACzD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;CACrD,GAAG,OAAO,CAAC;IACV,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,CAAC,CAuLD"}

package/lib/commands/init/evaluateImportsForOverrides.js

@@ -4,6 +4,7 @@ import { bulletedList, cyan } from '@ms-cloudpack/task-reporter';
 import { isBuiltin } from 'module';
 import { getConsumedPaths } from '@ms-cloudpack/api-server';
 import { neverExclude } from './neverExclude.js';
+import path from 'path';
 /**
  * Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.
  * If so, updates package overrides in the config.
@@ -29,65 +30,53 @@ export async function evaluateImportsForOverrides(options) {
         const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });
         const dependencyPath = resolveEntry?.path;
         const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;
-        const message = `The package "${dependencyName}" couldn't be found, but it's being imported by the package "${displayName}". ` +
-            `Please ensure that "${dependencyName}" is listed in the dependencies of "${displayName}".`;
-        const messageBuiltin = `The node built-in "${dependencyName}" is being imported by the package "${displayName}", but no browser-friendly version was found in dependencies. ` +
-            `This can be fixed by forcing the package "${displayName}" to use "bundlerType": "rollup" in package settings, or by adding a polyfill browser-friendly dependency.`;
         // If the dependency is not resolved, add an error.
         if (!dependencyPath || !dependencyDefinition) {
-            isBuiltin(dependencyName) ? errors.push(messageBuiltin) : errors.push(message);
+            errors.push(getMissingDepMessage({ dependencyName, displayName, issueType: 'not-found', packagePath }));
             // If the dependency is not resolved, we can't continue to evaluate it.
             continue;
         }
-        // If the dependency is not listed as a dependency add to includedDependencies.
+        // If the dependency is not listed, add to includedDependencies.
         if (!dependencies[dependencyName] && dependencyName !== definition.name && !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.
             if (!unusedDependencies[dependencyName]) {
-                isBuiltin(dependencyName) ? warnings.push(messageBuiltin) : warnings.push(message);
+                warnings.push(getMissingDepMessage({ dependencyName, displayName, issueType: 'undeclared', packagePath }));
             }
             // Make sure to add the package to the list of packages to evaluate.
             pathsToEvaluate.set(packagePath, importerContext);
             // Add to includedDependencies
             const packageSettings = (config.generated.packageSettings ??= []);
-            let generatedPackageSettings = getPackageSettings({
+            let { generatedPackageSettings } = getPackageSettings({
                 config: { generated: { packageSettings } },
                 name: packageName,
                 version: packageVersion,
                 firstMatch: true,
-            }).generatedPackageSettings;
+            });
             if (!generatedPackageSettings) {
-                if (isExternalPackage(packagePath)) {
-                    generatedPackageSettings = {
-                        match: { name: packageName, version: `^${packageVersion}` },
-                    };
-                }
-                else {
-                    generatedPackageSettings = {
-                        match: packageName,
-                    };
-                }
+                generatedPackageSettings = {
+                    match: isExternalPackage(packagePath) ? { name: packageName, version: `^${packageVersion}` } : packageName,
+                };
                 packageSettings.push(generatedPackageSettings);
             }
             generatedPackageSettings.includedDependencies ??= [];
             // Add to includedDependencies if it is not already included.
-            if (generatedPackageSettings.includedDependencies.includes(dependencyName)) {
-                continue;
+            if (!generatedPackageSettings.includedDependencies.includes(dependencyName)) {
+                generatedPackageSettings.includedDependencies.push(dependencyName);
+                includedDependenciesChanges.push({
+                    name: packageName,
+                    version: packageVersion,
+                    path: packagePath,
+                    changes: [
+                        {
+                            type: 'included-dependency',
+                            change: dependencyName,
+                            reason: `Imported by "${displayName}"`,
+                        },
+                    ],
+                });
+                pathsToRefresh.add(packagePath);
             }
-            generatedPackageSettings.includedDependencies.push(dependencyName);
-            includedDependenciesChanges.push({
-                name: packageName,
-                version: packageVersion,
-                path: packagePath,
-                changes: [
-                    {
-                        type: 'included-dependency',
-                        change: dependencyName,
-                        reason: `Imported by "${displayName}"`,
-                    },
-                ],
-            });
-            pathsToRefresh.add(packagePath);
         }
         const { name, version } = dependencyDefinition;
         if (!name || !version) {
@@ -160,15 +149,38 @@ export async function evaluateImportsForOverrides(options) {
                 pathsToRefresh.add(dependencyPath);
             }
             else {
-                const errorMessage = `An import couldn't be resolved to a physical file. Check that the import refers to a file that's exported by the package or adjust the "${cyan(dependencyName)}" package version to one that supports this import path.\n${bulletedList([
-                    `Import: ${cyan(dependencyImportPath.replace('.', dependencyName))}`,
-                    `Location: ${packagePath}`,
-                    `Resolved to: ${dependencyName}@${version} (${dependencyImportPath})`,
-                ], 2)}`;
-                errors.push(errorMessage);
+                const text = `An import couldn't be resolved to a physical file. ` +
+                    `Check that the import refers to a file that's exported by the package or adjust the "${cyan(dependencyName)}" package version to one that supports this import path.\n${bulletedList([
+                        `Import: ${cyan(dependencyImportPath.replace('.', dependencyName))}`,
+                        `Resolved to: ${dependencyName}@${version} (${dependencyImportPath})`,
+                    ], 2)}`;
+                errors.push({
+                    text,
+                    source: 'evaluate imports',
+                    location: { file: packagePath },
+                });
             }
         }
     }
     return { exportsChanges, includedDependenciesChanges, errors, warnings, pathsToEvaluate, pathsToRefresh };
 }
+function getMissingDepMessage(params) {
+    const { dependencyName, displayName, issueType, packagePath } = params;
+    let text;
+    if (isBuiltin(dependencyName)) {
+        text =
+            `The node built-in "${dependencyName}" is being imported by "${displayName}", ` +
+                `but no browser-friendly version was found in the package's dependencies. ` +
+                `This can be fixed by forcing "${displayName}" to use "bundlerType": "rollup" in package settings, ` +
+                `or by adding a polyfill browser-friendly dependency.`;
+    }
+    else {
+        text = `The package "${dependencyName}" is imported by "${displayName}", but ${issueType === 'not-found' ? "it couldn't be found" : "it's not included in the package's dependencies"}. Please ensure that "${dependencyName}" is listed in the dependencies of "${displayName}"${issueType === 'undeclared' ? ` or add it to "includedDependencies" for "${displayName}" in package settings.` : ''}.`;
+    }
+    return {
+        text,
+        source: 'evaluate imports',
+        location: { file: path.join(packagePath, 'package.json') },
+    };
+}
 //# sourceMappingURL=evaluateImportsForOverrides.js.map

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 } from '@ms-cloudpack/api-server';\nimport type {\n  CloudpackConfig,\n  PackageDefinitionsCache,\n  PackageImporterContext,\n  PackageJson,\n  PackageSettings,\n} from '@ms-cloudpack/common-types';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getDependencies,\n  getUnusedDependencies,\n  getExportsMap,\n  isExternalPackage,\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';\n\n/**\n * Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.\n * If so, updates package overrides in the config.\n */\nexport async function evaluateImportsForOverrides(options: {\n  packages: PackageDefinitionsCache;\n  info: BundleInfo;\n  definition: PackageJson;\n  packagePath: string;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n  importerContext: PackageImporterContext | undefined;\n}): Promise<{\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: string[];\n  /** Any warnings generated */\n  warnings: string[];\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n}> {\n  const { packages, info, definition, packagePath, config, resolveMap, 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 exportsChanges: GeneratedPackageChanges[] = [];\n  const includedDependenciesChanges: GeneratedPackageChanges[] = [];\n  const errors = [];\n  const warnings = [];\n  const pathsToEvaluate = new Map<string, PackageImporterContext | undefined>();\n  const pathsToRefresh = new Set<string>();\n  const dependencies = getDependencies(definition);\n  const unusedDependencies = getUnusedDependencies(definition);\n  const consumedPaths = getConsumedPaths(info);\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const [dependencyName, dependencyImportPaths] of Object.entries(consumedPaths)) {\n    const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n    const dependencyPath = resolveEntry?.path;\n    const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n    const message =\n      `The package \"${dependencyName}\" couldn't be found, but it's being imported by the package \"${displayName}\". ` +\n      `Please ensure that \"${dependencyName}\" is listed in the dependencies of \"${displayName}\".`;\n    const messageBuiltin =\n      `The node built-in \"${dependencyName}\" is being imported by the package \"${displayName}\", but no browser-friendly version was found in dependencies. ` +\n      `This can be fixed by forcing the package \"${displayName}\" to use \"bundlerType\": \"rollup\" in package settings, or by adding a polyfill browser-friendly dependency.`;\n\n    // If the dependency is not resolved, add an error.\n    if (!dependencyPath || !dependencyDefinition) {\n      isBuiltin(dependencyName) ? errors.push(messageBuiltin) : errors.push(message);\n      // If the dependency is not resolved, we can't continue to evaluate it.\n      continue;\n    }\n\n    // If the dependency is not listed as a dependency 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      if (!unusedDependencies[dependencyName]) {\n        isBuiltin(dependencyName) ? warnings.push(messageBuiltin) : warnings.push(message);\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\n      const packageSettings = (config.generated.packageSettings ??= []);\n      let generatedPackageSettings = getPackageSettings({\n        config: { generated: { packageSettings } },\n        name: packageName,\n        version: packageVersion,\n        firstMatch: true,\n      }).generatedPackageSettings;\n\n      if (!generatedPackageSettings) {\n        if (isExternalPackage(packagePath)) {\n          generatedPackageSettings = {\n            match: { name: packageName, version: `^${packageVersion}` },\n          };\n        } else {\n          generatedPackageSettings = {\n            match: packageName,\n          };\n        }\n        packageSettings.push(generatedPackageSettings);\n      }\n\n      generatedPackageSettings.includedDependencies ??= [];\n\n      // Add to includedDependencies if it is not already included.\n      if (generatedPackageSettings.includedDependencies.includes(dependencyName)) {\n        continue;\n      }\n\n      generatedPackageSettings.includedDependencies.push(dependencyName);\n\n      includedDependenciesChanges.push({\n        name: packageName,\n        version: packageVersion,\n        path: packagePath,\n        changes: [\n          {\n            type: 'included-dependency',\n            change: dependencyName,\n            reason: `Imported by \"${displayName}\"`,\n          },\n        ],\n      });\n\n      pathsToRefresh.add(packagePath);\n    }\n\n    const { name, version } = dependencyDefinition as Required<PackageJson>;\n    if (!name || !version) {\n      throw new Error(`Package \"${displayName}\" depends on \"${dependencyName}\" but it is missing a name or version.`);\n    }\n\n    let dependencyImporterContext: PackageImporterContext | undefined;\n    const versionRequirement = dependencies[dependencyName];\n    if (versionRequirement && definition.name && definition.version) {\n      dependencyImporterContext = {\n        parentName: definition.name,\n        parentVersion: definition.version,\n        importedName: dependencyName,\n        versionRequirement,\n      };\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    pathsToEvaluate.set(dependencyPath, dependencyImporterContext);\n\n    // Get the flattened bundle-able exports map for this dependency and iterate through our import paths to ensure nothing is missing.\n    const exports = await getExportsMap({ packagePath: dependencyPath }, { packages, config });\n    const flattenedExports = flattenExportsMap(exports);\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings: PackageSettings | undefined;\n    // iterate through all the import paths.\n    for (const dependencyImportPath of dependencyImportPaths) {\n      if (flattenedExports[dependencyImportPath]) {\n        continue;\n      }\n\n      // We are missing an import path. We need to add this entry to the exports map in package settings.\n      generatedPackageSettings ??= getPackageSettings({\n        config: { generated: { packageSettings } },\n        name,\n        version,\n        firstMatch: true,\n      }).generatedPackageSettings;\n\n      if (!generatedPackageSettings) {\n        if (isExternalPackage(dependencyPath)) {\n          generatedPackageSettings = {\n            match: { name, version: `^${version}` },\n            exports: {},\n          };\n        } else {\n          generatedPackageSettings = {\n            match: name,\n            exports: {},\n          };\n        }\n        packageSettings.push(generatedPackageSettings);\n      }\n\n      generatedPackageSettings.exports ??= {};\n\n      const addedEntry = await addExportsMapEntry(\n        {\n          exports: generatedPackageSettings.exports,\n          packagePath: dependencyPath,\n          importPath: dependencyImportPath,\n        },\n        { packages, config },\n      );\n\n      if (addedEntry) {\n        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 errorMessage = `An import couldn't be resolved to a physical file. 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            `Location: ${packagePath}`,\n            `Resolved to: ${dependencyName}@${version} (${dependencyImportPath})`,\n          ],\n          2,\n        )}`;\n        errors.push(errorMessage);\n      }\n    }\n  }\n\n  return { exportsChanges, includedDependenciesChanges, errors, warnings, pathsToEvaluate, pathsToRefresh };\n}\n"]}
+{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleInfo } from '@ms-cloudpack/api-server';\nimport type {\n  BundleMessage,\n  CloudpackConfig,\n  PackageDefinitionsCache,\n  PackageImporterContext,\n  PackageJson,\n  PackageSettings,\n} from '@ms-cloudpack/common-types';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getDependencies,\n  getUnusedDependencies,\n  getExportsMap,\n  isExternalPackage,\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\n/**\n * Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.\n * If so, updates package overrides in the config.\n */\nexport async function evaluateImportsForOverrides(options: {\n  packages: PackageDefinitionsCache;\n  info: BundleInfo;\n  definition: PackageJson;\n  packagePath: string;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n  importerContext: PackageImporterContext | undefined;\n}): Promise<{\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  const { packages, info, definition, packagePath, config, resolveMap, 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 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 unusedDependencies = getUnusedDependencies(definition);\n  const consumedPaths = getConsumedPaths(info);\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const [dependencyName, dependencyImportPaths] of Object.entries(consumedPaths)) {\n    const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n    const dependencyPath = resolveEntry?.path;\n    const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n    // If the dependency is not resolved, add an error.\n    if (!dependencyPath || !dependencyDefinition) {\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    // 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      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\n      const packageSettings = (config.generated.packageSettings ??= []);\n      let { generatedPackageSettings } = getPackageSettings({\n        config: { generated: { packageSettings } },\n        name: packageName,\n        version: packageVersion,\n        firstMatch: true,\n      });\n\n      if (!generatedPackageSettings) {\n        generatedPackageSettings = {\n          match: isExternalPackage(packagePath) ? { name: packageName, version: `^${packageVersion}` } : packageName,\n        };\n        packageSettings.push(generatedPackageSettings);\n      }\n\n      generatedPackageSettings.includedDependencies ??= [];\n\n      // Add to includedDependencies if it is not already included.\n      if (!generatedPackageSettings.includedDependencies.includes(dependencyName)) {\n        generatedPackageSettings.includedDependencies.push(dependencyName);\n\n        includedDependenciesChanges.push({\n          name: packageName,\n          version: packageVersion,\n          path: packagePath,\n          changes: [\n            {\n              type: 'included-dependency',\n              change: dependencyName,\n              reason: `Imported by \"${displayName}\"`,\n            },\n          ],\n        });\n\n        pathsToRefresh.add(packagePath);\n      }\n    }\n\n    const { name, version } = dependencyDefinition as Required<PackageJson>;\n    if (!name || !version) {\n      throw new Error(`Package \"${displayName}\" depends on \"${dependencyName}\" but it is missing a name or version.`);\n    }\n\n    let dependencyImporterContext: PackageImporterContext | undefined;\n    const versionRequirement = dependencies[dependencyName];\n    if (versionRequirement && definition.name && definition.version) {\n      dependencyImporterContext = {\n        parentName: definition.name,\n        parentVersion: definition.version,\n        importedName: dependencyName,\n        versionRequirement,\n      };\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    pathsToEvaluate.set(dependencyPath, dependencyImporterContext);\n\n    // Get the flattened bundle-able exports map for this dependency and iterate through our import paths to ensure nothing is missing.\n    const exports = await getExportsMap({ packagePath: dependencyPath }, { packages, config });\n    const flattenedExports = flattenExportsMap(exports);\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings: PackageSettings | undefined;\n    // iterate through all the import paths.\n    for (const dependencyImportPath of dependencyImportPaths) {\n      if (flattenedExports[dependencyImportPath]) {\n        continue;\n      }\n\n      // We are missing an import path. We need to add this entry to the exports map in package settings.\n      generatedPackageSettings ??= getPackageSettings({\n        config: { generated: { packageSettings } },\n        name,\n        version,\n        firstMatch: true,\n      }).generatedPackageSettings;\n\n      if (!generatedPackageSettings) {\n        if (isExternalPackage(dependencyPath)) {\n          generatedPackageSettings = {\n            match: { name, version: `^${version}` },\n            exports: {},\n          };\n        } else {\n          generatedPackageSettings = {\n            match: name,\n            exports: {},\n          };\n        }\n        packageSettings.push(generatedPackageSettings);\n      }\n\n      generatedPackageSettings.exports ??= {};\n\n      const addedEntry = await addExportsMapEntry(\n        {\n          exports: generatedPackageSettings.exports,\n          packagePath: dependencyPath,\n          importPath: dependencyImportPath,\n        },\n        { packages, config },\n      );\n\n      if (addedEntry) {\n        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 \"bundlerType\": \"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

@@ -21,6 +21,8 @@ export declare function evaluatePath(options: {
     initOptions: InitOptions;
     summaryData: InitSummaryData;
     ctx: EnsurePackageBundledContext;
+    /** The priority of the package being evaluated. To be used in the task runner. */
+    priority: number;
 }): Promise<{
     /** Map from new package path (to be evaluated) to info about the parent. */
     pathsToEvaluate?: Map<string, PackageImporterContext | undefined>;

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

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

package/lib/commands/init/evaluatePath.js

@@ -7,7 +7,7 @@ import { optimizeDependencies } from './optimizeDependencies.js';
  * in the generated config.
  */
 export async function evaluatePath(options) {
-    const { packagePath, config, initOptions, telemetryClient, resolveMap, summaryData, ctx, importerContext } = options;
+    const { packagePath, config, initOptions, telemetryClient, resolveMap, summaryData, ctx, importerContext, priority } = options;
     const { packages } = ctx;
     const { features } = config;
     // This line is the reason we have to track the importerContext for packages to evaluate:
@@ -27,6 +27,7 @@ export async function evaluatePath(options) {
             isIncremental: false,
             shouldGetBundleInfo: true,
             useHashAsId: true,
+            priority,
         },
         ctx,
     });
@@ -39,7 +40,7 @@ export async function evaluatePath(options) {
     };
     summaryData.recordResult({ packageResult: { ...resultIdentifier, errors, warnings, info } });
     // If there were errors or no imports, return early.
-    if (errors?.length || !info?.entry) {
+    if (errors?.length || !info) {
         return {};
     }
     // Given the package imports, find the missing exports maps and update packageOverrides.
@@ -54,10 +55,7 @@ export async function evaluatePath(options) {
     });
     if (evalErrors.length) {
         summaryData.recordResult({
-            packageResult: {
-                ...resultIdentifier,
-                errors: evalErrors.map((text) => ({ text, source: 'evaluate imports' })),
-            },
+            packageResult: { ...resultIdentifier, errors: evalErrors },
             append: true,
         });
     }
@@ -68,16 +66,7 @@ export async function evaluatePath(options) {
     // is both minimal (remove unused deps) and complete (include
     // specific devDeps.)
     if (features?.optimizeDependencies) {
-        const { warnings: excludedDependenciesWarnings, excludedDependenciesChanges } = optimizeDependencies({ definition, packagePath, info, resolveMap }, { packages, config });
-        if (excludedDependenciesWarnings.length) {
-            summaryData.recordResult({
-                packageResult: {
-                    ...resultIdentifier,
-                    warnings: excludedDependenciesWarnings.map((text) => ({ text, source: 'optimize dependencies' })),
-                },
-                append: true,
-            });
-        }
+        const excludedDependenciesChanges = optimizeDependencies({ definition, packagePath, info, resolveMap }, { packages, config });
         summaryData.recordGeneratedChanges(excludedDependenciesChanges);
     }
     // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed
@@ -86,7 +75,7 @@ export async function evaluatePath(options) {
     // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));
     if (initOptions.check && (exportsChanges.length || evalErrors.length)) {
         telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {
-            reason: exportsChanges ? 'Config needs to be updated.' : evalErrors,
+            reason: exportsChanges ? 'Config needs to be updated.' : evalErrors.map((e) => e.text),
         });
         return { shouldExit: true };
     }

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

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server';\nimport type { CloudpackConfig, PackageImporterContext } from '@ms-cloudpack/common-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport type { InitOptions } from './types/InitOptions.js';\n\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { optimizeDependencies } from './optimizeDependencies.js';\n\n/**\n * A helper which given the packagePath, tries to evaluate the path by bundling things, finding imports,\n * and cross checking the imports with explicit exports. If any exports are missing, they are documented\n * in the generated config.\n */\nexport async function evaluatePath(options: {\n  /** Path to evaluate. */\n  packagePath: string;\n  /** Info about how the parent package */\n  importerContext: PackageImporterContext | undefined;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n  telemetryClient: TelemetryClient;\n  initOptions: InitOptions;\n  summaryData: InitSummaryData;\n  ctx: EnsurePackageBundledContext;\n}): Promise<{\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate?: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh?: Set<string>;\n  /** Whether a fatal error was encountered. */\n  shouldExit?: boolean;\n}> {\n  const { packagePath, config, initOptions, telemetryClient, resolveMap, summaryData, ctx, importerContext } = options;\n  const { packages } = ctx;\n  const { features } = config;\n\n  // This line is the reason we have to track the importerContext for packages to evaluate:\n  // otherwise if a non-semver package is read here, we'd lose the modifications from the initial\n  // time the package was read (and getNonSemverTransform was called) when building the resolve map.\n  const definition = await packages.get(packagePath, { refresh: true, importerContext });\n  const { name, version } = definition || {};\n\n  if (!definition || !name || !version) {\n    // Unsure why a package would be missing a definition/name/version - we've built the resolve map already.\n    throw new Error(\n      `${packagePath} evaluation failed because the package.json with a name/version was not found or not readable.`,\n    );\n  }\n\n  // Bundle the package and find the imports it depends on.\n  const { result } = await ensurePackageBundled({\n    input: {\n      name,\n      version,\n      isIncremental: false,\n      shouldGetBundleInfo: true,\n      useHashAsId: true,\n    },\n    ctx,\n  });\n\n  const { errors, warnings, info } = result;\n\n  // Record the results for the summary.\n  const resultIdentifier = {\n    name: definition.name || '',\n    version: definition.version || '',\n    path: packagePath,\n  };\n\n  summaryData.recordResult({ packageResult: { ...resultIdentifier, errors, warnings, info } });\n\n  // If there were errors or no imports, return early.\n  if (errors?.length || !info?.entry) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    exportsChanges,\n    includedDependenciesChanges,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({\n    definition,\n    packagePath,\n    packages,\n    info,\n    config,\n    resolveMap,\n    importerContext,\n  });\n\n  if (evalErrors.length) {\n    summaryData.recordResult({\n      packageResult: {\n        ...resultIdentifier,\n        errors: evalErrors.map((text) => ({ text, source: 'evaluate imports' })),\n      },\n      append: true,\n    });\n  }\n  summaryData.recordGeneratedChanges(exportsChanges);\n  summaryData.recordGeneratedChanges(includedDependenciesChanges);\n\n  // Conditionally scan dependency usage so that we can populate\n  // include/excludeDependencies automatically, ensuring the dep list\n  // is both minimal (remove unused deps) and complete (include\n  // specific devDeps.)\n  if (features?.optimizeDependencies) {\n    const { warnings: excludedDependenciesWarnings, excludedDependenciesChanges } = optimizeDependencies(\n      { definition, packagePath, info, resolveMap },\n      { packages, config },\n    );\n\n    if (excludedDependenciesWarnings.length) {\n      summaryData.recordResult({\n        packageResult: {\n          ...resultIdentifier,\n          warnings: excludedDependenciesWarnings.map((text) => ({ text, source: 'optimize dependencies' })),\n        },\n        append: true,\n      });\n    }\n    summaryData.recordGeneratedChanges(excludedDependenciesChanges);\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)) {\n    telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {\n      reason: exportsChanges ? 'Config needs to be updated.' : evalErrors,\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}
+{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server';\nimport type { CloudpackConfig, PackageImporterContext } from '@ms-cloudpack/common-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport type { InitOptions } from './types/InitOptions.js';\n\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { optimizeDependencies } from './optimizeDependencies.js';\n\n/**\n * A helper which given the packagePath, tries to evaluate the path by bundling things, finding imports,\n * and cross checking the imports with explicit exports. If any exports are missing, they are documented\n * in the generated config.\n */\nexport async function evaluatePath(options: {\n  /** Path to evaluate. */\n  packagePath: string;\n  /** Info about how the parent package */\n  importerContext: PackageImporterContext | undefined;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n  telemetryClient: TelemetryClient;\n  initOptions: InitOptions;\n  summaryData: InitSummaryData;\n  ctx: EnsurePackageBundledContext;\n  /** The priority of the package being evaluated. To be used in the task runner. */\n  priority: number;\n}): Promise<{\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate?: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh?: Set<string>;\n  /** Whether a fatal error was encountered. */\n  shouldExit?: boolean;\n}> {\n  const { packagePath, config, initOptions, telemetryClient, resolveMap, summaryData, ctx, importerContext, priority } =\n    options;\n  const { packages } = ctx;\n  const { features } = config;\n\n  // This line is the reason we have to track the importerContext for packages to evaluate:\n  // otherwise if a non-semver package is read here, we'd lose the modifications from the initial\n  // time the package was read (and getNonSemverTransform was called) when building the resolve map.\n  const definition = await packages.get(packagePath, { refresh: true, importerContext });\n  const { name, version } = definition || {};\n\n  if (!definition || !name || !version) {\n    // Unsure why a package would be missing a definition/name/version - we've built the resolve map already.\n    throw new Error(\n      `${packagePath} evaluation failed because the package.json with a name/version was not found or not readable.`,\n    );\n  }\n\n  // Bundle the package and find the imports it depends on.\n  const { result } = await ensurePackageBundled({\n    input: {\n      name,\n      version,\n      isIncremental: false,\n      shouldGetBundleInfo: true,\n      useHashAsId: true,\n      priority,\n    },\n    ctx,\n  });\n\n  const { errors, warnings, info } = result;\n\n  // Record the results for the summary.\n  const resultIdentifier = {\n    name: definition.name || '',\n    version: definition.version || '',\n    path: packagePath,\n  };\n\n  summaryData.recordResult({ packageResult: { ...resultIdentifier, errors, warnings, info } });\n\n  // If there were errors or no imports, return early.\n  if (errors?.length || !info) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    exportsChanges,\n    includedDependenciesChanges,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({\n    definition,\n    packagePath,\n    packages,\n    info,\n    config,\n    resolveMap,\n    importerContext,\n  });\n\n  if (evalErrors.length) {\n    summaryData.recordResult({\n      packageResult: { ...resultIdentifier, errors: evalErrors },\n      append: true,\n    });\n  }\n  summaryData.recordGeneratedChanges(exportsChanges);\n  summaryData.recordGeneratedChanges(includedDependenciesChanges);\n\n  // Conditionally scan dependency usage so that we can populate\n  // include/excludeDependencies automatically, ensuring the dep list\n  // is both minimal (remove unused deps) and complete (include\n  // specific devDeps.)\n  if (features?.optimizeDependencies) {\n    const excludedDependenciesChanges = optimizeDependencies(\n      { definition, packagePath, info, resolveMap },\n      { packages, config },\n    );\n    summaryData.recordGeneratedChanges(excludedDependenciesChanges);\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)) {\n    telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {\n      reason: exportsChanges ? 'Config needs to be updated.' : evalErrors.map((e) => e.text),\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"formatInitSummary.d.ts","sourceRoot":"","sources":["../../../src/commands/init/formatInitSummary.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IAAC,OAAO,EAAE,WAAW,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,UA+GpH"}
+{"version":3,"file":"formatInitSummary.d.ts","sourceRoot":"","sources":["../../../src/commands/init/formatInitSummary.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,UAAU,uBAAuB;IAC/B,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,OAAO,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,UAUhE"}

package/lib/commands/init/formatInitSummary.js

@@ -1,97 +1,117 @@
-import { bold, bulletedList, cyan, green, lightCyan, plural, red, yellow, formatTime, statusCharacter, } from '@ms-cloudpack/task-reporter';
-import path from 'path';
+import { bold, bulletedList, cyan, formatTime, green, indent, lightCyan, plural, red, statusCharacter, yellow, } from '@ms-cloudpack/task-reporter';
+import { formatLocation } from '@ms-cloudpack/path-utilities';
 /**
- * Given an init summary and init options, returns a formatted string message to display to the user via console.
+ * Given init summaries and init options, returns a formatted string message to display to the user via console.
  */
 export function formatInitSummary(params) {
     const { summaries, options, isInterrupted } = params;
-    const summaryString = [];
     const isMultiApp = summaries.length > 1;
-    for (const summary of summaries) {
-        const { totalPackages, totalErrors, totalWarnings, totalRequiredChanges, packagesWithErrors, packagesWithWarnings, generatedFileUpdates, } = summary;
-        const { check } = options;
-        const incompleteText = isInterrupted ? bold(` (incomplete)`) : ``;
-        // Report the "Summary" title if no errors or warnings are listed (seems redundant otherwise.
-        if ((!packagesWithErrors.length && !packagesWithWarnings.length) || isMultiApp) {
-            summaryString.push(bold(`==== Summary for ${summary.appPath}${incompleteText} ====`));
-        }
-        if (!isMultiApp) {
-            // Report work done to the generated file.
-            if (!packagesWithErrors.length && generatedFileUpdates.length) {
-                summaryString.push(`Updates ${check || isInterrupted ? 'needed for' : 'made to'} ${cyan(`cloudpack.generated.json`)}:\n`);
-                for (const packageUpdates of generatedFileUpdates) {
-                    const exportsUpdates = packageUpdates.changes.filter((u) => u.type === 'added-export');
-                    if (exportsUpdates.length) {
-                        summaryString.push(`${formatPackageName(packageUpdates)} - ${yellow(plural(exportsUpdates.length, 'path'))} missing from exports map`);
-                        summaryString.push(bulletedList(exportsUpdates.map((u) => `${cyan(u.change)}${u.reason ? ` - ${u.reason}` : ``}`)), '');
-                    }
-                }
-            }
-            // Report packages with warnings.
-            if (packagesWithWarnings.length) {
-                summaryString.push(`${plural(packagesWithWarnings.length, 'package')} with ${yellow('warnings')}:\n`);
-                let currentCount = 1;
-                for (const packageWithWarnings of packagesWithWarnings) {
-                    summaryString.push(`${yellow(`${statusCharacter.warn} ${currentCount++}.`)} ${formatPackageName(packageWithWarnings)} - ${yellow(plural(packageWithWarnings.warnings.length, 'warning'))}, ${packageWithWarnings.path}:`);
-                    summaryString.push(formatBundleMessages(packageWithWarnings, false), '');
-                }
-            }
-        }
-        // Report packages with errors.
-        if (packagesWithErrors.length) {
-            summaryString.push(`${plural(packagesWithErrors.length, 'package')} ${red('failed')}:\n`);
-            let currentCount = 1;
-            for (const packageWithErrors of packagesWithErrors) {
-                summaryString.push(`${red(`${statusCharacter.fail} ${currentCount++}.`)} ${formatPackageName(packageWithErrors)} - ${red(plural(packageWithErrors.errors.length, 'error'))}, ${packageWithErrors.path}:`);
-                summaryString.push(formatBundleMessages(packageWithErrors, true), '');
-            }
+    return (summaries
+        .map((summary) => formatSummary({ summary, options, isInterrupted, isMultiApp }))
+        .join('\n')
+        // replace >= 3 newlines with 2 newlines
+        .replace(/\n{3,}/g, '\n\n'));
+}
+/** Format a single app's init summary. */
+function formatSummary(params) {
+    const { summary, options, isInterrupted, isMultiApp } = params;
+    const summaryString = [];
+    const { totalPackages, totalErrors, totalWarnings, totalChanges, totalRequiredChanges, packagesWithErrors, packagesWithWarnings, generatedFileUpdates, } = summary;
+    const { check } = options;
+    const incompleteText = isInterrupted ? bold(` (incomplete)`) : ``;
+    // Report the "Summary" title if no errors or warnings are listed (seems redundant otherwise.
+    if ((!packagesWithErrors.length && !packagesWithWarnings.length) || isMultiApp) {
+        summaryString.push(bold(`==== Summary for ${summary.appPath}${incompleteText} ====`));
+    }
+    if (!isMultiApp) {
+        // If there are required changes, updates will be "made" or "needed" with check,
+        // else if the changes are not required, only report work done when updates are "made" (check is disabled).
+        const updatesRequired = totalRequiredChanges || (totalChanges && !check);
+        // Report exports that were or should be added to the generated config.
+        if (!packagesWithErrors.length && updatesRequired) {
+            summaryString.push(formatAddedExports({ generatedFileUpdates, check }));
         }
-        const blockingIssueCount = packagesWithErrors.length || 0;
-        const requiresChanges = (check && totalRequiredChanges) || 0;
-        // Add summary.
-        summaryString.push(`${cyan(plural(totalPackages, 'total package'))} evaluated in ${formatTime(summary.duration)}${incompleteText}:`, bulletedList([
-            requiresChanges ? `${red(plural(totalRequiredChanges, 'change'))} required` : undefined,
-            `${green(plural(totalPackages - blockingIssueCount, 'package'))} built successfully${packagesWithWarnings.length
-                ? ` (${yellow(plural(packagesWithWarnings.length, 'package'))} with warnings)`
-                : ''}`,
-            blockingIssueCount ? `${red(plural(blockingIssueCount, 'package'))} failed to build` : undefined,
-            `Totals: ${totalErrors ? red(plural(totalErrors, 'error')) : '0 errors'}, ${totalWarnings ? yellow(plural(totalWarnings, 'warning')) : '0 warnings'}`,
-        ].filter(Boolean)));
-        if (isInterrupted) {
-            summaryString.push('', yellow(bold('Process was interrupted before all tasks could complete.')));
+        // Report packages with warnings.
+        if (packagesWithWarnings.length) {
+            summaryString.push(formatPackageResults({ results: packagesWithWarnings, issueType: 'warnings' }), '');
         }
-        else if (requiresChanges) {
-            summaryString.push(`Run "${yellow('cloudpack init')}" in your application folder to apply changes to the ${cyan('cloudpack.generated.json')} file.`);
+    }
+    // Report packages with errors.
+    if (packagesWithErrors.length) {
+        summaryString.push(formatPackageResults({ results: packagesWithErrors, issueType: 'errors' }), '');
+    }
+    const blockingIssueCount = packagesWithErrors.length || 0;
+    const requiresChanges = (check && totalRequiredChanges) || 0;
+    // Add summary.
+    summaryString.push(`${cyan(plural(totalPackages, 'total package'))} evaluated in ${formatTime(summary.duration)}${incompleteText}:`, bulletedList([
+        requiresChanges ? `${red(plural(totalRequiredChanges, 'change'))} required` : undefined,
+        `${green(plural(totalPackages - blockingIssueCount, 'package'))} built successfully${packagesWithWarnings.length
+            ? ` (${yellow(plural(packagesWithWarnings.length, 'package'))} with warnings)`
+            : ''}`,
+        blockingIssueCount ? `${red(plural(blockingIssueCount, 'package'))} failed to build` : undefined,
+        `Totals: ${totalErrors ? red(plural(totalErrors, 'error')) : '0 errors'}, ${totalWarnings ? yellow(plural(totalWarnings, 'warning')) : '0 warnings'}`,
+    ].filter(Boolean)));
+    if (isInterrupted) {
+        summaryString.push('', yellow(bold('Process was interrupted before all tasks could complete.')));
+    }
+    else if (requiresChanges) {
+        summaryString.push(`Run "${yellow('cloudpack init')}" in your application folder to apply changes to the ${cyan('cloudpack.generated.json')} file.`);
+    }
+    summaryString.push('\n');
+    return summaryString.join('\n');
+}
+function formatAddedExports(params) {
+    const { generatedFileUpdates, check, isInterrupted } = params;
+    const summaryString = [];
+    for (const packageUpdates of generatedFileUpdates) {
+        const exportsUpdates = packageUpdates.changes.filter((u) => u.type === 'added-export');
+        if (exportsUpdates.length) {
+            const description = plural(exportsUpdates.length, 'path$s missing from exports map');
+            summaryString.push(formatPackageHeader({ ...packageUpdates, isError: false, description }), bulletedList(exportsUpdates.map((u) => `${cyan(u.change)}${u.reason ? ` - ${u.reason}` : ''}`)), '');
         }
-        summaryString.push('\n');
     }
-    return summaryString.filter((a) => a !== undefined).join('\n');
+    if (summaryString.length) {
+        summaryString.unshift(`Updates ${check || isInterrupted ? 'needed for' : 'made to'} ${cyan(`cloudpack.generated.json`)}:\n`);
+    }
+    return summaryString.join('\n');
 }
-/** Helper to format bundle messages. */
-function formatBundleMessages(result, formatErrors) {
-    const messages = [];
-    const unformattedMessages = (formatErrors ? result.errors : result.warnings) || [];
-    for (const message of unformattedMessages) {
-        const { location, text, source } = message;
-        const prefix = `${formatErrors ? red('Error') : yellow('Warning')} [${source}]`;
-        if (!location?.file) {
-            messages.push(`${prefix}: ${text}`);
+/** Helper to format `packagesWithWarnings` or `packagesWithErrors`. */
+function formatPackageResults(params) {
+    const { results, issueType } = params;
+    if (!results.length) {
+        return '';
+    }
+    const isError = issueType === 'errors';
+    const color = isError ? red : yellow;
+    const statusChar = bold(color(isError ? statusCharacter.error : statusCharacter.warn));
+    const summaryString = [bold(color(`${plural(results.length, 'package')} with ${issueType}:`)), ''];
+    for (const result of results) {
+        const unformattedMessages = result[issueType];
+        if (!unformattedMessages?.length) {
+            continue;
         }
-        else {
+        const description = plural(unformattedMessages.length, issueType.slice(0, -1) + '$s');
+        summaryString.push(formatPackageHeader({ ...result, isError, description }));
+        const messages = unformattedMessages.map(({ location, text, source }) => {
             // Show the whole path so it can be easily opened with ctrl+click.
             // NOTE: location.file should be relative to the package path, not the app path.
-            const filePath = path.resolve(result.path, location.file);
-            const characterLocation = location.line !== undefined && location.column !== undefined
-                ? yellow(`:${location.line}:${location.column}`)
-                : ``;
-            messages.push(`${prefix}: ${filePath}${characterLocation} - ${text}`);
-        }
+            const filePath = location ? ` ${formatLocation({ ...location, fromPath: result.path })}` : '';
+            // Indent the message for readability.
+            return `[${source}]${filePath}\n${color(indent(text, 1))}`;
+        });
+        summaryString.push(bulletedList(messages, undefined, statusChar), '');
     }
-    return messages.length ? bulletedList(messages) : undefined;
+    return summaryString.join('\n');
 }
-/** Helper to format package names. */
-function formatPackageName(packageIdentifier) {
-    const { name, version } = packageIdentifier;
-    return bold(lightCyan(`${name}@${version || `<no-version>`}`));
+/**
+ * Helper to format the header for a list of issues in a package:
+ * status character, `name@version`, issue description, package path.
+ */
+function formatPackageHeader(params) {
+    const { name, version, path: packagePath, description, isError } = params;
+    const color = isError ? red : yellow;
+    const statusChar = bold(color(isError ? statusCharacter.error : statusCharacter.warn));
+    const packageName = bold(lightCyan(`${name}@${version || `<unknown>`}`));
+    return `${packageName} - ${packagePath}\n${statusChar} ${bold(color(description))}`;
 }
 //# sourceMappingURL=formatInitSummary.js.map