@ms-cloudpack/cli 0.58.6 → 0.59.1

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

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

package/lib/commands/bundle/execute.js

@@ -1,14 +1,12 @@
 import { createPartialApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';
-import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';
-import { bold, bulletedList, formatPackageName, green, red, yellow } from '@ms-cloudpack/task-reporter';
+import { plural, red, yellow } from '@ms-cloudpack/task-reporter';
 import path from 'path';
+import { getFilteredPackages } from '../../utilities/getFilteredPackages.js';
 export const execute = async (params) => {
     const { cwd: appPath, options, reporter, initialize, exit, autoDispose } = params;
-    const { package: packageArg } = options;
     const { config, telemetryClient } = await initialize({
         appPath,
     });
-    const { bundler: bundlerType, outdir, disableSourceMaps } = options;
     const [ctx] = autoDispose(await createPartialApiContext({
         appPath,
         config,
@@ -16,61 +14,58 @@ export const execute = async (params) => {
         telemetryClient,
         items: ['packages', 'watcher', 'session', 'taskRunner', 'bus', 'packageImportPaths', 'packageHashes'],
     }));
-    let packagePath = appPath;
-    if (packageArg) {
-        let packageName = packageArg;
-        let version;
-        const versionSeparatorIndex = packageName.lastIndexOf('@');
-        if (versionSeparatorIndex > 0) {
-            packageName = packageArg.substring(0, versionSeparatorIndex);
-            version = packageArg.substring(versionSeparatorIndex + 1);
+    const pathsToBundle = options.match ? getFilteredPackages(ctx.session.resolveMap, options.match) : [appPath];
+    if (!pathsToBundle.length) {
+        await exit({
+            message: 'No matching packages found to bundle.',
+            exitCode: 1,
+        });
+        return;
+    }
+    // Show completed bundle tasks so the user knows what's happening.
+    reporter.setOptions({ ...reporter.getOptions(), showCompleted: true });
+    let warnPackagesCount = 0;
+    let errorPackagesCount = 0;
+    let successPackagesCount = 0;
+    for (const packagePath of pathsToBundle) {
+        // If outdir is set, resolve relative to the package/app path.
+        // Otherwise, use the default path under the cloudpack cache to stay consistent with init and start,
+        // and to avoid potentially messing with the package's original output.
+        const outputPath = options.outdir ? path.resolve(packagePath, options.outdir) : undefined;
+        const definition = await ctx.packages.get(packagePath);
+        const { result } = await ensurePackageBundled({
+            input: {
+                name: definition?.name ?? '<unknown>',
+                version: definition?.version ?? '0.0.0',
+                outputPath,
+                bundlerType: options.bundler,
+                disableSourceMaps: options.disableSourceMaps,
+                shouldForce: true,
+                isIncremental: false,
+            },
+            ctx,
+        });
+        console.log('Output:', result.outputPath, '\n');
+        if (result.errors?.length) {
+            errorPackagesCount++;
         }
-        const { resolveMap } = ctx.session;
-        const entry = findResolveMapEntry({ packageName, version, resolveMap });
-        const versions = [resolveMap[packageName].version, ...Object.keys(resolveMap[packageName].scopedVersions || {})];
-        if (entry) {
-            if (!version && versions.length > 1) {
-                // Error out if there are multiple versions available and no version was specified.
-                await exit({
-                    message: `Package "${packageName}" has multiple versions available, specify one of the following:\n${bulletedList(versions.map((v) => formatPackageName({ name: packageName, version: v })))}`,
-                    exitCode: 1,
-                });
-            }
-            packagePath = entry.path;
-            console.log(`Package ${formatPackageName({ name: packageName, version: entry.version })} found: ${entry.path}`);
+        else if (result.warnings?.length) {
+            warnPackagesCount++;
         }
         else {
-            await exit({
-                message: `Package "${packageArg}" couldn't be found.`,
-                exitCode: 1,
-            });
-            return;
+            successPackagesCount++;
         }
     }
-    // If outdir is set, resolve relative to the package/app path.
-    // Otherwise, use the default path under the cloudpack cache to stay consistent with init and start,
-    // and to avoid potentially messing with the package's original output.
-    const outputPath = outdir ? path.resolve(packagePath, outdir) : undefined;
-    const definition = await ctx.packages.get(packagePath);
-    const { result } = await ensurePackageBundled({
-        input: {
-            name: definition?.name ?? '<unknown>',
-            version: definition?.version ?? '0.0.0',
-            outputPath,
-            bundlerType,
-            disableSourceMaps,
-            shouldForce: true,
-            isIncremental: false,
-        },
-        ctx,
-    });
-    const hasErrors = !!result?.errors?.length;
-    const hasWarnings = !!result?.warnings?.length;
-    const color = hasErrors ? red : hasWarnings ? yellow : green;
-    const status = hasErrors ? 'failed' : hasWarnings ? 'completed with warnings' : 'completed';
+    const status = [
+        errorPackagesCount && red(plural(errorPackagesCount, 'package$s failed')),
+        warnPackagesCount && yellow(plural(warnPackagesCount, 'package$s succeeded with warnings')),
+        successPackagesCount && plural(successPackagesCount, 'package$s succeeded'),
+    ]
+        .filter(Boolean)
+        .join(', ');
     await exit({
-        message: `${color(bold(`Bundling ${status}!`))}\nOutput: ${result.outputPath}\n`,
-        exitCode: hasErrors ? 1 : 0,
+        message: `Bundling ${status}\n`,
+        exitCode: errorPackagesCount ? 1 : 0,
     });
 };
 //# sourceMappingURL=execute.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/bundle/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import { createPartialApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { bold, bulletedList, formatPackageName, green, red, yellow } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\n\nexport const execute: CommandAction<BundleOptions> = async (params) => {\n  const { cwd: appPath, options, reporter, initialize, exit, autoDispose } = params;\n  const { package: packageArg } = options;\n  const { config, telemetryClient } = await initialize({\n    appPath,\n  });\n\n  const { bundler: bundlerType, outdir, disableSourceMaps } = options;\n\n  const [ctx] = autoDispose(\n    await createPartialApiContext({\n      appPath,\n      config,\n      reporter,\n      telemetryClient,\n      items: ['packages', 'watcher', 'session', 'taskRunner', 'bus', 'packageImportPaths', 'packageHashes'],\n    }),\n  );\n\n  let packagePath = appPath;\n\n  if (packageArg) {\n    let packageName = packageArg;\n    let version: string | undefined;\n\n    const versionSeparatorIndex = packageName.lastIndexOf('@');\n\n    if (versionSeparatorIndex > 0) {\n      packageName = packageArg.substring(0, versionSeparatorIndex);\n      version = packageArg.substring(versionSeparatorIndex + 1);\n    }\n    const { resolveMap } = ctx.session;\n    const entry = findResolveMapEntry({ packageName, version, resolveMap });\n    const versions = [resolveMap[packageName].version, ...Object.keys(resolveMap[packageName].scopedVersions || {})];\n\n    if (entry) {\n      if (!version && versions.length > 1) {\n        // Error out if there are multiple versions available and no version was specified.\n        await exit({\n          message: `Package \"${packageName}\" has multiple versions available, specify one of the following:\\n${bulletedList(versions.map((v) => formatPackageName({ name: packageName, version: v })))}`,\n          exitCode: 1,\n        });\n      }\n\n      packagePath = entry.path;\n      console.log(`Package ${formatPackageName({ name: packageName, version: entry.version })} found: ${entry.path}`);\n    } else {\n      await exit({\n        message: `Package \"${packageArg}\" couldn't be found.`,\n        exitCode: 1,\n      });\n\n      return;\n    }\n  }\n\n  // If outdir is set, resolve relative to the package/app path.\n  // Otherwise, use the default path under the cloudpack cache to stay consistent with init and start,\n  // and to avoid potentially messing with the package's original output.\n  const outputPath = outdir ? path.resolve(packagePath, outdir) : undefined;\n\n  const definition = await ctx.packages.get(packagePath);\n\n  const { result } = await ensurePackageBundled({\n    input: {\n      name: definition?.name ?? '<unknown>',\n      version: definition?.version ?? '0.0.0',\n      outputPath,\n      bundlerType,\n      disableSourceMaps,\n      shouldForce: true,\n      isIncremental: false,\n    },\n    ctx,\n  });\n\n  const hasErrors = !!result?.errors?.length;\n  const hasWarnings = !!result?.warnings?.length;\n  const color = hasErrors ? red : hasWarnings ? yellow : green;\n  const status = hasErrors ? 'failed' : hasWarnings ? 'completed with warnings' : 'completed';\n  await exit({\n    message: `${color(bold(`Bundling ${status}!`))}\\nOutput: ${result.outputPath}\\n`,\n    exitCode: hasErrors ? 1 : 0,\n  });\n};\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/bundle/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import { createPartialApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { plural, red, yellow } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\n\nexport const execute: CommandAction<BundleOptions> = async (params) => {\n  const { cwd: appPath, options, reporter, initialize, exit, autoDispose } = params;\n  const { config, telemetryClient } = await initialize({\n    appPath,\n  });\n\n  const [ctx] = autoDispose(\n    await createPartialApiContext({\n      appPath,\n      config,\n      reporter,\n      telemetryClient,\n      items: ['packages', 'watcher', 'session', 'taskRunner', 'bus', 'packageImportPaths', 'packageHashes'],\n    }),\n  );\n\n  const pathsToBundle = options.match ? getFilteredPackages(ctx.session.resolveMap, options.match) : [appPath];\n\n  if (!pathsToBundle.length) {\n    await exit({\n      message: 'No matching packages found to bundle.',\n      exitCode: 1,\n    });\n    return;\n  }\n\n  // Show completed bundle tasks so the user knows what's happening.\n  reporter.setOptions({ ...reporter.getOptions(), showCompleted: true });\n\n  let warnPackagesCount = 0;\n  let errorPackagesCount = 0;\n  let successPackagesCount = 0;\n\n  for (const packagePath of pathsToBundle) {\n    // If outdir is set, resolve relative to the package/app path.\n    // Otherwise, use the default path under the cloudpack cache to stay consistent with init and start,\n    // and to avoid potentially messing with the package's original output.\n    const outputPath = options.outdir ? path.resolve(packagePath, options.outdir) : undefined;\n\n    const definition = await ctx.packages.get(packagePath);\n\n    const { result } = await ensurePackageBundled({\n      input: {\n        name: definition?.name ?? '<unknown>',\n        version: definition?.version ?? '0.0.0',\n        outputPath,\n        bundlerType: options.bundler,\n        disableSourceMaps: options.disableSourceMaps,\n        shouldForce: true,\n        isIncremental: false,\n      },\n      ctx,\n    });\n\n    console.log('Output:', result.outputPath, '\\n');\n\n    if (result.errors?.length) {\n      errorPackagesCount++;\n    } else if (result.warnings?.length) {\n      warnPackagesCount++;\n    } else {\n      successPackagesCount++;\n    }\n  }\n\n  const status = [\n    errorPackagesCount && red(plural(errorPackagesCount, 'package$s failed')),\n    warnPackagesCount && yellow(plural(warnPackagesCount, 'package$s succeeded with warnings')),\n    successPackagesCount && plural(successPackagesCount, 'package$s succeeded'),\n  ]\n    .filter(Boolean)\n    .join(', ');\n\n  await exit({\n    message: `Bundling ${status}\\n`,\n    exitCode: errorPackagesCount ? 1 : 0,\n  });\n};\n"]}

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

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

package/lib/commands/bundle/index.js

@@ -1,4 +1,5 @@
-import { Option } from 'commander';
+import { InvalidArgumentError, Option } from 'commander';
+import { parseMatch } from '../../utilities/parseMatch.js';
 /** Defines the "bundle" verb. */
 export const init = (program) => {
     program.addSubCommand({
@@ -6,7 +7,10 @@ export const init = (program) => {
         description: 'Bundles a package.',
         options: {
             bundler: new Option('--bundler <name>', 'Forces use of a specific bundler.'),
-            package: new Option('--package <package>', "Bundles the named package in the current folder's application dependency graph."),
+            match: new Option('--match <match...>', 'Bundle specific package(s), optionally with a version: e.g. "foo", "@foo/*", "foo@1.2.3"').argParser(parseMatch),
+            package: new Option('--package <package>').hideHelp().argParser(() => {
+                throw new InvalidArgumentError('Use --match instead of --package');
+            }),
             outdir: new Option('--outdir <path>', 'Path to drop the bundle output, relative to current or package path. ' +
                 'If not set, uses the default path under the cloudpack cache.'),
             disableSourceMaps: new Option('--disable-source-maps', 'Disables source maps.'),

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/bundle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAInC,iCAAiC;AACjC,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAgB;QACnC,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE;YACP,OAAO,EAAE,IAAI,MAAM,CAAC,kBAAkB,EAAE,mCAAmC,CAAC;YAC5E,OAAO,EAAE,IAAI,MAAM,CACjB,qBAAqB,EACrB,iFAAiF,CAClF;YACD,MAAM,EAAE,IAAI,MAAM,CAChB,iBAAiB,EACjB,uEAAuE;gBACrE,8DAA8D,CACjE;YACD,iBAAiB,EAAE,IAAI,MAAM,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;SAChF;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\n\n/** Defines the \"bundle\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  program.addSubCommand<BundleOptions>({\n    name: 'bundle',\n    description: 'Bundles a package.',\n    options: {\n      bundler: new Option('--bundler <name>', 'Forces use of a specific bundler.'),\n      package: new Option(\n        '--package <package>',\n        \"Bundles the named package in the current folder's application dependency graph.\",\n      ),\n      outdir: new Option(\n        '--outdir <path>',\n        'Path to drop the bundle output, relative to current or package path. ' +\n          'If not set, uses the default path under the cloudpack cache.',\n      ),\n      disableSourceMaps: new Option('--disable-source-maps', 'Disables source maps.'),\n    },\n    getExecutor: () => import('./execute.js'),\n  });\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/bundle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,iCAAiC;AACjC,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAgB;QACnC,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE;YACP,OAAO,EAAE,IAAI,MAAM,CAAC,kBAAkB,EAAE,mCAAmC,CAAC;YAC5E,KAAK,EAAE,IAAI,MAAM,CACf,oBAAoB,EACpB,0FAA0F,CAC3F,CAAC,SAAS,CAAC,UAAU,CAAC;YACvB,OAAO,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE;gBACnE,MAAM,IAAI,oBAAoB,CAAC,kCAAkC,CAAC,CAAC;YACrE,CAAC,CAAC;YACF,MAAM,EAAE,IAAI,MAAM,CAChB,iBAAiB,EACjB,uEAAuE;gBACrE,8DAA8D,CACjE;YACD,iBAAiB,EAAE,IAAI,MAAM,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;SAChF;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { InvalidArgumentError, Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport { parseMatch } from '../../utilities/parseMatch.js';\n\n/** Defines the \"bundle\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  program.addSubCommand<BundleOptions>({\n    name: 'bundle',\n    description: 'Bundles a package.',\n    options: {\n      bundler: new Option('--bundler <name>', 'Forces use of a specific bundler.'),\n      match: new Option(\n        '--match <match...>',\n        'Bundle specific package(s), optionally with a version: e.g. \"foo\", \"@foo/*\", \"foo@1.2.3\"',\n      ).argParser(parseMatch),\n      package: new Option('--package <package>').hideHelp().argParser(() => {\n        throw new InvalidArgumentError('Use --match instead of --package');\n      }),\n      outdir: new Option(\n        '--outdir <path>',\n        'Path to drop the bundle output, relative to current or package path. ' +\n          'If not set, uses the default path under the cloudpack cache.',\n      ),\n      disableSourceMaps: new Option('--disable-source-maps', 'Disables source maps.'),\n    },\n    getExecutor: () => import('./execute.js'),\n  });\n};\n"]}

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

@@ -1,3 +1,4 @@
+import type { PackageSettings } from '@ms-cloudpack/common-types';
 export interface BundleOptions {
     /**
      * Forces use of a specific bundler. 'ori' | 'rollup' | 'auto'. Defaults to "auto".
@@ -15,8 +16,12 @@ export interface BundleOptions {
      */
     outdir?: string;
     /**
-     * Given a package name, resolves dependencies and finds the first patch.
+     * @deprecated Removed in favor of `match`.
      */
     package?: string;
+    /**
+     * If set, only evaluate matching packages.
+     */
+    match?: PackageSettings['match'][];
 }
 //# sourceMappingURL=BundleOptions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BundleOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/bundle/types/BundleOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"BundleOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/bundle/types/BundleOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;CACpC"}

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

@@ -1 +1 @@
-{"version":3,"file":"BundleOptions.js","sourceRoot":"","sources":["../../../../src/commands/bundle/types/BundleOptions.ts"],"names":[],"mappings":"","sourcesContent":["export interface BundleOptions {\n  /**\n   * Forces use of a specific bundler. 'ori' | 'rollup' | 'auto'. Defaults to \"auto\".\n   */\n  bundler?: string;\n\n  /**\n   * Disables source maps.\n   */\n  disableSourceMaps?: boolean;\n\n  /**\n   * Path to drop the bundle output. This is usually relative to the app path.\n   * If `package` is set, it's relative to the package path.\n   *\n   * If not set, the bundle output is dropped in the default path under the cloudpack cache.\n   */\n  outdir?: string;\n\n  /**\n   * Given a package name, resolves dependencies and finds the first patch.\n   */\n  package?: string;\n}\n"]}
+{"version":3,"file":"BundleOptions.js","sourceRoot":"","sources":["../../../../src/commands/bundle/types/BundleOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { PackageSettings } from '@ms-cloudpack/common-types';\n\nexport interface BundleOptions {\n  /**\n   * Forces use of a specific bundler. 'ori' | 'rollup' | 'auto'. Defaults to \"auto\".\n   */\n  bundler?: string;\n\n  /**\n   * Disables source maps.\n   */\n  disableSourceMaps?: boolean;\n\n  /**\n   * Path to drop the bundle output. This is usually relative to the app path.\n   * If `package` is set, it's relative to the package path.\n   *\n   * If not set, the bundle output is dropped in the default path under the cloudpack cache.\n   */\n  outdir?: string;\n\n  /**\n   * @deprecated Removed in favor of `match`.\n   */\n  package?: string;\n\n  /**\n   * If set, only evaluate matching packages.\n   */\n  match?: PackageSettings['match'][];\n}\n"]}

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,CA0LD"}

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,49 +30,39 @@ 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)) {
+                // TODO this seems wrong--it's skipping all further evaluation of the package
                 continue;
             }
             generatedPackageSettings.includedDependencies.push(dependencyName);
@@ -160,15 +151,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, line: 1, column: 0 },
+                });
             }
         }
     }
     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'), line: 1, column: 0 },
+    };
+}
 //# 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":"AASA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,eAAe,EACf,qBAAqB,EACrB,aAAa,EACb,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OASjD;IAcC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAEjG,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,cAAc,GAA8B,EAAE,CAAC;IACrD,MAAM,2BAA2B,GAA8B,EAAE,CAAC;IAClE,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,MAAM,eAAe,GAAG,IAAI,GAAG,EAA8C,CAAC;IAC9E,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,MAAM,YAAY,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IACjD,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAC7D,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAE7C,oEAAoE;IACpE,KAAK,MAAM,CAAC,cAAc,EAAE,qBAAqB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACpF,MAAM,YAAY,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;QAClG,MAAM,cAAc,GAAG,YAAY,EAAE,IAAI,CAAC;QAC1C,MAAM,oBAAoB,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE7F,mDAAmD;QACnD,IAAI,CAAC,cAAc,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC7C,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;YACxG,uEAAuE;YACvE,SAAS;QACX,CAAC;QAED,gEAAgE;QAChE,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,cAAc,KAAK,UAAU,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,EAAE,CAAC;YACjH,yEAAyE;YACzE,2CAA2C;YAC3C,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE,CAAC;gBACxC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;YAC7G,CAAC;YACD,oEAAoE;YACpE,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;YAElD,8BAA8B;YAC9B,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC;YAClE,IAAI,EAAE,wBAAwB,EAAE,GAAG,kBAAkB,CAAC;gBACpD,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,eAAe,EAAE,EAAE;gBAC1C,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,cAAc;gBACvB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;YAEH,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAC9B,wBAAwB,GAAG;oBACzB,KAAK,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW;iBAC3G,CAAC;gBACF,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACjD,CAAC;YAED,wBAAwB,CAAC,oBAAoB,KAAK,EAAE,CAAC;YAErD,6DAA6D;YAC7D,IAAI,wBAAwB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC3E,6EAA6E;gBAC7E,SAAS;YACX,CAAC;YAED,wBAAwB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAEnE,2BAA2B,CAAC,IAAI,CAAC;gBAC/B,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,cAAc;gBACvB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,qBAAqB;wBAC3B,MAAM,EAAE,cAAc;wBACtB,MAAM,EAAE,gBAAgB,WAAW,GAAG;qBACvC;iBACF;aACF,CAAC,CAAC;YAEH,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,oBAA6C,CAAC;QACxE,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,iBAAiB,cAAc,wCAAwC,CAAC,CAAC;QAClH,CAAC;QAED,IAAI,yBAA6D,CAAC;QAClE,MAAM,kBAAkB,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,kBAAkB,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;YAChE,yBAAyB,GAAG;gBAC1B,UAAU,EAAE,UAAU,CAAC,IAAI;gBAC3B,aAAa,EAAE,UAAU,CAAC,OAAO;gBACjC,YAAY,EAAE,cAAc;gBAC5B,kBAAkB;aACnB,CAAC;QACJ,CAAC;QAED,oEAAoE;QACpE,eAAe,CAAC,GAAG,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAC;QAE/D,mIAAmI;QACnI,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3F,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC;QAClE,IAAI,wBAAqD,CAAC;QAC1D,wCAAwC;QACxC,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,EAAE,CAAC;YACzD,IAAI,gBAAgB,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBAC3C,SAAS;YACX,CAAC;YAED,mGAAmG;YACnG,wBAAwB,KAAK,kBAAkB,CAAC;gBAC9C,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,eAAe,EAAE,EAAE;gBAC1C,IAAI;gBACJ,OAAO;gBACP,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC,wBAAwB,CAAC;YAE5B,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAC9B,IAAI,iBAAiB,CAAC,cAAc,CAAC,EAAE,CAAC;oBACtC,wBAAwB,GAAG;wBACzB,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,OAAO,EAAE,EAAE;wBACvC,OAAO,EAAE,EAAE;qBACZ,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,wBAAwB,GAAG;wBACzB,KAAK,EAAE,IAAI;wBACX,OAAO,EAAE,EAAE;qBACZ,CAAC;gBACJ,CAAC;gBACD,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACjD,CAAC;YAED,wBAAwB,CAAC,OAAO,KAAK,EAAE,CAAC;YAExC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CACzC;gBACE,OAAO,EAAE,wBAAwB,CAAC,OAAO;gBACzC,WAAW,EAAE,cAAc;gBAC3B,UAAU,EAAE,oBAAoB;aACjC,EACD,EAAE,QAAQ,EAAE,MAAM,EAAE,CACrB,CAAC;YAEF,IAAI,UAAU,EAAE,CAAC;gBACf,cAAc,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE,oBAAoB,CAAC,OAAO,IAAI,EAAE;oBAC3C,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,cAAc;4BACpB,MAAM,EAAE,oBAAoB;4BAC5B,MAAM,EAAE,gBAAgB,WAAW,GAAG;yBACvC;qBACF;iBACF,CAAC,CAAC;gBAEH,2FAA2F;gBAC3F,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,GACR,qDAAqD;oBACrD,wFAAwF,IAAI,CAC1F,cAAc,CACf,6DAA6D,YAAY,CACxE;wBACE,WAAW,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE;wBACpE,gBAAgB,cAAc,IAAI,OAAO,KAAK,oBAAoB,GAAG;qBACtE,EACD,CAAC,CACF,EAAE,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI;oBACJ,MAAM,EAAE,kBAAkB;oBAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;iBACpD,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC;AAC5G,CAAC;AAED,SAAS,oBAAoB,CAAC,MAK7B;IACC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAEvE,IAAI,IAAY,CAAC;IACjB,IAAI,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC;QAC9B,IAAI;YACF,sBAAsB,cAAc,2BAA2B,WAAW,KAAK;gBAC/E,2EAA2E;gBAC3E,iCAAiC,WAAW,wDAAwD;gBACpG,sDAAsD,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,gBAAgB,cAAc,qBAAqB,WAAW,UACnE,SAAS,KAAK,WAAW,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,iDACvD,yBAAyB,cAAc,uCAAuC,WAAW,IACvF,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,6CAA6C,WAAW,wBAAwB,CAAC,CAAC,CAAC,EAClH,GAAG,CAAC;IACN,CAAC;IAED,OAAO;QACL,IAAI;QACJ,MAAM,EAAE,kBAAkB;QAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;KAC/E,CAAC;AACJ,CAAC","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        // TODO this seems wrong--it's skipping all further evaluation of the package\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 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, line: 1, column: 0 },\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'), line: 1, column: 0 },\n  };\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,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;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,CAqGD"}

package/lib/commands/init/evaluatePath.js

@@ -39,7 +39,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 +54,7 @@ export async function evaluatePath(options) {
     });
     if (evalErrors.length) {
         summaryData.recordResult({
-            packageResult: {
-                ...resultIdentifier,
-                errors: evalErrors.map((text) => ({ text })),
-            },
+            packageResult: { ...resultIdentifier, errors: evalErrors },
             append: true,
         });
     }
@@ -68,16 +65,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 })),
-                },
-                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 +74,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 })),\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 })),\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}): 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) {\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.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":"AAYA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D;;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,UAoHpH"}