Split asset symbols

packages/core/types/index.js

@@ -931,7 +931,10 @@ export type TransformerResult = {|
    */
   +sideEffects?: boolean,
   /** The symbols that the asset exports. */
-  +symbols?: $ReadOnlyMap<Symbol, {|local: Symbol, loc: ?SourceLocation|}>,
+  +symbols?: ?$ReadOnlyMap<
+    Symbol,
+    {|local: Symbol, loc: ?SourceLocation, meta?: ?Meta|},
+  >,
   /**
    * When a transformer returns multiple assets, it can give them unique keys to identify them.
    * This can be used to find assets during packaging, or to create dependencies between multiple

packages/packagers/js/src/ScopeHoistingPackager.js

@@ -36,7 +36,7 @@ const NON_ID_CONTINUE_RE = /[^$_\u200C\u200D\p{ID_Continue}]/gu;
 // General regex used to replace imports with the resolved code, references with resolutions,
 // and count the number of newlines in the file for source maps.
 const REPLACEMENT_RE =
-  /\n|import\s+"([0-9a-f]{16}:.+?)";|(?:\$[0-9a-f]{16}\$exports)|(?:\$[0-9a-f]{16}\$(?:import|importAsync|require)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
+  /\n|import\s+"([0-9a-f]{16,}:.+?)";|(?:\$[0-9a-f]{16,}\$exports)|(?:\$[0-9a-f]{16,}\$(?:import|importAsync|require)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 
 const BUILTINS = Object.keys(globals.builtin);
 const GLOBALS_BY_CONTEXT = {
@@ -443,6 +443,7 @@ export class ScopeHoistingPackager {
     }
 
     let [depMap, replacements] = this.buildReplacements(asset, deps);
+    // console.log('ASSET', asset.id, asset.meta.id, depMap, '-', code, '-');
     let [prepend, prependLines, append] = this.buildAssetPrelude(asset, deps);
     if (prependLines > 0) {
       sourceMap?.offsetLines(1, prependLines);
@@ -474,6 +475,7 @@ export class ScopeHoistingPackager {
         // If we matched an import, replace with the source code for the dependency.
         if (d != null) {
           let deps = depMap.get(d);
+          // console.log('match', d, deps);
           if (!deps) {
             return m;
           }

packages/transformers/js/core/Cargo.toml

@@ -21,3 +21,4 @@ dunce = "1.0.1"
 pathdiff = "0.2.0"
 path-slash = "0.1.4"
 indexmap = "1.9.2"
+petgraph = "0.6.3"

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

@@ -24,6 +24,19 @@ macro_rules! collect_visit_fn {
   };
 }
 
+pub fn collect(
+  module: &Module,
+  source_map: Lrc<swc_common::SourceMap>,
+  decls: HashSet<Id>,
+  ignore_mark: Mark,
+  global_mark: Mark,
+  trace_bailouts: bool,
+) -> Collect {
+  let mut collect = Collect::new(source_map, decls, ignore_mark, global_mark, trace_bailouts);
+  module.visit_with(&mut collect);
+  collect
+}
+
 #[derive(Debug, Deserialize, PartialEq, Eq, Clone, Copy, Serialize)]
 pub enum ImportKind {
   Require,

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

@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use swc_ecmascript::ast::{self, Id};
+use swc_ecmascript::ast::{self, ClassExpr, FnExpr, Id};
 use swc_ecmascript::visit::{Visit, VisitWith};
 
 /// This pass collects all declarations in a module into a single HashSet of tuples
@@ -41,6 +41,18 @@ impl Visit for DeclCollector {
     node.visit_children_with(self);
   }
 
+  fn visit_default_decl(&mut self, node: &ast::DefaultDecl) {
+    match node {
+      ast::DefaultDecl::Class(ClassExpr { ident, .. })
+      | ast::DefaultDecl::Fn(FnExpr { ident, .. }) => {
+        if let Some(ident) = ident {
+          self.decls.insert((ident.sym.clone(), ident.span.ctxt()));
+        }
+      }
+      _ => {}
+    }
+  }
+
   fn visit_var_declarator(&mut self, node: &ast::VarDeclarator) {
     self.in_var = true;
     node.name.visit_with(self);