@endo/compartment-mapper 1.3.1 → 1.5.0

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;AA0JM,0CANI,MAAM,GAAG,UAAU,kBACnB,wBAAwB,gDAEtB,OAAO,CAAC,UAAU,CAAC,CAU/B;mCAtNS,YAAY;8CAAZ,YAAY;+CAAZ,YAAY;iCAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;2CAAZ,YAAY;gCAAZ,YAAY"}

package/src/import-lite.js

@@ -1,5 +1,6 @@
-/* Provides functions for evaluating a module and its transitive dependencies
- * given a partially completed compartment map.
+/**
+ * @module Provides functions for evaluating a module and its transitive
+ * dependencies given a partially completed compartment map.
  * The compartment map needs to describe every reachable compartment, where to
  * find modules in that compartment, and how to link modules between
  * compartments, but does not need to capture a module descriptor for every
@@ -14,19 +15,22 @@
  * `@endo/compartment-mapper/import-parsers.js` or similar.
  */
 
-// @ts-check
 /* eslint no-shadow: "off" */
-/** @import {CompartmentMapDescriptor} from './types.js' */
-/** @import {SyncImportLocationOptions} from './types.js' */
-/** @import {ImportNowHookMaker} from './types.js' */
-/** @import {ModuleTransforms} from './types.js' */
-/** @import {ReadNowPowers} from './types.js' */
-/** @import {Application} from './types.js' */
-/** @import {ImportLocationOptions} from './types.js' */
-/** @import {ExecuteFn} from './types.js' */
-/** @import {ReadFn} from './types.js' */
-/** @import {ReadPowers} from './types.js' */
-/** @import {SomeObject} from './types.js' */
+
+/**
+ * @import {
+ *   CompartmentMapDescriptor,
+ *   SyncImportLocationOptions,
+ *   ImportNowHookMaker,
+ *   ReadNowPowers,
+ *   Application,
+ *   ImportLocationOptions,
+ *   ExecuteFn,
+ *   ReadFn,
+ *   ReadPowers,
+ *   SomeObject,
+ * } from './types.js'
+ */
 
 import { link } from './link.js';
 import {
@@ -91,15 +95,12 @@ export const loadFromMap = async (readPowers, compartmentMap, options = {}) => {
   const {
     searchSuffixes = undefined,
     parserForLanguage: parserForLanguageOption = {},
-    languageForExtension: languageForExtensionOption = {},
+    Compartment: LoadCompartmentOption = Compartment,
   } = options;
 
   const parserForLanguage = freeze(
     assign(create(null), parserForLanguageOption),
   );
-  const languageForExtension = freeze(
-    assign(create(null), languageForExtensionOption),
-  );
 
   /**
    * Object containing options and read powers that fulfills all requirements
@@ -150,12 +151,14 @@ export const loadFromMap = async (readPowers, compartmentMap, options = {}) => {
       modules,
       transforms,
       __shimTransforms__,
-      Compartment,
+      Compartment: CompartmentOption = LoadCompartmentOption,
+      __native__,
       importHook: exitModuleImportHook,
     } = options;
     const compartmentExitModuleImportHook = exitModuleImportHookMaker({
       modules,
       exitModuleImportHook,
+      entryCompartmentName,
     });
     const makeImportHook = makeImportHookMaker(
       readPowers,
@@ -194,12 +197,12 @@ export const loadFromMap = async (readPowers, compartmentMap, options = {}) => {
         makeImportHook,
         makeImportNowHook,
         parserForLanguage,
-        languageForExtension,
         globals,
         transforms,
         syncModuleTransforms,
         __shimTransforms__,
-        Compartment,
+        Compartment: CompartmentOption,
+        __native__,
       }));
     } else {
       // sync module transforms are allowed, because they are "compatible"
@@ -208,13 +211,13 @@ export const loadFromMap = async (readPowers, compartmentMap, options = {}) => {
       ({ compartment, pendingJobsPromise } = link(compartmentMap, {
         makeImportHook,
         parserForLanguage,
-        languageForExtension,
         globals,
         transforms,
         moduleTransforms,
         syncModuleTransforms,
         __shimTransforms__,
-        Compartment,
+        Compartment: CompartmentOption,
+        __native__,
       }));
     }
 

package/src/import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["import.js"],"names":[],"mappings":";;;;;;;AA6CG,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;;;;;;;;;;;AAiCE,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;mCAlFgC,YAAY;wCAJP,YAAY;iCAFnB,YAAY;4BAQjB,YAAY;gCACR,YAAY;yCANH,YAAY;+CACN,YAAY;gCAC3B,YAAY;2CAJD,YAAY"}
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["import.js"],"names":[],"mappings":";;;;;;;AAiDG,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"}

package/src/import.js

@@ -1,6 +1,7 @@
-/* Provides functions for evaluating a module and its transitive
- * dependencies given the URL of the entry module and assuming packages
- * laid out according to the `node_modules` conventions.
+/**
+ * @module Provides functions for evaluating a module and its transitive
+ * dependencies given the URL of the entry module and assuming packages laid
+ * out according to the `node_modules` conventions.
  *
  * To import modules according to any other convention, use `import-lite.js`
  * and provide a compartment map with a custom analog to `mapNodeModules` from
@@ -10,7 +11,20 @@
  * for most cases.
  */
 
-// @ts-check
+/**
+ * @import {
+ *   Application,
+ *   SyncImportLocationOptions,
+ *   ImportLocationOptions,
+ *   SyncArchiveOptions,
+ *   LoadLocationOptions,
+ *   SomeObject,
+ *   ReadNowPowers,
+ *   ArchiveOptions,
+ *   ReadFn,
+ *   ReadPowers,
+ * } from './types.js'
+ */
 
 import { defaultParserForLanguage } from './import-parsers.js';
 import { mapNodeModules } from './node-modules.js';
@@ -18,17 +32,6 @@ import { loadFromMap } from './import-lite.js';
 
 const { assign, create, freeze } = Object;
 
-/** @import {Application} from './types.js' */
-/** @import {ImportLocationOptions} from './types.js' */
-/** @import {SyncArchiveOptions} from './types.js' */
-/** @import {LoadLocationOptions} from './types.js' */
-/** @import {SyncImportLocationOptions} from './types.js' */
-/** @import {SomeObject} from './types.js' */
-/** @import {ReadNowPowers} from './types.js' */
-/** @import {ArchiveOptions} from './types.js' */
-/** @import {ReadFn} from './types.js' */
-/** @import {ReadPowers} from './types.js' */
-
 /**
  * Add the default parserForLanguage option.
  * @param {ArchiveOptions} [options]
@@ -39,7 +42,8 @@ const assignParserForLanguage = (options = {}) => {
   const parserForLanguage = freeze(
     assign(create(null), defaultParserForLanguage, parserForLanguageOption),
   );
-  return { ...rest, parserForLanguage };
+  const languages = Object.keys(parserForLanguage);
+  return { ...rest, parserForLanguage, languages };
 };
 
 /**
@@ -69,21 +73,43 @@ export const loadLocation = async (
   moduleLocation,
   options = {},
 ) => {
-  const { dev, tags, commonDependencies, policy } = options;
+  const {
+    dev,
+    tags,
+    strict,
+    commonDependencies,
+    policy,
+    parserForLanguage,
+    languages,
+    languageForExtension,
+    commonjsLanguageForExtension,
+    moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
+    ...otherOptions
+  } = assignParserForLanguage(options);
   // conditions are not present in SyncArchiveOptions
   const conditions =
     'conditions' in options ? options.conditions || tags : tags;
   const compartmentMap = await mapNodeModules(readPowers, moduleLocation, {
     dev,
+    strict,
     conditions,
     commonDependencies,
     policy,
+    languageForExtension,
+    commonjsLanguageForExtension,
+    moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
+    languages,
+  });
+  return loadFromMap(readPowers, compartmentMap, {
+    parserForLanguage,
+    ...otherOptions,
   });
-  return loadFromMap(
-    readPowers,
-    compartmentMap,
-    assignParserForLanguage(options),
-  );
 };
 
 /**
@@ -111,7 +137,7 @@ export const loadLocation = async (
 /**
  * @param {ReadPowers|ReadFn|ReadNowPowers} readPowers
  * @param {string} moduleLocation
- * @param {ImportLocationOptions} [options]
+ * @param {ImportLocationOptions|SyncImportLocationOptions} [options]
  * @returns {Promise<SomeObject>} the object of the imported modules exported
  * names.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"infer-exports.d.ts","sourceRoot":"","sources":["infer-exports.js"],"names":[],"mappings":"AAsHO,+DATJ;IAAkC,IAAI,EAA9B,MAAM;IACqB,MAAM;IACN,OAAO,GAAlC,MAAM;CACd,cAAQ,GAAG,CAAC,MAAM,CAAC,SAEX,oBAAoB,kCA2B9B;AAkBM,yCAPI,MAAM,cACN,GAAG,CAAC,MAAM,CAAC,SAEX,oBAAoB,GAElB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAG8B;AAE1D,uIA2CN;0CApMuC,YAAY"}
+{"version":3,"file":"infer-exports.d.ts","sourceRoot":"","sources":["infer-exports.js"],"names":[],"mappings":"AAqHO,+DATJ;IAAkC,IAAI,EAA9B,MAAM;IACqB,MAAM;IACN,OAAO,GAAlC,MAAM;CACd,cAAQ,GAAG,CAAC,MAAM,CAAC,SAEX,oBAAoB,kCA2B9B;AAkBM,yCAPI,MAAM,cACN,GAAG,CAAC,MAAM,CAAC,SAEX,oBAAoB,GAElB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAG8B;AAE1D,uIA2CN;0CApMuC,YAAY"}

package/src/infer-exports.js

@@ -1,12 +1,11 @@
-/* Provides functions needed by `node-modules.js` for building
+/**
+ * @module Provides functions needed by `node-modules.js` for building
  * inter-compartment linkage according to the specifications in a
  * `package.json` as laid out in the `node_modules` convention.
  * These functions implement the behavior for a package's `"main"`,
  * `"browser"`, `"imports"`, and `"exports"` properties in a `package.json`.
  */
 
-// @ts-check
-
 /** @import {LanguageForExtension} from './types.js' */
 
 import { join, relativize } from './node-module-specifier.js';

package/src/json.d.ts.map

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

package/src/json.js

@@ -1,5 +1,4 @@
-/* Annotates JSON parse exceptions with the location of the source. */
-// @ts-check
+/** @module Annotates JSON parse exceptions with the location of the source. */
 
 /**
  * Parses JSON and, if necessary, throws exceptions that include the location

package/src/link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["link.js"],"names":[],"mappings":"AAqPO,sEAJI,wBAAwB,WACxB,WAAW,GACT,UAAU,CA0LtB;AAOM,yCAJI,wBAAwB,WACxB,WAAW,eAIqB;8CA5ZjC,YAAY;iCAAZ,YAAY;gCAAZ,YAAY"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["link.js"],"names":[],"mappings":"AAsPO,sEAJI,wBAAwB,WACxB,WAAW,GACT,UAAU,CA0KtB;AAOM,yCAJI,wBAAwB,WACxB,WAAW,eAIqB;8CA9YjC,YAAY;iCAAZ,YAAY;gCAAZ,YAAY"}

package/src/link.js

@@ -1,4 +1,6 @@
-/* Provides the linking behavior shared by all Compartment Mapper workflows.
+/**
+ * @module Provides the linking behavior shared by all Compartment Mapper
+ * workflows.
  * This involves creating and configuring compartments according to the
  * specifications in a compartment map, and is suitable for compartment maps
  * that just outline the locations of compartments and their inter-linkage and
@@ -6,26 +8,22 @@
  * dependencies of their entry module.
  */
 
-// @ts-check
-
-/** @import {ModuleMapHook} from 'ses' */
 /**
+ * @import {ModuleMapHook} from 'ses'
  * @import {
  *   CompartmentDescriptor,
  *   CompartmentMapDescriptor,
  *   ImportNowHookMaker,
- *   LanguageForExtension,
  *   LinkOptions,
  *   LinkResult,
  *   ModuleDescriptor,
  *   ParseFn,
- *   ParseFnAsync,
+ *   AsyncParseFn,
  *   ParserForLanguage,
  *   ParserImplementation,
  *   ShouldDeferError,
  * } from './types.js'
  */
-/** @import {ERef} from '@endo/eventual-send' */
 
 import { makeMapParsers } from './map-parser.js';
 import { resolve as resolveFallback } from './node-module-specifier.js';
@@ -43,7 +41,7 @@ const { allSettled } = Promise;
 
 /**
  * @template T
- * @type {(iterable: Iterable<ERef<T>>) => Promise<Array<PromiseSettledResult<T>>>}
+ * @type {(iterable: Iterable<Promise<T>>) => Promise<Array<PromiseSettledResult<T>>>}
  */
 const promiseAllSettled = allSettled.bind(Promise);
 
@@ -112,6 +110,8 @@ const makeModuleMapHook = (
 
     const moduleDescriptor = moduleDescriptors[moduleSpecifier];
     if (moduleDescriptor !== undefined) {
+      moduleDescriptor.retained = true;
+
       // "foreignCompartmentName" refers to the compartment which
       // may differ from the current compartment
       const {
@@ -193,6 +193,7 @@ const makeModuleMapHook = (
         // a moduleMapHook when we assemble compartments from the resulting
         // archive.
         moduleDescriptors[moduleSpecifier] = {
+          retained: true,
           compartment: foreignCompartmentName,
           module: foreignModuleSpecifier,
         };
@@ -252,12 +253,12 @@ export const link = (
     makeImportHook,
     makeImportNowHook = impossibleImportNowHookMaker,
     parserForLanguage: parserForLanguageOption = {},
-    languageForExtension: languageForExtensionOption = {},
     globals = {},
     transforms = [],
     moduleTransforms,
     syncModuleTransforms,
     __shimTransforms__ = [],
+    __native__ = false,
     archiveOnly = false,
     Compartment = defaultCompartment,
   } = options;
@@ -277,10 +278,6 @@ export const link = (
 
   const pendingJobs = [];
 
-  /** @type {LanguageForExtension} */
-  const defaultLanguageForExtension = freeze(
-    assign(create(null), languageForExtensionOption),
-  );
   /** @type {ParserForLanguage} */
   const parserForLanguage = freeze(
     assign(create(null), parserForLanguageOption),
@@ -298,8 +295,8 @@ export const link = (
     const {
       location,
       name,
-      parsers: languageForExtensionOverrides = {},
-      types: languageForModuleSpecifierOverrides = {},
+      parsers: languageForExtension = {},
+      types: languageForModuleSpecifier = {},
     } = compartmentDescriptor;
 
     // this is for retaining the correct type inference about these values
@@ -312,22 +309,9 @@ export const link = (
     // The `moduleMapHook` writes back to the compartment map.
     compartmentDescriptor.modules = modules;
 
-    /** @type {Record<string, string>} */
-    const languageForModuleSpecifier = freeze(
-      assign(create(null), languageForModuleSpecifierOverrides),
-    );
-    /** @type {LanguageForExtension} */
-    const languageForExtension = freeze(
-      assign(
-        create(null),
-        defaultLanguageForExtension,
-        languageForExtensionOverrides,
-      ),
-    );
-
     // TS is kind of dumb about this, so we can use a type assertion to avoid a
     // pointless ternary.
-    const parse = /** @type {ParseFn|ParseFnAsync} */ (
+    const parse = /** @type {ParseFn|AsyncParseFn} */ (
       mapParsers(languageForExtension, languageForModuleSpecifier)
     );
 
@@ -379,6 +363,7 @@ export const link = (
       transforms,
       __shimTransforms__,
       __options__: true,
+      __native__,
     });
 
     if (!archiveOnly) {

package/src/map-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-parser.d.ts","sourceRoot":"","sources":["map-parser.js"],"names":[],"mappings":"AAqSO,+FAHI,qBAAqB,GACnB,YAAY,CA+CxB;2CAxTS,YAAY;kCAAZ,YAAY"}
+{"version":3,"file":"map-parser.d.ts","sourceRoot":"","sources":["map-parser.js"],"names":[],"mappings":"AA6SO,+FAHI,qBAAqB,GACnB,YAAY,CA+CxB;2CAvUS,YAAY;kCAAZ,YAAY"}