@endo/compartment-mapper 1.5.0 → 1.6.1

package/src/bundle.js

@@ -6,8 +6,9 @@
  *   PrecompiledStaticModuleInterface
  * } from 'ses'
  * @import {
- *   ArchiveOptions,
+ *   BundleOptions,
  *   CompartmentDescriptor,
+ *   CompartmentMapDescriptor,
  *   CompartmentSources,
  *   MaybeReadPowers,
  *   ReadFn,
@@ -18,6 +19,29 @@
  */
 
 /**
+ * The bundler kit defines a language-specific behavior for injecting a module
+ * into a bundle.
+ * Each module must allocate cells for its imports and exports, link those cells
+ * to the cells of dependencies, and provide both the linker and evaluation behavior
+ * for the module.
+ * The linker behavior gets injected in a lexical scope with the linker runtime
+ * and has access to the cells of all modules, whereas the evaluation behavior
+ * gets injected in the generated script's top level lexical scope, so has
+ * no accidental visibility into the linkage runtime.
+ *
+ * For example, JSON modules produce a single "default" cell ("getCells"):
+ *
+ *   { default: cell('default') },
+ *
+ * Then, the JSON gets injected verbatim for the evaluation behavior ("getFunctor").
+ * The linker simply sets the cell to the value.
+ *
+ *   functors[0]['default'].set(modules[0]);
+ *
+ * For an ECMAScript or CommonJS module, the evaluation behavior is a function
+ * that the linker runtime can call to inject it with the cells it needs by
+ * the names it sees for them.
+ *
  * @typedef {object} BundlerKit
  * @property {() => string} getFunctor Produces a JavaScript string consisting of
  * a function expression followed by a comma delimiter that will be evaluated in
@@ -28,12 +52,10 @@
  * variable.
  * @property {() => string} getCells Produces a JavaScript string consisting of
  * a JavaScript object and a trailing comma.
- * The string is evaluated in a lexical context with a `cell` maker, the `cells`
- * array of every module's internal environment record.
- * @property {() => string} getFunctorCall Produces a JavaScript string may
- * be a statement that calls this module's functor with the calling convention
- * appropriate for its language, injecting whatever cells it needs to link to
- * other module namespaces.
+ * The string is evaluated in the linker runtime's lexical context.
+ * @property {() => string} getFunctorCall Produces a JavaScript string,
+ * a statement that effects the module's evaluation behavior using the cells
+ * it imports and exports and the evaluated "functor".
  * @property {() => string} getReexportsWiring Produces a JavaScript string
  * that may include statements that bind the cells reexported by this module.
  */
@@ -42,8 +64,10 @@
  * @template {unknown} SpecificModuleSource
  * @typedef {object} BundleModule
  * @property {string} key
+ * @property {string} exit
  * @property {string} compartmentName
  * @property {string} moduleSpecifier
+ * @property {string} sourceDirname
  * @property {string} parser
  * @property {StaticModuleType & SpecificModuleSource} record
  * @property {Record<string, string>} resolvedImports
@@ -53,10 +77,22 @@
  * @property {BundlerKit} bundlerKit
  */
 
+/**
+ * @typedef {object} BundleExit
+ * @property {string} exit
+ * @property {number} index
+ * @property {BundlerKit} bundlerKit
+ * @property {Record<string, number>} indexedImports
+ * @property {Record<string, string>} resolvedImports
+ */
+
 /**
  * @template {unknown} SpecificModuleSource
  * @callback GetBundlerKit
  * @param {BundleModule<SpecificModuleSource>} module
+ * @param {object} params
+ * @param {boolean} [params.useEvaluate]
+ * @param {string} [params.sourceUrlPrefix]
  * @returns {BundlerKit}
  */
 
@@ -68,13 +104,10 @@
  */
 
 import { resolve } from './node-module-specifier.js';
-import { compartmentMapForNodeModules } from './node-modules.js';
-import { search } from './search.js';
+import { mapNodeModules } from './node-modules.js';
 import { link } from './link.js';
-import { unpackReadPowers } from './powers.js';
 import { makeImportHookMaker } from './import-hook.js';
 import { defaultParserForLanguage } from './archive-parsers.js';
-import { parseLocatedJson } from './json.js';
 
 import mjsSupport from './bundle-mjs.js';
 import cjsSupport from './bundle-cjs.js';
@@ -85,16 +118,48 @@ const textEncoder = new TextEncoder();
 const { quote: q } = assert;
 
 /**
+ * @param {BundleExit} source
+ * @returns {BundlerKit}
+ */
+const makeCjsExitBundlerKit = ({ exit, index }) => ({
+  getFunctor: () => `\
+null,
+`,
+  getCells: () => `\
+    namespaceCells(tryRequire(${JSON.stringify(exit)})),
+`,
+  getReexportsWiring: () => '',
+  getFunctorCall: () => ``,
+});
+
+/**
+ * Produces a list of modules in the order they should be evaluated, and
+ * a side-table for following aliases.
+ * The modules are produce in topological postorder, such that the entry
+ * module appears last.
+ * The post-order traversal does not revisit modules that appear in cycles.
+ *
+ * Synthesizes a unique key for each module and translates
+ * each module's imports to their corresponding keys.
+ * Some import keys are aliased to other keys, such that walking from
+ * key to value in the aliases side table will eventually arrive at
+ * the key of a module that is present in the modules list.
+ *
+ * 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 {Record<string, CompartmentSources>} compartmentSources
  * @param {string} entryCompartmentName
  * @param {string} entryModuleSpecifier
+ * @param {Array<string>} exitModuleSpecifiers
  */
 const sortedModules = (
   compartmentDescriptors,
   compartmentSources,
   entryCompartmentName,
   entryModuleSpecifier,
+  exitModuleSpecifiers,
 ) => {
   /** @type {BundleModule<unknown>[]} */
   const modules = [];
@@ -103,6 +168,17 @@ const sortedModules = (
   /** @type {Set<string>} seen */
   const seen = new Set();
 
+  for (const exit of exitModuleSpecifiers) {
+    modules.push({
+      key: exit,
+      exit,
+      // @ts-expect-error
+      index: undefined,
+      // @ts-expect-error
+      bundlerKit: null,
+    });
+  }
+
   /**
    * @param {string} compartmentName
    * @param {string} moduleSpecifier
@@ -116,7 +192,11 @@ const sortedModules = (
 
     const source = compartmentSources[compartmentName][moduleSpecifier];
     if (source !== undefined) {
-      const { record, parser, deferredError, bytes } = source;
+      const { record, parser, deferredError, bytes, sourceDirname, exit } =
+        source;
+      if (exit !== undefined) {
+        return exit;
+      }
       assert(
         bytes !== undefined,
         `No bytes for ${moduleSpecifier} in ${compartmentName}`,
@@ -125,6 +205,10 @@ const sortedModules = (
         parser !== undefined,
         `No parser for ${moduleSpecifier} in ${compartmentName}`,
       );
+      assert(
+        sourceDirname !== undefined,
+        `No sourceDirname for ${moduleSpecifier} in ${compartmentName}`,
+      );
       if (deferredError) {
         throw Error(
           `Cannot bundle: encountered deferredError ${deferredError}`,
@@ -149,6 +233,7 @@ const sortedModules = (
           key,
           compartmentName,
           moduleSpecifier,
+          sourceDirname,
           parser,
           record,
           resolvedImports,
@@ -190,7 +275,7 @@ const sortedModules = (
   return { modules, aliases };
 };
 
-/** @type {Record<string, BundlerSupport<unknown>>} */
+/** @type {Record<string, BundlerSupport<any>>} */
 const bundlerSupportForLanguage = {
   'pre-mjs-json': mjsSupport,
   'pre-cjs-json': cjsSupport,
@@ -203,8 +288,13 @@ const getRuntime = language =>
     ? bundlerSupportForLanguage[language].runtime
     : `/*unknown language:${language}*/`;
 
-/** @param {BundleModule<unknown>} module */
-const getBundlerKitForModule = module => {
+/**
+ * @param {BundleModule<unknown>} module
+ * @param {object} params
+ * @param {boolean} [params.useEvaluate]
+ * @param {string} [params.sourceUrlPrefix]
+ */
+const getBundlerKitForModule = (module, params) => {
   const language = module.parser;
   assert(language !== undefined);
   if (bundlerSupportForLanguage[language] === undefined) {
@@ -219,37 +309,36 @@ const getBundlerKitForModule = module => {
     };
   }
   const { getBundlerKit } = bundlerSupportForLanguage[language];
-  return getBundlerKit(module);
+  return getBundlerKit(module, params);
 };
 
 /**
  * @param {ReadFn | ReadPowers | MaybeReadPowers} readPowers
- * @param {string} moduleLocation
- * @param {ArchiveOptions} [options]
+ * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {BundleOptions} [options]
  * @returns {Promise<string>}
  */
-export const makeBundle = async (readPowers, moduleLocation, options) => {
-  const { read } = unpackReadPowers(readPowers);
-
+export const makeFunctorFromMap = async (
+  readPowers,
+  compartmentMap,
+  options,
+) => {
   const {
     moduleTransforms,
-    dev,
-    tags: tagsOption,
-    conditions: conditionsOption = tagsOption,
+    syncModuleTransforms,
     searchSuffixes,
-    commonDependencies,
     sourceMapHook = undefined,
+    useEvaluate = false,
+    sourceUrlPrefix = undefined,
+    format = undefined,
     parserForLanguage: parserForLanguageOption = {},
-    languageForExtension: languageForExtensionOption = {},
-    commonjsLanguageForExtension: commonjsLanguageForExtensionOption = {},
-    moduleLanguageForExtension: moduleLanguageForExtensionOption = {},
-    workspaceLanguageForExtension: workspaceLanguageForExtensionOption = {},
-    workspaceCommonjsLanguageForExtension:
-      workspaceCommonjsLanguageForExtensionOption = {},
-    workspaceModuleLanguageForExtension:
-      workspaceModuleLanguageForExtensionOption = {},
   } = options || {};
-  const conditions = new Set(conditionsOption);
+
+  /** @type {((module: BundleExit) => BundlerKit) | undefined} */
+  let makeExitBundlerKit;
+  if (format === 'cjs') {
+    makeExitBundlerKit = makeCjsExitBundlerKit;
+  }
 
   const parserForLanguage = Object.freeze(
     Object.assign(
@@ -258,74 +347,52 @@ export const makeBundle = async (readPowers, moduleLocation, options) => {
       parserForLanguageOption,
     ),
   );
-  const languageForExtension = Object.freeze(
-    Object.assign(Object.create(null), languageForExtensionOption),
-  );
-  const commonjsLanguageForExtension = Object.freeze(
-    Object.assign(Object.create(null), commonjsLanguageForExtensionOption),
-  );
-  const moduleLanguageForExtension = Object.freeze(
-    Object.assign(Object.create(null), moduleLanguageForExtensionOption),
-  );
-  const workspaceLanguageForExtension = Object.freeze(
-    Object.assign(Object.create(null), workspaceLanguageForExtensionOption),
-  );
-  const workspaceCommonjsLanguageForExtension = Object.freeze(
-    Object.assign(
-      Object.create(null),
-      workspaceCommonjsLanguageForExtensionOption,
-    ),
-  );
-  const workspaceModuleLanguageForExtension = Object.freeze(
-    Object.assign(
-      Object.create(null),
-      workspaceModuleLanguageForExtensionOption,
-    ),
-  );
 
-  const {
-    packageLocation,
-    packageDescriptorText,
-    packageDescriptorLocation,
-    moduleSpecifier,
-  } = await search(readPowers, moduleLocation);
-
-  const packageDescriptor = parseLocatedJson(
-    packageDescriptorText,
-    packageDescriptorLocation,
-  );
-  const compartmentMap = await compartmentMapForNodeModules(
-    read,
-    packageLocation,
-    conditions,
-    packageDescriptor,
-    moduleSpecifier,
-    {
-      dev,
-      commonDependencies,
-      languageForExtension,
-      commonjsLanguageForExtension,
-      moduleLanguageForExtension,
-      workspaceLanguageForExtension,
-      workspaceCommonjsLanguageForExtension,
-      workspaceModuleLanguageForExtension,
-    },
-  );
+  const bundlerKitParams = {
+    useEvaluate,
+    sourceUrlPrefix,
+  };
 
   const {
     compartments,
     entry: { compartment: entryCompartmentName, module: entryModuleSpecifier },
   } = compartmentMap;
+  /** @type {string[]} */
+  const exitModuleSpecifiers = [];
   /** @type {Sources} */
   const sources = Object.create(null);
 
-  const makeImportHook = makeImportHookMaker(read, packageLocation, {
+  /**
+   * @param {string} moduleSpecifier
+   * @param {string} compartmentName
+   */
+  const exitModuleImportHook =
+    format !== undefined
+      ? /**
+         * @param {string} moduleSpecifier
+         * @param {string} compartmentName
+         */
+        async (moduleSpecifier, compartmentName) => {
+          const compartmentSources =
+            sources[compartmentName] || Object.create(null);
+          sources[compartmentName] = compartmentSources;
+          compartmentSources[moduleSpecifier] = {
+            exit: moduleSpecifier,
+          };
+          exitModuleSpecifiers.push(moduleSpecifier);
+          return { imports: [], exports: [], execute() {} };
+        }
+      : undefined;
+
+  const makeImportHook = makeImportHookMaker(readPowers, entryCompartmentName, {
+    archiveOnly: true,
     sources,
     compartmentDescriptors: compartments,
     searchSuffixes,
     entryCompartmentName,
     entryModuleSpecifier,
     sourceMapHook,
+    importHook: exitModuleImportHook,
   });
 
   // Induce importHook to record all the necessary modules to import the given module specifier.
@@ -333,6 +400,7 @@ export const makeBundle = async (readPowers, moduleLocation, options) => {
     resolve,
     makeImportHook,
     moduleTransforms,
+    syncModuleTransforms,
     parserForLanguage,
   });
   await compartment.load(entryModuleSpecifier);
@@ -342,6 +410,7 @@ export const makeBundle = async (readPowers, moduleLocation, options) => {
     sources,
     entryCompartmentName,
     entryModuleSpecifier,
+    exitModuleSpecifiers,
   );
 
   // Create an index of modules so we can resolve import specifiers to the
@@ -354,49 +423,93 @@ export const makeBundle = async (readPowers, moduleLocation, options) => {
   }
   const parsersInUse = new Set();
   for (const module of modules) {
-    module.indexedImports = Object.fromEntries(
-      Object.entries(module.resolvedImports).map(([importSpecifier, key]) => {
-        // UNTIL https://github.com/endojs/endo/issues/1514
-        // Prefer: key = aliases.get(key) ?? key;
-        const alias = aliases.get(key);
-        if (alias != null) {
-          key = alias;
-        }
-        const module = modulesByKey[key];
-        if (module === undefined) {
-          throw new Error(
-            `Unable to locate module for key ${q(key)} import specifier ${q(
-              importSpecifier,
-            )} in ${q(module.moduleSpecifier)} of compartment ${q(
-              module.compartmentName,
-            )}`,
-          );
-        }
-        const { index } = module;
-        return [importSpecifier, index];
-      }),
-    );
-    parsersInUse.add(module.parser);
-    module.bundlerKit = getBundlerKitForModule(module);
+    if (module.exit !== undefined) {
+      if (makeExitBundlerKit === undefined) {
+        // makeExitBundlerKit must have been provided to makeImportHookMaker for any modules with an exit property to have been created.
+        throw TypeError('Unreachable');
+      }
+      module.bundlerKit = makeExitBundlerKit(module);
+    } else {
+      module.indexedImports = Object.fromEntries(
+        Object.entries(module.resolvedImports).map(([importSpecifier, key]) => {
+          // UNTIL https://github.com/endojs/endo/issues/1514
+          // Prefer: key = aliases.get(key) ?? key;
+          const alias = aliases.get(key);
+          if (alias != null) {
+            key = alias;
+          }
+          const module = modulesByKey[key];
+          if (module === undefined) {
+            throw new Error(
+              `Unable to locate module for key ${q(key)} import specifier ${q(
+                importSpecifier,
+              )}`,
+            );
+          }
+          const { index } = module;
+          return [importSpecifier, index];
+        }),
+      );
+      parsersInUse.add(module.parser);
+      module.bundlerKit = getBundlerKitForModule(module, bundlerKitParams);
+    }
   }
 
-  const bundle = `\
-'use strict';
-(functors => {
+  // Some bundles appeal to the host module system appropriate to their format
+  // like `require` for bundles used as CommonJS modules.
+  // Each module in the modules array is constructed by a language-specific bundler kit,
+  // and in the case of an exit module, is a bundler kit made with
+  // makeExitBundlerKit, like makeCjsExitBundlerKit.
+  // This will generate a module initialization runtime that in turn needs this
+  // namespaceCells utility function to take a host module exports namespace
+  // and turn it into a bank of cells for importing and exporting the
+  // properties of the module exports namespace object.
+  const exitNamespaces =
+    exitModuleSpecifiers.length === 0
+      ? ''
+      : `\
+  const namespaceCells = namespace => fromEntries(
+    getOwnPropertyNames(namespace)
+    .map(name => [name, {
+      get() {
+        return get(namespace, name);
+      },
+      set() {
+        throw new TypeError('Non-writable export');
+      },
+      observe(observer) {
+        observer(get(namespace, name));
+      },
+      enumerable: true,
+    }])
+  );
+`;
 
+  // The linkage runtime creates a cell for every value exported by any of the
+  // bundled modules.
+  // The interface of a cell is very much like a getter/setter property
+  // deescriptor, and additionally has a method for registering an observer to
+  // notice when a variable is changed in its originating module, to support
+  // live bindings.
+  // Each module language defines its own behavior for the generation of its
+  // exported cells.
+  // After all cells are allocated, each language gets a second opportunity
+  // to introduce bindings for cells that the module re-exports from another
+  // module, but does not itself own.
+  const runtimeLinkageCells = `\
   const cell = (name, value = undefined) => {
     const observers = [];
-    return Object.freeze({
-      get: Object.freeze(() => {
+    return freeze({
+      get: freeze(() => {
         return value;
       }),
-      set: Object.freeze((newValue) => {
+      set: freeze((newValue) => {
         value = newValue;
         for (const observe of observers) {
           observe(value);
         }
       }),
-      observe: Object.freeze((observe) => {
+      observe: freeze((observe) => {
         observers.push(observe);
         observe(value);
       }),
@@ -409,8 +522,15 @@ ${''.concat(...modules.map(m => m.bundlerKit.getCells()))}\
   ];
 
 ${''.concat(...modules.map(m => m.bundlerKit.getReexportsWiring()))}\
+`;
 
-  const namespaces = cells.map(cells => Object.freeze(Object.create(null, {
+  // The linker runtime includes a parallel array of module exports namespace
+  // objects for each bundled module, for each respective index of the module
+  // functors array.
+  // Each namespace has a special '*' property for the namespace object itself,
+  // which is what modules obtain with `import * as x from 'x'` notation.
+  const moduleNamespaces = `\
+  const namespaces = cells.map(cells => freeze(create(null, {
     ...cells,
     // Make this appear like an ESM module namespace object.
     [Symbol.toStringTag]: {
@@ -424,16 +544,162 @@ ${''.concat(...modules.map(m => m.bundlerKit.getReexportsWiring()))}\
   for (let index = 0; index < namespaces.length; index += 1) {
     cells[index]['*'] = cell('*', namespaces[index]);
   }
+`;
 
-${''.concat(...Array.from(parsersInUse).map(parser => getRuntime(parser)))}
+  // Each language in use within the bundle has an opportunity to inject
+  // utilities into the bundle runtime that it can use in the shared lexical
+  // scope of module execution.
+  // CommonJS in particular injects a utility function here, if the script
+  // entrains any CommonJS modules.
+  const languageRuntimeExtensions = `\
+${''.concat(...Array.from(parsersInUse).map(parser => getRuntime(parser)))}\
+`;
 
+  // This section of the linker runtime causes each of the modules to execute
+  // in topological order, using a language-specific calling convention to
+  // link its imports and exports to other modules.
+  const moduleExecutionRuntime = `\
 ${''.concat(...modules.map(m => m.bundlerKit.getFunctorCall()))}\
+`;
+
+  // The linker runtime receives an array of language-specific representations
+  // of each module, which in the simplest case is just a function and a
+  // runtime initialization calling convention (a functor).
+  // Then, in the style of partial application, it receives runtime options.
+  // When driven by makeScript, the script will statically apply the options,
+  // but with makeFunctor, the runtime must evaluate and apply runtime options.
+  // Scripts are suitable for injection with <script> tags on the web, whereas
+  // functors require use of an evaluator at runtime.
+  const linkerRuntime = `functors => options => {
+  'use strict';
+
+  const {
+    Map,
+    Object,
+    ReferenceError,
+    Reflect,
+    TypeError,
+  } = globalThis;
+  const {
+    create,
+    defineProperties,
+    defineProperty,
+    freeze,
+    fromEntries,
+    getOwnPropertyDescriptors,
+    getOwnPropertyNames,
+    keys,
+  } = Object;
+  const { get, set } = Reflect;
+
+  const {
+${
+  !useEvaluate
+    ? ''
+    : `\
+    evaluate = eval,
+    sourceUrlPrefix = ${JSON.stringify(sourceUrlPrefix)},
+`
+}\
+${
+  format !== 'cjs'
+    ? ''
+    : `\
+    require: tryRequire = typeof require === 'function' ? require : specifier => {
+      throw new TypeError('Cannot import host module: ' + specifier);
+    },
+`
+}\
+  } = options || {};
+
+${
+  !useEvaluate
+    ? ''
+    : `\
+  const evaluateSource = (source, sourceUrl) => {
+    return evaluate(source + '\\n//# sourceURL=' + sourceUrlPrefix + sourceUrl + '\\n');
+  };`
+}\
+
+${exitNamespaces}\
+
+${runtimeLinkageCells}\
+
+${moduleNamespaces}\
+
+${languageRuntimeExtensions}\
+
+${moduleExecutionRuntime}\
 
   return cells[cells.length - 1]['*'].get();
-})([${''.concat(...modules.map(m => m.bundlerKit.getFunctor()))}]);
-`;
+}`;
+
+  // An array of language-specific representations of each bundled module,
+  // which in the simplest case is a function that must be initialized by the
+  // linkage runtime using a calling convention.
+  // We pass this array into the linkage runtime rather than embedding it in
+  // the linkage runtime in order to assure that the runtime's lexical context
+  // doesn't overshadow each module's lexical scope.
+  const moduleFunctors = `[
+${''.concat(
+  ...modules.map(
+    (m, index) => `\
+// === ${index}. ${m.sourceDirname} ${m.moduleSpecifier} ===
+${m.bundlerKit.getFunctor()}`,
+  ),
+)}\
+]`;
+
+  // Functors partially apply the linker runtime.
+  // Scripts go on to apply static options and execute immediately.
+  return `(${linkerRuntime})(${moduleFunctors})`;
+};
 
-  return bundle;
+/**
+ * @param {ReadFn | ReadPowers | MaybeReadPowers} readPowers
+ * @param {CompartmentMapDescriptor} compartmentMap
+ * @param {BundleOptions} [options]
+ * @returns {Promise<string>}
+ */
+export const makeScriptFromMap = async (
+  readPowers,
+  compartmentMap,
+  options,
+) => {
+  // Functors partially apply the linker runtime.
+  // Scripts go on to apply static options and execute immediately.
+  const functor = await makeFunctorFromMap(readPowers, compartmentMap, options);
+  return `${functor}()`;
+};
+
+/**
+ * @param {ReadFn | ReadPowers | MaybeReadPowers} readPowers
+ * @param {string} moduleLocation
+ * @param {BundleOptions} [options]
+ * @returns {Promise<string>}
+ */
+export const makeFunctor = async (readPowers, moduleLocation, options) => {
+  const compartmentMap = await mapNodeModules(
+    readPowers,
+    moduleLocation,
+    options,
+  );
+  return makeFunctorFromMap(readPowers, compartmentMap, options);
+};
+
+/**
+ * @param {ReadFn | ReadPowers | MaybeReadPowers} readPowers
+ * @param {string} moduleLocation
+ * @param {BundleOptions} [options]
+ * @returns {Promise<string>}
+ */
+export const makeScript = async (readPowers, moduleLocation, options) => {
+  const compartmentMap = await mapNodeModules(
+    readPowers,
+    moduleLocation,
+    options,
+  );
+  return makeScriptFromMap(readPowers, compartmentMap, options);
 };
 
 /**
@@ -441,16 +707,16 @@ ${''.concat(...modules.map(m => m.bundlerKit.getFunctorCall()))}\
  * @param {ReadFn} read
  * @param {string} bundleLocation
  * @param {string} moduleLocation
- * @param {ArchiveOptions} [options]
+ * @param {BundleOptions} [options]
  */
-export const writeBundle = async (
+export const writeScript = async (
   write,
   read,
   bundleLocation,
   moduleLocation,
   options,
 ) => {
-  const bundleString = await makeBundle(read, moduleLocation, options);
+  const bundleString = await makeScript(read, moduleLocation, options);
   const bundleBytes = textEncoder.encode(bundleString);
   await write(bundleLocation, bundleBytes);
 };