Revert "pull changes from oxc-project/oxc"

.github/workflows/benchmark.yml

@@ -8,6 +8,7 @@ on:
       - '**/*.rs'
       - 'Cargo.lock'
       - '.github/workflows/benchmark.yml'
+      - '!crates/oxc_codegen'
   push:
     branches:
       - main
@@ -16,6 +17,7 @@ on:
       - '**/*.rs'
       - 'Cargo.lock'
       - '.github/workflows/benchmark.yml'
+      - '!crates/oxc_codegen'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -48,15 +50,14 @@ jobs:
           RUSTFLAGS: "-C debuginfo=2 -C strip=none -g --cfg codspeed"
         shell: bash
         run: |
-          cargo build --release -p oxc_benchmark --features codspeed --bench lexer --bench parser --bench transformer --bench semantic --bench linter --bench minifier --bench codegen_sourcemap
+          cargo build --release -p oxc_benchmark --features codspeed --bench lexer --bench parser --bench transformer --bench semantic --bench linter --bench minifier
           mkdir -p target/codspeed/oxc_benchmark/
           mv target/release/deps/lexer-* target/codspeed/oxc_benchmark
           mv target/release/deps/parser-* target/codspeed/oxc_benchmark
           mv target/release/deps/transformer-* target/codspeed/oxc_benchmark
           mv target/release/deps/semantic-* target/codspeed/oxc_benchmark
           mv target/release/deps/linter-* target/codspeed/oxc_benchmark
           mv target/release/deps/minifier-* target/codspeed/oxc_benchmark
-          mv target/release/deps/codegen_sourcemap-* target/codspeed/oxc_benchmark
           rm -rf target/codspeed/oxc_benchmark/*.d
 
       - name: Run benchmark

crates/oxc_ast/src/ast/js.rs

@@ -383,7 +383,7 @@ pub struct ThisExpression {
 
 /// <https://tc39.es/ecma262/#prod-ArrayLiteral>
 #[derive(Debug, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "camelCase"))]
+#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
 #[cfg_attr(all(feature = "serde", feature = "wasm"), derive(tsify::Tsify))]
 pub struct ArrayExpression<'a> {
     #[cfg_attr(feature = "serde", serde(flatten))]
@@ -414,7 +414,7 @@ impl<'a> ArrayExpressionElement<'a> {
 
 /// Object Expression
 #[derive(Debug, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "camelCase"))]
+#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
 #[cfg_attr(all(feature = "serde", feature = "wasm"), derive(tsify::Tsify))]
 pub struct ObjectExpression<'a> {
     #[cfg_attr(feature = "serde", serde(flatten))]
@@ -968,7 +968,7 @@ pub enum AssignmentTargetPattern<'a> {
 }
 
 #[derive(Debug, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "camelCase"))]
+#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
 #[cfg_attr(all(feature = "serde", feature = "wasm"), derive(tsify::Tsify))]
 pub struct ArrayAssignmentTarget<'a> {
     #[cfg_attr(feature = "serde", serde(flatten))]
@@ -1770,8 +1770,6 @@ pub enum FunctionType {
     FunctionDeclaration,
     FunctionExpression,
     TSDeclareFunction,
-    /// <https://github.com/typescript-eslint/typescript-eslint/pull/1289>
-    TSEmptyBodyFunctionExpression,
 }
 
 /// <https://tc39.es/ecma262/#prod-FormalParameters>
@@ -1801,7 +1799,6 @@ pub struct FormalParameter<'a> {
     pub pattern: BindingPattern<'a>,
     pub accessibility: Option<TSAccessibility>,
     pub readonly: bool,
-    pub r#override: bool,
     pub decorators: Vec<'a, Decorator<'a>>,
 }
 
@@ -2410,11 +2407,19 @@ impl<'a> ExportDefaultDeclarationKind<'a> {
     #[inline]
     pub fn is_typescript_syntax(&self) -> bool {
         match self {
-            ExportDefaultDeclarationKind::FunctionDeclaration(func) => func.is_typescript_syntax(),
-            ExportDefaultDeclarationKind::ClassDeclaration(class) => class.is_typescript_syntax(),
+            ExportDefaultDeclarationKind::FunctionDeclaration(func)
+                if func.is_typescript_syntax() =>
+            {
+                true
+            }
+            ExportDefaultDeclarationKind::ClassDeclaration(class)
+                if class.is_typescript_syntax() =>
+            {
+                true
+            }
             ExportDefaultDeclarationKind::TSInterfaceDeclaration(_)
             | ExportDefaultDeclarationKind::TSEnumDeclaration(_) => true,
-            ExportDefaultDeclarationKind::Expression(_) => false,
+            _ => false,
         }
     }
 }

crates/oxc_ast/src/ast/ts.rs

@@ -137,17 +137,6 @@ impl<'a> TSType<'a> {
     pub fn is_const_type_reference(&self) -> bool {
         matches!(self, TSType::TSTypeReference(reference) if reference.type_name.is_const())
     }
-
-    /// Check if type maybe `undefined`
-    pub fn is_maybe_undefined(&self) -> bool {
-        match self {
-            TSType::TSUndefinedKeyword(_) => true,
-            TSType::TSUnionType(un) => {
-                un.types.iter().any(|t| matches!(t, TSType::TSUndefinedKeyword(_)))
-            }
-            _ => false,
-        }
-    }
 }
 
 /// `SomeType extends OtherType ? TrueType : FalseType;`
@@ -582,7 +571,6 @@ pub struct TSIndexSignature<'a> {
     pub span: Span,
     pub parameters: Vec<'a, Box<'a, TSIndexSignatureName<'a>>>,
     pub type_annotation: Box<'a, TSTypeAnnotation<'a>>,
-    pub readonly: bool,
 }
 
 #[derive(Debug, Hash)]
@@ -837,7 +825,7 @@ pub struct TSMappedType<'a> {
     pub span: Span,
     pub type_parameter: Box<'a, TSTypeParameter<'a>>,
     pub name_type: Option<TSType<'a>>,
-    pub type_annotation: Option<TSType<'a>>,
+    pub type_annotation: Option<Box<'a, TSTypeAnnotation<'a>>>,
     pub optional: TSMappedTypeModifierOperator,
     pub readonly: TSMappedTypeModifierOperator,
 }

crates/oxc_ast/src/ast_builder.rs

@@ -796,10 +796,9 @@ impl<'a> AstBuilder<'a> {
         pattern: BindingPattern<'a>,
         accessibility: Option<TSAccessibility>,
         readonly: bool,
-        r#override: bool,
         decorators: Vec<'a, Decorator<'a>>,
     ) -> FormalParameter<'a> {
-        FormalParameter { span, pattern, accessibility, readonly, r#override, decorators }
+        FormalParameter { span, pattern, accessibility, readonly, decorators }
     }
 
     pub fn ts_this_parameter(
@@ -1365,13 +1364,11 @@ impl<'a> AstBuilder<'a> {
         span: Span,
         parameters: Vec<'a, Box<'a, TSIndexSignatureName<'a>>>,
         type_annotation: Box<'a, TSTypeAnnotation<'a>>,
-        readonly: bool,
     ) -> TSSignature<'a> {
         TSSignature::TSIndexSignature(self.alloc(TSIndexSignature {
             span,
             parameters,
             type_annotation,
-            readonly,
         }))
     }
 
@@ -1670,7 +1667,7 @@ impl<'a> AstBuilder<'a> {
         span: Span,
         type_parameter: Box<'a, TSTypeParameter<'a>>,
         name_type: Option<TSType<'a>>,
-        type_annotation: Option<TSType<'a>>,
+        type_annotation: Option<Box<'a, TSTypeAnnotation<'a>>>,
         optional: TSMappedTypeModifierOperator,
         readonly: TSMappedTypeModifierOperator,
     ) -> TSType<'a> {

crates/oxc_ast/src/visit.rs

@@ -1044,11 +1044,6 @@ pub trait Visit<'a>: Sized {
     fn visit_jsx_element_name(&mut self, name: &JSXElementName<'a>) {
         let kind = AstKind::JSXElementName(self.alloc(name));
         self.enter_node(kind);
-        match name {
-            JSXElementName::Identifier(ident) => self.visit_jsx_identifier(ident),
-            JSXElementName::NamespacedName(expr) => self.visit_jsx_namespaced_name(expr),
-            JSXElementName::MemberExpression(expr) => self.visit_jsx_member_expression(expr),
-        }
         self.leave_node(kind);
     }
 
@@ -1668,7 +1663,7 @@ pub trait Visit<'a>: Sized {
             self.visit_ts_type(name);
         }
         if let Some(type_annotation) = &ty.type_annotation {
-            self.visit_ts_type(type_annotation);
+            self.visit_ts_type_annotation(type_annotation);
         }
     }
 

crates/oxc_ast/src/visit_mut.rs

@@ -1667,7 +1667,7 @@ pub trait VisitMut<'a>: Sized {
             self.visit_ts_type(name);
         }
         if let Some(type_annotation) = &mut ty.type_annotation {
-            self.visit_ts_type(type_annotation);
+            self.visit_ts_type_annotation(type_annotation);
         }
     }
 

crates/oxc_codegen/Cargo.toml

@@ -23,9 +23,8 @@ oxc_ast       = { workspace = true }
 oxc_span      = { workspace = true }
 oxc_allocator = { workspace = true }
 oxc_syntax    = { workspace = true }
-sourcemap     = { version = "7.0.1" }
-bitflags      = { workspace = true }
+
+bitflags = { workspace = true }
 
 [dev-dependencies]
 oxc_parser = { workspace = true }
-base64     = "0.21.7"