feat: swc_ecma_parser v23 (#316)

dsherret · web-flow · commit 0b74020e74ed · 2025-08-29T12:17:49.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,14 +21,14 @@ compat = ["transforms", "swc_ecma_transforms_compat", "swc_trace_macro", "swc_co
 proposal = ["transforms", "swc_ecma_transforms_proposal", "swc_ecma_transforms_classes", "swc_ecma_transforms_macros", "swc_macros_common"]
 react = ["transforms", "swc_ecma_transforms_react", "swc_ecma_transforms_macros", "swc_config", "swc_config_macro", "swc_macros_common"]
 scopes = ["view", "utils", "visit"]
-sourcemap = ["dprint-swc-ext/sourcemap"]
+sourcemap = ["dprint-swc-ext/sourcemap", "swc_sourcemap"]
 transforms = ["swc_ecma_loader", "swc_ecma_transforms_base"]
-emit = ["base64", "codegen", "sourcemap", "dep:sourcemap"]
+emit = ["base64", "codegen", "sourcemap"]
 transpiling = ["emit", "proposal", "react", "transforms", "typescript", "utils", "visit"]
 typescript = ["transforms", "swc_ecma_transforms_typescript"]
 utils = ["swc_ecma_utils"]
 view = ["dprint-swc-ext/view"]
-visit = ["swc_ecma_visit", "swc_visit", "swc_visit_macros", "swc_macros_common"]
+visit = ["swc_ecma_visit", "swc_visit", "swc_macros_common"]
 
 [dependencies]
 base64 = { version = "0.22.1", optional = true }
@@ -37,7 +37,7 @@ deno_media_type = "0.2.8"
 deno_terminal = "0.2.2"
 deno_error = "0.7.0"
 
-dprint-swc-ext = "0.24.0"
+dprint-swc-ext = "0.25.0"
 percent-encoding = "2.3.1"
 serde = { version = "1.0.219", features = ["derive"] }
 text_lines = { version = "0.6.0", features = ["serialization"] }
@@ -49,34 +49,33 @@ unicode-width = "0.2.0"
 # pulling in new versions of swc crates
 #
 # NOTE: You can automatically update these dependencies by running ./scripts/update_swc_deps.ts
-swc_atoms = "=5.0.0"
-swc_common = "=9.2.0"
-swc_config = { version = "=3.0.0", optional = true }
-swc_config_macro = { version = "=1.0.0", optional = true }
-swc_ecma_ast = { version = "=9.0.0", features = ["serde-impl"] }
-swc_ecma_codegen = { version = "=11.0.0", optional = true }
-swc_ecma_codegen_macros = { version = "=2.0.0", optional = true }
-swc_ecma_loader = { version = "=9.0.0", optional = true }
-swc_ecma_parser = "=12.0.0"
-swc_ecma_transforms_base = { version = "=13.0.0", optional = true }
-swc_ecma_transforms_classes = { version = "=13.0.0", optional = true }
-swc_ecma_transforms_compat = { version = "=15.0.0", optional = true }
-swc_ecma_transforms_macros = { version = "=1.0.0", optional = true }
-swc_ecma_transforms_optimization = { version = "=14.0.0", optional = true }
-swc_ecma_transforms_proposal = { version = "=13.0.0", optional = true }
-swc_ecma_transforms_react = { version = "=15.0.0", optional = true }
-swc_ecma_transforms_typescript = { version = "=15.0.0", optional = true }
-swc_ecma_utils = { version = "=13.1.0", optional = true }
-swc_ecma_visit = { version = "=9.0.0", optional = true }
-swc_eq_ignore_macros = "=1.0.0"
-swc_bundler = { version = "=17.0.0", optional = true }
-swc_graph_analyzer = { version = "=10.0.0", optional = true }
-swc_macros_common = { version = "=1.0.0", optional = true }
-swc_trace_macro = { version = "=2.0.1", optional = true }
-swc_visit = { version = "=2.0.0", optional = true }
-swc_visit_macros = { version = "=0.5.13", optional = true }
-# just for error handling
-sourcemap = { version = "9.1.2", optional = true }
+swc_atoms = "=7.0.0"
+swc_common = "=14.0.3"
+swc_config = { version = "=3.1.1", optional = true }
+swc_config_macro = { version = "=1.0.1", optional = true }
+swc_ecma_ast = { version = "=15.0.0", features = ["serde-impl"] }
+swc_ecma_codegen = { version = "=17.0.0", optional = true }
+swc_ecma_codegen_macros = { version = "=2.0.2", optional = true }
+swc_ecma_loader = { version = "=14.0.0", optional = true }
+swc_ecma_lexer = "=23.0.1"
+swc_ecma_parser = "=23.0.0"
+swc_ecma_transforms_base = { version = "=25.0.0", features = ["inline-helpers"], optional = true }
+swc_ecma_transforms_classes = { version = "=25.0.0", optional = true }
+swc_ecma_transforms_compat = { version = "=27.0.0", optional = true }
+swc_ecma_transforms_macros = { version = "=1.0.1", optional = true }
+swc_ecma_transforms_optimization = { version = "=26.0.0", optional = true }
+swc_ecma_transforms_proposal = { version = "=25.0.0", optional = true }
+swc_ecma_transforms_react = { version = "=28.0.0", optional = true }
+swc_ecma_transforms_typescript = { version = "=28.0.0", optional = true }
+swc_ecma_utils = { version = "=21.0.0", optional = true }
+swc_ecma_visit = { version = "=15.0.0", optional = true }
+swc_eq_ignore_macros = "=1.0.1"
+swc_bundler = { version = "=29.0.0", optional = true }
+swc_graph_analyzer = { version = "=14.0.1", optional = true }
+swc_macros_common = { version = "=1.0.1", optional = true }
+swc_sourcemap = { version = "9.3.4", optional = true }
+swc_trace_macro = { version = "=2.0.2", optional = true }
+swc_visit = { version = "=2.0.1", optional = true }
 thiserror = "2.0.12"
 
 [dev-dependencies]
diff --git a/deno.json b/deno.json
@@ -2,5 +2,8 @@
   "lock": false,
   "exclude": [
     "target"
-  ]
+  ],
+  "imports": {
+    "@deno/rust-automation": "jsr:@deno/rust-automation@^0.21.0"
+  }
 }
diff --git a/scripts/01_setup.ts b/scripts/01_setup.ts
@@ -2,7 +2,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 import { Repos } from "./repos.ts";
-import { $ } from "./deps.ts";
+import { $ } from "@deno/rust-automation";
 
 const repos = await Repos.load();
 
diff --git a/scripts/02_build.ts b/scripts/02_build.ts
@@ -2,7 +2,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 import { Repos } from "./repos.ts";
-import { $ } from "./deps.ts";
+import { $ } from "@deno/rust-automation";
 
 const repos = await Repos.load();
 
diff --git a/scripts/03_test.ts b/scripts/03_test.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env -S deno run -A
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { $ } from "./deps.ts";
+import { $ } from "@deno/rust-automation";
 import { Repos } from "./repos.ts";
 
 const repos = await Repos.load();
diff --git a/scripts/04_confirm.ts b/scripts/04_confirm.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env -S deno run -A
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { $, Repo } from "./deps.ts";
+import { $, Repo } from "@deno/rust-automation";
 import { Repos } from "./repos.ts";
 
 const repos = await Repos.load();
diff --git a/scripts/deps.ts b/scripts/deps.ts
diff --git a/scripts/repos.ts b/scripts/repos.ts
@@ -1,8 +1,8 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { $, Crate, Repo } from "./deps.ts";
+import { $, Crate, Repo } from "@deno/rust-automation";
 
-export const rootDir = $.path(import.meta).join("../../../").resolve();
+export const rootDir = $.path(import.meta.url).join("../../../").resolve();
 
 const repoNames = [
   "deno_ast",
diff --git a/scripts/update_swc_deps.ts b/scripts/update_swc_deps.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env -S deno run -A
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { $, Crate, Repo } from "./deps.ts";
+import { $, Crate, Repo } from "@deno/rust-automation";
 
 const repo = await Repo.load({
   name: "deno_ast",
diff --git a/src/emit.rs b/src/emit.rs
@@ -66,7 +66,7 @@ pub enum EmitError {
   SwcEmit(std::io::Error),
   #[class(type)]
   #[error(transparent)]
-  SourceMap(sourcemap::Error),
+  SourceMap(crate::swc::sourcemap::Error),
   #[class(type)]
   #[error(transparent)]
   SourceMapEncode(base64::EncodeSliceError),
@@ -120,11 +120,8 @@ pub fn emit(
       inline_sources: emit_options.inline_sources,
       maybe_base: emit_options.source_map_base.as_ref(),
     };
-    let mut source_map = source_map.build_source_map_with_config(
-      &src_map_buf,
-      None,
-      source_map_config,
-    );
+    let mut source_map =
+      source_map.build_source_map(&src_map_buf, None, source_map_config);
     if let Some(file) = &emit_options.source_map_file {
       source_map.set_file(Some(file.to_string()));
     }
diff --git a/src/lexing.rs b/src/lexing.rs
@@ -8,8 +8,8 @@ use crate::swc::common::comments::Comment;
 use crate::swc::common::comments::CommentKind;
 use crate::swc::common::comments::SingleThreadedComments;
 use crate::swc::common::input::StringInput;
-use crate::swc::parser::lexer::Lexer;
-use crate::swc::parser::token::Token;
+use crate::swc::lexer::token::Token;
+use crate::swc::lexer::Lexer;
 use crate::MediaType;
 use crate::SourceRangedForSpanned;
 use crate::StartSourcePos;
diff --git a/src/lib.rs b/src/lib.rs
@@ -62,9 +62,12 @@ pub mod swc {
   pub use swc_ecma_ast as ast;
   #[cfg(feature = "codegen")]
   pub use swc_ecma_codegen as codegen;
+  pub use swc_ecma_lexer as lexer;
   #[cfg(feature = "transforms")]
   pub use swc_ecma_loader as loader;
   pub use swc_ecma_parser as parser;
+  #[cfg(feature = "sourcemap")]
+  pub use swc_sourcemap as sourcemap;
   #[cfg(feature = "transforms")]
   pub mod transforms {
     pub use self::fixer::fixer;
diff --git a/src/parsing.rs b/src/parsing.rs
@@ -4,6 +4,7 @@ use std::sync::Arc;
 
 use dprint_swc_ext::common::SourceTextInfo;
 use dprint_swc_ext::common::StartSourcePos;
+use swc_ecma_lexer::common::parser::Parser as _;
 
 use crate::comments::MultiThreadedComments;
 use crate::swc::ast::EsVersion;
@@ -13,7 +14,6 @@ use crate::swc::ast::Script;
 use crate::swc::common::comments::SingleThreadedComments;
 use crate::swc::common::input::StringInput;
 use crate::swc::parser::error::Error as SwcError;
-use crate::swc::parser::lexer::Lexer;
 use crate::swc::parser::token::TokenAndSpan;
 use crate::swc::parser::EsSyntax;
 use crate::swc::parser::Syntax;
@@ -292,17 +292,19 @@ fn parse_string_input(
   SwcError,
 > {
   let comments = SingleThreadedComments::default();
-  let lexer = Lexer::new(syntax, ES_VERSION, input, Some(&comments));
 
   if capture_tokens {
-    let lexer = crate::swc::parser::Capturing::new(lexer);
-    let mut parser = crate::swc::parser::Parser::new_from(lexer);
+    let lexer =
+      crate::swc::lexer::Lexer::new(syntax, ES_VERSION, input, Some(&comments));
+    let lexer = crate::swc::lexer::Capturing::new(lexer);
+    let mut parser = crate::swc::lexer::Parser::new_from(lexer);
     let program = match parse_mode {
       ParseMode::Program => parser.parse_program()?,
       ParseMode::Module => Program::Module(parser.parse_module()?),
       ParseMode::Script => Program::Script(parser.parse_script()?),
     };
-    let tokens = parser.input().take();
+    let iter = &mut parser.input_mut().iter;
+    let tokens = crate::swc::lexer::Capturing::take(iter);
     let errors = parser.take_errors();
     let script_module_errors = parser.take_script_module_errors();
 
@@ -316,6 +318,12 @@ fn parse_string_input(
       },
     ))
   } else {
+    let lexer = crate::swc::parser::Lexer::new(
+      syntax,
+      ES_VERSION,
+      input,
+      Some(&comments),
+    );
     let mut parser = crate::swc::parser::Parser::new_from(lexer);
     let program = match parse_mode {
       ParseMode::Program => parser.parse_program()?,
@@ -548,12 +556,10 @@ mod test {
       // should contain some context by including the previous line
       // instead of just a blank line
       [
-        "Unexpected eof at file:///my_file.ts:2:1",
+        "Expression expected at file:///my_file.ts:1:22",
         "",
         "  setTimeout(() => {}),",
-        "  ~~~~~~~~~~~~~~~~~~~~~",
-        "",
-        "  ~"
+        "                       ~",
       ]
       .join("\n")
     );
@@ -566,18 +572,12 @@ mod test {
       .unwrap();
     assert_eq!(
       diagnostic.to_string(),
-      // should contain some context by including the previous lines
-      // instead of just a blank line
+      // should contain some context by including the expression
       [
-        "Unexpected eof at file:///my_file.ts:9:1",
+        "Expression expected at file:///my_file.ts:1:22",
         "",
         "  setTimeout(() => {}),",
-        "  ~~~~~~~~~~~~~~~~~~~~~",
-        "",
-        "  ~",
-        "  ...",
-        "",
-        "  ~"
+        "                       ~",
       ]
       .join("\n")
     );
diff --git a/src/transpiling/jsx_precompile.rs b/src/transpiling/jsx_precompile.rs
@@ -1,10 +1,10 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 use crate::swc::atoms::Atom;
-use crate::swc::parser::lexer::util::CharExt;
 use swc_common::SyntaxContext;
 use swc_common::DUMMY_SP;
 use swc_ecma_ast::*;
+use swc_ecma_lexer::common::lexer::char::CharExt;
 use swc_ecma_utils::prepend_stmt;
 use swc_ecma_utils::quote_ident;
 use swc_ecma_visit::noop_visit_mut_type;
diff --git a/src/transpiling/mod.rs b/src/transpiling/mod.rs
