fix(compartment-mapper): add support for alternatives in exports defn…

…itions (#1134) * fix(compartment-mapper): add support for alternatives in exports definitions * nicer looking search for non-empty export alternative
endojs · Apr 5, 2022 · 6663f25 · 6663f25
1 parent 1d9c17b
commit 6663f25
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 2 deletions.
diff --git a/packages/compartment-mapper/src/infer-exports.js b/packages/compartment-mapper/src/infer-exports.js
@@ -5,6 +5,7 @@
 import { join, relativize } from './node-module-specifier.js';
 
 const { entries, fromEntries } = Object;
+const { isArray } = Array;
 
 /**
  * @param {string} name - the name of the referrer package.
@@ -34,6 +35,15 @@ function* interpretBrowserExports(name, exports) {
  * @yields {[string, string]}
  */
 function* interpretExports(name, exports, tags) {
+  if (isArray(exports)) {
+    for (const section of exports) {
+      const results = [...interpretExports(name, section, tags)];
+      if (results.length > 0) {
+        yield* results;
+        break;
+      }
+    }
+  }
   if (typeof exports === 'string') {
     yield [name, relativize(exports)];
     return;

diff --git a/packages/compartment-mapper/src/parse-cjs-shared-export-wrapper.js b/packages/compartment-mapper/src/parse-cjs-shared-export-wrapper.js
@@ -95,7 +95,7 @@ export const wrap = (moduleEnvironmentRecord, compartment, resolvedImports) => {
     // the lexer.
     if (exportsHaveBeenOverwritten) {
       moduleEnvironmentRecord.default = finalExports;
-      keys(moduleEnvironmentRecord.default).forEach(prop => {
+      keys(moduleEnvironmentRecord.default || {}).forEach(prop => {
         if (prop !== 'default')
           moduleEnvironmentRecord[prop] = moduleEnvironmentRecord.default[prop];
       });

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/...ompartment-mapper/test/fixtures-cjs-compat/node_modules/nested-export/README.md b/...ompartment-mapper/test/fixtures-cjs-compat/node_modules/nested-export/README.md
diff --git a/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-export/callBound.js b/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-export/callBound.js
diff --git a/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-export/index.js b/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-export/index.js
diff --git a/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-export/package.json b/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-export/package.json
diff --git a/.../compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-file/README.md b/.../compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-file/README.md
diff --git a/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-file/main.js b/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-file/main.js
diff --git a/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-file/nested.js b/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-file/nested.js
diff --git a/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-file/package.json b/packages/compartment-mapper/test/fixtures-cjs-compat/node_modules/nested-file/package.json
diff --git a/packages/compartment-mapper/test/test-cjs-compat.js b/packages/compartment-mapper/test/test-cjs-compat.js
@@ -18,6 +18,7 @@ const assertFixture = (t, { namespace }) => {
   assertions.parserStruggles();
   assertions.moduleWithCycle();
   assertions.defaultChangesAfterExec();
+  assertions.packageNestedFile();
 
   t.pass();
 };