feat(core): make sure Semantic up-to-date after transforming (#1531)

### Description
rolldown · Jul 5, 2024 · a660554 · a660554
1 parent bc260e7
commit a660554
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 8 deletions.
diff --git a/crates/rolldown/src/ast_scanner/mod.rs b/crates/rolldown/src/ast_scanner/mod.rs
@@ -373,7 +373,12 @@ impl<'me> AstScanner<'me> {
 
   // If the reference is a global variable, `None` will be returned.
   fn resolve_symbol_from_reference(&self, id_ref: &IdentifierReference) -> Option<SymbolId> {
-    let ref_id = id_ref.reference_id.get().expect("must have reference id");
+    let ref_id = id_ref.reference_id.get().unwrap_or_else(|| {
+      panic!(
+        "{id_ref:#?} must have reference id in code```\n{}\n```\n",
+        self.current_stmt_info.debug_label.as_deref().unwrap_or("<None>")
+      )
+    });
     self.scopes.symbol_id_for(ref_id)
   }
   fn scan_export_default_decl(&mut self, decl: &ExportDefaultDeclaration) {

diff --git a/crates/rolldown/src/utils/pre_process_ast.rs b/crates/rolldown/src/utils/pre_process_ast.rs
@@ -19,8 +19,6 @@ pub fn pre_process_ast(
   path: &Path,
   source_type: SourceType,
 ) -> anyhow::Result<(OxcAst, SymbolTable, ScopeTree)> {
-  let (mut symbols, mut scopes) = ast.make_symbol_table_and_scope_tree();
-
   if !matches!(parse_type, OxcParseType::Js) {
     let trivias = ast.trivias.clone();
     let ret = ast.program.with_mut(move |fields| {
@@ -44,15 +42,14 @@ pub fn pre_process_ast(
         trivias,
         transformer_options,
       )
-      .build_with_symbols_and_scopes(symbols, scopes, fields.program)
+      .build(fields.program)
     });
 
     if !ret.errors.is_empty() {
       return Err(anyhow::anyhow!("Transform failed, got {:#?}", ret.errors));
     }
-
-    symbols = ret.symbols;
-    scopes = ret.scopes;
+    // symbols = ret.symbols;
+    // scopes = ret.scopes;
   }
 
   ast.program.with_mut(|fields| {
@@ -63,5 +60,8 @@ pub fn pre_process_ast(
 
   tweak_ast_for_scanning(&mut ast);
 
+  // We have to re-create the symbol table and scope tree after the transformation so far to make sure they are up-to-date.
+  let (symbols, scopes) = ast.make_symbol_table_and_scope_tree();
+
   Ok((ast, symbols, scopes))
 }
diff --git a/...sts/fixtures/module_types/ts/_config.json → ...xtures/module_types/ts/basic/_config.json b/...sts/fixtures/module_types/ts/_config.json → ...xtures/module_types/ts/basic/_config.json
diff --git a/...s/fixtures/module_types/ts/artifacts.snap → ...ures/module_types/ts/basic/artifacts.snap b/...s/fixtures/module_types/ts/artifacts.snap → ...ures/module_types/ts/basic/artifacts.snap
diff --git a/...wn/tests/fixtures/module_types/ts/main.ts → ...ts/fixtures/module_types/ts/basic/main.ts b/...wn/tests/fixtures/module_types/ts/main.ts → ...ts/fixtures/module_types/ts/basic/main.ts
diff --git a/...n/tests/fixtures/module_types/ts/enum_reference_id_not_exist_after_transform/_config.json b/...n/tests/fixtures/module_types/ts/enum_reference_id_not_exist_after_transform/_config.json
@@ -0,0 +1,8 @@
+{
+  "config": {
+    "input": [{
+      "name": "main_ts",
+      "import": "main.ts"
+    }]
+  }
+}
diff --git a/...tests/fixtures/module_types/ts/enum_reference_id_not_exist_after_transform/artifacts.snap b/...tests/fixtures/module_types/ts/enum_reference_id_not_exist_after_transform/artifacts.snap
@@ -0,0 +1,21 @@
+---
+source: crates/rolldown/tests/common/case.rs
+expression: content
+input_file: crates/rolldown/tests/fixtures/module_types/ts/reference_id_not_exist_after_transform
+---
+# Assets
+
+## main_ts.mjs
+
+```js
+
+//#region main.ts
+var LexerState = function(LexerState$1) {
+	LexerState$1[LexerState$1['inParens'] = 0] = 'inParens';
+	LexerState$1[LexerState$1['inSingleQuoteString'] = 1] = 'inSingleQuoteString';
+	LexerState$1[LexerState$1['inDoubleQuoteString'] = 2] = 'inDoubleQuoteString';
+	return LexerState$1;
+}(LexerState || {});
+
+//#endregion
+```
diff --git a/...lldown/tests/fixtures/module_types/ts/enum_reference_id_not_exist_after_transform/main.ts b/...lldown/tests/fixtures/module_types/ts/enum_reference_id_not_exist_after_transform/main.ts
@@ -0,0 +1,5 @@
+enum LexerState {
+  inParens,
+  inSingleQuoteString,
+  inDoubleQuoteString,
+}
diff --git a/crates/rolldown/tests/snapshots/fixtures__filename_with_hash.snap b/crates/rolldown/tests/snapshots/fixtures__filename_with_hash.snap
@@ -1577,10 +1577,14 @@ expression: "snapshot_outputs.join(\"\\n\")"
 
 - main_jsx-!~{000}~.mjs => main_jsx-TL8s4o_9.mjs
 
-# tests/fixtures/module_types/ts
+# tests/fixtures/module_types/ts/basic
 
 - main_ts-!~{000}~.mjs => main_ts-NyiJuHHI.mjs
 
+# tests/fixtures/module_types/ts/enum_reference_id_not_exist_after_transform
+
+- main_ts-!~{000}~.mjs => main_ts-m4kmDcdH.mjs
+
 # tests/fixtures/module_types/tsx
 
 - main_tsx-!~{000}~.mjs => main_tsx-7hnq3HXl.mjs