feat: upgrade to swc_ecma_parser 0.148 (#64)

dprint · Jul 25, 2024 · ab71d25 · ab71d25
1 parent 1d6f9f1
commit ab71d25
Show file tree

Hide file tree

Showing 7 changed files with 283 additions and 120 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/generation/generate/helpers.ts b/generation/generate/helpers.ts
@@ -37,7 +37,7 @@ export function writeType(writer: Writer, analysisResult: AnalysisResult, type:
   }
 
   function writeReference(type: TypeReferenceDefinition) {
-    const path = type.path.join("::").replace(/^swc_ecma_ast::/, "");
+    const path = type.path.join("::").replace(/^swc_ecma_ast::/, "").replace("swc_common::syntax_pos::hygiene::SyntaxContext", "swc_common::SyntaxContext");
     if (
       type.path[0] === "swc_ecma_ast"
       && (analysisResult.astEnums.some(e => e.name === type.name) || analysisResult.astStructs.some(s => s.name === type.name))
@@ -77,6 +77,10 @@ export function getIsReferenceType(analysisResult: AnalysisResult, type: TypeDef
     return getIsReferenceType(analysisResult, type.genericArgs[0]);
   }
 
+  if (type.name === "SyntaxContext") {
+    return false;
+  }
+
   const isSwcPlainEnumType = type != null && type.kind === "Reference" && analysisResult.plainEnums.some(e => e.name === type.name);
   if (isSwcPlainEnumType) {
     return false;

diff --git a/rs-lib/Cargo.toml b/rs-lib/Cargo.toml
@@ -20,9 +20,9 @@ bumpalo = { version = "3.16.0", optional = true, features = ["collections", "all
 num-bigint = "0.4"
 rustc-hash = "1.1.0"
 swc_atoms = "0.6.7"
-swc_common = "0.34.4"
-swc_ecma_ast = "0.115.1"
-swc_ecma_parser = "0.146.12"
+swc_common = "0.36.2"
+swc_ecma_ast = "0.117.4"
+swc_ecma_parser = "0.148.1"
 text_lines = "0.6.0"
 
 [dev-dependencies]

diff --git a/rs-lib/src/common/pos.rs b/rs-lib/src/common/pos.rs
@@ -240,7 +240,7 @@ impl<T: Into<SourcePos> + Clone + Copy> SourceRanged for SourceRange<T> {
 #[allow(clippy::from_over_into)]
 impl Into<Span> for SourceRange {
   fn into(self) -> Span {
-    Span::new(self.start.as_byte_pos(), self.end.as_byte_pos(), Default::default())
+    Span::new(self.start.as_byte_pos(), self.end.as_byte_pos())
   }
 }
 

diff --git a/rs-lib/src/test_helpers.rs b/rs-lib/src/test_helpers.rs
@@ -20,7 +20,7 @@ pub fn get_swc_module(file_path: &Path, file_text: &str) -> (Module, Vec<TokenAn
 
   let comments: SingleThreadedComments = Default::default();
   return {
-    let ts_config = crate::swc::parser::TsConfig {
+    let ts_config = crate::swc::parser::TsSyntax {
       tsx: should_parse_as_jsx(file_path),
       decorators: true,
       ..Default::default()

diff --git a/rs-lib/src/view/custom.rs b/rs-lib/src/view/custom.rs
@@ -11,10 +11,6 @@ impl<'a> Ident<'a> {
   pub fn to_id(&self) -> Id {
     (self.sym().clone(), self.ctxt())
   }
-
-  pub fn ctxt(&self) -> SyntaxContext {
-    self.inner.span.ctxt
-  }
 }
 
 impl<'a> BindingIdent<'a> {