Fix compiling duplicate ns imports to lazy CommonJS (#15941)

* Fix compiling duplicate ns imports to lazy CommonJS

* Better types

* whops

packages/babel-helper-module-transforms/src/index.ts

@@ -211,8 +211,7 @@ export function buildNamespaceInitStatements(
 ) {
   const statements = [];
 
-  let srcNamespace: t.Node = identifier(sourceMetadata.name);
-  if (sourceMetadata.lazy) srcNamespace = callExpression(srcNamespace, []);
+  const srcNamespaceId = identifier(sourceMetadata.name);
 
   for (const localName of sourceMetadata.importsNamespace) {
     if (localName === sourceMetadata.name) continue;
@@ -221,10 +220,15 @@ export function buildNamespaceInitStatements(
     statements.push(
       template.statement`var NAME = SOURCE;`({
         NAME: localName,
-        SOURCE: cloneNode(srcNamespace),
+        SOURCE: cloneNode(srcNamespaceId),
       }),
     );
   }
+
+  const srcNamespace = sourceMetadata.lazy
+    ? callExpression(srcNamespaceId, [])
+    : srcNamespaceId;
+
   if (constantReexports) {
     statements.push(...buildReexportsFromMeta(metadata, sourceMetadata, true));
   }

packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-dep/import-namespace-and-named/input.mjs

@@ -0,0 +1,4 @@
+import * as foo from "foo";
+import { bar } from "foo";
+
+console.log(foo, bar);

packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-dep/import-namespace-and-named/output.js

@@ -0,0 +1,10 @@
+"use strict";
+
+function foo() {
+  const data = babelHelpers.interopRequireWildcard(require("foo"));
+  foo = function () {
+    return data;
+  };
+  return data;
+}
+console.log(foo(), foo().bar);

packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-dep/import-namespace-multiple/input.mjs

@@ -0,0 +1,4 @@
+import * as foo from "foo";
+import * as foo2 from "foo";
+
+console.log(foo, foo2);

packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-dep/import-namespace-multiple/output.js

@@ -0,0 +1,11 @@
+"use strict";
+
+function foo() {
+  const data = babelHelpers.interopRequireWildcard(require("foo"));
+  foo = function () {
+    return data;
+  };
+  return data;
+}
+var foo2 = foo;
+console.log(foo(), foo2());