@endo/compartment-mapper 1.6.2 → 2.0.0

package/src/import-archive.d.ts

@@ -1,24 +1,10 @@
-export function parseArchive(archiveBytes: Uint8Array, archiveLocation?: string, options?: Options): Promise<Application>;
-export function loadArchive(readPowers: import("@endo/zip").ReadFn | ReadPowers, archiveLocation: string, options?: LoadArchiveOptions): Promise<Application>;
-export function importArchive(readPowers: import("@endo/zip").ReadFn | ReadPowers, archiveLocation: string, options: ExecuteOptions & LoadArchiveOptions): Promise<object>;
-export type CompartmentConstructor = typeof Compartment;
-export type Options = {
-    expectedSha512?: string | undefined;
-    computeSha512?: HashFn | undefined;
-    modules?: Record<string, unknown> | undefined;
-    importHook?: ExitModuleImportHook | undefined;
-    Compartment?: typeof Compartment | undefined;
-    computeSourceLocation?: ComputeSourceLocationHook | undefined;
-    computeSourceMapLocation?: ComputeSourceMapLocationHook | undefined;
-    parserForLanguage?: ParserForLanguage | undefined;
-};
+export function parseArchive(archiveBytes: Uint8Array, archiveLocation?: string, options?: ParseArchiveOptions): Promise<Application>;
+export function loadArchive(readPowers: ReadFn | ReadPowers, archiveLocation: string, options?: LoadArchiveOptions): Promise<Application>;
+export function importArchive(readPowers: ReadFn | ReadPowers, archiveLocation: string, options: ExecuteOptions & LoadArchiveOptions): Promise<object>;
+import type { ParseArchiveOptions } from './types.js';
 import type { Application } from './types.js';
+import type { ReadFn } from './types.js';
 import type { ReadPowers } from './types.js';
 import type { LoadArchiveOptions } from './types.js';
 import type { ExecuteOptions } from './types.js';
-import type { HashFn } from './types.js';
-import type { ExitModuleImportHook } from './types.js';
-import type { ComputeSourceLocationHook } from './types.js';
-import type { ComputeSourceMapLocationHook } from './types.js';
-import type { ParserForLanguage } from './types.js';
 //# sourceMappingURL=import-archive.d.ts.map

package/src/import-archive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-archive.d.ts","sourceRoot":"","sources":["import-archive.js"],"names":[],"mappings":"AA+EO,2CALI,UAAU,oBACV,MAAM,YACN,OAAO,GACL,OAAO,CAAC,WAAW,CAAC,CAW9B;AAQI,wCALI,OAAO,WAAW,EAAE,MAAM,GAAG,UAAU,mBACvC,MAAM,YACN,kBAAkB,GAChB,OAAO,CAAC,WAAW,CAAC,CAO9B;AAQI,0CALI,OAAO,WAAW,EAAE,MAAM,GAAG,UAAU,mBACvC,MAAM,WACN,cAAc,GAAG,kBAAkB,GACjC,OAAO,CAAC,MAAM,CAAC,CAOzB;qCArEW,OAAO,WAAW;;;;;;;;;;;iCAhBtB,YAAY;gCAAZ,YAAY;wCAAZ,YAAY;oCAAZ,YAAY;4BAAZ,YAAY;0CAAZ,YAAY;+CAAZ,YAAY;kDAAZ,YAAY;uCAAZ,YAAY"}
+{"version":3,"file":"import-archive.d.ts","sourceRoot":"","sources":["import-archive.js"],"names":[],"mappings":"AA2DO,2CALI,UAAU,oBACV,MAAM,YACN,mBAAmB,GACjB,OAAO,CAAC,WAAW,CAAC,CAW9B;AAQI,wCALI,MAAM,GAAG,UAAU,mBACnB,MAAM,YACN,kBAAkB,GAChB,OAAO,CAAC,WAAW,CAAC,CAO9B;AAQI,0CALI,MAAM,GAAG,UAAU,mBACnB,MAAM,WACN,cAAc,GAAG,kBAAkB,GACjC,OAAO,CAAC,MAAM,CAAC,CAOzB;yCAnEO,YAAY;iCAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;wCAAZ,YAAY;oCAAZ,YAAY"}

package/src/import-archive.js

@@ -19,14 +19,12 @@
 /**
  * @import {
  *   Application,
- *   ComputeSourceLocationHook,
- *   ComputeSourceMapLocationHook,
  *   ExecuteOptions,
- *   ExitModuleImportHook,
- *   HashFn,
  *   LoadArchiveOptions,
  *   ReadPowers,
  *   ParserForLanguage,
+ *   ParseArchiveOptions,
+ *   ReadFn,
  * } from './types.js'
  */
 
@@ -39,28 +37,10 @@ import {
 
 const { assign, create, freeze } = Object;
 
-// Must give the type of Compartment a name to capture the external meaning of
-// Compartment Otherwise @param {typeof Compartment} takes the Compartment to
-// mean the const variable defined within the function.
-//
-/** @typedef {typeof Compartment} CompartmentConstructor */
-
-/**
- * @typedef {object} Options
- * @property {string} [expectedSha512]
- * @property {HashFn} [computeSha512]
- * @property {Record<string, unknown>} [modules]
- * @property {ExitModuleImportHook} [importHook]
- * @property {CompartmentConstructor} [Compartment]
- * @property {ComputeSourceLocationHook} [computeSourceLocation]
- * @property {ComputeSourceMapLocationHook} [computeSourceMapLocation]
- * @property {ParserForLanguage} [parserForLanguage]
- */
-
 /**
  * Add the default parserForLanguage option.
- * @param {Options} [options]
- * @returns {Options}
+ * @param {ParseArchiveOptions} [options]
+ * @returns {ParseArchiveOptions}
  */
 const assignParserForLanguage = (options = {}) => {
   const { parserForLanguage: parserForLanguageOption, ...rest } = options;
@@ -74,7 +54,7 @@ const assignParserForLanguage = (options = {}) => {
 /**
  * @param {Uint8Array} archiveBytes
  * @param {string} [archiveLocation]
- * @param {Options} [options]
+ * @param {ParseArchiveOptions} [options]
  * @returns {Promise<Application>}
  */
 export const parseArchive = async (
@@ -89,7 +69,7 @@ export const parseArchive = async (
   );
 
 /**
- * @param {import('@endo/zip').ReadFn | ReadPowers} readPowers
+ * @param {ReadFn | ReadPowers} readPowers
  * @param {string} archiveLocation
  * @param {LoadArchiveOptions} [options]
  * @returns {Promise<Application>}
@@ -102,7 +82,7 @@ export const loadArchive = async (readPowers, archiveLocation, options) =>
   );
 
 /**
- * @param {import('@endo/zip').ReadFn | ReadPowers} readPowers
+ * @param {ReadFn | ReadPowers} readPowers
  * @param {string} archiveLocation
  * @param {ExecuteOptions & LoadArchiveOptions} options
  * @returns {Promise<object>}

package/src/import-hook.d.ts

@@ -2,18 +2,19 @@
  * Synchronous import for dynamic requires.
  *
  * @param {ReadNowPowers} readPowers
- * @param {string} baseLocation
+ * @param {FileUrlString} baseLocation
  * @param {MakeImportNowHookMakerOptions} options
  * @returns {ImportNowHookMaker}
  */
-export function makeImportNowHookMaker(readPowers: ReadNowPowers, baseLocation: string, { sources, compartmentDescriptors, computeSha512, searchSuffixes, archiveOnly, sourceMapHook, importNowHook: exitModuleImportNowHook, }: MakeImportNowHookMakerOptions): ImportNowHookMaker;
+export function makeImportNowHookMaker(readPowers: ReadNowPowers, baseLocation: FileUrlString, { sources, compartmentDescriptors, computeSha512, searchSuffixes, archiveOnly, sourceMapHook, importNowHook: exitModuleImportNowHook, moduleSourceHook, log, }: MakeImportNowHookMakerOptions): ImportNowHookMaker;
 export function exitModuleImportHookMaker({ modules, exitModuleImportHook, entryCompartmentName, }: {
     modules?: Record<string, any> | undefined;
     exitModuleImportHook?: ExitModuleImportHook | undefined;
     entryCompartmentName: string;
 }): ExitModuleImportHook | undefined;
-export function makeImportHookMaker(readPowers: ReadFn | ReadPowers, baseLocation: string, { sources, compartmentDescriptors, archiveOnly, computeSha512, searchSuffixes, sourceMapHook, entryCompartmentName, entryModuleSpecifier, importHook: exitModuleImportHook, }: MakeImportHookMakerOptions): ImportHookMaker;
+export function makeImportHookMaker(readPowers: ReadFn | ReadPowers, baseLocation: FileUrlString, { sources, compartmentDescriptors, archiveOnly, computeSha512, searchSuffixes, sourceMapHook, entryCompartmentName, entryModuleSpecifier, importHook: exitModuleImportHook, moduleSourceHook, log, }: MakeImportHookMakerOptions): ImportHookMaker;
 import type { ReadNowPowers } from './types.js';
+import type { FileUrlString } from './types.js';
 import type { MakeImportNowHookMakerOptions } from './types.js';
 import type { ImportNowHookMaker } from './types.js';
 import type { ExitModuleImportHook } from './types.js';

package/src/import-hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-hook.d.ts","sourceRoot":"","sources":["import-hook.js"],"names":[],"mappings":"AAkoBA;;;;;;;GAOG;AACH,mDALW,aAAa,gBACb,MAAM,2IACN,6BAA6B,GAC3B,kBAAkB,CAkN9B;AAnoBM,oGALJ;IAAqC,OAAO;IACN,oBAAoB;IACnC,oBAAoB,EAAnC,MAAM;CACd,GAAU,oBAAoB,GAAC,SAAS,CA8B1C;AAiPM,gDALI,MAAM,GAAC,UAAU,gBACjB,MAAM,iLACN,0BAA0B,GACxB,eAAe,CA8J3B;mCAzlBS,YAAY;mDAAZ,YAAY;wCAAZ,YAAY;0CAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;gDAAZ,YAAY;qCAAZ,YAAY"}
+{"version":3,"file":"import-hook.d.ts","sourceRoot":"","sources":["import-hook.js"],"names":[],"mappings":"AAouBA;;;;;;;GAOG;AACH,mDALW,aAAa,gBACb,aAAa,kKACb,6BAA6B,GAC3B,kBAAkB,CAqM9B;AA9tBM,oGALJ;IAAqC,OAAO;IACN,oBAAoB;IACnC,oBAAoB,EAAnC,MAAM;CACd,GAAU,oBAAoB,GAAC,SAAS,CA8B1C;AA0UM,gDALI,MAAM,GAAC,UAAU,gBACjB,aAAa,wMACb,0BAA0B,GACxB,eAAe,CA6K3B;mCAtrBS,YAAY;mCAAZ,YAAY;mDAAZ,YAAY;wCAAZ,YAAY;0CAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;gDAAZ,YAAY;qCAAZ,YAAY"}

package/src/import-hook.js

@@ -29,14 +29,19 @@
  *   ImportNowHookMaker,
  *   MakeImportHookMakerOptions,
  *   MakeImportNowHookMakerOptions,
- *   ModuleDescriptor,
  *   ParseResult,
  *   ReadFn,
  *   ReadPowers,
  *   ReadNowPowers,
  *   StrictlyRequiredFn,
+ *   DeferErrorFn,
+ *   ErrorModuleSource,
+ *   FileUrlString,
  *   CompartmentSources,
- *   DeferErrorFn
+ *   CompartmentModuleConfiguration,
+ *   LogOptions,
+ *   CanonicalName,
+ *   LocalModuleSource
  * } from './types.js'
  */
 
@@ -44,14 +49,14 @@ import { asyncTrampoline, syncTrampoline } from '@endo/trampoline';
 import { resolve } from './node-module-specifier.js';
 import {
   attenuateModuleHook,
-  ATTENUATORS_COMPARTMENT,
-  enforceModulePolicy,
+  enforcePolicyByModule,
+  enforcePackagePolicyByCanonicalName,
 } from './policy.js';
+import { ATTENUATORS_COMPARTMENT } from './policy-format.js';
 import { unpackReadPowers } from './powers.js';
 
 // q, as in quote, for quoting strings in error messages.
-const q = JSON.stringify;
-
+const { quote: q } = assert;
 const { apply } = Reflect;
 
 /**
@@ -62,7 +67,7 @@ const { apply } = Reflect;
  */
 const freeze = Object.freeze;
 
-const { entries, keys, assign, create } = Object;
+const { keys, assign, create } = Object;
 
 const { hasOwnProperty } = Object.prototype;
 /**
@@ -71,12 +76,15 @@ const { hasOwnProperty } = Object.prototype;
  */
 const has = (haystack, needle) => apply(hasOwnProperty, haystack, [needle]);
 
+const noop = () => {};
+
 /**
  * @param {string} rel - a relative URL
- * @param {string} abs - a fully qualified URL
- * @returns {string}
+ * @param {FileUrlString} abs - a fully qualified URL
+ * @returns {FileUrlString}
  */
-const resolveLocation = (rel, abs) => new URL(rel, abs).toString();
+const resolveLocation = (rel, abs) =>
+  /** @type {FileUrlString} */ (new URL(rel, abs).toString());
 
 // this is annoying
 function getImportsFromRecord(record) {
@@ -98,14 +106,14 @@ const nodejsConventionSearchSuffixes = [
 
 /**
  * Returns `true` if `absoluteModuleSpecifier` is within the path `compartmentLocation`.
- * @param {string} absoluteModudeSpecifier Absolute path to module specifier
+ * @param {string} absoluteModuleSpecifier Absolute path to module specifier
  * @param {string} compartmentLocation Absolute path to compartment location
  * @returns {boolean}
  */
 const isLocationWithinCompartment = (
-  absoluteModudeSpecifier,
+  absoluteModuleSpecifier,
   compartmentLocation,
-) => absoluteModudeSpecifier.startsWith(compartmentLocation);
+) => absoluteModuleSpecifier.startsWith(compartmentLocation);
 
 /**
  * Computes the relative path to a module from its compartment location (including a leading `./`)
@@ -159,30 +167,15 @@ const findRedirect = ({
         return undefined;
       }
 
-      // this tests the compartment referred to by the absolute path
-      // is a dependency of the compartment descriptor
-      if (compartmentDescriptor.compartments.has(location)) {
-        return {
-          specifier: relativeSpecifier(moduleSpecifierLocation, location),
-          compartment: compartments[location],
-        };
-      }
-
-      // this tests if the compartment descriptor is a dependency of the
-      // compartment referred to by the absolute path.
-      // it may be in scope, but disallowed by policy.
-      if (
-        someCompartmentDescriptor.compartments.has(
-          compartmentDescriptor.location,
-        )
-      ) {
-        enforceModulePolicy(
-          compartmentDescriptor.name,
+      if (compartmentDescriptor.policy) {
+        enforcePackagePolicyByCanonicalName(
           someCompartmentDescriptor,
+          compartmentDescriptor,
           {
-            errorHint: `Blocked in import hook. ${q(absoluteModuleSpecifier)} is part of the compartment map and resolves to ${location}`,
+            errorHint: `Blocked in importNow hook by package policy. ${q(absoluteModuleSpecifier)} is part of the compartment map and resolves to ${location}`,
           },
         );
+
         return {
           specifier: relativeSpecifier(moduleSpecifierLocation, location),
           compartment: compartments[location],
@@ -194,7 +187,8 @@ const findRedirect = ({
       // go up a directory
       const parentLocation = new URL('../', someLocation).href;
 
-      // afaict this behavior is consistent across both windows and posix
+      // afaict this behavior is consistent across both windows and posix:
+      // if this is true, we hit the filesystem root
       if (parentLocation === someLocation) {
         throw new Error(
           `Could not import unknown module: ${q(absoluteModuleSpecifier)}`,
@@ -263,6 +257,66 @@ const nominateCandidates = (moduleSpecifier, searchSuffixes) => {
   return candidates;
 };
 
+/**
+ * Executes the moduleSource hook for a {@link LocalModuleSource}.
+ *
+ * Preprocesses the fields for the hook.
+ *
+ * @param {import('./types.js').ModuleSourceHook | undefined} moduleSourceHook Hook function
+ * @param {LocalModuleSource} moduleSource Original `LocalModuleSource` object
+ * @param {CanonicalName} canonicalName Canonical name of the compartment/package
+ * @param {LogOptions} options Options
+ * @returns {void}
+ */
+const executeLocalModuleSourceHook = (
+  moduleSourceHook,
+  moduleSource,
+  canonicalName,
+  { log = noop } = {},
+) => {
+  if (!moduleSourceHook) {
+    return;
+  }
+
+  const {
+    sourceLocation: location,
+    parser: language,
+    bytes,
+    record,
+    sha512,
+  } = moduleSource;
+  /** @type {string[]|undefined} */
+  let imports;
+  /** @type {string[]|undefined} */
+  let exports;
+  /** @type {string[]|undefined} */
+  let reexports;
+
+  if ('imports' in record) {
+    ({ imports } = record);
+  }
+  if ('exports' in record) {
+    ({ exports } = record);
+  }
+  if ('reexports' in record) {
+    ({ reexports } = record);
+  }
+
+  moduleSourceHook({
+    moduleSource: {
+      location,
+      language,
+      bytes,
+      imports,
+      exports,
+      reexports,
+      sha512,
+    },
+    canonicalName,
+    log,
+  });
+};
+
 /**
  * Returns a generator which applies {@link ChooseModuleDescriptorOperators} in
  * `operators` using the options in options to ultimately result in a
@@ -296,7 +350,9 @@ function* chooseModuleDescriptor(
     readPowers,
     archiveOnly,
     sourceMapHook,
+    moduleSourceHook,
     strictlyRequiredForCompartment,
+    log = noop,
   },
   { maybeRead, parse, shouldDeferError = () => false },
 ) {
@@ -338,6 +394,20 @@ function* chooseModuleDescriptor(
     // name, they are usable as URL's.
     const moduleLocation = resolveLocation(candidateSpecifier, packageLocation);
 
+    // check if moduleLocation is within the compartment if it is not, then
+    // create a redirect record using absolute path which will be resolved by
+    // findRedirect
+    const { fileURLToPath } = unpackReadPowers(readPowers);
+    if (
+      typeof fileURLToPath === 'function' &&
+      !isLocationWithinCompartment(moduleLocation, packageLocation)
+    ) {
+      return {
+        specifier: fileURLToPath(moduleLocation),
+        compartment: compartments[packageLocation],
+      };
+    }
+
     // "next" values must have type assertions for narrowing because we have
     // multiple yielded types
     const moduleBytes = /** @type {Uint8Array|undefined} */ (
@@ -379,6 +449,7 @@ function* chooseModuleDescriptor(
           retained: true,
           module: candidateSpecifier,
           compartment: packageLocation,
+          __createdBy: 'import-hook',
         };
       }
       /** @type {StaticModuleType} */
@@ -405,7 +476,9 @@ function* chooseModuleDescriptor(
       const packageRelativeLocation = moduleLocation.slice(
         packageLocation.length,
       );
-      packageSources[candidateSpecifier] = {
+
+      /** @type {LocalModuleSource} */
+      const localModuleSource = {
         location: packageRelativeLocation,
         sourceLocation: moduleLocation,
         sourceDirname,
@@ -414,6 +487,16 @@ function* chooseModuleDescriptor(
         record: concreteRecord,
         sha512,
       };
+
+      packageSources[candidateSpecifier] = localModuleSource;
+
+      executeLocalModuleSourceHook(
+        moduleSourceHook,
+        localModuleSource,
+        compartmentDescriptor.label,
+        { log },
+      );
+
       if (!shouldDeferError(parser)) {
         for (const importSpecifier of getImportsFromRecord(record)) {
           strictlyRequiredForCompartment(packageLocation).add(
@@ -443,9 +526,7 @@ const makeDeferError = (
   packageSources,
 ) => {
   /**
-   * @param {string} specifier
-   * @param {Error} error - error to throw on execute
-   * @returns {StaticModuleType}
+   * @type {DeferErrorFn}
    */
   const deferError = (specifier, error) => {
     // strictlyRequired is populated with imports declared by modules whose parser is not using heuristics to figure
@@ -467,9 +548,11 @@ const makeDeferError = (
         throw error;
       },
     });
-    packageSources[specifier] = {
+    /** @type {ErrorModuleSource} */
+    const moduleSource = {
       deferredError: error.message,
     };
+    packageSources[specifier] = moduleSource;
 
     return record;
   };
@@ -478,7 +561,7 @@ const makeDeferError = (
 
 /**
  * @param {ReadFn|ReadPowers} readPowers
- * @param {string} baseLocation
+ * @param {FileUrlString} baseLocation
  * @param {MakeImportHookMakerOptions} options
  * @returns {ImportHookMaker}
  */
@@ -495,6 +578,8 @@ export const makeImportHookMaker = (
     entryCompartmentName,
     entryModuleSpecifier,
     importHook: exitModuleImportHook = undefined,
+    moduleSourceHook,
+    log = noop,
   },
 ) => {
   // Set of specifiers for modules (scoped to compartment) whose parser is not
@@ -566,12 +651,23 @@ export const makeImportHookMaker = (
             if (record) {
               // It'd be nice to check the policy before importing it, but we can only throw a policy error if the
               // hook returns something. Otherwise, we need to fall back to the 'cannot find' error below.
-              enforceModulePolicy(moduleSpecifier, compartmentDescriptor, {
+              enforcePolicyByModule(moduleSpecifier, compartmentDescriptor, {
                 exit: true,
                 errorHint: `Blocked in loading. ${q(
                   moduleSpecifier,
                 )} was not in the compartment map and an attempt was made to load it as a builtin`,
               });
+
+              if (moduleSourceHook) {
+                moduleSourceHook({
+                  moduleSource: {
+                    exit: moduleSpecifier,
+                  },
+                  canonicalName: compartmentDescriptor.label,
+                  log,
+                });
+              }
+
               if (archiveOnly) {
                 // Return a place-holder.
                 // Archived compartments are not executed.
@@ -615,7 +711,9 @@ export const makeImportHookMaker = (
             readPowers,
             archiveOnly,
             sourceMapHook,
+            moduleSourceHook,
             strictlyRequiredForCompartment,
+            log,
           },
           { maybeRead, parse, shouldDeferError },
         );
@@ -644,7 +742,7 @@ export const makeImportHookMaker = (
  * Synchronous import for dynamic requires.
  *
  * @param {ReadNowPowers} readPowers
- * @param {string} baseLocation
+ * @param {FileUrlString} baseLocation
  * @param {MakeImportNowHookMakerOptions} options
  * @returns {ImportNowHookMaker}
  */
@@ -659,13 +757,14 @@ export function makeImportNowHookMaker(
     archiveOnly = false,
     sourceMapHook = undefined,
     importNowHook: exitModuleImportNowHook = undefined,
+    moduleSourceHook,
+    log = noop,
   },
 ) {
   // Set of specifiers for modules (scoped to compartment) whose parser is not
   // using heuristics to determine imports.
   /** @type {Map<string, Set<string>>} compartment name ->* module specifier */
   const strictlyRequired = new Map();
-
   /**
    * @param {string} compartmentName
    */
@@ -689,10 +788,13 @@ export function makeImportNowHookMaker(
     compartments,
     shouldDeferError,
   }) => {
+    packageLocation = resolveLocation(packageLocation, baseLocation);
+    const packageSources = sources[packageLocation] || create(null);
+    sources[packageLocation] = packageSources;
     const deferError = makeDeferError(
       strictlyRequiredForCompartment,
       packageLocation,
-      sources,
+      packageSources,
     );
 
     /**
@@ -714,9 +816,9 @@ export function makeImportNowHookMaker(
         if (exitRecord) {
           // It'd be nice to check the policy before importing it, but we can only throw a policy error if the
           // hook returns something. Otherwise, we need to fall back to the 'cannot find' error below.
-          enforceModulePolicy(moduleSpecifier, compartmentDescriptor, {
+          enforcePolicyByModule(moduleSpecifier, compartmentDescriptor, {
             exit: true,
-            errorHint: `Blocked in loading. ${q(
+            errorHint: `Blocked exit module in loading. ${q(
               moduleSpecifier,
             )} was not in the compartment map and an attempt was made to load it as a builtin`,
           });
@@ -744,37 +846,17 @@ export function makeImportNowHookMaker(
       };
     }
 
-    const compartmentDescriptor = compartmentDescriptors[packageLocation] || {};
+    const compartmentDescriptor =
+      compartmentDescriptors[packageLocation] || create(null);
 
-    packageLocation = resolveLocation(packageLocation, baseLocation);
-    const packageSources = sources[packageLocation] || create(null);
-    sources[packageLocation] = packageSources;
     const {
       modules:
-        moduleDescriptors = /** @type {Record<string, ModuleDescriptor>} */ (
+        moduleDescriptors = /** @type {Record<string, CompartmentModuleConfiguration>} */ (
           create(null)
         ),
     } = compartmentDescriptor;
-    compartmentDescriptor.modules = moduleDescriptors;
 
-    let { policy } = compartmentDescriptor;
-    policy = policy || create(null);
-
-    // Associates modules with compartment descriptors based on policy
-    // in cases where the association was not made when building the
-    // compartment map but is indicated by the policy.
-    if ('packages' in policy && typeof policy.packages === 'object') {
-      for (const [packageName, packagePolicyItem] of entries(policy.packages)) {
-        if (
-          !(packageName in compartmentDescriptor.modules) &&
-          packageName in compartmentDescriptor.scopes &&
-          packagePolicyItem
-        ) {
-          compartmentDescriptor.modules[packageName] =
-            compartmentDescriptor.scopes[packageName];
-        }
-      }
-    }
+    compartmentDescriptor.modules = moduleDescriptors;
 
     const { maybeReadNow, isAbsolute } = readPowers;
 
@@ -809,7 +891,8 @@ export function makeImportNowHookMaker(
           }
         } else if (
           moduleSpecifier !== '.' &&
-          !moduleSpecifier.startsWith('./')
+          !moduleSpecifier.startsWith('./') &&
+          !moduleSpecifier.startsWith('../')
         ) {
           // could be a builtin, which means we should not bother bouncing on the trampoline to find it.
           return importExitModuleOrFail(moduleSpecifier, compartmentDescriptor);
@@ -834,7 +917,9 @@ export function makeImportNowHookMaker(
             readPowers,
             archiveOnly,
             sourceMapHook,
+            moduleSourceHook,
             strictlyRequiredForCompartment,
+            log,
           },
           {
             maybeRead: maybeReadNow,

package/src/import-lite.d.ts

@@ -1,22 +1,22 @@
 /**
  * @overload
  * @param {ReadNowPowers} readPowers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {SyncImportLocationOptions} [opts]
  * @returns {Promise<Application>}
  */
-export function loadFromMap(readPowers: ReadNowPowers, compartmentMap: CompartmentMapDescriptor, opts?: SyncImportLocationOptions | undefined): Promise<Application>;
+export function loadFromMap(readPowers: ReadNowPowers, compartmentMap: PackageCompartmentMapDescriptor, opts?: SyncImportLocationOptions | undefined): Promise<Application>;
 /**
  * @overload
  * @param {ReadFn | ReadPowers} readPowers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {ImportLocationOptions} [opts]
  * @returns {Promise<Application>}
  */
-export function loadFromMap(readPowers: ReadFn | ReadPowers, compartmentMap: CompartmentMapDescriptor, opts?: ImportLocationOptions | undefined): Promise<Application>;
-export function importFromMap(readPowers: ReadFn | ReadPowers, compartmentMap: CompartmentMapDescriptor, options?: ImportLocationOptions): Promise<SomeObject>;
+export function loadFromMap(readPowers: ReadFn | ReadPowers, compartmentMap: PackageCompartmentMapDescriptor, opts?: ImportLocationOptions | undefined): Promise<Application>;
+export function importFromMap(readPowers: ReadFn | ReadPowers, compartmentMap: PackageCompartmentMapDescriptor, options?: ImportLocationOptions): Promise<SomeObject>;
 import type { ReadNowPowers } from './types.js';
-import type { CompartmentMapDescriptor } from './types.js';
+import type { PackageCompartmentMapDescriptor } from './types.js';
 import type { SyncImportLocationOptions } from './types.js';
 import type { Application } from './types.js';
 import type { ReadFn } from './types.js';

package/src/import-lite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-lite.d.ts","sourceRoot":"","sources":["import-lite.js"],"names":[],"mappings":";;;;;;;AAyEG,wCACQ,aAAa,kBACb,wBAAwB,iDAEtB,OAAO,CAAC,WAAW,CAAC,CAChC;;;;;;;;AAGE,wCACQ,MAAM,GAAG,UAAU,kBACnB,wBAAwB,6CAEtB,OAAO,CAAC,WAAW,CAAC,CAChC;AA4JM,0CANI,MAAM,GAAG,UAAU,kBACnB,wBAAwB,YACxB,qBAAqB,GACnB,OAAO,CAAC,UAAU,CAAC,CAU/B;mCAxNS,YAAY;8CAAZ,YAAY;+CAAZ,YAAY;iCAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;2CAAZ,YAAY;gCAAZ,YAAY"}
+{"version":3,"file":"import-lite.d.ts","sourceRoot":"","sources":["import-lite.js"],"names":[],"mappings":";;;;;;;AAyEG,wCACQ,aAAa,kBACb,+BAA+B,iDAE7B,OAAO,CAAC,WAAW,CAAC,CAChC;;;;;;;;AAGE,wCACQ,MAAM,GAAG,UAAU,kBACnB,+BAA+B,6CAE7B,OAAO,CAAC,WAAW,CAAC,CAChC;AA+JM,0CANI,MAAM,GAAG,UAAU,kBACnB,+BAA+B,YAC/B,qBAAqB,GACnB,OAAO,CAAC,UAAU,CAAC,CAU/B;mCA3NS,YAAY;qDAAZ,YAAY;+CAAZ,YAAY;iCAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;2CAAZ,YAAY;gCAAZ,YAAY"}