@ms-cloudpack/package-utilities 13.3.4 → 13.5.0

package/lib/exportsMap/addExportsMapEntry.d.ts

@@ -1,24 +1,20 @@
 import type { CloudpackConfig, PackageDefinitionsCache, GeneratedExports } from '@ms-cloudpack/common-types';
-import { type FindFileInPackageResult } from '../findFileInPackage/findFileInPackage.js';
+import { type FindFileInPackageOptions, type FindFileInPackageResult } from '../findFileInPackage/findFileInPackage.js';
 /**
  * Options for `addExportsMapEntry`.
  */
-export interface AddExportsMapEntryOptions {
+export interface AddExportsMapEntryOptions extends Pick<FindFileInPackageOptions, 'packagePath' | 'resolveWebExtensions'> {
     /**
      * The generated exports map to add the entry to.
      */
     exports: GeneratedExports;
-    /**
-     * The package path to add the entry for. This is used to resolve relative paths.
-     */
-    packagePath: string;
     /**
      * The import path to add the entry for. This is used as the key in the exports map.
      * Defaults to `'.'` (the package import).
      */
     importPath?: string;
     /**
-     * The relative path to the physical file location, representing the "key" in the exports map.
+     * The relative path to the physical file location, used to derive the exports map value.
      * Can be a partial location, in which case we'll search for the file and associated source/d.ts files.
      * Defaults to `importPath` if provided, or `'index.js'`.
      */
@@ -35,10 +31,6 @@ export interface AddExportsMapEntryOptions {
      * - `node` is used for server rendering.
      */
     environmentCondition?: 'browser' | 'node';
-    /**
-     * Whether to resolve web extensions (e.g. `.web.js`).
-     */
-    resolveWebExtensions: boolean;
 }
 /**
  * Add an import path to an exports map. This is intended for use with generated exports maps,
@@ -50,7 +42,8 @@ export interface AddExportsMapEntryOptions {
  */
 export declare function addExportsMapEntry(options: AddExportsMapEntryOptions, context: {
     packages: PackageDefinitionsCache;
-    config: Pick<CloudpackConfig, 'features'>;
+    /** @deprecated Pass `resolveWebExtensions` option directly */
+    config?: Pick<CloudpackConfig, 'features'>;
 }): Promise<boolean>;
 /**
  * Internal logic of adding an entry to an exports map.

package/lib/exportsMap/addExportsMapEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addExportsMapEntry.d.ts","sourceRoot":"","sources":["../../src/exportsMap/addExportsMapEntry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE7G,OAAO,EAAqB,KAAK,uBAAuB,EAAE,MAAM,2CAA2C,CAAC;AAE5G;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,OAAO,EAAE,gBAAgB,CAAC;IAE1B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IAEpD;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAE1C;;OAEG;IACH,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;CAAE,GACxF,OAAO,CAAC,OAAO,CAAC,CAmBlB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,OAAO,EAAE,IAAI,CAAC,yBAAyB,EAAE,aAAa,GAAG,UAAU,CAAC,EACpE,SAAS,EAAE,uBAAuB,GACjC,OAAO,CAgDT"}
+{"version":3,"file":"addExportsMapEntry.d.ts","sourceRoot":"","sources":["../../src/exportsMap/addExportsMapEntry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE7G,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC7B,MAAM,2CAA2C,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,yBAA0B,SAAQ,IAAI,CACrD,wBAAwB,EACxB,aAAa,GAAG,sBAAsB,CACvC;IACC;;OAEG;IACH,OAAO,EAAE,gBAAgB,CAAC;IAE1B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IAEpD;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAC3C;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,8DAA8D;IAC9D,MAAM,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;CAC5C,GACA,OAAO,CAAC,OAAO,CAAC,CAwBlB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,OAAO,EAAE,IAAI,CAAC,yBAAyB,EAAE,aAAa,GAAG,UAAU,CAAC,EACpE,SAAS,EAAE,uBAAuB,GACjC,OAAO,CAgDT"}

package/lib/exportsMap/addExportsMapEntry.js

@@ -1,5 +1,5 @@
 import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
-import { findFileInPackage } from '../findFileInPackage/findFileInPackage.js';
+import { findFileInPackage, } from '../findFileInPackage/findFileInPackage.js';
 /**
  * Add an import path to an exports map. This is intended for use with generated exports maps,
  * either in the context of the generated config, or generated for a package which doesn't have
@@ -9,7 +9,12 @@ import { findFileInPackage } from '../findFileInPackage/findFileInPackage.js';
  * being updated is an array (it should have been normalized to object format before calling).
  */
 export async function addExportsMapEntry(options, context) {
-    const { exports, packagePath, resolveWebExtensions } = options;
+    // resolveWebExtensions should only be missing in weird dependency mismatch cases, and it's
+    // rarely used anyway. In this context, definitions.get() could cause an infinite loop,
+    // so fall back to checking the config only.
+    // eslint-disable-next-line etc/no-deprecated
+    const { exports, packagePath, resolveWebExtensions = !!context.config?.features?.resolveWebExtensions } = options;
+    const { packages } = context;
     // We try to enforce these conditions in the types, but also do an explicit check in case of
     // casting or other unexpected input.
     if (exports === null || Array.isArray(exports) || typeof exports === 'string') {
@@ -19,7 +24,7 @@ export async function addExportsMapEntry(options, context) {
         packagePath,
         filePath: options.filePath || options.importPath || '',
         resolveWebExtensions,
-    }, context);
+    }, { packages });
     return _addEntry(options, foundFile);
 }
 /**

package/lib/exportsMap/addExportsMapEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"addExportsMapEntry.js","sourceRoot":"","sources":["../../src/exportsMap/addExportsMapEntry.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, GeneratedExports } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { findFileInPackage, type FindFileInPackageResult } from '../findFileInPackage/findFileInPackage.js';\n\n/**\n * Options for `addExportsMapEntry`.\n */\nexport interface AddExportsMapEntryOptions {\n  /**\n   * The generated exports map to add the entry to.\n   */\n  exports: GeneratedExports;\n\n  /**\n   * The package path to add the entry for. This is used to resolve relative paths.\n   */\n  packagePath: string;\n\n  /**\n   * The import path to add the entry for. This is used as the key in the exports map.\n   * Defaults to `'.'` (the package import).\n   */\n  importPath?: string;\n\n  /**\n   * The relative path to the physical file location, representing the \"key\" in the exports map.\n   * Can be a partial location, in which case we'll search for the file and associated source/d.ts files.\n   * Defaults to `importPath` if provided, or `'index.js'`.\n   */\n  filePath?: string;\n\n  /**\n   * Module type condition to add the entry for.\n   * @default 'default'\n   */\n  requestCondition?: 'import' | 'require' | 'default';\n\n  /**\n   * The condition that describes the environment the entry is for.\n   * Unspecified implies environmentally agnostic.\n   * - `browser` is used for cases such as `browser` entries in package.json or implicit exports defined in routes.\n   * - `node` is used for server rendering.\n   */\n  environmentCondition?: 'browser' | 'node';\n\n  /**\n   * Whether to resolve web extensions (e.g. `.web.js`).\n   */\n  resolveWebExtensions: boolean;\n}\n\n/**\n * Add an import path to an exports map. This is intended for use with generated exports maps,\n * either in the context of the generated config, or generated for a package which doesn't have\n * an exports map.\n *\n * Throws an error if the exports map passed in is not an object, or if the value of the key\n * being updated is an array (it should have been normalized to object format before calling).\n */\nexport async function addExportsMapEntry(\n  options: AddExportsMapEntryOptions,\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<boolean> {\n  const { exports, packagePath, resolveWebExtensions } = options;\n\n  // We try to enforce these conditions in the types, but also do an explicit check in case of\n  // casting or other unexpected input.\n  if (exports === null || Array.isArray(exports) || typeof exports === 'string') {\n    throw new Error(`Exports passed to addExportsMapEntry must be an object; received: ${JSON.stringify(exports)}`);\n  }\n\n  const foundFile = await findFileInPackage(\n    {\n      packagePath,\n      filePath: options.filePath || options.importPath || '',\n      resolveWebExtensions,\n    },\n    context,\n  );\n\n  return _addEntry(options, foundFile);\n}\n\n/**\n * Internal logic of adding an entry to an exports map.\n * Exported for testing this logic separately from the filesystem parts.\n * @internal\n */\nexport function _addEntry(\n  options: Omit<AddExportsMapEntryOptions, 'packagePath' | 'filePath'>,\n  foundFile: FindFileInPackageResult,\n): boolean {\n  const { exports, environmentCondition, requestCondition = 'default' } = options;\n  const { filePath, sourcePath } = foundFile;\n\n  // Only do work if a file path was found.\n  if (!filePath) {\n    return false;\n  }\n\n  // Normalize the import path (this also converts undefined to '.')\n  const importPath = normalizeRelativePath(options.importPath);\n\n  const oldEntry = exports[importPath];\n  if (Array.isArray(oldEntry)) {\n    // This should never happen with the standardized generated exports map format.\n    // In theory we could handle it by pushing to the array, but nesting conditions inside arrays\n    // isn't valid in the exports map spec.\n    throw new Error(`Cannot add to an array of exports for \"${importPath}\"`);\n  }\n\n  let exportValue: string | Record<string, string>;\n\n  if (!sourcePath && !requestCondition) {\n    // If this is the only entry we're adding, set it to a string to minimize the exports map.\n    exportValue = filePath;\n  } else {\n    exportValue = {};\n\n    if (sourcePath) {\n      exportValue['source'] = sourcePath;\n    }\n\n    // Add the entry for the condition.\n    exportValue[requestCondition] = filePath;\n\n    if (requestCondition === 'default' && Object.keys(exportValue).length === 1) {\n      // Only the default condition is present, so flatten to a string\n      exportValue = filePath;\n    }\n  }\n\n  const newEntry: GeneratedExports[string] = environmentCondition\n    ? { [environmentCondition]: exportValue }\n    : exportValue;\n\n  exports[importPath] = mergeEntries({ oldEntry, newEntry });\n\n  return true;\n}\n\n/**\n * This handles the merging of potential nested environment and request conditions, and ensures that\n * the `default` key is in the correct order (always last).\n */\nfunction mergeEntries<T extends string | Record<string, T>>(params: {\n  oldEntry: T | null | undefined;\n  newEntry: T;\n}): T {\n  const { oldEntry, newEntry } = params;\n\n  if (!oldEntry) {\n    return newEntry;\n  }\n\n  // If oldEntry is a string... (using !== object instead of === string so TS infers the correct type later)\n  if (typeof oldEntry !== 'object') {\n    // If newEntry is an object without a default, use oldEntry as the default.\n    if (typeof newEntry === 'object' && !newEntry.default) {\n      return { ...newEntry, default: oldEntry };\n    }\n    // Otherwise ignore oldEntry.\n    return newEntry;\n  }\n\n  if (typeof newEntry !== 'object') {\n    // oldEntry object, newEntry string => use newEntry as default\n    return { ...oldEntry, default: newEntry };\n  }\n\n  // both objects => full merge (the typings get imprecise here)\n  const merged: Record<string, T> = {};\n  // put the new keys first in the merged object (this could be made configurable later if needed)\n  const allKeys = new Set([...Object.keys(newEntry), ...Object.keys(oldEntry)]);\n  for (const key of allKeys) {\n    if (newEntry[key]) {\n      merged[key] = mergeEntries({ oldEntry: oldEntry[key], newEntry: newEntry[key] });\n    } else {\n      merged[key] = oldEntry[key];\n    }\n  }\n\n  const defaultValue = merged.default;\n  if (defaultValue) {\n    if (Object.keys(merged).length === 1) {\n      // flatten out the default condition\n      return defaultValue;\n    }\n\n    // ensure the default is last (exports maps keys are ordered)\n    delete merged.default;\n    merged.default = defaultValue;\n  }\n\n  return merged as T;\n}\n"]}
+{"version":3,"file":"addExportsMapEntry.js","sourceRoot":"","sources":["../../src/exportsMap/addExportsMapEntry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EACL,iBAAiB,GAGlB,MAAM,2CAA2C,CAAC;AA0CnD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAkC,EAClC,OAIC;IAED,2FAA2F;IAC3F,uFAAuF;IACvF,4CAA4C;IAC5C,6CAA6C;IAC7C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,oBAAoB,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC;IAClH,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,4FAA4F;IAC5F,qCAAqC;IACrC,IAAI,OAAO,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC9E,MAAM,IAAI,KAAK,CAAC,qEAAqE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAClH,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,iBAAiB,CACvC;QACE,WAAW;QACX,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,UAAU,IAAI,EAAE;QACtD,oBAAoB;KACrB,EACD,EAAE,QAAQ,EAAE,CACb,CAAC;IAEF,OAAO,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS,CACvB,OAAoE,EACpE,SAAkC;IAElC,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;IAChF,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;IAE3C,yCAAyC;IACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,KAAK,CAAC;IACf,CAAC;IAED,kEAAkE;IAClE,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE7D,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,+EAA+E;QAC/E,6FAA6F;QAC7F,uCAAuC;QACvC,MAAM,IAAI,KAAK,CAAC,0CAA0C,UAAU,GAAG,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,WAA4C,CAAC;IAEjD,IAAI,CAAC,UAAU,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACrC,0FAA0F;QAC1F,WAAW,GAAG,QAAQ,CAAC;IACzB,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,EAAE,CAAC;QAEjB,IAAI,UAAU,EAAE,CAAC;YACf,WAAW,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;QACrC,CAAC;QAED,mCAAmC;QACnC,WAAW,CAAC,gBAAgB,CAAC,GAAG,QAAQ,CAAC;QAEzC,IAAI,gBAAgB,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5E,gEAAgE;YAChE,WAAW,GAAG,QAAQ,CAAC;QACzB,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAA6B,oBAAoB;QAC7D,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,EAAE,WAAW,EAAE;QACzC,CAAC,CAAC,WAAW,CAAC;IAEhB,OAAO,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE3D,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAS,YAAY,CAAuC,MAG3D;IACC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEtC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,0GAA0G;IAC1G,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,2EAA2E;QAC3E,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YACtD,OAAO,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;QAC5C,CAAC;QACD,6BAA6B;QAC7B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,8DAA8D;QAC9D,OAAO,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAC5C,CAAC;IAED,8DAA8D;IAC9D,MAAM,MAAM,GAAsB,EAAE,CAAC;IACrC,gGAAgG;IAChG,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9E,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnF,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC;IACpC,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,oCAAoC;YACpC,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,6DAA6D;QAC7D,OAAO,MAAM,CAAC,OAAO,CAAC;QACtB,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC;IAChC,CAAC;IAED,OAAO,MAAW,CAAC;AACrB,CAAC","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, GeneratedExports } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport {\n  findFileInPackage,\n  type FindFileInPackageOptions,\n  type FindFileInPackageResult,\n} from '../findFileInPackage/findFileInPackage.js';\n\n/**\n * Options for `addExportsMapEntry`.\n */\nexport interface AddExportsMapEntryOptions extends Pick<\n  FindFileInPackageOptions,\n  'packagePath' | 'resolveWebExtensions'\n> {\n  /**\n   * The generated exports map to add the entry to.\n   */\n  exports: GeneratedExports;\n\n  /**\n   * The import path to add the entry for. This is used as the key in the exports map.\n   * Defaults to `'.'` (the package import).\n   */\n  importPath?: string;\n\n  /**\n   * The relative path to the physical file location, used to derive the exports map value.\n   * Can be a partial location, in which case we'll search for the file and associated source/d.ts files.\n   * Defaults to `importPath` if provided, or `'index.js'`.\n   */\n  filePath?: string;\n\n  /**\n   * Module type condition to add the entry for.\n   * @default 'default'\n   */\n  requestCondition?: 'import' | 'require' | 'default';\n\n  /**\n   * The condition that describes the environment the entry is for.\n   * Unspecified implies environmentally agnostic.\n   * - `browser` is used for cases such as `browser` entries in package.json or implicit exports defined in routes.\n   * - `node` is used for server rendering.\n   */\n  environmentCondition?: 'browser' | 'node';\n}\n\n/**\n * Add an import path to an exports map. This is intended for use with generated exports maps,\n * either in the context of the generated config, or generated for a package which doesn't have\n * an exports map.\n *\n * Throws an error if the exports map passed in is not an object, or if the value of the key\n * being updated is an array (it should have been normalized to object format before calling).\n */\nexport async function addExportsMapEntry(\n  options: AddExportsMapEntryOptions,\n  context: {\n    packages: PackageDefinitionsCache;\n    /** @deprecated Pass `resolveWebExtensions` option directly */\n    config?: Pick<CloudpackConfig, 'features'>;\n  },\n): Promise<boolean> {\n  // resolveWebExtensions should only be missing in weird dependency mismatch cases, and it's\n  // rarely used anyway. In this context, definitions.get() could cause an infinite loop,\n  // so fall back to checking the config only.\n  // eslint-disable-next-line etc/no-deprecated\n  const { exports, packagePath, resolveWebExtensions = !!context.config?.features?.resolveWebExtensions } = options;\n  const { packages } = context;\n\n  // We try to enforce these conditions in the types, but also do an explicit check in case of\n  // casting or other unexpected input.\n  if (exports === null || Array.isArray(exports) || typeof exports === 'string') {\n    throw new Error(`Exports passed to addExportsMapEntry must be an object; received: ${JSON.stringify(exports)}`);\n  }\n\n  const foundFile = await findFileInPackage(\n    {\n      packagePath,\n      filePath: options.filePath || options.importPath || '',\n      resolveWebExtensions,\n    },\n    { packages },\n  );\n\n  return _addEntry(options, foundFile);\n}\n\n/**\n * Internal logic of adding an entry to an exports map.\n * Exported for testing this logic separately from the filesystem parts.\n * @internal\n */\nexport function _addEntry(\n  options: Omit<AddExportsMapEntryOptions, 'packagePath' | 'filePath'>,\n  foundFile: FindFileInPackageResult,\n): boolean {\n  const { exports, environmentCondition, requestCondition = 'default' } = options;\n  const { filePath, sourcePath } = foundFile;\n\n  // Only do work if a file path was found.\n  if (!filePath) {\n    return false;\n  }\n\n  // Normalize the import path (this also converts undefined to '.')\n  const importPath = normalizeRelativePath(options.importPath);\n\n  const oldEntry = exports[importPath];\n  if (Array.isArray(oldEntry)) {\n    // This should never happen with the standardized generated exports map format.\n    // In theory we could handle it by pushing to the array, but nesting conditions inside arrays\n    // isn't valid in the exports map spec.\n    throw new Error(`Cannot add to an array of exports for \"${importPath}\"`);\n  }\n\n  let exportValue: string | Record<string, string>;\n\n  if (!sourcePath && !requestCondition) {\n    // If this is the only entry we're adding, set it to a string to minimize the exports map.\n    exportValue = filePath;\n  } else {\n    exportValue = {};\n\n    if (sourcePath) {\n      exportValue['source'] = sourcePath;\n    }\n\n    // Add the entry for the condition.\n    exportValue[requestCondition] = filePath;\n\n    if (requestCondition === 'default' && Object.keys(exportValue).length === 1) {\n      // Only the default condition is present, so flatten to a string\n      exportValue = filePath;\n    }\n  }\n\n  const newEntry: GeneratedExports[string] = environmentCondition\n    ? { [environmentCondition]: exportValue }\n    : exportValue;\n\n  exports[importPath] = mergeEntries({ oldEntry, newEntry });\n\n  return true;\n}\n\n/**\n * This handles the merging of potential nested environment and request conditions, and ensures that\n * the `default` key is in the correct order (always last).\n */\nfunction mergeEntries<T extends string | Record<string, T>>(params: {\n  oldEntry: T | null | undefined;\n  newEntry: T;\n}): T {\n  const { oldEntry, newEntry } = params;\n\n  if (!oldEntry) {\n    return newEntry;\n  }\n\n  // If oldEntry is a string... (using !== object instead of === string so TS infers the correct type later)\n  if (typeof oldEntry !== 'object') {\n    // If newEntry is an object without a default, use oldEntry as the default.\n    if (typeof newEntry === 'object' && !newEntry.default) {\n      return { ...newEntry, default: oldEntry };\n    }\n    // Otherwise ignore oldEntry.\n    return newEntry;\n  }\n\n  if (typeof newEntry !== 'object') {\n    // oldEntry object, newEntry string => use newEntry as default\n    return { ...oldEntry, default: newEntry };\n  }\n\n  // both objects => full merge (the typings get imprecise here)\n  const merged: Record<string, T> = {};\n  // put the new keys first in the merged object (this could be made configurable later if needed)\n  const allKeys = new Set([...Object.keys(newEntry), ...Object.keys(oldEntry)]);\n  for (const key of allKeys) {\n    if (newEntry[key]) {\n      merged[key] = mergeEntries({ oldEntry: oldEntry[key], newEntry: newEntry[key] });\n    } else {\n      merged[key] = oldEntry[key];\n    }\n  }\n\n  const defaultValue = merged.default;\n  if (defaultValue) {\n    if (Object.keys(merged).length === 1) {\n      // flatten out the default condition\n      return defaultValue;\n    }\n\n    // ensure the default is last (exports maps keys are ordered)\n    delete merged.default;\n    merged.default = defaultValue;\n  }\n\n  return merged as T;\n}\n"]}

package/lib/exportsMap/createExportsMap.d.ts

@@ -1,15 +1,18 @@
-import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/common-types';
+import type { PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/common-types';
+import { type AddExportsMapEntryOptions } from './addExportsMapEntry.js';
+export interface CreateExportsMapOptions extends Pick<AddExportsMapEntryOptions, 'packagePath' | 'resolveWebExtensions'> {
+    /**
+     * If true, create the exports map based on the original package definition, not the
+     * transformed one.
+     */
+    disableTransforms?: boolean;
+}
 /**
  * Given a package path, return its exports if already set (this could be from either the original
  * package.json or as generated by `createPackageSettingsTransform`), or otherwise generate an
  * exports map based on other fields in the package definition.
  */
-export declare function createExportsMap(options: {
-    packagePath: string;
-    disableTransforms?: boolean;
-    resolveWebExtensions: boolean;
-}, context: {
+export declare function createExportsMap(options: CreateExportsMapOptions, context: {
     packages: PackageDefinitionsCache;
-    config: Pick<CloudpackConfig, 'features'>;
 }): Promise<PackageJsonExports>;
 //# sourceMappingURL=createExportsMap.d.ts.map

package/lib/exportsMap/createExportsMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createExportsMap.d.ts","sourceRoot":"","sources":["../../src/exportsMap/createExportsMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,uBAAuB,EACvB,kBAAkB,EAEnB,MAAM,4BAA4B,CAAC;AAIpC;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,EAAE,OAAO,CAAC;CAC/B,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;CAAE,GACxF,OAAO,CAAC,kBAAkB,CAAC,CAyG7B"}
+{"version":3,"file":"createExportsMap.d.ts","sourceRoot":"","sources":["../../src/exportsMap/createExportsMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,kBAAkB,EAAoB,MAAM,4BAA4B,CAAC;AAEhH,OAAO,EAAsB,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAE7F,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CACnD,yBAAyB,EACzB,aAAa,GAAG,sBAAsB,CACvC;IACC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GAC7C,OAAO,CAAC,kBAAkB,CAAC,CAyG7B"}

package/lib/exportsMap/createExportsMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createExportsMap.js","sourceRoot":"","sources":["../../src/exportsMap/createExportsMap.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  CloudpackConfig,\n  PackageDefinitionsCache,\n  PackageJsonExports,\n  GeneratedExports,\n} from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { addExportsMapEntry } from './addExportsMapEntry.js';\n\n/**\n * Given a package path, return its exports if already set (this could be from either the original\n * package.json or as generated by `createPackageSettingsTransform`), or otherwise generate an\n * exports map based on other fields in the package definition.\n */\nexport async function createExportsMap(\n  options: {\n    packagePath: string;\n    disableTransforms?: boolean;\n    resolveWebExtensions: boolean;\n  },\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<PackageJsonExports> {\n  const { packagePath, resolveWebExtensions } = options;\n  const { packages } = context;\n  const definition = await packages.get(packagePath, { disableTransforms: options.disableTransforms });\n\n  // Don't create an exports map for a definition that already has one.\n  if (definition.exports) {\n    return definition.exports;\n  }\n\n  const { browser, main, module, type } = definition;\n  // Use the GeneratedExports type internally because it matches up with the more constrained\n  // format of the exports map we're creating here (and addExportsMapEntry requires this type).\n  const exports: GeneratedExports = {};\n\n  // Only try to add `index.js` as an entry if main/module/browser isn't available.\n  if (!(main || module || browser)) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: 'index.js',\n        requestCondition: type === 'module' ? 'import' : undefined,\n        resolveWebExtensions,\n      },\n      context,\n    );\n  }\n\n  if (main) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: main,\n        requestCondition: type === 'module' ? 'import' : undefined,\n        resolveWebExtensions,\n      },\n      context,\n    );\n  }\n\n  if (module) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: module,\n        requestCondition: 'import',\n        resolveWebExtensions,\n      },\n      context,\n    );\n  }\n\n  if (browser) {\n    if (typeof definition.browser === 'string') {\n      await addExportsMapEntry(\n        { exports, packagePath, filePath: definition.browser, environmentCondition: 'browser', resolveWebExtensions },\n        context,\n      );\n    } else if (typeof definition.browser === 'object') {\n      for (const [key, value] of Object.entries(definition.browser)) {\n        if (!value || typeof value !== 'string') {\n          continue;\n        }\n\n        const isDefaultModule = normalizeRelativePath(module) === normalizeRelativePath(key);\n        const isDefaultMain = normalizeRelativePath(main) === normalizeRelativePath(key);\n\n        let importPaths: string[];\n        if (isDefaultMain || isDefaultModule) {\n          importPaths = ['.'];\n        } else {\n          importPaths = [key, key.replace(/\\.js$/, '')];\n        }\n\n        for (const importPath of importPaths) {\n          await addExportsMapEntry(\n            {\n              exports,\n              packagePath,\n              importPath,\n              filePath: value,\n              environmentCondition: 'browser',\n              requestCondition: isDefaultModule || (isDefaultMain && type === 'module') ? 'import' : undefined,\n              resolveWebExtensions,\n            },\n            context,\n          );\n        }\n      }\n    }\n  }\n\n  // If we couldn't infer the exports map shape from existing metadata,\n  // formulate based off inferred file structure.\n  // Note: CRA defaults to src/index.js, Vite defaults to src/main.js\n  if (Object.keys(exports).length === 0) {\n    (await addExportsMapEntry({ exports, packagePath, filePath: './lib/index.js', resolveWebExtensions }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './lib/main.js', resolveWebExtensions }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './index.js', resolveWebExtensions }, context));\n  }\n\n  return exports;\n}\n"]}
+{"version":3,"file":"createExportsMap.js","sourceRoot":"","sources":["../../src/exportsMap/createExportsMap.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache, PackageJsonExports, GeneratedExports } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { addExportsMapEntry, type AddExportsMapEntryOptions } from './addExportsMapEntry.js';\n\nexport interface CreateExportsMapOptions extends Pick<\n  AddExportsMapEntryOptions,\n  'packagePath' | 'resolveWebExtensions'\n> {\n  /**\n   * If true, create the exports map based on the original package definition, not the\n   * transformed one.\n   */\n  disableTransforms?: boolean;\n}\n\n/**\n * Given a package path, return its exports if already set (this could be from either the original\n * package.json or as generated by `createPackageSettingsTransform`), or otherwise generate an\n * exports map based on other fields in the package definition.\n */\nexport async function createExportsMap(\n  options: CreateExportsMapOptions,\n  context: { packages: PackageDefinitionsCache },\n): Promise<PackageJsonExports> {\n  const { packagePath, resolveWebExtensions } = options;\n  const { packages } = context;\n  const definition = await packages.get(packagePath, { disableTransforms: options.disableTransforms });\n\n  // Don't create an exports map for a definition that already has one.\n  if (definition.exports) {\n    return definition.exports;\n  }\n\n  const { browser, main, module, type } = definition;\n  // Use the GeneratedExports type internally because it matches up with the more constrained\n  // format of the exports map we're creating here (and addExportsMapEntry requires this type).\n  const exports: GeneratedExports = {};\n\n  // Only try to add `index.js` as an entry if main/module/browser isn't available.\n  if (!(main || module || browser)) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: 'index.js',\n        requestCondition: type === 'module' ? 'import' : undefined,\n        resolveWebExtensions,\n      },\n      context,\n    );\n  }\n\n  if (main) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: main,\n        requestCondition: type === 'module' ? 'import' : undefined,\n        resolveWebExtensions,\n      },\n      context,\n    );\n  }\n\n  if (module) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: module,\n        requestCondition: 'import',\n        resolveWebExtensions,\n      },\n      context,\n    );\n  }\n\n  if (browser) {\n    if (typeof definition.browser === 'string') {\n      await addExportsMapEntry(\n        { exports, packagePath, filePath: definition.browser, environmentCondition: 'browser', resolveWebExtensions },\n        context,\n      );\n    } else if (typeof definition.browser === 'object') {\n      for (const [key, value] of Object.entries(definition.browser)) {\n        if (!value || typeof value !== 'string') {\n          continue;\n        }\n\n        const isDefaultModule = normalizeRelativePath(module) === normalizeRelativePath(key);\n        const isDefaultMain = normalizeRelativePath(main) === normalizeRelativePath(key);\n\n        let importPaths: string[];\n        if (isDefaultMain || isDefaultModule) {\n          importPaths = ['.'];\n        } else {\n          importPaths = [key, key.replace(/\\.js$/, '')];\n        }\n\n        for (const importPath of importPaths) {\n          await addExportsMapEntry(\n            {\n              exports,\n              packagePath,\n              importPath,\n              filePath: value,\n              environmentCondition: 'browser',\n              requestCondition: isDefaultModule || (isDefaultMain && type === 'module') ? 'import' : undefined,\n              resolveWebExtensions,\n            },\n            context,\n          );\n        }\n      }\n    }\n  }\n\n  // If we couldn't infer the exports map shape from existing metadata,\n  // formulate based off inferred file structure.\n  // Note: CRA defaults to src/index.js, Vite defaults to src/main.js\n  if (Object.keys(exports).length === 0) {\n    (await addExportsMapEntry({ exports, packagePath, filePath: './lib/index.js', resolveWebExtensions }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './lib/main.js', resolveWebExtensions }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './index.js', resolveWebExtensions }, context));\n  }\n\n  return exports;\n}\n"]}

package/lib/exportsMap/getExportsMap.d.ts

@@ -1,4 +1,5 @@
-import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/common-types';
+import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports, WithOptional } from '@ms-cloudpack/common-types';
+import { type CreateExportsMapOptions } from './createExportsMap.js';
 /**
  * Get a package's provided exports map, or create one based on other entry info and the
  * package structure as a fallback.
@@ -7,18 +8,14 @@ import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports } fro
  * by `createPackageSettingsTransform`. (Exception is tests within `package-utilities` or other
  * contexts that didn't use `createPackageDefinitions`.)
  */
-export declare function getExportsMap(options: {
-    packagePath: string;
-    disableTransforms: boolean;
-    resolveWebExtensions: boolean;
-}, context: {
+export declare function getExportsMap(options: Required<CreateExportsMapOptions>, context: {
     packages: PackageDefinitionsCache;
-    config: Pick<CloudpackConfig, 'features'>;
+    /** @deprecated Pass `resolveWebExtensions` option directly */
+    config?: Pick<CloudpackConfig, 'features'>;
 }): Promise<PackageJsonExports>;
-export declare function getExportsMap(options: {
-    packagePath: string;
-}, context: {
+export declare function getExportsMap(options: WithOptional<Omit<CreateExportsMapOptions, 'disableTransforms'>, 'resolveWebExtensions'>, context: {
     packages: PackageDefinitionsCache;
-    config: Pick<CloudpackConfig, 'features'>;
+    /** @deprecated Pass `resolveWebExtensions` option directly */
+    config?: Pick<CloudpackConfig, 'features'>;
 }): Promise<PackageJsonExports>;
 //# sourceMappingURL=getExportsMap.d.ts.map

package/lib/exportsMap/getExportsMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getExportsMap.d.ts","sourceRoot":"","sources":["../../src/exportsMap/getExportsMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EAEf,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,4BAA4B,CAAC;AAGpC;;;;;;;GAOG;AAEH,wBAAsB,aAAa,CACjC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,OAAO,CAAC;IAAC,oBAAoB,EAAE,OAAO,CAAA;CAAE,EAC3F,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;CAAE,GACxF,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAE/B,wBAAsB,aAAa,CACjC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,EAChC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;CAAE,GACxF,OAAO,CAAC,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"getExportsMap.d.ts","sourceRoot":"","sources":["../../src/exportsMap/getExportsMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EAEf,uBAAuB,EACvB,kBAAkB,EAClB,YAAY,EACb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAoB,KAAK,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEvF;;;;;;;GAOG;AAEH,wBAAsB,aAAa,CACjC,OAAO,EAAE,QAAQ,CAAC,uBAAuB,CAAC,EAC1C,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,8DAA8D;IAC9D,MAAM,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;CAC5C,GACA,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAE/B,wBAAsB,aAAa,CACjC,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,uBAAuB,EAAE,mBAAmB,CAAC,EAAE,sBAAsB,CAAC,EACjG,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,8DAA8D;IAC9D,MAAM,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;CAC5C,GACA,OAAO,CAAC,kBAAkB,CAAC,CAAC"}

package/lib/exportsMap/getExportsMap.js

@@ -4,7 +4,7 @@ export async function getExportsMap(options, context) {
     const { packagePath, disableTransforms } = options;
     const { packages } = context;
     const definition = await packages.get(packagePath, options);
-    if (disableTransforms !== undefined && options.resolveWebExtensions === undefined) {
+    if (disableTransforms && options.resolveWebExtensions === undefined) {
         // When disableTransforms is defined, we need to know if we should resolve web extensions.
         throw new Error('resolveWebExtensions is required when disableTransforms is true (this is a Cloudpack bug).');
     }
@@ -17,7 +17,7 @@ export async function getExportsMap(options, context) {
         resolveWebExtensions: options.resolveWebExtensions ??
             bundlerCapabilities['resolve-web-extensions'] ??
             // eslint-disable-next-line etc/no-deprecated
-            !!context.config.features?.resolveWebExtensions,
+            !!context.config?.features?.resolveWebExtensions,
     }, context);
 }
 //# sourceMappingURL=getExportsMap.js.map

package/lib/exportsMap/getExportsMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"getExportsMap.js","sourceRoot":"","sources":["../../src/exportsMap/getExportsMap.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAoBzD,iBAAiB;AACjB,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA6F,EAC7F,OAAyF;IAEzF,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAE5D,IAAI,iBAAiB,KAAK,SAAS,IAAI,OAAO,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QAClF,0FAA0F;QAC1F,MAAM,IAAI,KAAK,CAAC,4FAA4F,CAAC,CAAC;IAChH,CAAC;IAED,IAAI,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACrC,OAAO,UAAU,CAAC,OAAO,CAAC;IAC5B,CAAC;IAED,MAAM,mBAAmB,GAAG,CAAC,UAAU,CAAC,SAAS,EAAE,mBAAmB,IAAI,EAAE,CAAuC,CAAC;IAEpH,OAAO,gBAAgB,CACrB;QACE,GAAG,OAAO;QACV,oBAAoB,EAClB,OAAO,CAAC,oBAAoB;YAC5B,mBAAmB,CAAC,wBAAwB,CAAC;YAC7C,6CAA6C;YAC7C,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,oBAAoB;KAClD,EACD,OAAO,CACR,CAAC;AACJ,CAAC","sourcesContent":["import type {\n  CloudpackConfig,\n  InternalBundlerCapabilitiesOptions,\n  PackageDefinitionsCache,\n  PackageJsonExports,\n} from '@ms-cloudpack/common-types';\nimport { createExportsMap } from './createExportsMap.js';\n\n/**\n * Get a package's provided exports map, or create one based on other entry info and the\n * package structure as a fallback.\n *\n * NOTE: Unless `disableTransforms` is true, this will use the cached exports map that was created\n * by `createPackageSettingsTransform`. (Exception is tests within `package-utilities` or other\n * contexts that didn't use `createPackageDefinitions`.)\n */\n// When disableTransforms is defined, resolveWebExtensions is required\nexport async function getExportsMap(\n  options: { packagePath: string; disableTransforms: boolean; resolveWebExtensions: boolean },\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<PackageJsonExports>;\n// When disableTransforms is undefined, resolveWebExtensions is not required since we can get it from cached settings\nexport async function getExportsMap(\n  options: { packagePath: string },\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<PackageJsonExports>;\n// Implementation\nexport async function getExportsMap(\n  options: { packagePath: string; disableTransforms?: boolean; resolveWebExtensions?: boolean },\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<PackageJsonExports> {\n  const { packagePath, disableTransforms } = options;\n  const { packages } = context;\n  const definition = await packages.get(packagePath, options);\n\n  if (disableTransforms !== undefined && options.resolveWebExtensions === undefined) {\n    // When disableTransforms is defined, we need to know if we should resolve web extensions.\n    throw new Error('resolveWebExtensions is required when disableTransforms is true (this is a Cloudpack bug).');\n  }\n\n  if (definition.exports !== undefined) {\n    return definition.exports;\n  }\n\n  const bundlerCapabilities = (definition.cloudpack?.bundlerCapabilities || {}) as InternalBundlerCapabilitiesOptions;\n\n  return createExportsMap(\n    {\n      ...options,\n      resolveWebExtensions:\n        options.resolveWebExtensions ??\n        bundlerCapabilities['resolve-web-extensions'] ??\n        // eslint-disable-next-line etc/no-deprecated\n        !!context.config.features?.resolveWebExtensions,\n    },\n    context,\n  );\n}\n"]}
+{"version":3,"file":"getExportsMap.js","sourceRoot":"","sources":["../../src/exportsMap/getExportsMap.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAgC,MAAM,uBAAuB,CAAC;AA4BvF,iBAAiB;AACjB,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA6F,EAC7F,OAA0F;IAE1F,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAE5D,IAAI,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACpE,0FAA0F;QAC1F,MAAM,IAAI,KAAK,CAAC,4FAA4F,CAAC,CAAC;IAChH,CAAC;IAED,IAAI,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACrC,OAAO,UAAU,CAAC,OAAO,CAAC;IAC5B,CAAC;IAED,MAAM,mBAAmB,GAAG,CAAC,UAAU,CAAC,SAAS,EAAE,mBAAmB,IAAI,EAAE,CAAuC,CAAC;IAEpH,OAAO,gBAAgB,CACrB;QACE,GAAG,OAAO;QACV,oBAAoB,EAClB,OAAO,CAAC,oBAAoB;YAC5B,mBAAmB,CAAC,wBAAwB,CAAC;YAC7C,6CAA6C;YAC7C,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,oBAAoB;KACnD,EACD,OAAO,CACR,CAAC;AACJ,CAAC","sourcesContent":["import type {\n  CloudpackConfig,\n  InternalBundlerCapabilitiesOptions,\n  PackageDefinitionsCache,\n  PackageJsonExports,\n  WithOptional,\n} from '@ms-cloudpack/common-types';\nimport { createExportsMap, type CreateExportsMapOptions } from './createExportsMap.js';\n\n/**\n * Get a package's provided exports map, or create one based on other entry info and the\n * package structure as a fallback.\n *\n * NOTE: Unless `disableTransforms` is true, this will use the cached exports map that was created\n * by `createPackageSettingsTransform`. (Exception is tests within `package-utilities` or other\n * contexts that didn't use `createPackageDefinitions`.)\n */\n// When disableTransforms is defined, resolveWebExtensions is required\nexport async function getExportsMap(\n  options: Required<CreateExportsMapOptions>,\n  context: {\n    packages: PackageDefinitionsCache;\n    /** @deprecated Pass `resolveWebExtensions` option directly */\n    config?: Pick<CloudpackConfig, 'features'>;\n  },\n): Promise<PackageJsonExports>;\n// When disableTransforms is undefined, resolveWebExtensions is not required since we can get it from cached settings\nexport async function getExportsMap(\n  options: WithOptional<Omit<CreateExportsMapOptions, 'disableTransforms'>, 'resolveWebExtensions'>,\n  context: {\n    packages: PackageDefinitionsCache;\n    /** @deprecated Pass `resolveWebExtensions` option directly */\n    config?: Pick<CloudpackConfig, 'features'>;\n  },\n): Promise<PackageJsonExports>;\n// Implementation\nexport async function getExportsMap(\n  options: { packagePath: string; disableTransforms?: boolean; resolveWebExtensions?: boolean },\n  context: { packages: PackageDefinitionsCache; config?: Pick<CloudpackConfig, 'features'> },\n): Promise<PackageJsonExports> {\n  const { packagePath, disableTransforms } = options;\n  const { packages } = context;\n  const definition = await packages.get(packagePath, options);\n\n  if (disableTransforms && options.resolveWebExtensions === undefined) {\n    // When disableTransforms is defined, we need to know if we should resolve web extensions.\n    throw new Error('resolveWebExtensions is required when disableTransforms is true (this is a Cloudpack bug).');\n  }\n\n  if (definition.exports !== undefined) {\n    return definition.exports;\n  }\n\n  const bundlerCapabilities = (definition.cloudpack?.bundlerCapabilities || {}) as InternalBundlerCapabilitiesOptions;\n\n  return createExportsMap(\n    {\n      ...options,\n      resolveWebExtensions:\n        options.resolveWebExtensions ??\n        bundlerCapabilities['resolve-web-extensions'] ??\n        // eslint-disable-next-line etc/no-deprecated\n        !!context.config?.features?.resolveWebExtensions,\n    },\n    context,\n  );\n}\n"]}

package/lib/findFileInPackage/findFileInPackage.d.ts

@@ -1,25 +1,40 @@
 import type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';
-export type FindFileInPackageOptions = {
+export interface FindFileInPackageOptions {
+    /** Absolute path to the package root, used to resolve relative paths. */
     packagePath: string;
+    /**
+     * The relative path to the physical file location.
+     * Can be a partial location, in which case we'll search for the file.
+     */
     filePath: string;
+    /** Whether to try `.web.*` extensions when resolving files. */
     resolveWebExtensions: boolean;
-};
-export type FindFileInPackageResult = {
+}
+export interface FindFileInPackageResult {
+    /**
+     * Relative path to the resolved file (if found), with leading `./`
+     */
     filePath?: string;
+    /**
+     * For internal packages only: relative path to the corresponding source file (if found),
+     * with leading `./`
+     */
     sourcePath?: string;
-};
+}
 /**
- * Given a requested partial filePath, resolves the relative intermediate path if the file exists, with special
- * consideration for internal packages, which may not have intermediate files but only source files. Paths returned
- * are always relative and start with `./`.
+ * Given a requested partial `filePath`, resolves the relative intermediate path if the file exists,
+ * with special consideration for internal packages (which may not have intermediate files, only
+ * source files).
  *
- * This helper is used in deriving if the given package.json entries are actual validate candidates when constructing an
- * exports map from existing metadata. For example, a package.json may list `main` as `lib/index.js`. If this file
- * exists, or in internal packages, if `src/index.tsx` exists, then this is a valid candidate. If the file does not
- * exist, then we should not include it in the exports map.
+ * This helper is used in deriving if the given package.json entries are actual validate candidates
+ * when constructing an exports map from existing metadata. For example, a package.json may list
+ * `main` as `lib/index.js`. If this file exists, or in internal packages, if `src/index.tsx` exists,
+ * then this is a valid candidate. If the file does not exist, then we should not include it in the
+ * exports map.
  */
 export declare function findFileInPackage(options: FindFileInPackageOptions, context: {
     packages: PackageDefinitionsCache;
-    config: Pick<CloudpackConfig, 'features'>;
+    /** @deprecated Pass `resolveWebExtensions` directly instead */
+    config?: Pick<CloudpackConfig, 'features'>;
 }): Promise<FindFileInPackageResult>;
 //# sourceMappingURL=findFileInPackage.d.ts.map

package/lib/findFileInPackage/findFileInPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findFileInPackage.d.ts","sourceRoot":"","sources":["../../src/findFileInPackage/findFileInPackage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAe3F,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;CAAE,GACxF,OAAO,CAAC,uBAAuB,CAAC,CA2FlC"}
+{"version":3,"file":"findFileInPackage.d.ts","sourceRoot":"","sources":["../../src/findFileInPackage/findFileInPackage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAe3F,MAAM,WAAW,wBAAwB;IACvC,yEAAyE;IACzE,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,+DAA+D;IAC/D,MAAM,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;CAC5C,GACA,OAAO,CAAC,uBAAuB,CAAC,CAoGlC"}

package/lib/findFileInPackage/findFileInPackage.js

@@ -5,24 +5,30 @@ import { flattenExportsMap } from '../exportsMap/flattenExportsMap.js';
 import { getCandidates } from './getCandidates.js';
 import { getExportsMap } from '../exportsMap/getExportsMap.js';
 /**
- * Given a requested partial filePath, resolves the relative intermediate path if the file exists, with special
- * consideration for internal packages, which may not have intermediate files but only source files. Paths returned
- * are always relative and start with `./`.
+ * Given a requested partial `filePath`, resolves the relative intermediate path if the file exists,
+ * with special consideration for internal packages (which may not have intermediate files, only
+ * source files).
  *
- * This helper is used in deriving if the given package.json entries are actual validate candidates when constructing an
- * exports map from existing metadata. For example, a package.json may list `main` as `lib/index.js`. If this file
- * exists, or in internal packages, if `src/index.tsx` exists, then this is a valid candidate. If the file does not
- * exist, then we should not include it in the exports map.
+ * This helper is used in deriving if the given package.json entries are actual validate candidates
+ * when constructing an exports map from existing metadata. For example, a package.json may list
+ * `main` as `lib/index.js`. If this file exists, or in internal packages, if `src/index.tsx` exists,
+ * then this is a valid candidate. If the file does not exist, then we should not include it in the
+ * exports map.
  */
 export async function findFileInPackage(options, context) {
-    const { resolveWebExtensions } = options;
+    // resolveWebExtensions should only be missing in weird dependency mismatch cases, and it's
+    // rarely used anyway. In this context, definitions.get() could cause an infinite loop,
+    // so fall back to checking the config only.
+    // eslint-disable-next-line etc/no-deprecated
+    const { resolveWebExtensions = !!context.config?.features?.resolveWebExtensions } = options;
+    const { packages } = context;
     const originalPath = normalizeRelativePath(options.filePath);
     const packagePath = slash(options.packagePath);
+    const isInternal = !isExternalPackage(packagePath);
     let filePath;
     let sourcePath;
-    const isInternal = !isExternalPackage(packagePath);
     const pathsToConsider = [originalPath];
-    const originalDefinition = await context.packages.tryGet(packagePath, { disableTransforms: true });
+    const originalDefinition = await packages.tryGet(packagePath, { disableTransforms: true });
     // If the original package.json has an exports map, we should not use main and module as hints.
     if (originalPath === '.' && originalDefinition && !originalDefinition.exports) {
         const { main, module } = originalDefinition;
@@ -42,18 +48,18 @@ export async function findFileInPackage(options, context) {
         }
     }
     for (const currentPath of pathsToConsider) {
-        const candidates = await getCandidates({ filePath: currentPath, packagePath, resolveWebExtensions }, context);
+        const candidates = await getCandidates({ filePath: currentPath, packagePath, resolveWebExtensions }, { packages });
         // Try and resolve a physical file given the candidates.
         filePath = candidates.find((candidate) => isFileSync(path.join(packagePath, candidate)));
         if (filePath) {
             break;
         }
     }
-    const isNestedPackageDefinition = filePath && path.basename(filePath) === 'package.json' && path.basename(originalPath) !== 'package.json';
     const result = {};
-    if (isNestedPackageDefinition) {
+    if (filePath && path.basename(filePath) === 'package.json' && path.basename(originalPath) !== 'package.json') {
+        // Nested package.json reference
         const nestedDefinitionPath = path.dirname(path.join(packagePath, filePath));
-        const exportsMap = await getExportsMap({ packagePath: nestedDefinitionPath }, context);
+        const exportsMap = await getExportsMap({ packagePath: nestedDefinitionPath, resolveWebExtensions: options.resolveWebExtensions }, { packages });
         const entryPath = flattenExportsMap(exportsMap)['.'];
         if (entryPath) {
             return findFileInPackage({

package/lib/findFileInPackage/findFileInPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"findFileInPackage.js","sourceRoot":"","sources":["../../src/findFileInPackage/findFileInPackage.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport {\n  intermediateToSourcePath,\n  isExternalPackage,\n  isFileSync,\n  plainJsRegex,\n  sourceToIntermediatePath,\n  transpiledSourceRegex,\n} from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport { flattenExportsMap } from '../exportsMap/flattenExportsMap.js';\nimport { getCandidates } from './getCandidates.js';\nimport { getExportsMap } from '../exportsMap/getExportsMap.js';\n\nexport type FindFileInPackageOptions = {\n  packagePath: string;\n  filePath: string;\n  resolveWebExtensions: boolean;\n};\n\nexport type FindFileInPackageResult = {\n  filePath?: string;\n  sourcePath?: string;\n};\n\n/**\n * Given a requested partial filePath, resolves the relative intermediate path if the file exists, with special\n * consideration for internal packages, which may not have intermediate files but only source files. Paths returned\n * are always relative and start with `./`.\n *\n * This helper is used in deriving if the given package.json entries are actual validate candidates when constructing an\n * exports map from existing metadata. For example, a package.json may list `main` as `lib/index.js`. If this file\n * exists, or in internal packages, if `src/index.tsx` exists, then this is a valid candidate. If the file does not\n * exist, then we should not include it in the exports map.\n */\nexport async function findFileInPackage(\n  options: FindFileInPackageOptions,\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<FindFileInPackageResult> {\n  const { resolveWebExtensions } = options;\n  const originalPath = normalizeRelativePath(options.filePath);\n  const packagePath = slash(options.packagePath);\n  let filePath: string | undefined;\n  let sourcePath: string | undefined;\n  const isInternal = !isExternalPackage(packagePath);\n  const pathsToConsider = [originalPath];\n\n  const originalDefinition = await context.packages.tryGet(packagePath, { disableTransforms: true });\n  // If the original package.json has an exports map, we should not use main and module as hints.\n  if (originalPath === '.' && originalDefinition && !originalDefinition.exports) {\n    const { main, module } = originalDefinition;\n    if (main) {\n      pathsToConsider.unshift(main);\n    }\n    if (module) {\n      pathsToConsider.unshift(module);\n    }\n  }\n\n  if (originalDefinition && originalDefinition.exports) {\n    // Pass in packagePath so that we can expand wildcards in the exports map.\n    const expandedExportsMap = flattenExportsMap(originalDefinition.exports, { packagePath });\n    if (expandedExportsMap[originalPath]) {\n      // If the original path is an entry in the exports map, we should use that as a candidate.\n      pathsToConsider.unshift(expandedExportsMap[originalPath]);\n    }\n  }\n\n  for (const currentPath of pathsToConsider) {\n    const candidates = await getCandidates({ filePath: currentPath, packagePath, resolveWebExtensions }, context);\n\n    // Try and resolve a physical file given the candidates.\n    filePath = candidates.find((candidate) => isFileSync(path.join(packagePath, candidate)));\n    if (filePath) {\n      break;\n    }\n  }\n\n  const isNestedPackageDefinition =\n    filePath && path.basename(filePath) === 'package.json' && path.basename(originalPath) !== 'package.json';\n  const result: FindFileInPackageResult = {};\n\n  if (isNestedPackageDefinition) {\n    const nestedDefinitionPath = path.dirname(path.join(packagePath, filePath as string));\n    const exportsMap = await getExportsMap({ packagePath: nestedDefinitionPath }, context);\n    const entryPath = flattenExportsMap(exportsMap)['.'];\n\n    if (entryPath) {\n      return findFileInPackage(\n        {\n          packagePath,\n          filePath: normalizeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, entryPath))),\n          resolveWebExtensions: options.resolveWebExtensions,\n        },\n        context,\n      );\n    } else {\n      // If we can't find an entry, we should not include this in the exports map.\n      // This avoids adding a \"./package.json\" value to a \".\" entry.\n      return result;\n    }\n  }\n\n  // If the resolved file is a typescript file in an internal package, try to resolve the intermediate.\n  if (filePath && transpiledSourceRegex.test(filePath)) {\n    sourcePath = filePath;\n    filePath = isInternal ? sourceToIntermediatePath(filePath) : undefined;\n  }\n\n  // If we haven't resolved a sourcePath, try to resolve it from the intermediate.\n  if (isInternal && filePath && !sourcePath && plainJsRegex.test(filePath)) {\n    // Not a TS file, but a JS file. Try to find the source.\n    sourcePath = intermediateToSourcePath(filePath, packagePath);\n\n    // If we couldn't find a TS file, clear sourcePath.\n    if (sourcePath === filePath) {\n      sourcePath = undefined;\n    }\n  }\n\n  if (filePath) {\n    result.filePath = normalizeRelativePath(filePath);\n  }\n\n  if (sourcePath) {\n    result.sourcePath = normalizeRelativePath(sourcePath);\n  }\n\n  return result;\n}\n"]}
+{"version":3,"file":"findFileInPackage.js","sourceRoot":"","sources":["../../src/findFileInPackage/findFileInPackage.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport {\n  intermediateToSourcePath,\n  isExternalPackage,\n  isFileSync,\n  plainJsRegex,\n  sourceToIntermediatePath,\n  transpiledSourceRegex,\n} from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport { flattenExportsMap } from '../exportsMap/flattenExportsMap.js';\nimport { getCandidates } from './getCandidates.js';\nimport { getExportsMap } from '../exportsMap/getExportsMap.js';\n\nexport interface FindFileInPackageOptions {\n  /** Absolute path to the package root, used to resolve relative paths. */\n  packagePath: string;\n  /**\n   * The relative path to the physical file location.\n   * Can be a partial location, in which case we'll search for the file.\n   */\n  filePath: string;\n  /** Whether to try `.web.*` extensions when resolving files. */\n  resolveWebExtensions: boolean;\n}\n\nexport interface FindFileInPackageResult {\n  /**\n   * Relative path to the resolved file (if found), with leading `./`\n   */\n  filePath?: string;\n  /**\n   * For internal packages only: relative path to the corresponding source file (if found),\n   * with leading `./`\n   */\n  sourcePath?: string;\n}\n\n/**\n * Given a requested partial `filePath`, resolves the relative intermediate path if the file exists,\n * with special consideration for internal packages (which may not have intermediate files, only\n * source files).\n *\n * This helper is used in deriving if the given package.json entries are actual validate candidates\n * when constructing an exports map from existing metadata. For example, a package.json may list\n * `main` as `lib/index.js`. If this file exists, or in internal packages, if `src/index.tsx` exists,\n * then this is a valid candidate. If the file does not exist, then we should not include it in the\n * exports map.\n */\nexport async function findFileInPackage(\n  options: FindFileInPackageOptions,\n  context: {\n    packages: PackageDefinitionsCache;\n    /** @deprecated Pass `resolveWebExtensions` directly instead */\n    config?: Pick<CloudpackConfig, 'features'>;\n  },\n): Promise<FindFileInPackageResult> {\n  // resolveWebExtensions should only be missing in weird dependency mismatch cases, and it's\n  // rarely used anyway. In this context, definitions.get() could cause an infinite loop,\n  // so fall back to checking the config only.\n  // eslint-disable-next-line etc/no-deprecated\n  const { resolveWebExtensions = !!context.config?.features?.resolveWebExtensions } = options;\n  const { packages } = context;\n\n  const originalPath = normalizeRelativePath(options.filePath);\n  const packagePath = slash(options.packagePath);\n  const isInternal = !isExternalPackage(packagePath);\n\n  let filePath: string | undefined;\n  let sourcePath: string | undefined;\n  const pathsToConsider = [originalPath];\n\n  const originalDefinition = await packages.tryGet(packagePath, { disableTransforms: true });\n  // If the original package.json has an exports map, we should not use main and module as hints.\n  if (originalPath === '.' && originalDefinition && !originalDefinition.exports) {\n    const { main, module } = originalDefinition;\n    if (main) {\n      pathsToConsider.unshift(main);\n    }\n    if (module) {\n      pathsToConsider.unshift(module);\n    }\n  }\n\n  if (originalDefinition && originalDefinition.exports) {\n    // Pass in packagePath so that we can expand wildcards in the exports map.\n    const expandedExportsMap = flattenExportsMap(originalDefinition.exports, { packagePath });\n    if (expandedExportsMap[originalPath]) {\n      // If the original path is an entry in the exports map, we should use that as a candidate.\n      pathsToConsider.unshift(expandedExportsMap[originalPath]);\n    }\n  }\n\n  for (const currentPath of pathsToConsider) {\n    const candidates = await getCandidates({ filePath: currentPath, packagePath, resolveWebExtensions }, { packages });\n\n    // Try and resolve a physical file given the candidates.\n    filePath = candidates.find((candidate) => isFileSync(path.join(packagePath, candidate)));\n    if (filePath) {\n      break;\n    }\n  }\n\n  const result: FindFileInPackageResult = {};\n\n  if (filePath && path.basename(filePath) === 'package.json' && path.basename(originalPath) !== 'package.json') {\n    // Nested package.json reference\n    const nestedDefinitionPath = path.dirname(path.join(packagePath, filePath));\n    const exportsMap = await getExportsMap(\n      { packagePath: nestedDefinitionPath, resolveWebExtensions: options.resolveWebExtensions },\n      { packages },\n    );\n    const entryPath = flattenExportsMap(exportsMap)['.'];\n\n    if (entryPath) {\n      return findFileInPackage(\n        {\n          packagePath,\n          filePath: normalizeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, entryPath))),\n          resolveWebExtensions: options.resolveWebExtensions,\n        },\n        context,\n      );\n    } else {\n      // If we can't find an entry, we should not include this in the exports map.\n      // This avoids adding a \"./package.json\" value to a \".\" entry.\n      return result;\n    }\n  }\n\n  // If the resolved file is a typescript file in an internal package, try to resolve the intermediate.\n  if (filePath && transpiledSourceRegex.test(filePath)) {\n    sourcePath = filePath;\n    filePath = isInternal ? sourceToIntermediatePath(filePath) : undefined;\n  }\n\n  // If we haven't resolved a sourcePath, try to resolve it from the intermediate.\n  if (isInternal && filePath && !sourcePath && plainJsRegex.test(filePath)) {\n    // Not a TS file, but a JS file. Try to find the source.\n    sourcePath = intermediateToSourcePath(filePath, packagePath);\n\n    // If we couldn't find a TS file, clear sourcePath.\n    if (sourcePath === filePath) {\n      sourcePath = undefined;\n    }\n  }\n\n  if (filePath) {\n    result.filePath = normalizeRelativePath(filePath);\n  }\n\n  if (sourcePath) {\n    result.sourcePath = normalizeRelativePath(sourcePath);\n  }\n\n  return result;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "13.3.4",
+  "version": "13.5.0",
   "description": "Utilities for resolving/parsing packages and their imports in Cloudpack",
   "license": "MIT",
   "type": "module",
@@ -29,7 +29,7 @@
     "@ms-cloudpack/json-utilities": "^0.1.11",
     "@ms-cloudpack/path-string-parsing": "^1.3.0",
     "@ms-cloudpack/path-utilities": "^3.2.5",
-    "@ms-cloudpack/task-reporter": "^0.17.4",
+    "@ms-cloudpack/task-reporter": "^0.19.0",
     "acorn": "^8.11.2",
     "acorn-walk": "^8.2.1",
     "semver": "^7.6.0",