@endo/compartment-mapper 1.6.3 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@endo/compartment-mapper",
-  "version": "1.6.3",
+  "version": "2.1.0",
   "description": "The compartment mapper assembles Node applications in a sandbox",
   "keywords": [
     "node",
@@ -49,35 +49,41 @@
   },
   "scripts": {
     "build": "exit 0",
-    "prepack": "tsc --build tsconfig.build.json",
-    "postpack": "git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\"",
-    "cover": "c8 ava",
+    "prepack": "git clean -fX -e node_modules/ && tsc --build tsconfig.build.json",
+    "postpack": "git clean -fX -e node_modules/",
+    "cover": "c8 ava --config test/_ava-ses.config.js",
     "lint": "yarn lint:types && yarn lint:eslint",
     "lint-fix": "eslint --fix .",
     "lint:eslint": "eslint .",
     "lint:types": "tsc",
     "prettier-fixtures": "prettier --write --with-node-modules './test/fixtures-*/**/*.*js'",
-    "test": "ava"
+    "test": "ses-ava"
   },
   "dependencies": {
     "@endo/cjs-module-analyzer": "^1.0.11",
-    "@endo/module-source": "^1.3.3",
+    "@endo/module-source": "^1.4.1",
     "@endo/path-compare": "^1.1.0",
     "@endo/trampoline": "^1.0.5",
-    "@endo/zip": "^1.0.11",
-    "ses": "^1.14.0"
+    "@endo/zip": "^1.1.0",
+    "ses": "^2.0.0"
   },
   "devDependencies": {
-    "ava": "^6.1.3",
+    "@endo/env-options": "^1.1.11",
+    "@endo/evasive-transform": "^2.1.0",
+    "@endo/eventual-send": "^1.5.0",
+    "@endo/init": "^1.1.13",
+    "@endo/ses-ava": "^1.4.1",
+    "ava": "catalog:dev",
     "babel-eslint": "^10.1.0",
-    "c8": "^7.14.0",
-    "eslint": "^8.57.1",
+    "c8": "catalog:dev",
+    "eslint": "catalog:dev",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.31.0",
     "prettier": "^3.5.3",
-    "typescript": "~5.8.3"
+    "ses": "workspace:^",
+    "typescript": "catalog:dev"
   },
   "files": [
     "./*.d.ts",
@@ -112,12 +118,16 @@
   },
   "ava": {
     "files": [
-      "test/**/*.test.*"
+      "test/**/*.test.*",
+      "!test/**/*.node-condition.test.*"
     ],
     "timeout": "2m"
   },
+  "sesAvaConfigs": {
+    "node-condition": "test/_ava-node-condition.config.js"
+  },
   "typeCoverage": {
     "atLeast": 86.14
   },
-  "gitHead": "9815aea9541f241389d2135c6097a7442bdffa17"
+  "gitHead": "e74ed050e9d1122d692b00ee14971299c6afbf30"
 }

package/src/archive-lite.d.ts

@@ -1,13 +1,13 @@
-export function makeArchiveCompartmentMap(compartmentMap: CompartmentMapDescriptor, sources: Sources): ArchiveResult;
-export function makeAndHashArchiveFromMap(powers: ReadFn | ReadPowers, compartmentMap: CompartmentMapDescriptor, options?: ArchiveLiteOptions): Promise<{
+export function makeArchiveCompartmentMap(compartmentMap: PackageCompartmentMapDescriptor, sources: Sources): ArchiveResult;
+export function makeAndHashArchiveFromMap(powers: ReadFn | ReadPowers, compartmentMap: PackageCompartmentMapDescriptor, options?: ArchiveLiteOptions): Promise<{
     bytes: Uint8Array;
     sha512?: string;
 }>;
-export function makeArchiveFromMap(powers: ReadFn | ReadPowers, compartmentMap: CompartmentMapDescriptor, options?: ArchiveLiteOptions): Promise<Uint8Array>;
-export function mapFromMap(powers: ReadFn | ReadPowers, compartmentMap: CompartmentMapDescriptor, options?: ArchiveLiteOptions): Promise<Uint8Array>;
-export function hashFromMap(powers: HashPowers, compartmentMap: CompartmentMapDescriptor, options?: ArchiveLiteOptions): Promise<string>;
-export function writeArchiveFromMap(write: WriteFn, readPowers: ReadFn | ReadPowers, archiveLocation: string, compartmentMap: CompartmentMapDescriptor, options?: ArchiveLiteOptions): Promise<void>;
-import type { CompartmentMapDescriptor } from './types.js';
+export function makeArchiveFromMap(powers: ReadFn | ReadPowers, compartmentMap: PackageCompartmentMapDescriptor, options?: ArchiveLiteOptions): Promise<Uint8Array>;
+export function mapFromMap(powers: ReadFn | ReadPowers, compartmentMap: PackageCompartmentMapDescriptor, options?: ArchiveLiteOptions): Promise<Uint8Array>;
+export function hashFromMap(powers: HashPowers, compartmentMap: PackageCompartmentMapDescriptor, options?: ArchiveLiteOptions): Promise<string>;
+export function writeArchiveFromMap(write: WriteFn, readPowers: ReadFn | ReadPowers, archiveLocation: string, compartmentMap: PackageCompartmentMapDescriptor, options?: ArchiveLiteOptions): Promise<void>;
+import type { PackageCompartmentMapDescriptor } from './types.js';
 import type { Sources } from './types.js';
 import type { ArchiveResult } from './types.js';
 import type { ReadFn } from './types.js';

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

@@ -1 +1 @@
-{"version":3,"file":"archive-lite.d.ts","sourceRoot":"","sources":["archive-lite.js"],"names":[],"mappings":"AAmHO,0DAJI,wBAAwB,WACxB,OAAO,GACL,aAAa,CAiBzB;AAyGM,kDALI,MAAM,GAAG,UAAU,kBACnB,wBAAwB,YACxB,kBAAkB,GAChB,OAAO,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC,CAmBzD;AAQM,2CALI,MAAM,GAAG,UAAU,kBACnB,wBAAwB,YACxB,kBAAkB,GAChB,OAAO,CAAC,UAAU,CAAC,CAS/B;AAQM,mCALI,MAAM,GAAG,UAAU,kBACnB,wBAAwB,YACxB,kBAAkB,GAChB,OAAO,CAAC,UAAU,CAAC,CAS/B;AAQM,oCALI,UAAU,kBACV,wBAAwB,YACxB,kBAAkB,GAChB,OAAO,CAAC,MAAM,CAAC,CAU3B;AASM,2CANI,OAAO,cACP,MAAM,GAAG,UAAU,mBACnB,MAAM,kBACN,wBAAwB,YACxB,kBAAkB,iBAe5B;8CApRS,YAAY;6BAAZ,YAAY;mCAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;wCAAZ,YAAY;gCAAZ,YAAY;6BAAZ,YAAY"}
+{"version":3,"file":"archive-lite.d.ts","sourceRoot":"","sources":["archive-lite.js"],"names":[],"mappings":"AA+GO,0DAJI,+BAA+B,WAC/B,OAAO,GACL,aAAa,CAoEzB;AA6GM,kDALI,MAAM,GAAG,UAAU,kBACnB,+BAA+B,YAC/B,kBAAkB,GAChB,OAAO,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC,CAmBzD;AAQM,2CALI,MAAM,GAAG,UAAU,kBACnB,+BAA+B,YAC/B,kBAAkB,GAChB,OAAO,CAAC,UAAU,CAAC,CAS/B;AAQM,mCALI,MAAM,GAAG,UAAU,kBACnB,+BAA+B,YAC/B,kBAAkB,GAChB,OAAO,CAAC,UAAU,CAAC,CAS/B;AAQM,oCALI,UAAU,kBACV,+BAA+B,YAC/B,kBAAkB,GAChB,OAAO,CAAC,MAAM,CAAC,CAU3B;AASM,2CANI,OAAO,cACP,MAAM,GAAG,UAAU,mBACnB,MAAM,kBACN,+BAA+B,YAC/B,kBAAkB,iBAe5B;qDAlUS,YAAY;6BAAZ,YAAY;mCAAZ,YAAY;4BAAZ,YAAY;gCAAZ,YAAY;wCAAZ,YAAY;gCAAZ,YAAY;6BAAZ,YAAY"}

package/src/archive-lite.js

@@ -1,4 +1,5 @@
-/* Provides functions to create an archive (zip file with a
+/**
+ * Provides functions to create an archive (zip file with a
  * compartment-map.json) from a partially completed compartment map (it must
  * mention all packages/compartments as well as inter-compartment references
  * but does not contain an entry for every module reachable from its entry
@@ -26,6 +27,8 @@
  * In fruition of https://github.com/endojs/endo/issues/400, we will be able to
  * use original source archives on XS and Node.js, but not on the web until the
  * web platform makes further progress on virtual module loaers.
+ *
+ * @module
  */
 
 /* eslint no-shadow: 0 */
@@ -36,8 +39,10 @@
  *   ArchiveResult,
  *   ArchiveWriter,
  *   CaptureSourceLocationHook,
- *   CompartmentMapDescriptor,
+ *   CompartmentsRenameFn,
+ *   FileUrlString,
  *   HashPowers,
+ *   PackageCompartmentMapDescriptor,
  *   ReadFn,
  *   ReadPowers,
  *   Sources,
@@ -55,19 +60,12 @@ import {
 import { unpackReadPowers } from './powers.js';
 import { detectAttenuators } from './policy.js';
 import { digestCompartmentMap } from './digest.js';
+import { stringCompare } from './compartment-map.js';
+import { ATTENUATORS_COMPARTMENT } from './policy-format.js';
 
 const textEncoder = new TextEncoder();
 
-const { assign, create, freeze } = Object;
-
-/**
- * @param {string} rel - a relative URL
- * @param {string} abs - a fully qualified URL
- * @returns {string}
- */
-const resolveLocation = (rel, abs) => new URL(rel, abs).toString();
-
-const { keys } = Object;
+const { assign, create, freeze, keys } = Object;
 
 /**
  * @param {ArchiveWriter} archive
@@ -77,12 +75,10 @@ const addSourcesToArchive = async (archive, sources) => {
   await null;
   for (const compartment of keys(sources).sort()) {
     const modules = sources[compartment];
-    const compartmentLocation = resolveLocation(`${compartment}/`, 'file:///');
     for (const specifier of keys(modules).sort()) {
-      const { bytes, location } = modules[specifier];
-      if (location !== undefined) {
-        const moduleLocation = resolveLocation(location, compartmentLocation);
-        const path = new URL(moduleLocation).pathname.slice(1); // elide initial "/"
+      if ('location' in modules[specifier]) {
+        const { bytes, location } = modules[specifier];
+        const path = `${compartment}/${location}`;
         if (bytes !== undefined) {
           // eslint-disable-next-line no-await-in-loop
           await archive.write(path, bytes);
@@ -100,8 +96,8 @@ const captureSourceLocations = async (sources, captureSourceLocation) => {
   for (const compartmentName of keys(sources).sort()) {
     const modules = sources[compartmentName];
     for (const moduleSpecifier of keys(modules).sort()) {
-      const { sourceLocation } = modules[moduleSpecifier];
-      if (sourceLocation !== undefined) {
+      if ('sourceLocation' in modules[moduleSpecifier]) {
+        const { sourceLocation } = modules[moduleSpecifier];
         captureSourceLocation(compartmentName, moduleSpecifier, sourceLocation);
       }
     }
@@ -109,18 +105,69 @@ const captureSourceLocations = async (sources, captureSourceLocation) => {
 };
 
 /**
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {Sources} sources
  * @returns {ArchiveResult}
  */
 export const makeArchiveCompartmentMap = (compartmentMap, sources) => {
+  /** @type {CompartmentsRenameFn<FileUrlString, string>} */
+  const renameCompartments = compartments => {
+    /** @type {Record<FileUrlString, string>} */
+    const compartmentRenames = create(null);
+
+    /**
+     * Get the new name of format `packageName-v${version}` compartments (except
+     * for the attenuators compartment)
+     * @param {string} name
+     * @param {string} version
+     * @returns {string}
+     */
+    const getCompartmentName = (name, version) => {
+      const compartment = compartments[name];
+      return ATTENUATORS_COMPARTMENT === compartment.name
+        ? compartment.name
+        : `${compartment.name}-v${version}`;
+    };
+
+    // 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 compartmentsByLabel =
+      /** @type {Array<{name: FileUrlString, packageName: string, compartmentName: string}>} */ (
+        Object.entries(compartments)
+          .map(([name, compartment]) => ({
+            name,
+            packageName: compartments[name].name,
+            compartmentName: getCompartmentName(name, compartment.version),
+          }))
+          .sort((a, b) => stringCompare(a.compartmentName, b.compartmentName))
+      );
+
+    /** @type {string|undefined} */
+    let prev;
+    let index = 1;
+    for (const { name, packageName, compartmentName } of compartmentsByLabel) {
+      if (packageName === prev) {
+        compartmentRenames[name] = `${compartmentName}-n${index}`; // Added numeric suffix for duplicates
+        index += 1;
+      } else {
+        compartmentRenames[name] = compartmentName;
+        prev = packageName;
+        index = 1;
+      }
+    }
+    return compartmentRenames;
+  };
+
   const {
     compartmentMap: archiveCompartmentMap,
     sources: archiveSources,
     oldToNewCompartmentNames,
     newToOldCompartmentNames,
     compartmentRenames,
-  } = digestCompartmentMap(compartmentMap, sources);
+  } = digestCompartmentMap(compartmentMap, sources, { renameCompartments });
+
   return {
     archiveCompartmentMap,
     archiveSources,
@@ -130,9 +177,11 @@ export const makeArchiveCompartmentMap = (compartmentMap, sources) => {
   };
 };
 
+const noop = () => {};
+
 /**
  * @param {ReadFn | ReadPowers} powers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {ArchiveLiteOptions} [options]
  * @returns {Promise<{sources: Sources, compartmentMapBytes: Uint8Array, sha512?: string}>}
  */
@@ -146,6 +195,7 @@ const digestFromMap = async (powers, compartmentMap, options = {}) => {
     policy = undefined,
     sourceMapHook = undefined,
     parserForLanguage: parserForLanguageOption = {},
+    log: _log = noop,
   } = options;
 
   const parserForLanguage = freeze(
@@ -179,6 +229,7 @@ const digestFromMap = async (powers, compartmentMap, options = {}) => {
     importHook: consolidatedExitModuleImportHook,
     sourceMapHook,
   });
+
   // Induce importHook to record all the necessary modules to import the given module specifier.
   const { compartment, attenuatorsCompartment } = link(compartmentMap, {
     resolve,
@@ -204,7 +255,7 @@ const digestFromMap = async (powers, compartmentMap, options = {}) => {
 
   const archiveCompartmentMapText = JSON.stringify(
     archiveCompartmentMap,
-    null,
+    (key, value) => (key.startsWith('_') ? undefined : value),
     2,
   );
   const archiveCompartmentMapBytes = textEncoder.encode(
@@ -223,13 +274,13 @@ const digestFromMap = async (powers, compartmentMap, options = {}) => {
   return {
     compartmentMapBytes: archiveCompartmentMapBytes,
     sources: archiveSources,
-    sha512: archiveSha512,
+    ...(archiveSha512 !== undefined && { sha512: archiveSha512 }),
   };
 };
 
 /**
  * @param {ReadFn | ReadPowers} powers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {ArchiveLiteOptions} [options]
  * @returns {Promise<{bytes: Uint8Array, sha512?: string}>}
  */
@@ -249,12 +300,12 @@ export const makeAndHashArchiveFromMap = async (
   await addSourcesToArchive(archive, sources);
   const bytes = await archive.snapshot();
 
-  return { bytes, sha512 };
+  return { bytes, ...(sha512 !== undefined && { sha512 }) };
 };
 
 /**
  * @param {ReadFn | ReadPowers} powers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {ArchiveLiteOptions} [options]
  * @returns {Promise<Uint8Array>}
  */
@@ -269,7 +320,7 @@ export const makeArchiveFromMap = async (powers, compartmentMap, options) => {
 
 /**
  * @param {ReadFn | ReadPowers} powers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {ArchiveLiteOptions} [options]
  * @returns {Promise<Uint8Array>}
  */
@@ -284,7 +335,7 @@ export const mapFromMap = async (powers, compartmentMap, options) => {
 
 /**
  * @param {HashPowers} powers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {ArchiveLiteOptions} [options]
  * @returns {Promise<string>}
  */
@@ -302,7 +353,7 @@ export const hashFromMap = async (powers, compartmentMap, options) => {
  * @param {WriteFn} write
  * @param {ReadFn | ReadPowers} readPowers
  * @param {string} archiveLocation
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {ArchiveLiteOptions} [options]
  */
 export const writeArchiveFromMap = async (

package/src/archive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["archive.js"],"names":[],"mappings":"AA6DO,2CALI,MAAM,GAAG,UAAU,kBACnB,MAAM,YACN,cAAc,GACZ,OAAO,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC,CAiBzD;AAQM,oCALI,MAAM,GAAG,UAAU,kBACnB,MAAM,YACN,cAAc,GACZ,OAAO,CAAC,UAAU,CAAC,CAwC/B;AAQM,oCALI,MAAM,GAAG,UAAU,kBACnB,MAAM,YACN,cAAc,GACZ,OAAO,CAAC,UAAU,CAAC,CAyC/B;AAQM,qCALI,UAAU,kBACV,MAAM,YACN,cAAc,GACZ,OAAO,CAAC,MAAM,CAAC,CAyC3B;AASM,oCANI,OAAO,cACP,MAAM,GAAG,UAAU,mBACnB,MAAM,kBACN,MAAM,YACN,cAAc,iBA+CxB;4BApPS,YAAY;gCAAZ,YAAY;oCAAZ,YAAY;gCAAZ,YAAY;6BAAZ,YAAY"}
+{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["archive.js"],"names":[],"mappings":"AA8DO,2CALI,MAAM,GAAG,UAAU,kBACnB,MAAM,YACN,cAAc,GACZ,OAAO,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC,CAiBzD;AAQM,oCALI,MAAM,GAAG,UAAU,kBACnB,MAAM,YACN,cAAc,GACZ,OAAO,CAAC,UAAU,CAAC,CAwC/B;AAQM,oCALI,MAAM,GAAG,UAAU,kBACnB,MAAM,YACN,cAAc,GACZ,OAAO,CAAC,UAAU,CAAC,CAyC/B;AAWM,qCALI,UAAU,kBACV,MAAM,YACN,cAAc,GACZ,OAAO,CAAC,MAAM,CAAC,CA4C3B;AASM,oCANI,OAAO,cACP,MAAM,GAAG,UAAU,mBACnB,MAAM,kBACN,MAAM,YACN,cAAc,iBA+CxB;4BA1PS,YAAY;gCAAZ,YAAY;oCAAZ,YAAY;gCAAZ,YAAY;6BAAZ,YAAY"}

package/src/archive.js

@@ -24,6 +24,7 @@
  *   ReadPowers,
  *   HashPowers,
  *   WriteFn,
+ *   LogFn,
  * } from './types.js'
  */
 
@@ -169,6 +170,9 @@ export const mapLocation = async (powers, moduleLocation, options = {}) => {
   });
 };
 
+/** @type {LogFn} */
+const noop = () => {};
+
 /**
  * @param {HashPowers} powers
  * @param {string} moduleLocation
@@ -191,10 +195,12 @@ export const hashLocation = async (powers, moduleLocation, options = {}) => {
     workspaceLanguageForExtension,
     workspaceCommonjsLanguageForExtension,
     workspaceModuleLanguageForExtension,
+    log = noop,
     ...otherOptions
   } = assignParserForLanguage(options);
 
   const compartmentMap = await mapNodeModules(powers, moduleLocation, {
+    log,
     dev,
     strict,
     conditions,
@@ -212,6 +218,7 @@ export const hashLocation = async (powers, moduleLocation, options = {}) => {
   return hashFromMap(powers, compartmentMap, {
     parserForLanguage,
     policy,
+    log,
     ...otherOptions,
   });
 };

package/src/bundle-lite.d.ts

@@ -1,5 +1,5 @@
-export function makeFunctorFromMap(readPowers: ReadFn | ReadPowers | MaybeReadPowers, compartmentMap: CompartmentMapDescriptor, options?: BundleOptions): Promise<string>;
-export function makeScriptFromMap(readPowers: ReadFn | ReadPowers | MaybeReadPowers, compartmentMap: CompartmentMapDescriptor, options?: BundleOptions): Promise<string>;
+export function makeFunctorFromMap(readPowers: ReadFn | ReadPowers | MaybeReadPowers, compartmentMap: PackageCompartmentMapDescriptor, options?: BundleOptions): Promise<string>;
+export function makeScriptFromMap(readPowers: ReadFn | ReadPowers | MaybeReadPowers, compartmentMap: PackageCompartmentMapDescriptor, options?: BundleOptions): Promise<string>;
 /**
  * The bundler kit defines a language-specific behavior for injecting a module
  * into a bundle.
@@ -85,7 +85,7 @@ export type BundlerSupport<SpecificModuleSource extends unknown> = {
 import type { ReadFn } from './types.js';
 import type { ReadPowers } from './types.js';
 import type { MaybeReadPowers } from './types.js';
-import type { CompartmentMapDescriptor } from './types.js';
+import type { PackageCompartmentMapDescriptor } from './types.js';
 import type { BundleOptions } from './types.js';
 import type { StaticModuleType } from 'ses';
 //# sourceMappingURL=bundle-lite.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundle-lite.d.ts","sourceRoot":"","sources":["bundle-lite.js"],"names":[],"mappings":"AA2TO,+CALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,wBAAwB,YACxB,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAgV3B;AAQM,8CALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,wBAAwB,YACxB,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAW3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBA9mBa,MAAM,MAAM;;;;;;cAOZ,MAAM,MAAM;;;;;;oBAGZ,MAAM,MAAM;;;;;wBAGZ,MAAM,MAAM;;yBAKH,oBAAoB,SAA9B,OAAS;SAER,MAAM;UACN,MAAM;qBACN,MAAM;qBACN,MAAM;mBACN,MAAM;YACN,MAAM;YACN,gBAAgB,GAAG,oBAAoB;qBACvC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;oBACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;WACtB,UAAU;WACV,MAAM;gBACN,UAAU;;;UAKV,MAAM;WACN,MAAM;gBACN,UAAU;oBACV,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;qBACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;;0BAIb,oBAAoB,SAA9B,OAAS,aAEX,YAAY,CAAC,oBAAoB,CAAC,UAE1C;IAAyB,WAAW;IACZ,eAAe;CACvC,KAAU,UAAU;2BAIA,oBAAoB,SAA9B,OAAS;aAER,MAAM;mBACN,aAAa,CAAC,oBAAoB,CAAC;;4BArFvC,YAAY;gCAAZ,YAAY;qCAAZ,YAAY;8CAAZ,YAAY;mCAAZ,YAAY;sCAVZ,KAAK"}
+{"version":3,"file":"bundle-lite.d.ts","sourceRoot":"","sources":["bundle-lite.js"],"names":[],"mappings":"AAsTO,+CALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,+BAA+B,YAC/B,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAgV3B;AAQM,8CALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,+BAA+B,YAC/B,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAW3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBAzmBa,MAAM,MAAM;;;;;;cAOZ,MAAM,MAAM;;;;;;oBAGZ,MAAM,MAAM;;;;;wBAGZ,MAAM,MAAM;;yBAKH,oBAAoB,SAA9B,OAAS;SAER,MAAM;UACN,MAAM;qBACN,MAAM;qBACN,MAAM;mBACN,MAAM;YACN,MAAM;YACN,gBAAgB,GAAG,oBAAoB;qBACvC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;oBACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;WACtB,UAAU;WACV,MAAM;gBACN,UAAU;;;UAKV,MAAM;WACN,MAAM;gBACN,UAAU;oBACV,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;qBACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;;0BAIb,oBAAoB,SAA9B,OAAS,aAEX,YAAY,CAAC,oBAAoB,CAAC,UAE1C;IAAyB,WAAW;IACZ,eAAe;CACvC,KAAU,UAAU;2BAIA,oBAAoB,SAA9B,OAAS;aAER,MAAM;mBACN,aAAa,CAAC,oBAAoB,CAAC;;4BArFvC,YAAY;gCAAZ,YAAY;qCAAZ,YAAY;qDAAZ,YAAY;mCAAZ,YAAY;sCAVZ,KAAK"}

package/src/bundle-lite.js

@@ -7,9 +7,9 @@
  * } from 'ses'
  * @import {
  *   BundleOptions,
- *   CompartmentDescriptor,
- *   CompartmentMapDescriptor,
  *   CompartmentSources,
+ *   PackageCompartmentDescriptors,
+ *   PackageCompartmentMapDescriptor,
  *   MaybeReadPowers,
  *   ReadFn,
  *   ReadPowers,
@@ -110,6 +110,11 @@ import { defaultParserForLanguage } from './archive-parsers.js';
 import mjsSupport from './bundle-mjs.js';
 import cjsSupport from './bundle-cjs.js';
 import jsonSupport from './bundle-json.js';
+import {
+  isErrorModuleSource,
+  isExitModuleSource,
+  isLocalModuleSource,
+} from './guards.js';
 
 const { quote: q } = assert;
 
@@ -144,7 +149,7 @@ null,
  * The first modules are place-holders for the modules that exit
  * the compartment map to the host's module system.
  *
- * @param {Record<string, CompartmentDescriptor>} compartmentDescriptors
+ * @param {PackageCompartmentDescriptors} compartmentDescriptors
  * @param {Record<string, CompartmentSources>} compartmentSources
  * @param {string} entryCompartmentName
  * @param {string} entryModuleSpecifier
@@ -188,28 +193,18 @@ const sortedModules = (
 
     const source = compartmentSources[compartmentName][moduleSpecifier];
     if (source !== undefined) {
-      const { record, parser, deferredError, bytes, sourceDirname, exit } =
-        source;
-      if (exit !== undefined) {
-        return exit;
-      }
-      assert(
-        bytes !== undefined,
-        `No bytes for ${moduleSpecifier} in ${compartmentName}`,
-      );
-      assert(
-        parser !== undefined,
-        `No parser for ${moduleSpecifier} in ${compartmentName}`,
-      );
-      assert(
-        sourceDirname !== undefined,
-        `No sourceDirname for ${moduleSpecifier} in ${compartmentName}`,
-      );
-      if (deferredError) {
+      if (isErrorModuleSource(source)) {
         throw Error(
-          `Cannot bundle: encountered deferredError ${deferredError}`,
+          `Cannot bundle: encountered deferredError ${source.deferredError}`,
         );
       }
+      if (isExitModuleSource(source)) {
+        return source.exit;
+      }
+      if (!isLocalModuleSource(source)) {
+        throw new TypeError(`Unexpected source type ${JSON.stringify(source)}`);
+      }
+      const { record, parser, bytes, sourceDirname } = source;
       if (record) {
         const { imports = [], reexports = [] } =
           /** @type {PrecompiledStaticModuleInterface} */ (record);
@@ -309,7 +304,7 @@ const getBundlerKitForModule = (module, params) => {
 
 /**
  * @param {ReadFn | ReadPowers | MaybeReadPowers} readPowers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {BundleOptions} [options]
  * @returns {Promise<string>}
  */
@@ -651,7 +646,7 @@ ${m.bundlerKit.getFunctor()}`,
 
 /**
  * @param {ReadFn | ReadPowers | MaybeReadPowers} readPowers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {BundleOptions} [options]
  * @returns {Promise<string>}
  */

package/src/bundle.d.ts

@@ -1,5 +1,5 @@
-export function makeFunctorFromMap(readPowers: ReadFn | ReadPowers | MaybeReadPowers, compartmentMap: CompartmentMapDescriptor, options?: BundleOptions): Promise<string>;
-export function makeScriptFromMap(readPowers: ReadFn | ReadPowers | MaybeReadPowers, compartmentMap: CompartmentMapDescriptor, options?: BundleOptions): Promise<string>;
+export function makeFunctorFromMap(readPowers: ReadFn | ReadPowers | MaybeReadPowers, compartmentMap: PackageCompartmentMapDescriptor, options?: BundleOptions): Promise<string>;
+export function makeScriptFromMap(readPowers: ReadFn | ReadPowers | MaybeReadPowers, compartmentMap: PackageCompartmentMapDescriptor, options?: BundleOptions): Promise<string>;
 export function makeFunctor(readPowers: ReadFn | ReadPowers | MaybeReadPowers, moduleLocation: string, options?: BundleOptions): Promise<string>;
 export function makeScript(readPowers: ReadFn | ReadPowers | MaybeReadPowers, moduleLocation: string, options?: BundleOptions): Promise<string>;
 export function writeScript(write: WriteFn, read: ReadFn, bundleLocation: string, moduleLocation: string, options?: BundleOptions): Promise<void>;
@@ -88,7 +88,7 @@ export type BundlerSupport<SpecificModuleSource extends unknown> = {
 import type { ReadFn } from './types.js';
 import type { ReadPowers } from './types.js';
 import type { MaybeReadPowers } from './types.js';
-import type { CompartmentMapDescriptor } from './types.js';
+import type { PackageCompartmentMapDescriptor } from './types.js';
 import type { BundleOptions } from './types.js';
 import type { WriteFn } from './types.js';
 import type { StaticModuleType } from 'ses';

package/src/bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["bundle.js"],"names":[],"mappings":"AAgUO,+CALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,wBAAwB,YACxB,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAiV3B;AAQM,8CALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,wBAAwB,YACxB,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAW3B;AAQM,wCALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,MAAM,YACN,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAS3B;AAQM,uCALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,MAAM,YACN,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAS3B;AASM,mCANI,OAAO,QACP,MAAM,kBACN,MAAM,kBACN,MAAM,YACN,aAAa,iBAYvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBApqBa,MAAM,MAAM;;;;;;cAOZ,MAAM,MAAM;;;;;;oBAGZ,MAAM,MAAM;;;;;wBAGZ,MAAM,MAAM;;yBAKH,oBAAoB,SAA9B,OAAS;SAER,MAAM;UACN,MAAM;qBACN,MAAM;qBACN,MAAM;mBACN,MAAM;YACN,MAAM;YACN,gBAAgB,GAAG,oBAAoB;qBACvC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;oBACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;WACtB,UAAU;WACV,MAAM;gBACN,UAAU;;;UAKV,MAAM;WACN,MAAM;gBACN,UAAU;oBACV,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;qBACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;;0BAIb,oBAAoB,SAA9B,OAAS,aAEX,YAAY,CAAC,oBAAoB,CAAC,UAE1C;IAAyB,WAAW;IACZ,eAAe;CACvC,KAAU,UAAU;2BAIA,oBAAoB,SAA9B,OAAS;aAER,MAAM;mBACN,aAAa,CAAC,oBAAoB,CAAC;;4BArFvC,YAAY;gCAAZ,YAAY;qCAAZ,YAAY;8CAAZ,YAAY;mCAAZ,YAAY;6BAAZ,YAAY;sCAXZ,KAAK"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["bundle.js"],"names":[],"mappings":"AA2TO,+CALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,+BAA+B,YAC/B,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAiV3B;AAQM,8CALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,+BAA+B,YAC/B,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAW3B;AAQM,wCALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,MAAM,YACN,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAS3B;AAQM,uCALI,MAAM,GAAG,UAAU,GAAG,eAAe,kBACrC,MAAM,YACN,aAAa,GACX,OAAO,CAAC,MAAM,CAAC,CAS3B;AASM,mCANI,OAAO,QACP,MAAM,kBACN,MAAM,kBACN,MAAM,YACN,aAAa,iBAYvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBA/pBa,MAAM,MAAM;;;;;;cAOZ,MAAM,MAAM;;;;;;oBAGZ,MAAM,MAAM;;;;;wBAGZ,MAAM,MAAM;;yBAKH,oBAAoB,SAA9B,OAAS;SAER,MAAM;UACN,MAAM;qBACN,MAAM;qBACN,MAAM;mBACN,MAAM;YACN,MAAM;YACN,gBAAgB,GAAG,oBAAoB;qBACvC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;oBACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;WACtB,UAAU;WACV,MAAM;gBACN,UAAU;;;UAKV,MAAM;WACN,MAAM;gBACN,UAAU;oBACV,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;qBACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;;0BAIb,oBAAoB,SAA9B,OAAS,aAEX,YAAY,CAAC,oBAAoB,CAAC,UAE1C;IAAyB,WAAW;IACZ,eAAe;CACvC,KAAU,UAAU;2BAIA,oBAAoB,SAA9B,OAAS;aAER,MAAM;mBACN,aAAa,CAAC,oBAAoB,CAAC;;4BArFvC,YAAY;gCAAZ,YAAY;qCAAZ,YAAY;qDAAZ,YAAY;mCAAZ,YAAY;6BAAZ,YAAY;sCAXZ,KAAK"}

package/src/bundle.js

@@ -7,9 +7,9 @@
  * } from 'ses'
  * @import {
  *   BundleOptions,
- *   CompartmentDescriptor,
- *   CompartmentMapDescriptor,
  *   CompartmentSources,
+ *   PackageCompartmentDescriptors,
+ *   PackageCompartmentMapDescriptor,
  *   MaybeReadPowers,
  *   ReadFn,
  *   ReadPowers,
@@ -112,6 +112,11 @@ import { defaultParserForLanguage } from './archive-parsers.js';
 import mjsSupport from './bundle-mjs.js';
 import cjsSupport from './bundle-cjs.js';
 import jsonSupport from './bundle-json.js';
+import {
+  isErrorModuleSource,
+  isExitModuleSource,
+  isLocalModuleSource,
+} from './guards.js';
 
 const textEncoder = new TextEncoder();
 
@@ -148,7 +153,7 @@ null,
  * The first modules are place-holders for the modules that exit
  * the compartment map to the host's module system.
  *
- * @param {Record<string, CompartmentDescriptor>} compartmentDescriptors
+ * @param {PackageCompartmentDescriptors} compartmentDescriptors
  * @param {Record<string, CompartmentSources>} compartmentSources
  * @param {string} entryCompartmentName
  * @param {string} entryModuleSpecifier
@@ -192,28 +197,18 @@ const sortedModules = (
 
     const source = compartmentSources[compartmentName][moduleSpecifier];
     if (source !== undefined) {
-      const { record, parser, deferredError, bytes, sourceDirname, exit } =
-        source;
-      if (exit !== undefined) {
-        return exit;
-      }
-      assert(
-        bytes !== undefined,
-        `No bytes for ${moduleSpecifier} in ${compartmentName}`,
-      );
-      assert(
-        parser !== undefined,
-        `No parser for ${moduleSpecifier} in ${compartmentName}`,
-      );
-      assert(
-        sourceDirname !== undefined,
-        `No sourceDirname for ${moduleSpecifier} in ${compartmentName}`,
-      );
-      if (deferredError) {
+      if (isErrorModuleSource(source)) {
         throw Error(
-          `Cannot bundle: encountered deferredError ${deferredError}`,
+          `Cannot bundle: encountered deferredError ${source.deferredError}`,
         );
       }
+      if (isExitModuleSource(source)) {
+        return source.exit;
+      }
+      if (!isLocalModuleSource(source)) {
+        throw new TypeError(`Unexpected source type ${JSON.stringify(source)}`);
+      }
+      const { record, parser, bytes, sourceDirname } = source;
       if (record) {
         const { imports = [], reexports = [] } =
           /** @type {PrecompiledStaticModuleInterface} */ (record);
@@ -314,7 +309,7 @@ const getBundlerKitForModule = (module, params) => {
 
 /**
  * @param {ReadFn | ReadPowers | MaybeReadPowers} readPowers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {BundleOptions} [options]
  * @returns {Promise<string>}
  */
@@ -657,7 +652,7 @@ ${m.bundlerKit.getFunctor()}`,
 
 /**
  * @param {ReadFn | ReadPowers | MaybeReadPowers} readPowers
- * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {PackageCompartmentMapDescriptor} compartmentMap
  * @param {BundleOptions} [options]
  * @returns {Promise<string>}
  */

package/src/capture-lite.d.ts

@@ -1,7 +1,7 @@
-export function captureFromMap(powers: ReadFn | ReadPowers, compartmentMap: CompartmentMapDescriptor, options?: CaptureLiteOptions): Promise<CaptureResult>;
+export function captureFromMap(readPowers: ReadFn | ReadPowers, compartmentMap: PackageCompartmentMapDescriptor, options?: CaptureLiteOptions): Promise<CaptureResult>;
 import type { ReadFn } from './types.js';
 import type { ReadPowers } from './types.js';
-import type { CompartmentMapDescriptor } from './types.js';
+import type { PackageCompartmentMapDescriptor } from './types.js';
 import type { CaptureLiteOptions } from './types.js';
 import type { CaptureResult } from './types.js';
 //# sourceMappingURL=capture-lite.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"capture-lite.d.ts","sourceRoot":"","sources":["capture-lite.js"],"names":[],"mappings":"AAsFO,uCALI,MAAM,GAAG,UAAU,kBACnB,wBAAwB,YACxB,kBAAkB,GAChB,OAAO,CAAC,aAAa,CAAC,CAmElC;4BA9GS,YAAY;gCAAZ,YAAY;8CAAZ,YAAY;wCAAZ,YAAY;mCAAZ,YAAY"}
+{"version":3,"file":"capture-lite.d.ts","sourceRoot":"","sources":["capture-lite.js"],"names":[],"mappings":"AA2RO,2CALI,MAAM,GAAG,UAAU,kBACnB,+BAA+B,YAC/B,kBAAkB,GAChB,OAAO,CAAC,aAAa,CAAC,CAwFlC;4BApUS,YAAY;gCAAZ,YAAY;qDAAZ,YAAY;wCAAZ,YAAY;mCAAZ,YAAY"}