@endo/compartment-mapper 1.6.2 → 2.0.0

package/src/import-lite.js

@@ -21,7 +21,6 @@
 
 /**
  * @import {
- *   CompartmentMapDescriptor,
  *   SyncImportLocationOptions,
  *   ImportNowHookMaker,
  *   ReadNowPowers,
@@ -31,6 +30,7 @@
  *   ReadFn,
  *   ReadPowers,
  *   SomeObject,
+ *   PackageCompartmentMapDescriptor,
  * } from './types.js'
  */
 
@@ -73,7 +73,7 @@ const isSyncOptions = value => {
 /**
  * @overload
  * @param {ReadNowPowers} readPowers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {SyncImportLocationOptions} [opts]
  * @returns {Promise<Application>}
  */
@@ -81,14 +81,14 @@ const isSyncOptions = value => {
 /**
  * @overload
  * @param {ReadFn | ReadPowers} readPowers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {ImportLocationOptions} [opts]
  * @returns {Promise<Application>}
  */
 
 /**
  * @param {ReadFn|ReadPowers|ReadNowPowers} readPowers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {ImportLocationOptions} [options]
  * @returns {Promise<Application>}
  */
@@ -98,6 +98,7 @@ export const loadFromMap = async (readPowers, compartmentMap, options = {}) => {
     searchSuffixes = undefined,
     parserForLanguage: parserForLanguageOption = {},
     Compartment: LoadCompartmentOption = Compartment,
+    moduleSourceHook,
   } = options;
 
   const parserForLanguage = freeze(
@@ -172,6 +173,7 @@ export const loadFromMap = async (readPowers, compartmentMap, options = {}) => {
         entryCompartmentName,
         entryModuleSpecifier,
         importHook: compartmentExitModuleImportHook,
+        moduleSourceHook,
       },
     );
 
@@ -195,6 +197,7 @@ export const loadFromMap = async (readPowers, compartmentMap, options = {}) => {
           compartmentDescriptors: compartmentMap.compartments,
           searchSuffixes,
           importNowHook: exitModuleImportNowHook,
+          moduleSourceHook,
         },
       );
       ({ compartment, pendingJobsPromise } = link(compartmentMap, {
@@ -235,7 +238,7 @@ export const loadFromMap = async (readPowers, compartmentMap, options = {}) => {
 
 /**
  * @param {ReadFn | ReadPowers} readPowers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {ImportLocationOptions} [options]
  * @returns {Promise<SomeObject>} the object of the imported modules exported
  * names.

package/src/import.d.ts

@@ -2,10 +2,10 @@
  * @overload
  * @param {ReadNowPowers} readPowers
  * @param {string} moduleLocation
- * @param {SyncArchiveOptions} options
+ * @param {SyncLoadLocationOptions} options
  * @returns {Promise<Application>}
  */
-export function loadLocation(readPowers: ReadNowPowers, moduleLocation: string, options: SyncArchiveOptions): Promise<Application>;
+export function loadLocation(readPowers: ReadNowPowers, moduleLocation: string, options: SyncLoadLocationOptions): Promise<Application>;
 /**
  * @overload
  * @param {ReadFn | ReadPowers} readPowers
@@ -37,7 +37,7 @@ export function importLocation(readPowers: ReadNowPowers, moduleLocation: string
  */
 export function importLocation(readPowers: ReadPowers | ReadFn, moduleLocation: string, options?: ImportLocationOptions | undefined): Promise<SomeObject>;
 import type { ReadNowPowers } from './types.js';
-import type { SyncArchiveOptions } from './types.js';
+import type { SyncLoadLocationOptions } from './types.js';
 import type { Application } from './types.js';
 import type { ReadFn } from './types.js';
 import type { ReadPowers } from './types.js';

package/src/import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["import.js"],"names":[],"mappings":";;;;;;;AAmDG,yCACQ,aAAa,kBACb,MAAM,WACN,kBAAkB,GAChB,OAAO,CAAC,WAAW,CAAC,CAChC;;;;;;;;AAGE,yCACQ,MAAM,GAAG,UAAU,kBACnB,MAAM,8CAEJ,OAAO,CAAC,WAAW,CAAC,CAChC;;;;;;;;;;;AAuDE,2CACQ,aAAa,kBACb,MAAM,WACN,yBAAyB,GACvB,OAAO,CAAC,UAAU,CAAC,CAE/B;;;;;;;;;;;AAKE,2CACQ,UAAU,GAAC,MAAM,kBACjB,MAAM,gDAEJ,OAAO,CAAC,UAAU,CAAC,CAE/B;mCA7GS,YAAY;wCAAZ,YAAY;iCAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;yCAAZ,YAAY;+CAAZ,YAAY;gCAAZ,YAAY;2CAAZ,YAAY"}
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["import.js"],"names":[],"mappings":";;;;;;;AAkDG,yCACQ,aAAa,kBACb,MAAM,WACN,uBAAuB,GACrB,OAAO,CAAC,WAAW,CAAC,CAChC;;;;;;;;AAGE,yCACQ,MAAM,GAAG,UAAU,kBACnB,MAAM,8CAEJ,OAAO,CAAC,WAAW,CAAC,CAChC;;;;;;;;;;;AAkEE,2CACQ,aAAa,kBACb,MAAM,WACN,yBAAyB,GACvB,OAAO,CAAC,UAAU,CAAC,CAE/B;;;;;;;;;;;AAKE,2CACQ,UAAU,GAAC,MAAM,kBACjB,MAAM,gDAEJ,OAAO,CAAC,UAAU,CAAC,CAE/B;mCAxHS,YAAY;6CAAZ,YAAY;iCAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;yCAAZ,YAAY;+CAAZ,YAAY;gCAAZ,YAAY;2CAAZ,YAAY"}

package/src/import.js

@@ -18,26 +18,25 @@
  *   Application,
  *   SyncImportLocationOptions,
  *   ImportLocationOptions,
- *   SyncArchiveOptions,
  *   LoadLocationOptions,
  *   SomeObject,
  *   ReadNowPowers,
- *   ArchiveOptions,
  *   ReadFn,
  *   ReadPowers,
+ SyncLoadLocationOptions,
  * } from './types.js'
  */
 
+import { loadFromMap } from './import-lite.js';
 import { defaultParserForLanguage } from './import-parsers.js';
 import { mapNodeModules } from './node-modules.js';
-import { loadFromMap } from './import-lite.js';
 
 const { assign, create, freeze } = Object;
 
 /**
  * Add the default parserForLanguage option.
- * @param {ArchiveOptions} [options]
- * @returns {ArchiveOptions}
+ * @param {LoadLocationOptions} [options]
+ * @returns {LoadLocationOptions}
  */
 const assignParserForLanguage = (options = {}) => {
   const { parserForLanguage: parserForLanguageOption, ...rest } = options;
@@ -52,7 +51,7 @@ const assignParserForLanguage = (options = {}) => {
  * @overload
  * @param {ReadNowPowers} readPowers
  * @param {string} moduleLocation
- * @param {SyncArchiveOptions} options
+ * @param {SyncLoadLocationOptions} options
  * @returns {Promise<Application>}
  */
 
@@ -82,6 +81,7 @@ export const loadLocation = async (
     commonDependencies,
     policy,
     parserForLanguage,
+    log,
     languages,
     languageForExtension,
     commonjsLanguageForExtension,
@@ -89,6 +89,10 @@ export const loadLocation = async (
     workspaceLanguageForExtension,
     workspaceCommonjsLanguageForExtension,
     workspaceModuleLanguageForExtension,
+    unknownCanonicalNameHook,
+    packageDataHook,
+    packageDependenciesHook,
+    moduleSourceHook,
     ...otherOptions
   } = assignParserForLanguage(options);
   // conditions are not present in SyncArchiveOptions
@@ -107,9 +111,15 @@ export const loadLocation = async (
     workspaceCommonjsLanguageForExtension,
     workspaceModuleLanguageForExtension,
     languages,
+    log,
+    unknownCanonicalNameHook,
+    packageDataHook,
+    packageDependenciesHook,
   });
   return loadFromMap(readPowers, compartmentMap, {
     parserForLanguage,
+    log,
+    moduleSourceHook,
     ...otherOptions,
   });
 };

package/src/infer-exports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"infer-exports.d.ts","sourceRoot":"","sources":["infer-exports.js"],"names":[],"mappings":"AA4HO,+DAPI,iBAAiB,cACjB,GAAG,CAAC,MAAM,CAAC,SAEX,oBAAoB,kCA2B9B;AAkBM,yCAPI,iBAAiB,cACjB,GAAG,CAAC,MAAM,CAAC,SAEX,oBAAoB,GAElB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAG8B;AAU1D,mDANI,iBAAiB,mBACjB,IAAI,CAAC,iBAAiB,CAAC,mBACvB,IAAI,CAAC,iBAAiB,CAAC,cACvB,GAAG,CAAC,MAAM,CAAC,SACX,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QA6ChC;uCAhNyD,YAAY;0CAAZ,YAAY;0BAC/C,yBAAyB"}
+{"version":3,"file":"infer-exports.d.ts","sourceRoot":"","sources":["infer-exports.js"],"names":[],"mappings":"AAsIO,+DAPI,iBAAiB,cACjB,GAAG,CAAC,MAAM,CAAC,SAEX,oBAAoB,kCA2B9B;AAkBM,yCAPI,iBAAiB,cACjB,GAAG,CAAC,MAAM,CAAC,SAEX,oBAAoB,GAElB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAG8B;AAU1D,mDANI,iBAAiB,mBACjB,IAAI,CAAC,iBAAiB,CAAC,mBACvB,IAAI,CAAC,iBAAiB,CAAC,cACvB,GAAG,CAAC,MAAM,CAAC,SACX,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QA6ChC;uCA1NyD,YAAY;0CAAZ,YAAY;0BAC/C,yBAAyB"}

package/src/infer-exports.js

@@ -63,13 +63,15 @@ function* interpretBrowserField(name, browser, main = 'index.js') {
  * @param {object} exports - the `exports` field from a package.json.
  * @param {Set<string>} conditions - build conditions about the target environment
  * for selecting relevant exports, e.g., "browser" or "node".
+ * @param {LanguageForExtension} types - an object to populate
+ * with any recognized module's type, if implied by a tag.
  * @yields {[string, string]}
  * @returns {Generator<[string, string]>}
  */
-function* interpretExports(name, exports, conditions) {
+function* interpretExports(name, exports, conditions, types) {
   if (isArray(exports)) {
     for (const section of exports) {
-      const results = [...interpretExports(name, section, conditions)];
+      const results = [...interpretExports(name, section, conditions, types)];
       if (results.length > 0) {
         yield* results;
         break;
@@ -93,12 +95,20 @@ function* interpretExports(name, exports, conditions) {
       continue; // or no-op
     } else if (key.startsWith('./') || key === '.') {
       if (name === '.') {
-        yield* interpretExports(key, value, conditions);
+        yield* interpretExports(key, value, conditions, types);
       } else {
-        yield* interpretExports(join(name, key), value, conditions);
+        yield* interpretExports(join(name, key), value, conditions, types);
       }
     } else if (conditions.has(key)) {
-      yield* interpretExports(name, value, conditions);
+      if (types && key === 'import' && typeof value === 'string') {
+        // In this one case, the key "import" has carried a hint that the
+        // referenced module is an ECMASCript module, and that hint may be
+        // necessary to override whatever type might be inferred from the module
+        // specifier extension.
+        const spec = relativize(value);
+        types[spec] = 'mjs';
+      }
+      yield* interpretExports(name, value, conditions, types);
       // Take only the first matching tag.
       break;
     }
@@ -141,7 +151,7 @@ export const inferExportsEntries = function* inferExportsEntries(
     yield ['.', relativize(main)];
   }
   if (exports !== undefined) {
-    yield* interpretExports('.', exports, conditions);
+    yield* interpretExports('.', exports, conditions, types);
   }
   // TODO Otherwise, glob 'files' for all '.js', '.cjs', and '.mjs' entry
   // modules, taking care to exclude node_modules.

package/src/json.d.ts

@@ -1,2 +1,2 @@
-export function parseLocatedJson(source: string, location: string): any;
+export function parseLocatedJson<T = any>(source: string, location: string): T;
 //# sourceMappingURL=json.d.ts.map

package/src/json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["json.js"],"names":[],"mappings":"AASO,yCAHI,MAAM,YACN,MAAM,OAWhB"}
+{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["json.js"],"names":[],"mappings":"AAgBO,iCANO,CAAC,gBAEJ,MAAM,YACN,MAAM,GACJ,CAAC,CAWb"}

package/src/json.js

@@ -1,11 +1,18 @@
-/** @module Annotates JSON parse exceptions with the location of the source. */
+/**
+ * Annotates JSON parse exceptions with the location of the source.
+ *
+ * @module
+ */
 
 /**
- * Parses JSON and, if necessary, throws exceptions that include the location
- * of the offending file.
+ * Parses JSON and, if necessary, throws exceptions that include the location of
+ * the offending file.
  *
+ * @template [T=any] The desired type of the parsed JSON. `unknown` is
+ * recommended; using the default is unsafe.
  * @param {string} source
  * @param {string} location
+ * @returns {T}
  */
 export const parseLocatedJson = (source, location) => {
   try {

package/src/link.d.ts

@@ -1,6 +1,7 @@
-export function link({ entry, compartments: compartmentDescriptors }: CompartmentMapDescriptor, options: LinkOptions): LinkResult;
-export function assemble(compartmentMap: CompartmentMapDescriptor, options: LinkOptions): Compartment;
-import type { CompartmentMapDescriptor } from './types.js';
+export function link({ entry, compartments: compartmentDescriptors }: PackageCompartmentMapDescriptor | FileCompartmentMapDescriptor, options: LinkOptions): LinkResult;
+export function assemble(compartmentMap: PackageCompartmentMapDescriptor, options: LinkOptions): Compartment;
+import type { PackageCompartmentMapDescriptor } from './types.js';
+import type { FileCompartmentMapDescriptor } from './types.js';
 import type { LinkOptions } from './types.js';
 import type { LinkResult } from './types.js';
 //# sourceMappingURL=link.d.ts.map

package/src/link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["link.js"],"names":[],"mappings":"AAwPO,sEAJI,wBAAwB,WACxB,WAAW,GACT,UAAU,CA2KtB;AAOM,yCAJI,wBAAwB,WACxB,WAAW,eAIqB;8CA/YjC,YAAY;iCAAZ,YAAY;gCAAZ,YAAY"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["link.js"],"names":[],"mappings":"AA+PO,sEAJI,+BAA+B,GAAC,4BAA4B,WAC5D,WAAW,GACT,UAAU,CAgLtB;AAOM,yCAJI,+BAA+B,WAC/B,WAAW,eAIqB;qDArZjC,YAAY;kDAAZ,YAAY;iCAAZ,YAAY;gCAAZ,YAAY"}

package/src/link.js

@@ -13,28 +13,38 @@
 /**
  * @import {ModuleMapHook} from 'ses'
  * @import {
- *   CompartmentDescriptor,
- *   CompartmentMapDescriptor,
  *   ImportNowHookMaker,
  *   LinkOptions,
  *   LinkResult,
- *   ModuleDescriptor,
  *   ParseFn,
  *   AsyncParseFn,
  *   ParserForLanguage,
  *   ParserImplementation,
  *   ShouldDeferError,
+ *   ScopeDescriptor,
+ *   CompartmentModuleConfiguration,
+ *   PackageCompartmentMapDescriptor,
+ *   FileUrlString,
+ *   PackageCompartmentDescriptor,
+ *   FileCompartmentMapDescriptor,
+ *   FileCompartmentDescriptor,
+ *   FileModuleConfiguration,
+ *   MakeModuleMapHookOptions,
  * } from './types.js'
  */
 
 import { makeMapParsers } from './map-parser.js';
 import { resolve as resolveFallback } from './node-module-specifier.js';
 import {
-  ATTENUATORS_COMPARTMENT,
   attenuateGlobals,
-  enforceModulePolicy,
+  enforcePolicyByModule,
   makeDeferredAttenuatorsProvider,
 } from './policy.js';
+import { ATTENUATORS_COMPARTMENT } from './policy-format.js';
+import {
+  isCompartmentModuleConfiguration,
+  isExitModuleConfiguration,
+} from './guards.js';
 
 const { assign, create, entries, freeze } = Object;
 const { hasOwnProperty } = Object.prototype;
@@ -47,17 +57,17 @@ const { allSettled } = Promise;
  */
 const promiseAllSettled = allSettled.bind(Promise);
 
-const defaultCompartment = Compartment;
-
-// q, as in quote, for strings in error messages.
-const q = JSON.stringify;
+const DefaultCompartment = Compartment;
 
 /**
+ * TODO: can we just use `Object.hasOwn` instead?
  * @param {Record<string, unknown>} object
  * @param {string} key
  * @returns {boolean}
  */
 const has = (object, key) => apply(hasOwnProperty, object, [key]);
+// q, as in quote, for strings in error messages.
+const { quote: q } = assert;
 
 /**
  * For a full, absolute module specifier like "dependency",
@@ -89,11 +99,11 @@ const trimModuleSpecifierPrefix = (moduleSpecifier, prefix) => {
  * Any module specifier with an absolute prefix should be captured by
  * the `moduleMap` or `moduleMapHook`.
  *
- * @param {CompartmentDescriptor} compartmentDescriptor
+ * @param {FileCompartmentDescriptor|PackageCompartmentDescriptor} compartmentDescriptor
  * @param {Record<string, Compartment>} compartments
  * @param {string} compartmentName
- * @param {Record<string, ModuleDescriptor>} moduleDescriptors
- * @param {Record<string, ModuleDescriptor>} scopeDescriptors
+ * @param {Record<string, FileModuleConfiguration|CompartmentModuleConfiguration>} moduleDescriptors
+ * @param {Record<string, ScopeDescriptor<FileUrlString>>} scopeDescriptors
  * @returns {ModuleMapHook | undefined}
  */
 const makeModuleMapHook = (
@@ -104,8 +114,7 @@ const makeModuleMapHook = (
   scopeDescriptors,
 ) => {
   /**
-   * @param {string} moduleSpecifier
-   * @returns {string | object | undefined}
+   * @type {ModuleMapHook}
    */
   const moduleMapHook = moduleSpecifier => {
     compartmentDescriptor.retained = true;
@@ -114,40 +123,42 @@ const makeModuleMapHook = (
     if (moduleDescriptor !== undefined) {
       moduleDescriptor.retained = true;
 
+      if (isExitModuleConfiguration(moduleDescriptor)) {
+        return undefined;
+      }
       // "foreignCompartmentName" refers to the compartment which
       // may differ from the current compartment
-      const {
-        compartment: foreignCompartmentName = compartmentName,
-        module: foreignModuleSpecifier,
-        exit,
-      } = moduleDescriptor;
-      if (exit !== undefined) {
-        return undefined; // fall through to import hook
-      }
-      if (foreignModuleSpecifier !== undefined) {
-        // archive goes through foreignModuleSpecifier for local modules too
-        if (!moduleSpecifier.startsWith('./')) {
-          // This code path seems to only be reached on subsequent imports of the same specifier in the same compartment.
-          // The check should be redundant and is only left here out of abundance of caution.
-          enforceModulePolicy(moduleSpecifier, compartmentDescriptor, {
-            exit: false,
-            errorHint:
-              'This check should not be reachable. If you see this error, please file an issue.',
-          });
-        }
-
-        const foreignCompartment = compartments[foreignCompartmentName];
-        if (foreignCompartment === undefined) {
-          throw Error(
-            `Cannot import from missing compartment ${q(
-              foreignCompartmentName,
-            )}}`,
-          );
+      if (isCompartmentModuleConfiguration(moduleDescriptor)) {
+        const {
+          compartment: foreignCompartmentName = compartmentName,
+          module: foreignModuleSpecifier,
+        } = moduleDescriptor;
+        if (foreignModuleSpecifier !== undefined) {
+          // archive goes through foreignModuleSpecifier for local modules too
+          if (!moduleSpecifier.startsWith('./')) {
+            // This code path seems to only be reached on subsequent imports of the same specifier in the same compartment.
+            // The check should be redundant and is only left here out of abundance of caution.
+            enforcePolicyByModule(moduleSpecifier, compartmentDescriptor, {
+              exit: false,
+              errorHint:
+                'This check should not be reachable. If you see this error, please file an issue.',
+            });
+          }
+
+          const foreignCompartment = compartments[foreignCompartmentName];
+          if (foreignCompartment === undefined) {
+            throw Error(
+              `Cannot import from missing compartment ${q(
+                foreignCompartmentName,
+              )}}`,
+            );
+          }
+          // actual module descriptor
+          return {
+            compartment: foreignCompartment,
+            namespace: foreignModuleSpecifier,
+          };
         }
-        return {
-          compartment: foreignCompartment,
-          namespace: foreignModuleSpecifier,
-        };
       }
     }
 
@@ -178,7 +189,7 @@ const makeModuleMapHook = (
           );
         }
 
-        enforceModulePolicy(scopePrefix, compartmentDescriptor, {
+        enforcePolicyByModule(scopePrefix, compartmentDescriptor, {
           exit: false,
           errorHint: `Blocked in linking. ${q(
             moduleSpecifier,
@@ -198,7 +209,9 @@ const makeModuleMapHook = (
           retained: true,
           compartment: foreignCompartmentName,
           module: foreignModuleSpecifier,
+          __createdBy: 'link',
         };
+        // actual module descriptor
         return {
           compartment: foreignCompartment,
           namespace: foreignModuleSpecifier,
@@ -236,16 +249,10 @@ const impossibleImportNowHookMaker = () => {
  * - Passes the given globals and external modules into the root compartment
  *   only.
  *
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor|FileCompartmentMapDescriptor} compartmentMap
  * @param {LinkOptions} options
  * @returns {LinkResult} the root compartment of the compartment DAG
  */
-
-/**
- * @param {CompartmentMapDescriptor} compartmentMap
- * @param {LinkOptions} options
- * @returns {LinkResult}
- */
 export const link = (
   { entry, compartments: compartmentDescriptors },
   options,
@@ -262,7 +269,7 @@ export const link = (
     __shimTransforms__ = [],
     __native__ = false,
     archiveOnly = false,
-    Compartment = defaultCompartment,
+    Compartment = DefaultCompartment,
   } = options;
 
   const { compartment: entryCompartmentName } = entry;
@@ -291,9 +298,14 @@ export const link = (
     syncModuleTransforms,
   });
 
-  for (const [compartmentName, compartmentDescriptor] of entries(
-    compartmentDescriptors,
-  )) {
+  const compartmentDescriptorEntries =
+    /** @type {[string, PackageCompartmentDescriptor|FileCompartmentDescriptor][]} */ (
+      entries(compartmentDescriptors)
+    );
+  for (const [
+    compartmentName,
+    compartmentDescriptor,
+  ] of compartmentDescriptorEntries) {
     const {
       location,
       name,
@@ -418,7 +430,7 @@ export const link = (
 };
 
 /**
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {LinkOptions} options
  * @deprecated Use {@link link}.
  */

package/src/node-modules.d.ts

@@ -1,11 +1,13 @@
 export function basename(location: string): string;
-export function compartmentMapForNodeModules(readPowers: ReadFn | ReadPowers | MaybeReadPowers, packageLocation: string, conditionsOption: Set<string>, packageDescriptor: PackageDescriptor, moduleSpecifier: string, options?: CompartmentMapForNodeModulesOptions): Promise<CompartmentMapDescriptor>;
-export function mapNodeModules(readPowers: ReadFn | ReadPowers | MaybeReadPowers, moduleLocation: string, { tags, conditions, log, ...otherOptions }?: MapNodeModulesOptions): Promise<CompartmentMapDescriptor>;
+export function compartmentMapForNodeModules_(readPowers: ReadFn | ReadPowers<FileUrlString> | MaybeReadPowers<FileUrlString>, entryPackageLocation: FileUrlString, conditionsOption: Set<string>, packageDescriptor: PackageDescriptor, entryModuleSpecifier: string, options?: CompartmentMapForNodeModulesOptions): Promise<PackageCompartmentMapDescriptor>;
+export function mapNodeModules(readPowers: ReadFn | ReadPowers<FileUrlString> | MaybeReadPowers<FileUrlString>, moduleLocation: string, { tags, conditions, log, unknownCanonicalNameHook, packageDataHook, packageDependenciesHook, policy, ...otherOptions }?: MapNodeModulesOptions): Promise<PackageCompartmentMapDescriptor>;
+export function compartmentMapForNodeModules(readPowers: ReadFn | ReadPowers<FileUrlString> | MaybeReadPowers<FileUrlString>, entryPackageLocation: FileUrlString, conditionsOption: Set<string>, packageDescriptor: PackageDescriptor, entryModuleSpecifier: string, options?: CompartmentMapForNodeModulesOptions): Promise<PackageCompartmentMapDescriptor>;
 import type { ReadFn } from './types.js';
+import type { FileUrlString } from './types.js';
 import type { ReadPowers } from './types.js';
 import type { MaybeReadPowers } from './types.js';
 import type { PackageDescriptor } from './types.js';
 import type { CompartmentMapForNodeModulesOptions } from './types.js';
-import type { CompartmentMapDescriptor } from './types.js';
+import type { PackageCompartmentMapDescriptor } from './types.js';
 import type { MapNodeModulesOptions } from './types.js';
 //# sourceMappingURL=node-modules.d.ts.map

package/src/node-modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-modules.d.ts","sourceRoot":"","sources":["node-modules.js"],"names":[],"mappings":"AAmFO,mCAHI,MAAM,GACJ,MAAM,CAYlB;AA43BM,yDATI,MAAM,GAAG,UAAU,GAAG,eAAe,mBACrC,MAAM,oBACN,GAAG,CAAC,MAAM,CAAC,qBACX,iBAAiB,mBACjB,MAAM,YACN,mCAAmC,GACjC,OAAO,CAAC,wBAAwB,CAAC,CAkE7C;AAaM,2CALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,MAAM,+CACN,qBAAqB,GACnB,OAAO,CAAC,wBAAwB,CAAC,CA0B7C;4BA9hCS,YAAY;gCAAZ,YAAY;qCAAZ,YAAY;uCAAZ,YAAY;yDAAZ,YAAY;8CAAZ,YAAY;2CAAZ,YAAY"}
+{"version":3,"file":"node-modules.d.ts","sourceRoot":"","sources":["node-modules.js"],"names":[],"mappings":"AA4LO,mCAHI,MAAM,GACJ,MAAM,CAYlB;AAqlCM,0DARI,MAAM,GAAG,WAAW,aAAa,CAAC,GAAG,gBAAgB,aAAa,CAAC,wBACnE,aAAa,oBACb,GAAG,CAAC,MAAM,CAAC,qBACX,iBAAiB,wBACjB,MAAM,YACN,mCAAmC,GACjC,OAAO,CAAC,+BAA+B,CAAC,CA0HpD;AAaM,2CALI,MAAM,GAAG,WAAW,aAAa,CAAC,GAAG,gBAAgB,aAAa,CAAC,kBACnE,MAAM,2HACN,qBAAqB,GACnB,OAAO,CAAC,+BAA+B,CAAC,CA6CpD;AAhLM,yDARI,MAAM,GAAG,WAAW,aAAa,CAAC,GAAG,gBAAgB,aAAa,CAAC,wBACnE,aAAa,oBACb,GAAG,CAAC,MAAM,CAAC,qBACX,iBAAiB,wBACjB,MAAM,YACN,mCAAmC,GACjC,OAAO,CAAC,+BAA+B,CAAC,CA0HpD;4BA51CS,YAAY;mCAAZ,YAAY;gCAAZ,YAAY;qCAAZ,YAAY;uCAAZ,YAAY;yDAAZ,YAAY;qDAAZ,YAAY;2CAAZ,YAAY"}