feat(compartment-mapper): Bundle the unarchiver (merge #1356)

Author: kriskowal

packages/compartment-mapper/NEWS.md

@@ -2,6 +2,7 @@ User-visible changes to the compartment mapper:
 
 # Next release
 
+- Bundles now evaluate to their entrypoint module's namespace object.
 - Removes support for `globalLexicals`.
 
 # 0.7.7 (2022-06-28)

packages/compartment-mapper/src/bundle.js

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

packages/compartment-mapper/src/import-archive.js

@@ -304,7 +304,8 @@ export const parseArchive = async (
       __shimTransforms__,
       Compartment,
     });
-    return compartment.import(moduleSpecifier);
+    // eslint-disable-next-line dot-notation
+    return compartment['import'](moduleSpecifier);
   };
 
   return { import: execute, sha512 };

packages/compartment-mapper/test/fixtures-0/node_modules/bundle-dep/index.js

@@ -13,6 +13,7 @@ const fixture = new URL(
 const { read } = makeReadPowers({ fs, url });
 
 const expectedLog = [
+  'dependency',
   'foo',
   {
     c: 'sea',

packages/compartment-mapper/test/fixtures-0/node_modules/bundle-dep/package.json

@@ -1,6 +1,6 @@
 import 'ses';
 import test from 'ava';
-import { loadLocation, importArchive } from '../index.js';
+import { loadLocation, importArchive, makeBundle } from '../index.js';
 import { scaffold, readPowers, setup } from './scaffold.js';
 
 const fixture = new URL(
@@ -83,6 +83,42 @@ with the current test fixture.`);
   assertFixture(t, { namespace, globals });
 });
 
+test('makeBundle / importArchive', async t => {
+  t.plan(fixtureAssertionCount);
+
+  const archiverLocation = new URL(
+    '../src/import-archive.js',
+    import.meta.url,
+  ).toString();
+
+  const archiverBundle = await makeBundle(readPowers.read, archiverLocation);
+  const archiverCompartment = new Compartment({
+    TextEncoder,
+    TextDecoder,
+    URL,
+    assert,
+  });
+  const evasiveArchiverBundle = archiverBundle
+    .replace(/(?<!\.)\bimport\b(?![:"'])/g, 'IMPORT')
+    .replace(/\beval\b/g, 'EVAL');
+  const { importArchive: bundledImportArchive } = archiverCompartment.evaluate(
+    evasiveArchiverBundle,
+  );
+
+  const { globals, modules } = await setup();
+
+  const { namespace } = await bundledImportArchive(
+    readPowers.read,
+    archiveFixture,
+    {
+      globals,
+      modules,
+      Compartment,
+    },
+  );
+  assertFixture(t, { namespace, globals });
+});
+
 test('no dev dependencies', async t => {
   const { globals, modules } = await setup();