fix: import name conflict

j4k0xb · Dec 19, 2023 · 44e42b4 · 44e42b4
1 parent f23fdef
commit 44e42b4
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/packages/webcrack/src/unpack/webpack/esm.ts b/packages/webcrack/src/unpack/webpack/esm.ts
@@ -154,23 +154,25 @@ export function convertESM(module: WebpackModule): void {
           ...new Set(references.map((p) => p.node.property.name)),
         ];
         const localNames = importNames.map((name) => {
-          const binding = path.scope.getBinding(name);
-          const hasNameConflict = binding?.referencePaths.some(
-            (p) => p.scope.getBinding(name) !== binding,
+          const hasNameConflict = binding.referencePaths.some((ref) =>
+            ref.scope.hasBinding(name),
           );
           return hasNameConflict ? path.scope.generateUid(name) : name;
         });
 
-        path.replaceWith(
+        const [importDeclaration] = path.replaceWith(
           buildNamedImport(
             localNames,
             importNames,
             String(requiredModuleId.current),
           ),
         );
+        importDeclaration.scope.crawl();
 
         [...references].forEach((ref) => {
-          ref.replaceWith(ref.node.property);
+          const localName =
+            localNames[importNames.indexOf(ref.node.property.name)];
+          ref.replaceWith(t.identifier(localName));
           if (zeroSequenceMatcher.match(ref.parent)) {
             ref.parentPath.replaceWith(ref);
           }