@endo/compartment-mapper 1.3.1 → 1.5.0

package/src/node-modules.js

@@ -1,6 +1,7 @@
-/* Provides functions for constructing a compartment map that has a compartment
- * descriptor corresponding to every reachable package from an entry module and
- * how to create links between them.
+/**
+ * @module Provides functions for constructing a compartment map that has a
+ * compartment descriptor corresponding to every reachable package from an
+ * entry module and how to create links between them.
  * The resulting compartment map does not describe individual modules but does
  * capture every usable route between packages including those generalized by
  * wildcard expansion.
@@ -8,23 +9,27 @@
  * for transitive dependencies.
  */
 
-// @ts-check
 /* eslint no-shadow: 0 */
 
-/** @import {CanonicalFn} from './types.js' */
-/** @import {CompartmentMapForNodeModulesOptions} from './types.js' */
-/** @import {SomePolicy} from './types.js' */
-/** @import {CompartmentDescriptor} from './types.js' */
-/** @import {CompartmentMapDescriptor} from './types.js' */
-/** @import {Language} from './types.js' */
-/** @import {LanguageForExtension} from './types.js' */
-/** @import {MaybeReadFn} from './types.js' */
-/** @import {MaybeReadPowers} from './types.js' */
-/** @import {ModuleDescriptor} from './types.js' */
-/** @import {ReadFn} from './types.js' */
-/** @import {ReadPowers} from './types.js' */
-/** @import {ScopeDescriptor} from './types.js' */
-/** @import {SomePackagePolicy} from './types.js' */
+/**
+ * @import {
+ *   CanonicalFn,
+ *   CompartmentDescriptor,
+ *   CompartmentMapDescriptor,
+ *   CompartmentMapForNodeModulesOptions,
+ *   Language,
+ *   LanguageForExtension,
+ *   MapNodeModulesOptions,
+ *   MaybeReadFn,
+ *   MaybeReadPowers,
+ *   ModuleDescriptor,
+ *   ReadFn,
+ *   ReadPowers,
+ *   ScopeDescriptor,
+ *   SomePackagePolicy,
+ *   SomePolicy,
+ * } from './types.js'
+ */
 
 /**
  * The graph is an intermediate object model that the functions of this module
@@ -52,6 +57,15 @@
  * modules.
  */
 
+/**
+ * @typedef {object} LanguageOptions
+ * @property {LanguageForExtension} commonjsLanguageForExtension
+ * @property {LanguageForExtension} moduleLanguageForExtension
+ * @property {LanguageForExtension} workspaceCommonjsLanguageForExtension
+ * @property {LanguageForExtension} workspaceModuleLanguageForExtension
+ * @property {Set<string>} languages
+ */
+
 /**
  * @typedef {Record<string, {spec: string, alias: string}>} CommonDependencyDescriptors
  */
@@ -184,83 +198,83 @@ const findPackage = async (readDescriptor, canonical, directory, name) => {
   }
 };
 
-const defaultLanguages = /** @type {const} */ ([
-  'mjs',
-  'cjs',
-  'json',
-  'text',
-  'bytes',
-]);
-const defaultUncontroversialParsers = /** @type {const} */ ({
-  cjs: 'cjs',
+const defaultLanguageForExtension = /** @type {const} */ ({
   mjs: 'mjs',
+  cjs: 'cjs',
   json: 'json',
   text: 'text',
   bytes: 'bytes',
 });
-const defaultCommonParsers = /** @type {const} */ ({
+const defaultCommonjsLanguageForExtension = /** @type {const} */ ({
   js: 'cjs',
-  ...defaultUncontroversialParsers,
 });
-const defaultModuleParsers = /** @type {const} */ ({
+const defaultModuleLanguageForExtension = /** @type {const} */ ({
   js: 'mjs',
-  ...defaultUncontroversialParsers,
 });
 
 /**
  * @param {object} descriptor
  * @param {string} location
- * @param {object} [options]
- * @param {readonly string[]|string[]} [options.languages]
- * @param {Record<string, string>} [options.uncontroversialParsers]
- * @param {Record<string, string>} [options.commonParsers]
- * @param {Record<string, string>} [options.moduleParsers]
+ * @param {LanguageOptions} languageOptions
  * @returns {Record<string, string>}
  */
-const inferParsers = (
-  descriptor,
-  location,
-  {
-    languages = defaultLanguages,
-    uncontroversialParsers = defaultUncontroversialParsers,
-    commonParsers = defaultCommonParsers,
-    moduleParsers = defaultModuleParsers,
-  } = {},
-) => {
-  const { type, module, parsers } = descriptor;
-  let additionalParsers = Object.create(null);
-  if (parsers !== undefined) {
-    if (typeof parsers !== 'object') {
-      throw Error(
-        `Cannot interpret parser map ${JSON.stringify(
-          parsers,
-        )} of package at ${location}, must be an object mapping file extensions to corresponding languages (mjs for ECMAScript modules, cjs for CommonJS modules, or json for JSON modules`,
-      );
-    }
-    const invalidLanguages = values(parsers).filter(
-      language => !languages.includes(language),
+const inferParsers = (descriptor, location, languageOptions) => {
+  let { moduleLanguageForExtension, commonjsLanguageForExtension } =
+    languageOptions;
+  const {
+    languages,
+    workspaceModuleLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+  } = languageOptions;
+
+  // Select languageForExtension options based on whether they are physically
+  // under node_modules, indicating that they have not been built for npm,
+  // so any languages that compile to JavaScript may need additional parsers.
+  if (!location.includes('/node_modules/')) {
+    moduleLanguageForExtension = workspaceModuleLanguageForExtension;
+    commonjsLanguageForExtension = workspaceCommonjsLanguageForExtension;
+  }
+
+  const {
+    type,
+    module,
+    parsers: packageLanguageForExtension = {},
+  } = descriptor;
+
+  // Validate package-local "parsers"
+  if (
+    typeof packageLanguageForExtension !== 'object' ||
+    packageLanguageForExtension === null
+  ) {
+    throw Error(
+      `Cannot interpret parser map ${JSON.stringify(
+        packageLanguageForExtension,
+      )} of package at ${location}, must be an object mapping file extensions to corresponding languages (for example, mjs for ECMAScript modules, cjs for CommonJS modules, or json for JSON modules`,
+    );
+  }
+  const invalidLanguages = values(packageLanguageForExtension).filter(
+    language => !languages.has(language),
+  );
+  if (invalidLanguages.length > 0) {
+    throw Error(
+      `Cannot interpret parser map language values ${JSON.stringify(
+        invalidLanguages,
+      )} of package at ${location}, must be an object mapping file extensions to corresponding languages (for example, mjs for ECMAScript modules, cjs for CommonJS modules, or json for JSON modules`,
     );
-    if (invalidLanguages.length > 0) {
-      throw Error(
-        `Cannot interpret parser map language values ${JSON.stringify(
-          invalidLanguages,
-        )} of package at ${location}, must be an object mapping file extensions to corresponding languages (mjs for ECMAScript modules, cjs for CommonJS modules, or json for JSON modules`,
-      );
-    }
-    additionalParsers = { ...uncontroversialParsers, ...parsers };
   }
+
   if (type === 'module' || module !== undefined) {
-    return { ...moduleParsers, ...additionalParsers };
+    return { ...moduleLanguageForExtension, ...packageLanguageForExtension };
   }
   if (type === 'commonjs') {
-    return { ...commonParsers, ...additionalParsers };
+    return { ...commonjsLanguageForExtension, ...packageLanguageForExtension };
   }
   if (type !== undefined) {
     throw Error(
       `Cannot infer parser map for package of type ${type} at ${location}`,
     );
   }
-  return { ...commonParsers, ...additionalParsers };
+  return { ...commonjsLanguageForExtension, ...packageLanguageForExtension };
 };
 
 /**
@@ -281,6 +295,8 @@ const inferParsers = (
  * @param {Set<string>} conditions
  * @param {boolean | undefined} dev
  * @param {CommonDependencyDescriptors} commonDependencyDescriptors
+ * @param {LanguageOptions} languageOptions
+ * @param {boolean} strict
  * @param {Map<string, Array<string>>} preferredPackageLogicalPathMap
  * @param {Array<string>} logicalPath
  * @returns {Promise<undefined>}
@@ -294,6 +310,8 @@ const graphPackage = async (
   conditions,
   dev,
   commonDependencyDescriptors,
+  languageOptions,
+  strict,
   preferredPackageLogicalPathMap = new Map(),
   logicalPath = [],
 ) => {
@@ -328,14 +346,18 @@ const graphPackage = async (
     devDependencies = {},
   } = packageDescriptor;
   const allDependencies = {};
-  assign(allDependencies, commonDependencyDescriptors);
-  for (const [name, { spec }] of Object.entries(commonDependencyDescriptors)) {
-    allDependencies[name] = spec;
+  for (const [name, descriptor] of Object.entries(
+    commonDependencyDescriptors,
+  )) {
+    if (Object(descriptor) === descriptor) {
+      const { spec } = descriptor;
+      allDependencies[name] = spec;
+    }
   }
   assign(allDependencies, dependencies);
   assign(allDependencies, peerDependencies);
-  for (const [name, { optional }] of Object.entries(peerDependenciesMeta)) {
-    if (optional) {
+  for (const [name, meta] of Object.entries(peerDependenciesMeta)) {
+    if (Object(meta) === meta && meta.optional) {
       optionals.add(name);
     }
   }
@@ -344,7 +366,7 @@ const graphPackage = async (
   for (const name of Object.keys(optionalDependencies)) {
     optionals.add(name);
   }
-  if (dev !== undefined && dev !== null ? dev : conditions.has('development')) {
+  if (dev) {
     assign(allDependencies, devDependencies);
   }
 
@@ -363,6 +385,8 @@ const graphPackage = async (
         name,
         conditions,
         preferredPackageLogicalPathMap,
+        languageOptions,
+        strict,
         childLogicalPath,
         optional,
         commonDependencyDescriptors,
@@ -394,6 +418,12 @@ const graphPackage = async (
     types,
   );
 
+  const parsers = inferParsers(
+    packageDescriptor,
+    packageLocation,
+    languageOptions,
+  );
+
   Object.assign(result, {
     name,
     path: logicalPath,
@@ -403,7 +433,7 @@ const graphPackage = async (
     internalAliases,
     dependencyLocations,
     types,
-    parsers: inferParsers(packageDescriptor, packageLocation),
+    parsers,
   });
 
   await Promise.all(
@@ -457,6 +487,8 @@ const graphPackage = async (
  * @param {string} name - name of the package of interest.
  * @param {Set<string>} conditions
  * @param {Map<string, Array<string>>} preferredPackageLogicalPathMap
+ * @param {LanguageOptions} languageOptions
+ * @param {boolean} strict
  * @param {Array<string>} [childLogicalPath]
  * @param {boolean} [optional] - whether the dependency is optional
  * @param {object} [commonDependencyDescriptors] - dependencies to be added to all packages
@@ -470,6 +502,8 @@ const gatherDependency = async (
   name,
   conditions,
   preferredPackageLogicalPathMap,
+  languageOptions,
+  strict,
   childLogicalPath = [],
   optional = false,
   commonDependencyDescriptors = undefined,
@@ -482,7 +516,7 @@ const gatherDependency = async (
   );
   if (dependency === undefined) {
     // allow the dependency to be missing if optional
-    if (optional) {
+    if (optional || !strict) {
       return;
     }
     throw Error(`Cannot find dependency ${name} for ${packageLocation}`);
@@ -506,6 +540,8 @@ const gatherDependency = async (
     conditions,
     false,
     commonDependencyDescriptors,
+    languageOptions,
+    strict,
     preferredPackageLogicalPathMap,
     childLogicalPath,
   );
@@ -528,7 +564,9 @@ const gatherDependency = async (
  * package.json, which was already read when searching for the package.json.
  * @param {boolean|undefined} dev - whether to use devDependencies from this package (and
  * only this package).
- * @param {Record<string,string>} [commonDependencies] - dependencies to be added to all packages
+ * @param {Record<string,string>} commonDependencies - dependencies to be added to all packages
+ * @param {LanguageOptions} languageOptions
+ * @param {boolean} strict
  */
 const graphPackages = async (
   maybeRead,
@@ -537,7 +575,9 @@ const graphPackages = async (
   conditions,
   mainPackageDescriptor,
   dev,
-  commonDependencies = {},
+  commonDependencies,
+  languageOptions,
+  strict,
 ) => {
   const memo = create(null);
   /**
@@ -594,6 +634,8 @@ const graphPackages = async (
     conditions,
     dev,
     commonDependencyDescriptors,
+    languageOptions,
+    strict,
   );
   return graph;
 };
@@ -749,10 +791,78 @@ const translateGraph = (
   };
 };
 
+/**
+ * @param {Pick<MapNodeModulesOptions,
+ *   'languageForExtension' |
+ *   'moduleLanguageForExtension' |
+ *   'commonjsLanguageForExtension' |
+ *   'workspaceLanguageForExtension' |
+ *   'workspaceModuleLanguageForExtension' |
+ *   'workspaceCommonjsLanguageForExtension' |
+ *   'languages'
+ * >} options
+ */
+const makeLanguageOptions = ({
+  languageForExtension: additionalLanguageForExtension = {},
+  moduleLanguageForExtension: additionalModuleLanguageForExtension = {},
+  commonjsLanguageForExtension: additionalCommonjsLanguageForExtension = {},
+  workspaceLanguageForExtension: additionalWorkspaceLanguageForExtension = {},
+  workspaceModuleLanguageForExtension:
+    additionalWorkspaceModuleLanguageForExtension = {},
+  workspaceCommonjsLanguageForExtension:
+    additionalWorkspaceCommonjsLanguageForExtension = {},
+  languages: additionalLanguages = [],
+}) => {
+  const commonjsLanguageForExtension = {
+    ...defaultLanguageForExtension,
+    ...additionalLanguageForExtension,
+    ...defaultCommonjsLanguageForExtension,
+    ...additionalCommonjsLanguageForExtension,
+  };
+  const moduleLanguageForExtension = {
+    ...defaultLanguageForExtension,
+    ...additionalLanguageForExtension,
+    ...defaultModuleLanguageForExtension,
+    ...additionalModuleLanguageForExtension,
+  };
+  const workspaceCommonjsLanguageForExtension = {
+    ...defaultLanguageForExtension,
+    ...additionalLanguageForExtension,
+    ...defaultCommonjsLanguageForExtension,
+    ...additionalCommonjsLanguageForExtension,
+    ...additionalWorkspaceLanguageForExtension,
+    ...additionalWorkspaceCommonjsLanguageForExtension,
+  };
+  const workspaceModuleLanguageForExtension = {
+    ...defaultLanguageForExtension,
+    ...additionalLanguageForExtension,
+    ...defaultModuleLanguageForExtension,
+    ...additionalModuleLanguageForExtension,
+    ...additionalWorkspaceLanguageForExtension,
+    ...additionalWorkspaceModuleLanguageForExtension,
+  };
+
+  const languages = new Set([
+    ...Object.values(moduleLanguageForExtension),
+    ...Object.values(commonjsLanguageForExtension),
+    ...Object.values(workspaceModuleLanguageForExtension),
+    ...Object.values(workspaceCommonjsLanguageForExtension),
+    ...additionalLanguages,
+  ]);
+
+  return {
+    languages,
+    commonjsLanguageForExtension,
+    moduleLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
+  };
+};
+
 /**
  * @param {ReadFn | ReadPowers | MaybeReadPowers} readPowers
  * @param {string} packageLocation
- * @param {Set<string>} conditions
+ * @param {Set<string>} conditionsOption
  * @param {object} packageDescriptor
  * @param {string} moduleSpecifier
  * @param {CompartmentMapForNodeModulesOptions} [options]
@@ -761,21 +871,37 @@ const translateGraph = (
 export const compartmentMapForNodeModules = async (
   readPowers,
   packageLocation,
-  conditions,
+  conditionsOption,
   packageDescriptor,
   moduleSpecifier,
   options = {},
 ) => {
-  const { dev = undefined, commonDependencies, policy } = options;
+  const {
+    dev = false,
+    commonDependencies = {},
+    policy,
+    strict = false,
+  } = options;
   const { maybeRead, canonical } = unpackReadPowers(readPowers);
+  const languageOptions = makeLanguageOptions(options);
+
+  const conditions = new Set(conditionsOption || []);
+
+  // dev is only set for the entry package, and implied by the development
+  // condition.
+  // The dev option is deprecated in favor of using conditions, since that
+  // covers more intentional behaviors of the development mode.
+
   const graph = await graphPackages(
     maybeRead,
     canonical,
     packageLocation,
     conditions,
     packageDescriptor,
-    dev,
+    dev || (conditions && conditions.has('development')),
     commonDependencies,
+    languageOptions,
+    strict,
   );
 
   if (policy) {
@@ -808,12 +934,7 @@ export const compartmentMapForNodeModules = async (
 /**
  * @param {ReadFn | ReadPowers | MaybeReadPowers} readPowers
  * @param {string} moduleLocation
- * @param {object} [options]
- * @param {Set<string>} [options.tags] deprecated in favor of `conditions`
- * @param {Set<string>} [options.conditions]
- * @param {boolean} [options.dev]
- * @param {object} [options.commonDependencies]
- * @param {object} [options.policy]
+ * @param {MapNodeModulesOptions} [options]
  * @returns {Promise<CompartmentMapDescriptor>}
  */
 export const mapNodeModules = async (
@@ -821,13 +942,7 @@ export const mapNodeModules = async (
   moduleLocation,
   options = {},
 ) => {
-  const {
-    tags = new Set(),
-    conditions = tags,
-    dev = undefined,
-    commonDependencies,
-    policy,
-  } = options;
+  const { tags = new Set(), conditions = tags, ...otherOptions } = options;
 
   const {
     packageLocation,
@@ -847,6 +962,6 @@ export const mapNodeModules = async (
     conditions,
     packageDescriptor,
     moduleSpecifier,
-    { dev, commonDependencies, policy },
+    otherOptions,
   );
 };

package/src/node-powers.d.ts

@@ -39,12 +39,12 @@ export function makeWritePowers({ fs, url }: {
 };
 export function makeNodeReadPowers(fs: FsInterface, crypto?: CryptoInterface | undefined): ReadPowers;
 export function makeNodeWritePowers(fs: FsInterface): WritePowers;
-import type { FsInterface } from './types.js';
-import type { UrlInterface } from './types.js';
-import type { CryptoInterface } from './types.js';
-import type { PathInterface } from './types.js';
-import type { MaybeReadPowers } from './types.js';
-import type { ReadNowPowers } from './types.js';
-import type { ReadPowers } from './types.js';
-import type { WritePowers } from './types.js';
+import type { FsInterface } from './types/node-powers.js';
+import type { UrlInterface } from './types/node-powers.js';
+import type { CryptoInterface } from './types/node-powers.js';
+import type { PathInterface } from './types/node-powers.js';
+import type { MaybeReadPowers } from './types/powers.js';
+import type { ReadNowPowers } from './types/powers.js';
+import type { ReadPowers } from './types/powers.js';
+import type { WritePowers } from './types/powers.js';
 //# sourceMappingURL=node-powers.d.ts.map

package/src/node-powers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-powers.d.ts","sourceRoot":"","sources":["node-powers.js"],"names":[],"mappings":"AAqLO,8DANJ;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;IACA,MAAM;IACR,IAAI;CACjC,GAAU,eAAe,GAAG,aAAa,CAoC3C;AAlKD;;;;;;;;;;;GAWG;AACH,2DANG;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;IACA,MAAM;IACR,IAAI;CACjC,GAAU,eAAe,CA0G3B;AAgDD;;;;;;;;GAQG;AACH,6CAHG;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;CAAC;sBAOtB,MAAM,QACN,UAAU;EAYtB;AA2BM,uCALI,WAAW,yCAET,UAAU,CAKtB;AAWM,wCAJI,WAAW,GACT,WAAW,CAKvB;iCAjR8B,YAAY;kCAWX,YAAY;qCAbT,YAAY;mCAOd,YAAY;qCADV,YAAY;mCAMd,YAAY;gCAFf,YAAY;iCAIX,YAAY"}
+{"version":3,"file":"node-powers.d.ts","sourceRoot":"","sources":["node-powers.js"],"names":[],"mappings":"AA0LO,8DANJ;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;IACA,MAAM;IACR,IAAI;CACjC,GAAU,eAAe,GAAG,aAAa,CAoC3C;AAlKD;;;;;;;;;;;GAWG;AACH,2DANG;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;IACA,MAAM;IACR,IAAI;CACjC,GAAU,eAAe,CA0G3B;AAgDD;;;;;;;;GAQG;AACH,6CAHG;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;CAAC;sBAOtB,MAAM,QACN,UAAU;EAYtB;AA2BM,uCALI,WAAW,yCAET,UAAU,CAKtB;AAWM,wCAJI,WAAW,GACT,WAAW,CAKvB;iCApRS,wBAAwB;kCAAxB,wBAAwB;qCAAxB,wBAAwB;mCAAxB,wBAAwB;qCAexB,mBAAmB;mCAAnB,mBAAmB;gCAAnB,mBAAmB;iCAAnB,mBAAmB"}

package/src/node-powers.js

@@ -1,30 +1,35 @@
-/* Provides adapters for Compartment Mapper I/O to the corresponding Node.js
- * implementations of those behaviors.
+/**
+ * @module Provides adapters for Compartment Mapper I/O to the corresponding
+ * Node.js implementations of those behaviors.
  *
  * The Compartment Mapper generalizes its I/O interface to allow for a wide
  * variety of I/O providers, but especially for reading and writing from
  * virtualized file systems like zip files.
  */
 
-// @ts-check
-
-/** @import {CanonicalFn} from './types.js' */
-/** @import {CryptoInterface} from './types.js' */
-/** @import {FileURLToPathFn} from './types.js' */
-/** @import {FsInterface} from './types.js' */
-/** @import {HashFn} from './types.js' */
-/** @import {IsAbsoluteFn} from './types.js' */
-/** @import {MaybeReadFn} from './types.js' */
-/** @import {MaybeReadPowers} from './types.js' */
-/** @import {PathInterface} from './types.js' */
-/** @import {PathToFileURLFn} from './types.js' */
-/** @import {ReadFn} from './types.js' */
-/** @import {ReadPowers} from './types.js' */
-/** @import {RequireResolveFn} from './types.js' */
-/** @import {ReadNowPowers} from './types.js' */
-/** @import {UrlInterface} from './types.js' */
-/** @import {WritePowers} from './types.js' */
-/** @import {MaybeReadNowFn} from './types.js' */
+/**
+ * @import {
+ *   CryptoInterface,
+ *   FsInterface,
+ *   PathInterface,
+ *   UrlInterface,
+ * } from './types/node-powers.js'
+ * @import {
+ *   CanonicalFn,
+ *   FileURLToPathFn,
+ *   HashFn,
+ *   IsAbsoluteFn,
+ *   MaybeReadFn,
+ *   MaybeReadNowFn,
+ *   MaybeReadPowers,
+ *   PathToFileURLFn,
+ *   ReadFn,
+ *   ReadNowPowers,
+ *   ReadPowers,
+ *   RequireResolveFn,
+ *   WritePowers,
+ * } from './types/powers.js'
+ */
 
 import { createRequire } from 'module';
 
@@ -43,7 +48,7 @@ const fakeFileURLToPath = location => {
  * @type {PathToFileURLFn} path
  */
 const fakePathToFileURL = path => {
-  return new URL(path, 'file://').toString();
+  return new URL(path, 'file://');
 };
 
 /**
@@ -138,10 +143,10 @@ const makeReadPowersSloppy = ({
         const realPath = await fs.promises.realpath(
           fileURLToPath(location).replace(/\/$/, ''),
         );
-        return `${pathToFileURL(realPath)}/`;
+        return `${pathToFileURL(realPath).href}/`;
       } else {
         const realPath = await fs.promises.realpath(fileURLToPath(location));
-        return pathToFileURL(realPath).toString();
+        return pathToFileURL(realPath).href;
       }
     } catch {
       return location;

package/src/parse-archive-cjs.d.ts

@@ -1,5 +1,6 @@
-/** @type {import('./types.js').ParseFn} */
-export const parseArchiveCjs: import("./types.js").ParseFn;
+/** @type {ParseFn} */
+export const parseArchiveCjs: ParseFn;
 declare const _default: import("./types.js").ParserImplementation;
 export default _default;
+import type { ParseFn } from './types.js';
 //# sourceMappingURL=parse-archive-cjs.d.ts.map

package/src/parse-archive-cjs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-archive-cjs.d.ts","sourceRoot":"","sources":["parse-archive-cjs.js"],"names":[],"mappings":"AAiBA,2CAA2C;AAC3C,8BADW,OAAO,YAAY,EAAE,OAAO,CA6CrC;wBAES,OAAO,YAAY,EAAE,oBAAoB"}
+{"version":3,"file":"parse-archive-cjs.d.ts","sourceRoot":"","sources":["parse-archive-cjs.js"],"names":[],"mappings":"AAkBA,sBAAsB;AACtB,8BADW,OAAO,CA6ChB;wBAES,OAAO,YAAY,EAAE,oBAAoB;;6BA5DzB,YAAY"}

package/src/parse-archive-cjs.js

@@ -1,8 +1,9 @@
-/* Provides language behavior for analyzing, pre-compiling, and storing
+/**
+ * @module Provides language behavior for analyzing, pre-compiling, and storing
  * CommonJS modules for an archive.
  */
 
-// @ts-check
+/** @import {ParseFn} from './types.js' */
 
 import { analyzeCommonJS } from '@endo/cjs-module-analyzer';
 
@@ -15,10 +16,10 @@ const freeze = Object.freeze;
 const noopExecute = () => {};
 freeze(noopExecute);
 
-/** @type {import('./types.js').ParseFn} */
+/** @type {ParseFn} */
 export const parseArchiveCjs = (
   bytes,
-  specifier,
+  _specifier,
   location,
   _packageLocation,
 ) => {

package/src/parse-archive-mjs.d.ts

@@ -1,5 +1,6 @@
-/** @type {import('./types.js').ParseFn} */
-export const parseArchiveMjs: import("./types.js").ParseFn;
+/** @type {ParseFn} */
+export const parseArchiveMjs: ParseFn;
 declare const _default: import("./types.js").ParserImplementation;
 export default _default;
+import type { ParseFn } from './types.js';
 //# sourceMappingURL=parse-archive-mjs.d.ts.map

package/src/parse-archive-mjs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-archive-mjs.d.ts","sourceRoot":"","sources":["parse-archive-mjs.js"],"names":[],"mappings":"AAUA,2CAA2C;AAC3C,8BADW,OAAO,YAAY,EAAE,OAAO,CAqBrC;wBAES,OAAO,YAAY,EAAE,oBAAoB"}
+{"version":3,"file":"parse-archive-mjs.d.ts","sourceRoot":"","sources":["parse-archive-mjs.js"],"names":[],"mappings":"AAYA,sBAAsB;AACtB,8BADW,OAAO,CAqBhB;wBAES,OAAO,YAAY,EAAE,oBAAoB;;6BA9BzB,YAAY"}