@endo/compartment-mapper 0.7.14 → 0.8.0

package/CHANGELOG.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.8.0](https://github.com/endojs/endo/compare/@endo/compartment-mapper@0.7.15...@endo/compartment-mapper@0.8.0) (2022-11-14)
+
+
+### ⚠ BREAKING CHANGES
+
+* **compartment-mapper:** Remove support for globalLexicals
+
+### Features
+
+* **compartment-mapper:** Bundles evaluate to entrypoint namespace ([85a69aa](https://github.com/endojs/endo/commit/85a69aaf8133fa84ec3548e8004777097cf7c326))
+* **compartment-mapper:** Remove support for globalLexicals ([7d9603d](https://github.com/endojs/endo/commit/7d9603d0c838e02c1b052cf6e8f725ebf195aaf2))
+* **compartment-mapper:** support peerDependencies and bundleDependencies ([3afd7c5](https://github.com/endojs/endo/commit/3afd7c5680813063a1ab7ff93af1a116e6af2f02))
+* **compartment-mapper:** support various types of optional deps ([72fa6e7](https://github.com/endojs/endo/commit/72fa6e7a3089be31be97caee2616090ac842bb3e))
+
+
+### Bug Fixes
+
+* assert touchups ([#1350](https://github.com/endojs/endo/issues/1350)) ([3fcb5b1](https://github.com/endojs/endo/commit/3fcb5b117eccb326c6c81339ae6a293a6bcaa9d4))
+
+
+
+### [0.7.15](https://github.com/endojs/endo/compare/@endo/compartment-mapper@0.7.14...@endo/compartment-mapper@0.7.15) (2022-10-24)
+
+**Note:** Version bump only for package @endo/compartment-mapper
+
+
+
+
+
 ### [0.7.14](https://github.com/endojs/endo/compare/@endo/compartment-mapper@0.7.13...@endo/compartment-mapper@0.7.14) (2022-10-19)
 
 **Note:** Version bump only for package @endo/compartment-mapper

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@endo/compartment-mapper",
-  "version": "0.7.14",
+  "version": "0.8.0",
   "description": "The compartment mapper assembles Node applications in a sandbox",
   "keywords": [
     "node",
@@ -41,10 +41,10 @@
     "test": "ava"
   },
   "dependencies": {
-    "@endo/cjs-module-analyzer": "^0.2.27",
-    "@endo/static-module-record": "^0.7.13",
-    "@endo/zip": "^0.2.27",
-    "ses": "^0.16.0"
+    "@endo/cjs-module-analyzer": "^0.2.28",
+    "@endo/static-module-record": "^0.7.15",
+    "@endo/zip": "^0.2.28",
+    "ses": "^0.18.0"
   },
   "devDependencies": {
     "@endo/eslint-config": "^0.5.1",
@@ -58,7 +58,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^3.4.1",
     "prettier": "^1.19.1",
-    "typescript": "~4.6.2"
+    "typescript": "~4.8.4"
   },
   "files": [
     "LICENSE*",
@@ -93,5 +93,5 @@
     ],
     "timeout": "2m"
   },
-  "gitHead": "8da6dc1002417c0f18cd43b351f8f62d7010260c"
+  "gitHead": "da16a94856482e36296b7cae16d715aa63344928"
 }

package/src/bundle.js

@@ -337,6 +337,8 @@ ${importsCellSetter(__fixedExportMap__, index)}\
 `,
   ),
 )}\
+
+  return cells[cells.length - 1]['*'].get();
 })();
 `;
 

package/src/compartment-map.js

@@ -1,6 +1,10 @@
 // @ts-check
 /// <reference types="ses"/>
 
+// TODO convert to the new `||` assert style.
+// Deferred because this file pervasively uses simple template strings rather than
+// template strings tagged with `assert.details` (aka `X`), and uses
+// this definition of `q` rather than `assert.quote`
 const q = JSON.stringify;
 
 const moduleLanguages = [

package/src/import-archive.js

@@ -29,7 +29,7 @@ import { assertCompartmentMap } from './compartment-map.js';
 
 const DefaultCompartment = Compartment;
 
-const { quote: q, details: d } = assert;
+const { Fail, quote: q } = assert;
 
 const textDecoder = new TextDecoder();
 
@@ -207,12 +207,10 @@ export const parseArchive = async (
 
   // Track all modules that get loaded, all files that are used.
   const unseen = new Set(archive.files.keys());
-  assert(
-    unseen.size >= 2,
-    `Archive failed sanity check: should contain at least a compartment map file and one module file in ${q(
+  unseen.size >= 2 ||
+    Fail`Archive failed sanity check: should contain at least a compartment map file and one module file in ${q(
       archiveLocation,
-    )}`,
-  );
+    )}`;
 
   /**
    * @param {string} path
@@ -280,24 +278,16 @@ export const parseArchive = async (
     });
 
     await compartment.load(moduleSpecifier);
-    assert(
-      unseen.size === 0,
-      d`Archive contains extraneous files: ${q([...unseen])} in ${q(
+    unseen.size === 0 ||
+      Fail`Archive contains extraneous files: ${q([...unseen])} in ${q(
         archiveLocation,
-      )}`,
-    );
+      )}`;
   }
 
   /** @type {ExecuteFn} */
   const execute = options => {
-    const {
-      globals,
-      globalLexicals,
-      modules,
-      transforms,
-      __shimTransforms__,
-      Compartment,
-    } = options || {};
+    const { globals, modules, transforms, __shimTransforms__, Compartment } =
+      options || {};
     const makeImportHook = makeArchiveImportHookMaker(
       get,
       compartments,
@@ -309,13 +299,13 @@ export const parseArchive = async (
       makeImportHook,
       parserForLanguage,
       globals,
-      globalLexicals,
       modules,
       transforms,
       __shimTransforms__,
       Compartment,
     });
-    return compartment.import(moduleSpecifier);
+    // eslint-disable-next-line dot-notation
+    return compartment['import'](moduleSpecifier);
   };
 
   return { import: execute, sha512 };

package/src/import.js

@@ -67,7 +67,6 @@ export const loadLocation = async (readPowers, moduleLocation, options) => {
   const execute = async (options = {}) => {
     const {
       globals,
-      globalLexicals,
       modules,
       transforms,
       __shimTransforms__,
@@ -78,7 +77,6 @@ export const loadLocation = async (readPowers, moduleLocation, options) => {
       makeImportHook,
       parserForLanguage,
       globals,
-      globalLexicals,
       modules,
       transforms,
       moduleTransforms,

package/src/link.js

@@ -333,7 +333,6 @@ export const link = (
     makeImportHook,
     parserForLanguage,
     globals = {},
-    globalLexicals = {},
     transforms = [],
     moduleTransforms = {},
     __shimTransforms__ = [],
@@ -401,7 +400,6 @@ export const link = (
       moduleMapHook,
       transforms,
       __shimTransforms__,
-      globalLexicals,
       name: location,
     });
 

package/src/node-modules.js

@@ -252,13 +252,37 @@ const graphPackage = async (
   graph[packageLocation] = /** @type {Node} */ (result);
 
   /** @type {Record<string, string>} */
-  const dependencies = {};
+  const dependencyLocations = {};
   const children = [];
-  const predicates = packageDescriptor.dependencies || {};
+  const optionals = new Set();
+  const {
+    dependencies = {},
+    peerDependencies = {},
+    peerDependenciesMeta = {},
+    bundleDependencies = {},
+    optionalDependencies = {},
+    devDependencies = {},
+  } = packageDescriptor;
+  const allDependencies = {};
+  assign(allDependencies, dependencies);
+  assign(allDependencies, peerDependencies);
+  for (const [name, { optional }] of Object.entries(peerDependenciesMeta)) {
+    if (optional) {
+      optionals.add(name);
+    }
+  }
+  assign(allDependencies, bundleDependencies);
+  assign(allDependencies, optionalDependencies);
+  Object.keys(optionalDependencies).forEach(name => {
+    optionals.add(name);
+  });
+
   if (dev) {
-    assign(predicates, packageDescriptor.devDependencies || {});
+    assign(allDependencies, devDependencies);
   }
-  for (const name of keys(predicates).sort()) {
+
+  for (const name of keys(allDependencies).sort()) {
+    const optional = optionals.has(name);
     children.push(
       // Mutual recursion ahead:
       // eslint-disable-next-line no-use-before-define
@@ -266,10 +290,11 @@ const graphPackage = async (
         readDescriptor,
         canonical,
         graph,
-        dependencies,
+        dependencyLocations,
         packageLocation,
         name,
         tags,
+        optional,
       ),
     );
   }
@@ -291,7 +316,7 @@ const graphPackage = async (
     label: `${name}${version ? `-v${version}` : ''}`,
     explicit: exports !== undefined,
     exports: inferExports(packageDescriptor, tags, types),
-    dependencies,
+    dependencies: dependencyLocations,
     types,
     parsers: inferParsers(packageDescriptor, packageLocation),
   });
@@ -317,6 +342,7 @@ const graphPackage = async (
  * @param {string} packageLocation - location of the package of interest.
  * @param {string} name - name of the package of interest.
  * @param {Set<string>} tags
+ * @param {boolean} optional - whether the dependency is optional
  */
 const gatherDependency = async (
   readDescriptor,
@@ -326,6 +352,7 @@ const gatherDependency = async (
   packageLocation,
   name,
   tags,
+  optional = false,
 ) => {
   const dependency = await findPackage(
     readDescriptor,
@@ -334,6 +361,10 @@ const gatherDependency = async (
     name,
   );
   if (dependency === undefined) {
+    // allow the dependency to be missing if optional
+    if (optional) {
+      return;
+    }
     throw new Error(`Cannot find dependency ${name} for ${packageLocation}`);
   }
   dependencies[name] = dependency.packageLocation;

package/src/types.js

@@ -234,7 +234,6 @@ export {};
 /**
  * @typedef {Object} ExecuteOptions
  * @property {Object} [globals]
- * @property {Object} [globalLexicals]
  * @property {Array<Transform>} [transforms]
  * @property {Array<Transform>} [__shimTransforms__]
  * @property {Record<string, Object>} [modules]