@endo/compartment-mapper 1.3.1 → 1.4.0

package/src/import-archive-lite.js

@@ -1,4 +1,5 @@
-/* Provides functions for evaluating the modules in an archive (a zip
+/**
+ * @module Provides functions for evaluating the modules in an archive (a zip
  * file with a `compartment-map.json` and a file for each module it contains.)
  *
  * These functions do not have a bias for any particular mapping, so you will
@@ -11,26 +12,30 @@
  * `@endo/compartment-mapper/archive-parsers.js`.
  */
 
-// @ts-check
 /* eslint no-shadow: "off" */
 
-/** @import {ImportHook} from 'ses' */
-/** @import {ModuleExportsNamespace} from 'ses' */
-/** @import {StaticModuleType} from 'ses' */
-/** @import {Application} from './types.js' */
-/** @import {CompartmentDescriptor} from './types.js' */
-/** @import {ComputeSourceLocationHook} from './types.js' */
-/** @import {ComputeSourceMapLocationHook} from './types.js' */
-/** @import {ExecuteFn} from './types.js' */
-/** @import {ExitModuleImportHook} from './types.js' */
-/** @import {HashFn} from './types.js' */
-/** @import {ImportHookMaker} from './types.js' */
-/** @import {LanguageForExtension} from './types.js' */
-/** @import {LoadArchiveOptions} from './types.js' */
-/** @import {ParserForLanguage} from './types.js' */
-/** @import {ReadFn} from './types.js' */
-/** @import {ReadPowers} from './types.js' */
-/** @import {SomeObject} from './types.js' */
+/**
+ * @import {
+ *   ImportHook,
+ *   StaticModuleType,
+ * } from 'ses';
+ * @import {
+ *   Application,
+ *   CompartmentDescriptor,
+ *   ComputeSourceLocationHook,
+ *   ComputeSourceMapLocationHook,
+ *   ExecuteFn,
+ *   ExitModuleImportHook,
+ *   HashFn,
+ *   ImportHookMaker,
+ *   LoadArchiveOptions,
+ *   ParseArchiveOptions,
+ *   ParserForLanguage,
+ *   ReadFn,
+ *   ReadPowers,
+ *   SomeObject,
+ * } from './types.js'
+ */
 
 import { ZipReader } from '@endo/zip';
 import { link } from './link.js';
@@ -41,8 +46,6 @@ import { assertCompartmentMap } from './compartment-map.js';
 import { exitModuleImportHookMaker } from './import-hook.js';
 import { attenuateModuleHook, enforceModulePolicy } from './policy.js';
 
-const DefaultCompartment = Compartment;
-
 const { Fail, quote: q } = assert;
 
 const textDecoder = new TextDecoder();
@@ -119,7 +122,10 @@ const makeArchiveImportHookMaker = (
               moduleSpecifier,
             )} was not in the archive and an attempt was made to load it as a builtin`,
           });
-          const record = await exitModuleImportHook(moduleSpecifier);
+          const record = await exitModuleImportHook(
+            moduleSpecifier,
+            packageLocation,
+          );
           if (record) {
             // note it's not being marked as exit in sources
             // it could get marked and the second pass, when the archive is being executed, would have the data
@@ -230,24 +236,10 @@ const makeArchiveImportHookMaker = (
   return makeImportHook;
 };
 
-// Have to give it 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 */
-
 /**
  * @param {Uint8Array} archiveBytes
  * @param {string} [archiveLocation]
- * @param {object} [options]
- * @param {string} [options.expectedSha512]
- * @param {HashFn} [options.computeSha512]
- * @param {Record<string, unknown>} [options.modules]
- * @param {ExitModuleImportHook} [options.importHook]
- * @param {CompartmentConstructor} [options.Compartment]
- * @param {ComputeSourceLocationHook} [options.computeSourceLocation]
- * @param {ComputeSourceMapLocationHook} [options.computeSourceMapLocation]
- * @param {ParserForLanguage} [options.parserForLanguage]
- * @param {LanguageForExtension} [options.languageForExtension]
+ * @param {ParseArchiveOptions} [options]
  * @returns {Promise<Application>}
  */
 export const parseArchive = async (
@@ -261,24 +253,15 @@ export const parseArchive = async (
     expectedSha512 = undefined,
     computeSourceLocation = undefined,
     computeSourceMapLocation = undefined,
-    Compartment = DefaultCompartment,
+    Compartment: CompartmentParseOption = Compartment,
     modules = undefined,
     importHook: exitModuleImportHook = undefined,
     parserForLanguage: parserForLanguageOption = {},
-    languageForExtension: languageForExtensionOption = {},
   } = options;
 
   const parserForLanguage = freeze(
     assign(create(null), parserForLanguageOption),
   );
-  const languageForExtension = freeze(
-    assign(create(null), languageForExtensionOption),
-  );
-
-  const compartmentExitModuleImportHook = exitModuleImportHookMaker({
-    modules,
-    exitModuleImportHook,
-  });
 
   const archive = new ZipReader(archiveBytes, { name: archiveLocation });
 
@@ -324,9 +307,15 @@ export const parseArchive = async (
 
   const {
     compartments,
-    entry: { module: moduleSpecifier },
+    entry: { module: entryModuleSpecifier, compartment: entryCompartmentName },
   } = compartmentMap;
 
+  const compartmentExitModuleImportHook = exitModuleImportHookMaker({
+    modules,
+    exitModuleImportHook,
+    entryCompartmentName,
+  });
+
   // Archive integrity checks: ensure every module is pre-loaded so its hash
   // gets checked, and ensure that every file in the archive is used, and
   // therefore checked.
@@ -348,18 +337,17 @@ export const parseArchive = async (
     const { compartment, pendingJobsPromise } = link(compartmentMap, {
       makeImportHook,
       parserForLanguage,
-      languageForExtension,
       modules: Object.fromEntries(
         Object.keys(modules || {}).map(specifier => {
           return [specifier, { namespace: {} }];
         }),
       ),
-      Compartment,
+      Compartment: CompartmentParseOption,
     });
 
     await pendingJobsPromise;
 
-    await compartment.load(moduleSpecifier);
+    await compartment.load(entryModuleSpecifier);
     unseen.size === 0 ||
       Fail`Archive contains extraneous files: ${q([...unseen])} in ${q(
         archiveLocation,
@@ -373,13 +361,14 @@ export const parseArchive = async (
       modules,
       transforms,
       __shimTransforms__,
-      Compartment,
+      Compartment: CompartmentOption = CompartmentParseOption,
       importHook: exitModuleImportHook,
     } = options || {};
 
     const compartmentExitModuleImportHook = exitModuleImportHookMaker({
       modules,
       exitModuleImportHook,
+      entryCompartmentName,
     });
     const makeImportHook = makeArchiveImportHookMaker(
       get,
@@ -394,18 +383,17 @@ export const parseArchive = async (
     const { compartment, pendingJobsPromise } = link(compartmentMap, {
       makeImportHook,
       parserForLanguage,
-      languageForExtension,
       globals,
       modules,
       transforms,
       __shimTransforms__,
-      Compartment,
+      Compartment: CompartmentOption,
     });
 
     await pendingJobsPromise;
 
     // eslint-disable-next-line dot-notation
-    return compartment['import'](moduleSpecifier);
+    return compartment['import'](entryModuleSpecifier);
   };
 
   return { import: execute, sha512 };
@@ -429,7 +417,6 @@ export const loadArchive = async (
     modules,
     computeSourceMapLocation,
     parserForLanguage,
-    languageForExtension,
   } = options;
   const archiveBytes = await read(archiveLocation);
   return parseArchive(archiveBytes, archiveLocation, {
@@ -439,7 +426,6 @@ export const loadArchive = async (
     modules,
     computeSourceMapLocation,
     parserForLanguage,
-    languageForExtension,
   });
 };
 

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

@@ -1 +1 @@
-{"version":3,"file":"import-archive-parsers.d.ts","sourceRoot":"","sources":["import-archive-parsers.js"],"names":[],"mappings":"AAcA,+CAA+C;AAC/C;;;;;;GAQE"}
+{"version":3,"file":"import-archive-parsers.d.ts","sourceRoot":"","sources":["import-archive-parsers.js"],"names":[],"mappings":"AAeA,+CAA+C;AAC/C;;;;;;GAQE"}

package/src/import-archive-parsers.js

@@ -4,6 +4,7 @@
  *
  * This module does not entrain a dependency on Babel.
  */
+
 /** @import {ParserForLanguage} from './types.js' */
 
 import parserPreCjs from './parse-pre-cjs.js';

package/src/import-archive.d.ts

@@ -1,5 +1,5 @@
 export function parseArchive(archiveBytes: Uint8Array, archiveLocation?: string | undefined, options?: Options | undefined): Promise<Application>;
-export function loadArchive(readPowers: import("@endo/zip").ReadFn | ReadPowers, archiveLocation: string, options?: LoadArchiveOptions | undefined): Promise<Application>;
+export function loadArchive(readPowers: import("@endo/zip").ReadFn | ReadPowers, archiveLocation: string, options?: import("./types.js").ParseArchiveOptions | undefined): 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 = {
@@ -14,8 +14,8 @@ export type Options = {
 };
 import type { Application } from './types.js';
 import type { ReadPowers } from './types.js';
-import type { LoadArchiveOptions } from './types.js';
 import type { ExecuteOptions } from './types.js';
+import type { LoadArchiveOptions } from './types.js';
 import type { HashFn } from './types.js';
 import type { ExitModuleImportHook } from './types.js';
 import type { ComputeSourceLocationHook } from './types.js';

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

@@ -1 +1 @@
-{"version":3,"file":"import-archive.d.ts","sourceRoot":"","sources":["import-archive.js"],"names":[],"mappings":"AA0EO,2CALI,UAAU,wEAGR,OAAO,CAAC,WAAW,CAAC,CAW9B;AAQI,wCALI,OAAO,WAAW,EAAE,MAAM,GAAG,UAAU,mBACvC,MAAM,6CAEJ,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;;;;;;;;;;;iCAdD,YAAY;gCAOb,YAAY;wCADJ,YAAY;oCAHhB,YAAY;4BAEpB,YAAY;0CADE,YAAY;+CAHP,YAAY;kDACT,YAAY;uCAMvB,YAAY"}
+{"version":3,"file":"import-archive.d.ts","sourceRoot":"","sources":["import-archive.js"],"names":[],"mappings":"AA6EO,2CALI,UAAU,wEAGR,OAAO,CAAC,WAAW,CAAC,CAW9B;AAQI,wCALI,OAAO,WAAW,EAAE,MAAM,GAAG,UAAU,mBACvC,MAAM,mEAEJ,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;oCAAZ,YAAY;wCAAZ,YAAY;4BAAZ,YAAY;0CAAZ,YAAY;+CAAZ,YAAY;kDAAZ,YAAY;uCAAZ,YAAY"}

package/src/import-archive.js

@@ -1,4 +1,5 @@
-/* Provides functions for evaluating modules in an archive (a zip file
+/**
+ * @module Provides functions for evaluating modules in an archive (a zip file
  * with a `compartment-map.json` and a file for a module and each of its
  * transitive dependencies.)
  *
@@ -13,7 +14,19 @@
  * dependency on Babel.
  */
 
-// @ts-check
+/**
+ * @import {
+ *   Application,
+ *   ComputeSourceLocationHook,
+ *   ComputeSourceMapLocationHook,
+ *   ExecuteOptions,
+ *   ExitModuleImportHook,
+ *   HashFn,
+ *   LoadArchiveOptions,
+ *   ReadPowers,
+ *   ParserForLanguage,
+ * } from './types.js'
+ */
 
 import { defaultParserForLanguage } from './import-archive-parsers.js';
 import {
@@ -24,16 +37,6 @@ import {
 
 const { assign, create, freeze } = Object;
 
-/** @import {Application} from './types.js' */
-/** @import {ComputeSourceLocationHook} from './types.js' */
-/** @import {ComputeSourceMapLocationHook} from './types.js' */
-/** @import {ExecuteOptions} from './types.js' */
-/** @import {ExitModuleImportHook} from './types.js' */
-/** @import {HashFn} from './types.js' */
-/** @import {LoadArchiveOptions} from './types.js' */
-/** @import {ReadPowers} from './types.js' */
-/** @import {ParserForLanguage} from './types.js' */
-
 // 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.

package/src/import-hook.d.ts

@@ -7,9 +7,10 @@
  * @returns {ImportNowHookMaker}
  */
 export function makeImportNowHookMaker(readPowers: ReadNowPowers, baseLocation: string, { sources, compartmentDescriptors, computeSha512, searchSuffixes, sourceMapHook, exitModuleImportNowHook, }: MakeImportNowHookMakerOptions): ImportNowHookMaker;
-export function exitModuleImportHookMaker({ modules, exitModuleImportHook, }: {
+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, exitModuleImportHook, }: {
     sources?: Sources | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"import-hook.d.ts","sourceRoot":"","sources":["import-hook.js"],"names":[],"mappings":"AAilBA;;;;;;;GAOG;AACH,mDALW,aAAa,gBACb,MAAM,+GACN,6BAA6B,GAC3B,kBAAkB,CAsJ9B;AAnjBM,8EAJJ;IAAqC,OAAO,GAApC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAAC;IACU,oBAAoB;CAC1D,GAAU,oBAAoB,GAAC,SAAS,CA0B1C;AA0MM,gDApBI,MAAM,GAAC,UAAU,gBACjB,MAAM,qKAEd;IAA0B,OAAO;IACuB,sBAAsB;IACpD,WAAW;IACZ,aAAa;IACN,cAAc;IAOtB,oBAAoB,EAApC,MAAM;IACU,oBAAoB,EAApC,MAAM;IACyB,oBAAoB;IAC3B,aAAa;CAC7C,GAAU,eAAe,CAqL3B;mCA7iBS,YAAY;mDAAZ,YAAY;wCAAZ,YAAY;0CAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;6BAAZ,YAAY;2CAAZ,YAAY;4BAAZ,YAAY;mCAAZ,YAAY;qCAAZ,YAAY"}
+{"version":3,"file":"import-hook.d.ts","sourceRoot":"","sources":["import-hook.js"],"names":[],"mappings":"AA2lBA;;;;;;;GAOG;AACH,mDALW,aAAa,gBACb,MAAM,+GACN,6BAA6B,GAC3B,kBAAkB,CAuJ9B;AA5jBM,oGALJ;IAAqC,OAAO;IACN,oBAAoB;IACnC,oBAAoB,EAAnC,MAAM;CACd,GAAU,oBAAoB,GAAC,SAAS,CA8B1C;AA4MM,gDApBI,MAAM,GAAC,UAAU,gBACjB,MAAM,qKAEd;IAA0B,OAAO;IACuB,sBAAsB;IACpD,WAAW;IACZ,aAAa;IACN,cAAc;IAOtB,oBAAoB,EAApC,MAAM;IACU,oBAAoB,EAApC,MAAM;IACyB,oBAAoB;IAC3B,aAAa;CAC7C,GAAU,eAAe,CAuL3B;mCAtjBS,YAAY;mDAAZ,YAAY;wCAAZ,YAAY;0CAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;6BAAZ,YAAY;2CAAZ,YAAY;4BAAZ,YAAY;mCAAZ,YAAY;qCAAZ,YAAY"}

package/src/import-hook.js

@@ -1,12 +1,13 @@
-/* Provides the implementation of each compartment's `importHook` when using
- * `import.js`, `import-lite.js`, `archive.js`, or `archive-lite.js`.
- * However, `import-archive.js` and `import-archive-lite.js` use their own variant.
+/**
+ * @module Provides the implementation of each compartment's `importHook` when
+ * using `import.js`, `import-lite.js`, `archive.js`, or `archive-lite.js`.
+ * However, `import-archive.js` and `import-archive-lite.js` use their own
+ * variant.
  *
  * For building archives, these import hooks create a table of all the modules
  * in a "working set" of transitive dependencies.
  */
 
-// @ts-check
 /**
  * @import {
  *   ImportHook,
@@ -17,7 +18,7 @@
  * @import {
  *   CompartmentDescriptor,
  *   ChooseModuleDescriptorOperators,
- *   ChooseModuleDescriptorOptions,
+ *   ChooseModuleDescriptorParams,
  *   ChooseModuleDescriptorYieldables,
  *   ExitModuleImportHook,
  *   FindRedirectParams,
@@ -180,13 +181,15 @@ const findRedirect = ({
 
 /**
  * @param {object} params
- * @param {Record<string, any>=} params.modules
+ * @param {Record<string, any>} [params.modules]
  * @param {ExitModuleImportHook} [params.exitModuleImportHook]
+ * @param {string} params.entryCompartmentName
  * @returns {ExitModuleImportHook|undefined}
  */
 export const exitModuleImportHookMaker = ({
   modules = undefined,
   exitModuleImportHook = undefined,
+  entryCompartmentName,
 }) => {
   if (!modules && !exitModuleImportHook) {
     return undefined;
@@ -204,7 +207,10 @@ export const exitModuleImportHookMaker = ({
       });
     }
     if (exitModuleImportHook) {
-      return exitModuleImportHook(specifier);
+      // The entryCompartmentName is a file URL when constructing an archive or
+      // importing from a file system, but is merely a zip archive root
+      // directory name when importing from an archive.
+      return exitModuleImportHook(specifier, entryCompartmentName);
     }
     return undefined;
   };
@@ -243,7 +249,7 @@ const nominateCandidates = (moduleSpecifier, searchSuffixes) => {
  *
  * @template {ChooseModuleDescriptorOperators} Operators Type of operators (sync
  * or async)
- * @param {ChooseModuleDescriptorOptions} options Options/context
+ * @param {ChooseModuleDescriptorParams} options Options/context
  * @param {Operators} operators Operators
  * @returns {Generator<ChooseModuleDescriptorYieldables,
  * StaticModuleType|undefined, Awaited<ChooseModuleDescriptorYieldables>>}
@@ -269,6 +275,7 @@ function* chooseModuleDescriptor(
   for (const candidateSpecifier of candidates) {
     const candidateModuleDescriptor = moduleDescriptors[candidateSpecifier];
     if (candidateModuleDescriptor !== undefined) {
+      candidateModuleDescriptor.retained = true;
       const { compartment: candidateCompartmentName = packageLocation } =
         candidateModuleDescriptor;
       const candidateCompartment = compartments[candidateCompartmentName];
@@ -339,6 +346,7 @@ function* chooseModuleDescriptor(
       // module specifier than the requested one.
       if (candidateSpecifier !== moduleSpecifier) {
         moduleDescriptors[moduleSpecifier] = {
+          retained: true,
           module: candidateSpecifier,
           compartment: packageLocation,
         };
@@ -502,89 +510,91 @@ export const makeImportHookMaker = (
       // for lint rule
       await null;
 
-      // per-module:
-
-      // In Node.js, an absolute specifier always indicates a built-in or
-      // third-party dependency.
-      // The `moduleMapHook` captures all third-party dependencies, unless
-      // we allow importing any exit.
-      if (moduleSpecifier !== '.' && !moduleSpecifier.startsWith('./')) {
-        if (exitModuleImportHook) {
-          const record = await exitModuleImportHook(moduleSpecifier);
-          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, {
-              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 (archiveOnly) {
-              // Return a place-holder.
-              // Archived compartments are not executed.
-              return freeze({ imports: [], exports: [], execute() {} });
-            }
-            // note it's not being marked as exit in sources
-            // it could get marked and the second pass, when the archive is being executed, would have the data
-            // to enforce which exits can be dynamically imported
-            const attenuatedRecord = await attenuateModuleHook(
+      // All importHook errors must be deferred if coming from loading dependencies
+      // identified by a parser that discovers imports heuristically.
+      try {
+        // per-module:
+
+        // In Node.js, an absolute specifier always indicates a built-in or
+        // third-party dependency.
+        // The `moduleMapHook` captures all third-party dependencies, unless
+        // we allow importing any exit.
+        if (moduleSpecifier !== '.' && !moduleSpecifier.startsWith('./')) {
+          if (exitModuleImportHook) {
+            const record = await exitModuleImportHook(
               moduleSpecifier,
-              record,
-              compartmentDescriptor.policy,
-              attenuators,
+              packageLocation,
             );
-            return attenuatedRecord;
+            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, {
+                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 (archiveOnly) {
+                // Return a place-holder.
+                // Archived compartments are not executed.
+                return freeze({ imports: [], exports: [], execute() {} });
+              }
+              // note it's not being marked as exit in sources
+              // it could get marked and the second pass, when the archive is being executed, would have the data
+              // to enforce which exits can be dynamically imported
+              const attenuatedRecord = await attenuateModuleHook(
+                moduleSpecifier,
+                record,
+                compartmentDescriptor.policy,
+                attenuators,
+              );
+              return attenuatedRecord;
+            }
           }
-        }
-        return deferError(
-          moduleSpecifier,
-          Error(
+          throw Error(
             `Cannot find external module ${q(
               moduleSpecifier,
             )} in package ${packageLocation}`,
-          ),
-        );
-      }
+          );
+        }
 
-      const { maybeRead } = unpackReadPowers(readPowers);
+        const { maybeRead } = unpackReadPowers(readPowers);
 
-      const candidates = nominateCandidates(moduleSpecifier, searchSuffixes);
+        const candidates = nominateCandidates(moduleSpecifier, searchSuffixes);
 
-      const record = await asyncTrampoline(
-        chooseModuleDescriptor,
-        {
-          candidates,
-          compartmentDescriptor,
-          compartmentDescriptors,
-          compartments,
-          computeSha512,
-          moduleDescriptors,
-          moduleSpecifier,
-          packageLocation,
-          packageSources,
-          readPowers,
-          sourceMapHook,
-          strictlyRequiredForCompartment,
-        },
-        { maybeRead, parse, shouldDeferError },
-      );
+        const record = await asyncTrampoline(
+          chooseModuleDescriptor,
+          {
+            candidates,
+            compartmentDescriptor,
+            compartmentDescriptors,
+            compartments,
+            computeSha512,
+            moduleDescriptors,
+            moduleSpecifier,
+            packageLocation,
+            packageSources,
+            readPowers,
+            sourceMapHook,
+            strictlyRequiredForCompartment,
+          },
+          { maybeRead, parse, shouldDeferError },
+        );
 
-      if (record) {
-        return record;
-      }
+        if (record) {
+          return record;
+        }
 
-      return deferError(
-        moduleSpecifier,
-        // TODO offer breadcrumbs in the error message, or how to construct breadcrumbs with another tool.
-        Error(
+        throw Error(
           `Cannot find file for internal module ${q(
             moduleSpecifier,
           )} (with candidates ${candidates
             .map(x => q(x))
             .join(', ')}) in package ${packageLocation}`,
-        ),
-      );
+        );
+      } catch (error) {
+        return deferError(moduleSpecifier, error);
+      }
     };
     return importHook;
   };
@@ -724,7 +734,8 @@ export function makeImportNowHookMaker(
       }
 
       if (exitModuleImportNowHook) {
-        // this hook is responsible for ensuring that the moduleSpecifier actually refers to an exit module
+        // This hook is responsible for ensuring that the moduleSpecifier
+        // actually refers to an exit module.
         const exitRecord = exitModuleImportNowHook(
           moduleSpecifier,
           packageLocation,

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

@@ -1 +1 @@
-{"version":3,"file":"import-lite.d.ts","sourceRoot":"","sources":["import-lite.js"],"names":[],"mappings":";;;;;;;AAmEG,wCACQ,aAAa,kBACb,wBAAwB,iDAEtB,OAAO,CAAC,WAAW,CAAC,CAChC;;;;;;;;AAGE,wCACQ,MAAM,GAAG,UAAU,kBACnB,wBAAwB,6CAEtB,OAAO,CAAC,WAAW,CAAC,CAChC;AA2JM,0CANI,MAAM,GAAG,UAAU,kBACnB,wBAAwB,gDAEtB,OAAO,CAAC,UAAU,CAAC,CAU/B;mCA5NgC,YAAY;8CAJD,YAAY;+CACX,YAAY;iCAI1B,YAAY;4BAGjB,YAAY;gCACR,YAAY;2CAHD,YAAY;gCAIvB,YAAY"}
+{"version":3,"file":"import-lite.d.ts","sourceRoot":"","sources":["import-lite.js"],"names":[],"mappings":";;;;;;;AAuEG,wCACQ,aAAa,kBACb,wBAAwB,iDAEtB,OAAO,CAAC,WAAW,CAAC,CAChC;;;;;;;;AAGE,wCACQ,MAAM,GAAG,UAAU,kBACnB,wBAAwB,6CAEtB,OAAO,CAAC,WAAW,CAAC,CAChC;AAuJM,0CANI,MAAM,GAAG,UAAU,kBACnB,wBAAwB,gDAEtB,OAAO,CAAC,UAAU,CAAC,CAU/B;mCAnNS,YAAY;8CAAZ,YAAY;+CAAZ,YAAY;iCAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;2CAAZ,YAAY;gCAAZ,YAAY"}