@endo/compartment-mapper 1.3.1 → 1.5.0

package/src/digest.js

@@ -0,0 +1,235 @@
+/* eslint-disable no-shadow */
+/**
+ * Provides {@link digestCompartmentMap} which creates a digest of a compartment
+ * map suitable for archival or further inspection.
+ *
+ * @module
+ */
+
+/**
+ * @import {
+ *   CompartmentDescriptor,
+ *   CompartmentMapDescriptor,
+ *   DigestResult,
+ *   ModuleDescriptor,
+ *   Sources,
+ * } from './types.js'
+ */
+
+import {
+  assertCompartmentMap,
+  pathCompare,
+  stringCompare,
+} from './compartment-map.js';
+
+const { create, fromEntries, entries, keys } = Object;
+
+/**
+ * We attempt to produce compartment maps that are consistent regardless of
+ * whether the packages were originally laid out on disk for development or
+ * production, and other trivia like the fully qualified path of a specific
+ * installation.
+ *
+ * Naming compartments for the self-ascribed name and version of each Node.js
+ * package is insufficient because they are not guaranteed to be unique.
+ * Dependencies do not necessarilly come from the npm registry and may be
+ * for example derived from fully qualified URL's or Github org and project
+ * names.
+ * Package managers are also not required to fully deduplicate the hard
+ * copy of each package even when they are identical resources.
+ * Duplication is undesirable, but we elect to defer that problem to solutions
+ * in the package managers, as the alternative would be to consistently hash
+ * the original sources of the packages themselves, which may not even be
+ * available much less pristine for us.
+ *
+ * So, instead, we use the lexically least path of dependency names, delimited
+ * by hashes.
+ * The compartment maps generated by the ./node-modules.js tooling pre-compute
+ * these traces for our use here.
+ * We sort the compartments lexically on their self-ascribed name and version,
+ * and use the lexically least dependency name path as a tie-breaker.
+ * The dependency path is logical and orthogonal to the package manager's
+ * actual installation location, so should be orthogonal to the vagaries of the
+ * package manager's deduplication algorithm.
+ *
+ * @param {Record<string, CompartmentDescriptor>} compartments
+ * @returns {Record<string, string>} map from old to new compartment names.
+ */
+const renameCompartments = compartments => {
+  /** @type {Record<string, string>} */
+  const compartmentRenames = create(null);
+  let index = 0;
+  let prev = '';
+
+  // The sort below combines two comparators to avoid depending on sort
+  // stability, which became standard as recently as 2019.
+  // If that date seems quaint, please accept my regards from the distant past.
+  // We are very proud of you.
+  const compartmentsByPath = Object.entries(compartments)
+    .map(([name, compartment]) => ({
+      name,
+      path: compartment.path,
+      label: compartment.label,
+    }))
+    .sort((a, b) => {
+      if (a.label === b.label) {
+        assert(a.path !== undefined && b.path !== undefined);
+        return pathCompare(a.path, b.path);
+      }
+      return stringCompare(a.label, b.label);
+    });
+
+  for (const { name, label } of compartmentsByPath) {
+    if (label === prev) {
+      compartmentRenames[name] = `${label}-n${index}`;
+      index += 1;
+    } else {
+      compartmentRenames[name] = label;
+      prev = label;
+      index = 1;
+    }
+  }
+  return compartmentRenames;
+};
+
+/**
+ * @param {Record<string, CompartmentDescriptor>} compartments
+ * @param {Sources} sources
+ * @param {Record<string, string>} compartmentRenames
+ */
+const translateCompartmentMap = (compartments, sources, compartmentRenames) => {
+  const result = create(null);
+  for (const compartmentName of keys(compartmentRenames)) {
+    const compartment = compartments[compartmentName];
+    const { name, label, retained: compartmentRetained, policy } = compartment;
+    if (compartmentRetained) {
+      // rename module compartments
+      /** @type {Record<string, ModuleDescriptor>} */
+      const modules = create(null);
+      const compartmentModules = compartment.modules;
+      if (compartment.modules) {
+        for (const name of keys(compartmentModules).sort()) {
+          const { retained: moduleRetained, ...retainedModule } =
+            compartmentModules[name];
+          if (moduleRetained) {
+            if (retainedModule.compartment !== undefined) {
+              modules[name] = {
+                ...retainedModule,
+                compartment: compartmentRenames[retainedModule.compartment],
+              };
+            } else {
+              modules[name] = retainedModule;
+            }
+          }
+        }
+      }
+
+      // integrate sources into modules
+      const compartmentSources = sources[compartmentName];
+      if (compartmentSources) {
+        for (const name of keys(compartmentSources).sort()) {
+          const source = compartmentSources[name];
+          const { location, parser, exit, sha512, deferredError } = source;
+          if (location !== undefined) {
+            modules[name] = {
+              location,
+              parser,
+              sha512,
+            };
+          } else if (exit !== undefined) {
+            modules[name] = {
+              exit,
+            };
+          } else if (deferredError !== undefined) {
+            modules[name] = {
+              deferredError,
+            };
+          }
+        }
+      }
+
+      result[compartmentRenames[compartmentName]] = {
+        name,
+        label,
+        location: compartmentRenames[compartmentName],
+        modules,
+        policy,
+        // `scopes`, `types`, and `parsers` are not necessary since every
+        // loadable module is captured in `modules`.
+      };
+    }
+  }
+
+  return result;
+};
+
+/**
+ * @param {Sources} sources
+ * @param {Record<string, string>} compartmentRenames
+ * @returns {Sources}
+ */
+const renameSources = (sources, compartmentRenames) => {
+  return fromEntries(
+    entries(sources).map(([name, compartmentSources]) => [
+      compartmentRenames[name],
+      compartmentSources,
+    ]),
+  );
+};
+
+/**
+ * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {Sources} sources
+ * @returns {DigestResult}
+ */
+export const digestCompartmentMap = (compartmentMap, sources) => {
+  const {
+    compartments,
+    entry: { compartment: entryCompartmentName, module: entryModuleSpecifier },
+  } = compartmentMap;
+
+  const oldToNewCompartmentNames = renameCompartments(compartments);
+  const digestCompartments = translateCompartmentMap(
+    compartments,
+    sources,
+    oldToNewCompartmentNames,
+  );
+  const digestEntryCompartmentName =
+    oldToNewCompartmentNames[entryCompartmentName];
+  const digestSources = renameSources(sources, oldToNewCompartmentNames);
+
+  const digestCompartmentMap = {
+    // TODO graceful migration from tags to conditions
+    // https://github.com/endojs/endo/issues/2388
+    tags: [],
+    entry: {
+      compartment: digestEntryCompartmentName,
+      module: entryModuleSpecifier,
+    },
+    compartments: digestCompartments,
+  };
+
+  // Cross-check:
+  // We assert that we have constructed a valid compartment map, not because it
+  // might not be, but to ensure that the assertCompartmentMap function can
+  // accept all valid compartment maps.
+  assertCompartmentMap(digestCompartmentMap);
+
+  const newToOldCompartmentNames = fromEntries(
+    entries(oldToNewCompartmentNames).map(([oldName, newName]) => [
+      newName,
+      oldName,
+    ]),
+  );
+
+  /** @type {DigestResult} */
+  const digestResult = {
+    compartmentMap: digestCompartmentMap,
+    sources: digestSources,
+    oldToNewCompartmentNames,
+    newToOldCompartmentNames,
+    compartmentRenames: newToOldCompartmentNames,
+  };
+
+  return digestResult;
+};

package/src/extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["extension.js"],"names":[],"mappings":"AAYO,yCAHI,MAAM,GACJ,MAAM,CAalB"}
+{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["extension.js"],"names":[],"mappings":"AAUO,yCAHI,MAAM,GACJ,MAAM,CAalB"}

package/src/extension.js

@@ -1,6 +1,4 @@
-/* Extracts the extension from a URL pathname. */
-
-// @ts-check
+/** @module Extracts the extension from a URL pathname. */
 
 /**
  * `parseExtension` returns the file extension for the given URL, or an empty

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

@@ -0,0 +1,11 @@
+/** @satisfies {Readonly<ParserForLanguage>} */
+export const defaultParserForLanguage: Readonly<{
+    readonly 'pre-cjs-json': import("./types.js").ParserImplementation;
+    readonly 'pre-mjs-json': import("./types.js").ParserImplementation;
+    readonly cjs: import("./types.js").ParserImplementation;
+    readonly mjs: import("./types.js").ParserImplementation;
+    readonly json: import("./types.js").ParserImplementation;
+    readonly text: import("./types.js").ParserImplementation;
+    readonly bytes: import("./types.js").ParserImplementation;
+}>;
+//# sourceMappingURL=import-archive-all-parsers.d.ts.map

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

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

package/src/import-archive-all-parsers.js

@@ -0,0 +1,29 @@
+/* Provides a set of default language behaviors (parsers) suitable for
+ * evaluating archives (zip files with a `compartment-map.json` and a file for
+ * each module) with pre-compiled _or_ original ESM and CommonJS.
+ *
+ * This module does not entrain a dependency on Babel on XS, but does on other
+ * platforms like Node.js.
+ */
+/** @import {ParserForLanguage} from './types.js' */
+
+import parserPreCjs from './parse-pre-cjs.js';
+import parserJson from './parse-json.js';
+import parserText from './parse-text.js';
+import parserBytes from './parse-bytes.js';
+import parserPreMjs from './parse-pre-mjs.js';
+import parserMjs from './parse-mjs.js';
+import parserCjs from './parse-cjs.js';
+
+/** @satisfies {Readonly<ParserForLanguage>} */
+export const defaultParserForLanguage = Object.freeze(
+  /** @type {const} */ ({
+    'pre-cjs-json': parserPreCjs,
+    'pre-mjs-json': parserPreMjs,
+    cjs: parserCjs,
+    mjs: parserMjs,
+    json: parserJson,
+    text: parserText,
+    bytes: parserBytes,
+  }),
+);

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

@@ -1,23 +1,7 @@
-export function parseArchive(archiveBytes: Uint8Array, archiveLocation?: string | undefined, 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;
-    languageForExtension?: LanguageForExtension | undefined;
-} | undefined): Promise<Application>;
-export function loadArchive(readPowers: ReadFn | ReadPowers, archiveLocation: string, options?: LoadArchiveOptions | undefined): Promise<Application>;
+export function parseArchive(archiveBytes: Uint8Array, archiveLocation?: string | undefined, options?: ParseArchiveOptions | undefined): Promise<Application>;
+export function loadArchive(readPowers: ReadFn | ReadPowers, archiveLocation: string, options?: ParseArchiveOptions | undefined): Promise<Application>;
 export function importArchive(readPowers: ReadFn | ReadPowers, archiveLocation: string, options: LoadArchiveOptions): Promise<SomeObject>;
-export type CompartmentConstructor = typeof Compartment;
-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';
-import type { LanguageForExtension } from './types.js';
+import type { ParseArchiveOptions } from './types.js';
 import type { Application } from './types.js';
 import type { ReadFn } from './types.js';
 import type { ReadPowers } from './types.js';

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

@@ -1 +1 @@
-{"version":3,"file":"import-archive-lite.d.ts","sourceRoot":"","sources":["import-archive-lite.js"],"names":[],"mappings":"AA4PO,2CAdI,UAAU;;;;;;;;;;gBAYR,OAAO,CAAC,WAAW,CAAC,CAiKhC;AAQM,wCALI,MAAM,GAAG,UAAU,mBACnB,MAAM,6CAEJ,OAAO,CAAC,WAAW,CAAC,CA0BhC;AAQM,0CALI,MAAM,GAAG,UAAU,mBACnB,MAAM,WACN,kBAAkB,GAChB,OAAO,CAAC,UAAU,CAAC,CAK/B;qCA3Na,OAAO,WAAW;4BAlNN,YAAY;0CADE,YAAY;+CAHP,YAAY;kDACT,YAAY;uCAOvB,YAAY;0CAFT,YAAY;iCARrB,YAAY;4BAWjB,YAAY;gCACR,YAAY;wCAHJ,YAAY;gCAIpB,YAAY"}
+{"version":3,"file":"import-archive-lite.d.ts","sourceRoot":"","sources":["import-archive-lite.js"],"names":[],"mappings":"AAoPO,2CALI,UAAU,oFAGR,OAAO,CAAC,WAAW,CAAC,CAiKhC;AAQM,wCALI,MAAM,GAAG,UAAU,mBACnB,MAAM,8CAEJ,OAAO,CAAC,WAAW,CAAC,CAwBhC;AAQM,0CALI,MAAM,GAAG,UAAU,mBACnB,MAAM,WACN,kBAAkB,GAChB,OAAO,CAAC,UAAU,CAAC,CAK/B;yCAxZS,YAAY;iCAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;wCAAZ,YAAY;gCAAZ,YAAY"}

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,16 @@ export const parseArchive = async (
     expectedSha512 = undefined,
     computeSourceLocation = undefined,
     computeSourceMapLocation = undefined,
-    Compartment = DefaultCompartment,
+    Compartment: CompartmentParseOption = Compartment,
     modules = undefined,
     importHook: exitModuleImportHook = undefined,
     parserForLanguage: parserForLanguageOption = {},
-    languageForExtension: languageForExtensionOption = {},
+    __native__ = false,
   } = 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 +308,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 +338,18 @@ 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,
+      __native__,
     });
 
     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 +363,15 @@ export const parseArchive = async (
       modules,
       transforms,
       __shimTransforms__,
-      Compartment,
+      Compartment: CompartmentOption = CompartmentParseOption,
+      __native__,
       importHook: exitModuleImportHook,
     } = options || {};
 
     const compartmentExitModuleImportHook = exitModuleImportHookMaker({
       modules,
       exitModuleImportHook,
+      entryCompartmentName,
     });
     const makeImportHook = makeArchiveImportHookMaker(
       get,
@@ -394,18 +386,18 @@ export const parseArchive = async (
     const { compartment, pendingJobsPromise } = link(compartmentMap, {
       makeImportHook,
       parserForLanguage,
-      languageForExtension,
       globals,
       modules,
       transforms,
       __shimTransforms__,
-      Compartment,
+      Compartment: CompartmentOption,
+      __native__,
     });
 
     await pendingJobsPromise;
 
     // eslint-disable-next-line dot-notation
-    return compartment['import'](moduleSpecifier);
+    return compartment['import'](entryModuleSpecifier);
   };
 
   return { import: execute, sha512 };
@@ -429,7 +421,6 @@ export const loadArchive = async (
     modules,
     computeSourceMapLocation,
     parserForLanguage,
-    languageForExtension,
   } = options;
   const archiveBytes = await read(archiveLocation);
   return parseArchive(archiveBytes, archiveLocation, {
@@ -439,7 +430,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"}