fix: namespace import MemberProp name failed (#1826)

Co-authored-by: brightwu <[email protected]>
farm-fe · Oct 12, 2024 · e1f5c69 · e1f5c69
1 parent 7d84234
commit e1f5c69
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 11 deletions.
diff --git a/.changeset/three-cats-collect.md b/.changeset/three-cats-collect.md
@@ -0,0 +1,5 @@
+---
+"@farmfe/core": patch
+---
+
+fix namespace import MemberProp name failed
diff --git a/crates/compiler/tests/fixtures/bundle/library/hybrid/normal/output.js b/crates/compiler/tests/fixtures/bundle/library/hybrid/normal/output.js
@@ -76,7 +76,7 @@ var index_cjs = __commonJs((module, exports)=>{
         bar: function() {
             return bar;
         },
-        index_default: function() {
+        default: function() {
             return _default;
         },
         foo: function() {
@@ -92,6 +92,6 @@ var index_cjs = __commonJs((module, exports)=>{
     const foo = 'foo';
     const bar = 'bar';
 });
-var index_default = _interop_require_default(index_cjs()).index_default, bar = index_cjs()["bar"], foo = index_cjs()["foo"];
+var index_default = _interop_require_default(index_cjs()).default, bar = index_cjs()["bar"], foo = index_cjs()["foo"];
 export { bar, foo };
 export default index_default;
diff --git a/crates/compiler/tests/fixtures/bundle/library/reexport/esm/namespace/index.ts b/crates/compiler/tests/fixtures/bundle/library/reexport/esm/namespace/index.ts
@@ -1 +1,7 @@
-export * as ns from './foo';
+export * as ns from './foo';
+
+import * as ns from './foo';
+
+const foo = 123;
+
+console.log(ns.default, ns.foo, foo);
diff --git a/crates/compiler/tests/fixtures/bundle/library/reexport/esm/namespace/output.js b/crates/compiler/tests/fixtures/bundle/library/reexport/esm/namespace/output.js
@@ -44,13 +44,15 @@
         return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
     })(nodeInterop);
 }var foo_default = 'foo';
-const foo = 'foo';
+const foo$1 = 'foo';
 const bar = 'bar';
 var foo_ns = {
     bar: bar,
-    foo: foo,
+    foo: foo$1,
     "default": foo_default,
     __esModule: true
 };
 
+const foo = 123;
+console.log(foo_ns.default, foo_ns.foo, foo);
 export { foo_ns as ns };
diff --git a/crates/plugin_bundle/src/resource_pot_to_bundle/defined_idents_collector.rs b/crates/plugin_bundle/src/resource_pot_to_bundle/defined_idents_collector.rs
@@ -3,8 +3,7 @@ use std::collections::{HashMap, HashSet};
 use farmfe_core::{
   swc_common::DUMMY_SP,
   swc_ecma_ast::{
-    AssignExpr, AssignOp, AssignTarget, BindingIdent, Expr, Id, KeyValuePatProp, ObjectPatProp,
-    Pat, Prop, PropName, SimpleAssignTarget,
+    AssignExpr, AssignOp, AssignTarget, BindingIdent, Expr, Id, KeyValuePatProp, KeyValueProp, MemberProp, ObjectPat, ObjectPatProp, Pat, Prop, PropName, PropOrSpread, SimpleAssignTarget
   },
 };
 use farmfe_toolkit::{
@@ -98,7 +97,7 @@ impl<'a> VisitMut for RenameIdent<'a> {
     match n {
       Prop::Shorthand(m) => {
         if let Some(new_name) = self.rename(m) {
-          *n = farmfe_core::swc_ecma_ast::Prop::KeyValue(farmfe_core::swc_ecma_ast::KeyValueProp {
+          *n = Prop::KeyValue(farmfe_core::swc_ecma_ast::KeyValueProp {
             key: farmfe_core::swc_ecma_ast::PropName::Ident(Ident {
               span: DUMMY_SP,
               sym: m.sym.as_str().into(),
@@ -108,16 +107,75 @@ impl<'a> VisitMut for RenameIdent<'a> {
               new_name.as_str().into(),
             )),
           });
+          return;
+        }
+      }
+
+      _ => {}
+    }
 
-          n.visit_mut_children_with(self);
+    n.visit_mut_children_with(self);
+  }
+
+  fn visit_mut_prop_or_spread(&mut self, n: &mut PropOrSpread) {
+    match n {
+      PropOrSpread::Prop(box p) => match p {
+        Prop::Shorthand(ident) => {
+          if let Some(new_name) = self.rename(ident) {
+            *p = Prop::KeyValue(KeyValueProp {
+              key: farmfe_core::swc_ecma_ast::PropName::Ident(Ident {
+                span: DUMMY_SP,
+                sym: ident.sym.as_str().into(),
+                optional: false,
+              }),
+              value: Box::new(farmfe_core::swc_ecma_ast::Expr::Ident(
+                new_name.as_str().into(),
+              )),
+            });
+          } else {
+            p.visit_mut_with(self);
+          }
+        }
+        Prop::KeyValue(key_value_prop) => {
+          key_value_prop.visit_mut_with(self);
+        }
+        _ => {
+          p.visit_mut_with(self);
         }
+      },
+      PropOrSpread::Spread(s) => {
+        s.visit_mut_with(self);
       }
+    }
+  }
+
+  fn visit_mut_key_value_prop(&mut self, n: &mut KeyValueProp) {
+    //
+    // skip it
+    // ```js
+    // {
+    //   key: value,
+    // }
+    // ```
+    //
+    if let farmfe_core::swc_ecma_ast::PropName::Ident(_) = n.key {
+    } else {
+      n.key.visit_mut_with(self);
+    }
+
+    n.value.visit_mut_with(self);
+  }
 
-      _ => n.visit_mut_children_with(self),
+  fn visit_mut_key_value_pat_prop(&mut self, n: &mut KeyValuePatProp) {
+    if let PropName::Ident(_) = n.key {
+    } else {
+      n.key.visit_mut_with(self);
     }
+
+    n.value.visit_mut_with(self);
   }
 
-  fn visit_mut_object_pat(&mut self, n: &mut farmfe_core::swc_ecma_ast::ObjectPat) {
+  fn visit_mut_object_pat(&mut self, n: &mut ObjectPat) {
     for prop in &mut n.props {
       match prop {
         ObjectPatProp::Assign(n) => {
@@ -150,8 +208,20 @@ impl<'a> VisitMut for RenameIdent<'a> {
             n.visit_mut_with(self);
           }
         }
+        ObjectPatProp::KeyValue(n) => {
+          n.visit_mut_with(self);
+        }
         _ => prop.visit_mut_children_with(self),
       };
     }
   }
+
+  fn visit_mut_member_prop(&mut self, n: &mut MemberProp) {
+    // ns.default, skip
+    if let MemberProp::Ident(_) = n {
+      return;
+    }
+
+    n.visit_mut_children_with(self);
+  }
 }