fix(transformer/legacy-decorator): decorated fields with the declare modifier are not transformed

Author: Dunqing

crates/oxc_transformer/src/decorator/legacy/metadata.rs

@@ -174,7 +174,7 @@ impl<'a> Traverse<'a, TransformState<'a>> for LegacyDecoratorMetadata<'a, '_> {
         prop: &mut PropertyDefinition<'a>,
         ctx: &mut TraverseCtx<'a>,
     ) {
-        if prop.declare || prop.decorators.is_empty() {
+        if prop.decorators.is_empty() {
             return;
         }
         prop.decorators.push(self.create_design_type_metadata(prop.type_annotation.as_ref(), ctx));

crates/oxc_transformer/src/decorator/legacy/mod.rs

@@ -603,7 +603,9 @@ impl<'a> LegacyDecorator<'a, '_> {
 
         for element in &mut class.body.body {
             let (is_static, key, descriptor, decorations) = match element {
-                ClassElement::MethodDefinition(method) if !method.value.is_typescript_syntax() => {
+                ClassElement::MethodDefinition(method)
+                    if !method.value.is_typescript_syntax() && method.value.body.is_some() =>
+                {
                     let Some(decorations) = self.get_all_decorators_of_class_method(method, ctx)
                     else {
                         continue;
@@ -876,7 +878,10 @@ impl<'a> LegacyDecorator<'a, '_> {
                             PrivateInExpressionDetector::has_private_in_expression_in_method_decorator(method);
                     }
                 }
-                ClassElement::MethodDefinition(method) if !method.value.is_typescript_syntax() => {
+                ClassElement::MethodDefinition(method)
+                    if !method.value.r#type.is_typescript_syntax()
+                        && method.value.body.is_some() =>
+                {
                     class_element_is_decorated |= !method.decorators.is_empty()
                         || Self::class_method_parameter_is_decorated(&method.value);
 
@@ -885,8 +890,8 @@ impl<'a> LegacyDecorator<'a, '_> {
                             PrivateInExpressionDetector::has_private_in_expression_in_method_decorator(method);
                     }
                 }
-                ClassElement::PropertyDefinition(prop) if !prop.declare => {
-                    class_element_is_decorated |= !prop.decorators.is_empty();
+                ClassElement::PropertyDefinition(prop) if !prop.decorators.is_empty() => {
+                    class_element_is_decorated = true;
 
                     if class_element_is_decorated && !has_private_in_expression_in_decorator {
                         has_private_in_expression_in_decorator =
@@ -896,7 +901,7 @@ impl<'a> LegacyDecorator<'a, '_> {
                     }
                 }
                 ClassElement::AccessorProperty(accessor) => {
-                    class_element_is_decorated |= !accessor.decorators.is_empty();
+                    class_element_is_decorated = true;
 
                     if class_element_is_decorated && !has_private_in_expression_in_decorator {
                         has_private_in_expression_in_decorator =

crates/oxc_transformer/src/lib.rs

@@ -303,9 +303,6 @@ impl<'a> Traverse<'a, TransformState<'a>> for TransformerImpl<'a, '_> {
     }
 
     fn enter_class_body(&mut self, body: &mut ClassBody<'a>, ctx: &mut TraverseCtx<'a>) {
-        if let Some(typescript) = self.x0_typescript.as_mut() {
-            typescript.enter_class_body(body, ctx);
-        }
         self.x2_es2022.enter_class_body(body, ctx);
     }
 

crates/oxc_transformer/src/typescript/annotations.rs

@@ -223,9 +223,9 @@ impl<'a> Traverse<'a, TransformState<'a>> for TypeScriptAnnotations<'a, '_> {
         class.r#abstract = false;
     }
 
-    fn enter_class_body(&mut self, body: &mut ClassBody<'a>, _ctx: &mut TraverseCtx<'a>) {
+    fn exit_class(&mut self, class: &mut Class<'a>, _: &mut TraverseCtx<'a>) {
         // Remove type only members
-        body.body.retain(|elem| match elem {
+        class.body.body.retain(|elem| match elem {
             ClassElement::MethodDefinition(method) => {
                 matches!(method.r#type, MethodDefinitionType::MethodDefinition)
                     && !method.value.is_typescript_syntax()
@@ -346,7 +346,6 @@ impl<'a> Traverse<'a, TransformState<'a>> for TypeScriptAnnotations<'a, '_> {
         );
 
         def.accessibility = None;
-        def.declare = false;
         def.definite = false;
         def.r#override = false;
         def.optional = false;

crates/oxc_transformer/src/typescript/class.rs

@@ -246,14 +246,13 @@ impl<'a> TypeScript<'a, '_> {
         constructor: &mut MethodDefinition<'a>,
         ctx: &mut TraverseCtx<'a>,
     ) {
-        if !constructor.kind.is_constructor() {
+        if !constructor.kind.is_constructor() || constructor.value.body.is_none() {
             return;
         }
 
         let params = &constructor.value.params.items;
         let assignments = Self::convert_constructor_params(params, ctx).collect::<Vec<_>>();
 
-        // `constructor {}` is guaranteed that it is `Some`.
         let constructor_body_statements = &mut constructor.value.body.as_mut().unwrap().statements;
         let super_call_position = Self::get_super_call_position(constructor_body_statements);
 

crates/oxc_transformer/src/typescript/mod.rs

@@ -131,13 +131,10 @@ impl<'a> Traverse<'a, TransformState<'a>> for TypeScript<'a, '_> {
     }
 
     fn exit_class(&mut self, class: &mut Class<'a>, ctx: &mut TraverseCtx<'a>) {
+        self.annotations.exit_class(class, ctx);
         self.transform_class_on_exit(class, ctx);
     }
 
-    fn enter_class_body(&mut self, body: &mut ClassBody<'a>, ctx: &mut TraverseCtx<'a>) {
-        self.annotations.enter_class_body(body, ctx);
-    }
-
     fn enter_expression(&mut self, expr: &mut Expression<'a>, ctx: &mut TraverseCtx<'a>) {
         self.annotations.enter_expression(expr, ctx);
     }

tasks/transform_conformance/snapshots/oxc.snap.md

@@ -1,6 +1,6 @@
 commit: 1d4546bc
 
-Passed: 176/293
+Passed: 178/295
 
 # All Passed:
 * babel-plugin-transform-class-static-block
@@ -494,7 +494,7 @@ after transform: SymbolId(4): ScopeId(1)
 rebuilt        : SymbolId(5): ScopeId(4)
 
 
-# legacy-decorators (4/76)
+# legacy-decorators (6/78)
 * oxc/metadata/abstract-class/input.ts
 Symbol reference IDs mismatch for "Dependency":
 after transform: SymbolId(1): [ReferenceId(1), ReferenceId(2), ReferenceId(3)]

tasks/transform_conformance/tests/legacy-decorators/test/fixtures/oxc/fields-with-declare-modifier/input.ts

@@ -0,0 +1,4 @@
+class DeclareFields {
+	@dec declare name: number;
+	@dec declare output: string;
+}

tasks/transform_conformance/tests/legacy-decorators/test/fixtures/oxc/fields-with-declare-modifier/output.ts

@@ -0,0 +1,4 @@
+class DeclareFields {}
+
+babelHelpers.decorate([dec], DeclareFields.prototype, "name", void 0);
+babelHelpers.decorate([dec], DeclareFields.prototype, "output", void 0);

tasks/transform_conformance/tests/legacy-decorators/test/fixtures/oxc/metadata/fields-with-declare-modifier/input.ts

@@ -0,0 +1,4 @@
+class DeclareFields {
+	@dec declare name: number;
+	@dec declare output: string;
+}