fix(compartment-mapper): handle passing and reading exports reference (…

…#1142)
endojs · Apr 5, 2022 · 3b7584a · 3b7584a
1 parent 6663f25
commit 3b7584a
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 13 deletions.
diff --git a/packages/compartment-mapper/src/parse-cjs-shared-export-wrapper.js b/packages/compartment-mapper/src/parse-cjs-shared-export-wrapper.js
@@ -42,10 +42,7 @@ export const wrap = (moduleEnvironmentRecord, compartment, resolvedImports) => {
     moduleEnvironmentRecord.default[prop] = value;
   };
 
-  const originalExports = new Proxy(Object.create(null), {
-    get(target, prop) {
-      return moduleEnvironmentRecord.default[prop];
-    },
+  const originalExports = new Proxy(moduleEnvironmentRecord.default, {
     set(_target, prop, value) {
       assignProp(prop, value);
       return true;

diff --git a/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/app/index.js b/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/app/index.js
diff --git a/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/app/package.json b/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/app/package.json
diff --git a/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/callself/package.json b/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/callself/package.json
diff --git a/...js-compat/node_modules/callself/README.md → ...ode_modules/exports-shenanigans/README.md b/...js-compat/node_modules/callself/README.md → ...ode_modules/exports-shenanigans/README.md
diff --git a/...partment-mapper/test/fixtures-cjs-compat/node_modules/exports-shenanigans/debug-common.js b/...partment-mapper/test/fixtures-cjs-compat/node_modules/exports-shenanigans/debug-common.js
diff --git a/...ompartment-mapper/test/fixtures-cjs-compat/node_modules/exports-shenanigans/from-debug.js b/...ompartment-mapper/test/fixtures-cjs-compat/node_modules/exports-shenanigans/from-debug.js
diff --git a/...-cjs-compat/node_modules/callself/main.js → .../node_modules/exports-shenanigans/main.js b/...-cjs-compat/node_modules/callself/main.js → .../node_modules/exports-shenanigans/main.js
diff --git a/...compartment-mapper/test/fixtures-cjs-compat/node_modules/exports-shenanigans/package.json b/...compartment-mapper/test/fixtures-cjs-compat/node_modules/exports-shenanigans/package.json
diff --git a/packages/compartment-mapper/test/scaffold.js b/packages/compartment-mapper/test/scaffold.js
@@ -18,6 +18,7 @@ import { makeReadPowers } from '../src/node-powers.js';
 export const readPowers = makeReadPowers({ fs, crypto, url });
 
 const globals = {
+  // process: { _rawDebug: process._rawDebug }, // useful for debugging
   globalProperty: 42,
   globalLexical: 'global', // should be overshadowed
 };

diff --git a/packages/compartment-mapper/test/test-cjs-compat.js b/packages/compartment-mapper/test/test-cjs-compat.js
@@ -12,7 +12,7 @@ const fixture = new URL(
 const assertFixture = (t, { namespace }) => {
   const { assertions } = namespace;
 
-  assertions.packageReferencingItself();
+  assertions.packageExportsShenanigans();
   assertions.packageWithDefaultField();
   assertions.moduleWithDefaultField();
   assertions.parserStruggles();