Review

babel · Apr 6, 2021 · d195510 · d195510
1 parent e003910
commit d195510
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/packages/babel-helper-module-transforms/src/normalize-and-load-metadata.ts b/packages/babel-helper-module-transforms/src/normalize-and-load-metadata.ts
@@ -22,11 +22,11 @@ export interface ModuleMetadata {
 }
 
 export type InteropType =
-  | "default"
-  | "namespace"
-  | "node-default"
-  | "node-namespace"
-  | "none";
+  | "default" // Babel interop for default-only imports
+  | "namespace" // Babel interop for namespace or default+named imports
+  | "node-default" // Node.js interop for default-only imports
+  | "node-namespace" // Node.js interop for namespace or default+named imports
+  | "none"; // No interop, or named-only imports
 
 export interface SourceModuleMetadata {
   // A unique variable name to use for this namespace object. Centralized for simplicity.

diff --git a/packages/babel-helpers/src/helpers.js b/packages/babel-helpers/src/helpers.js
@@ -619,12 +619,14 @@ helpers.interopRequireDefault = helper("7.0.0-beta.0")`
 `;
 
 helpers.interopRequireWildcard = helper("7.14.0")`
-  function _getRequireWildcardCache(i) {
+  function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
 
-    var cache = [/* babel interop */ new WeakMap(), /* node interop */ new WeakMap()];
-    _getRequireWildcardCache = function (i) { return cache[i]; };
-    return cache[i];
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function (nodeInterop) {
+      return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
   }
 
   export default function _interopRequireWildcard(obj, nodeInterop) {
@@ -636,15 +638,15 @@ helpers.interopRequireWildcard = helper("7.14.0")`
       return { default: obj }
     }
 
-    var cache = _getRequireWildcardCache(+!!nodeInterop);
+    var cache = _getRequireWildcardCache(nodeInterop);
     if (cache && cache.has(obj)) {
       return cache.get(obj);
     }
 
     var newObj = {};
     var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
     for (var key in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key) && key !== "default") {
+      if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
         var desc = hasPropertyDescriptor
           ? Object.getOwnPropertyDescriptor(obj, key)
           : null;

diff --git a/...-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters-star/output.js b/...-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters-star/output.js
@@ -9,6 +9,6 @@ var foo = _interopRequireWildcard(require("./moduleWithGetter"));
 
 exports.foo = foo;
 
-function _getRequireWildcardCache(i) { if (typeof WeakMap !== "function") return null; var cache = [new WeakMap(), new WeakMap()]; _getRequireWildcardCache = function (i) { return cache[i]; }; return cache[i]; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(+!!nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key) && key !== "default") { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }