Fix symbol collection with multiple exports of same function

Fixes bundling date-fns. Fixes #9676. Fixes #10098.

Author: devongovett

packages/core/integration-tests/package.json

@@ -27,6 +27,7 @@
     "command-exists": "^1.2.6",
     "core-js": "^3.2.1",
     "cross-env": "^7.0.0",
+    "date-fns": "^4.1.0",
     "elm": "^0.19.1-5",
     "elm-hot": "^1.1.5",
     "esbuild-register": "^3.5.0",

packages/core/integration-tests/test/javascript.js

@@ -6143,6 +6143,25 @@ describe('javascript', function () {
       await res.output;
       assert.equal(res.result, 2);
     });
+
+    it(`can bundle date-fns ${
+      shouldScopeHoist ? 'with' : 'without'
+    } scope-hoisting`, async () => {
+      await fsFixture(overlayFS, __dirname)`
+        date-fns
+          a.ts:
+            import {format} from 'date-fns';
+            output = format(new Date(2025, 1, 3), "yyyy-MM-dd");`;
+
+      let b = await bundle(path.join(__dirname, 'date-fns/a.ts'), {
+        ...options,
+        mode: 'development',
+        inputFS: overlayFS,
+      });
+      let res = await run(b, null, {require: false});
+      let result = await res.output;
+      assert.equal(result, '2025-02-03');
+    });
   }
 
   for (let defaultTargetOptions of [

packages/transformers/js/core/src/collect.rs

@@ -457,8 +457,7 @@ impl Visit for Collect {
         );
         self
           .exports_locals
-          .entry(id!(class.ident))
-          .or_insert_with(|| class.ident.sym.clone());
+          .insert(id!(class.ident), class.ident.sym.clone());
       }
       Decl::Fn(func) => {
         self.exports.insert(
@@ -472,8 +471,7 @@ impl Visit for Collect {
         );
         self
           .exports_locals
-          .entry(id!(func.ident))
-          .or_insert_with(|| func.ident.sym.clone());
+          .insert(id!(func.ident), func.ident.sym.clone());
       }
       Decl::Var(var) => {
         for decl in &var.decls {
@@ -503,10 +501,7 @@ impl Visit for Collect {
               is_esm: true,
             },
           );
-          self
-            .exports_locals
-            .entry(id!(ident))
-            .or_insert_with(|| js_word!("default"));
+          self.exports_locals.insert(id!(ident), js_word!("default"));
         } else {
           self.exports.insert(
             js_word!("default"),
@@ -530,10 +525,7 @@ impl Visit for Collect {
               is_esm: true,
             },
           );
-          self
-            .exports_locals
-            .entry(id!(ident))
-            .or_insert_with(|| js_word!("default"));
+          self.exports_locals.insert(id!(ident), js_word!("default"));
         } else {
           self.exports.insert(
             js_word!("default"),
@@ -597,8 +589,7 @@ impl Visit for Collect {
       );
       self
         .exports_locals
-        .entry(id!(node.id))
-        .or_insert_with(|| node.id.sym.clone());
+        .insert(id!(node.id), node.id.sym.clone());
     }
 
     if self.in_assign && node.id.ctxt.has_mark(self.global_mark) {
@@ -623,8 +614,7 @@ impl Visit for Collect {
       );
       self
         .exports_locals
-        .entry(id!(node.key))
-        .or_insert_with(|| node.key.sym.clone());
+        .insert(id!(node.key), node.key.sym.clone());
     }
 
     if self.in_assign && node.key.ctxt.has_mark(self.global_mark) {
@@ -700,7 +690,8 @@ impl Visit for Collect {
             .entry(id!(ident))
             .or_default()
             .push(node.span);
-        } else if self.imports.contains_key(&id!(ident)) {
+        }
+        if self.imports.contains_key(&id!(ident)) {
           self.used_imports.insert(id!(ident));
         }
         return;

packages/transformers/js/core/src/hoist.rs

@@ -1593,6 +1593,17 @@ mod tests {
         w!("y") => (w!("other"), w!("*"), false)
       }
     );
+
+    let (collect, _code, _hoist) = parse(
+      r#"
+    import { formatters } from "other";
+    
+    export function format() {
+      return formatters[something]();
+    }
+    "#,
+    );
+    assert_eq_set!(collect.used_imports, set! { w!("formatters") });
   }
 
   #[test]
@@ -2870,6 +2881,23 @@ mod tests {
         w!("siteSettings") => (w!("./settings"), w!("settings"))
       }
     );
+
+    let (_collect, _code, hoist) = parse(
+      r#"
+      export { format as formatDate };
+      export function format() {}
+    export default format;
+    "#,
+    );
+
+    assert_eq_exported_symbols!(
+      hoist.exported_symbols,
+      map! {
+        w!("formatDate") => (w!("$abc$export$d9468344d3651243"), true),
+        w!("format") => (w!("$abc$export$d9468344d3651243"), true),
+        w!("default") => (w!("$abc$export$2e2bcd8739ae039"), true)
+      }
+    );
   }
 
   #[test]

yarn.lock

@@ -5079,6 +5079,11 @@ data-view-byte-offset@^1.0.0:
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
+date-fns@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-4.1.0.tgz#64b3d83fff5aa80438f5b1a633c2e83b8a1c2d14"
+  integrity sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==
+
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"