refactor(transformer): remove boilerplate code around decorators to r…

…educe noise (#2991)
oxc-project · Apr 15, 2024 · 82e00bc · 82e00bc
1 parent b4bfa2f
commit 82e00bc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 56 deletions.
diff --git a/crates/oxc_transformer/src/decorators/mod.rs b/crates/oxc_transformer/src/decorators/mod.rs
diff --git a/crates/oxc_transformer/src/lib.rs b/crates/oxc_transformer/src/lib.rs
@@ -12,7 +12,6 @@ mod compiler_assumptions;
 mod context;
 mod options;
 // Presets: <https://babel.dev/docs/presets>
-mod decorators;
 mod react;
 mod typescript;
 
@@ -27,13 +26,12 @@ use oxc_diagnostics::Error;
 use oxc_semantic::Semantic;
 
 pub use crate::{
-    compiler_assumptions::CompilerAssumptions, decorators::DecoratorsOptions,
-    options::TransformOptions, react::ReactOptions, typescript::TypeScriptOptions,
+    compiler_assumptions::CompilerAssumptions, options::TransformOptions, react::ReactOptions,
+    typescript::TypeScriptOptions,
 };
 
 use crate::{
     context::{Ctx, TransformCtx},
-    decorators::Decorators,
     react::React,
     typescript::TypeScript,
 };
@@ -43,7 +41,6 @@ pub struct Transformer<'a> {
     // NOTE: all callbacks must run in order.
     x0_typescript: TypeScript<'a>,
     x1_react: React<'a>,
-    x2_decorators: Decorators<'a>,
 }
 
 impl<'a> Transformer<'a> {
@@ -58,7 +55,6 @@ impl<'a> Transformer<'a> {
             ctx: Rc::clone(&ctx),
             x0_typescript: TypeScript::new(options.typescript, &ctx),
             x1_react: React::new(options.react, &ctx),
-            x2_decorators: Decorators::new(options.decorators, &ctx),
         }
     }
 
@@ -191,12 +187,6 @@ impl<'a> VisitMut<'a> for Transformer<'a> {
         self.x0_typescript.transform_statements_on_exit(stmts);
     }
 
-    fn visit_statement(&mut self, stmt: &mut Statement<'a>) {
-        self.x2_decorators.transform_statement(stmt);
-
-        walk_mut::walk_statement_mut(self, stmt);
-    }
-
     fn visit_tagged_template_expression(&mut self, expr: &mut TaggedTemplateExpression<'a>) {
         self.x0_typescript.transform_tagged_template_expression(expr);
 

diff --git a/crates/oxc_transformer/src/options.rs b/crates/oxc_transformer/src/options.rs
@@ -1,6 +1,5 @@
 use crate::{
-    compiler_assumptions::CompilerAssumptions, decorators::DecoratorsOptions, react::ReactOptions,
-    typescript::TypeScriptOptions,
+    compiler_assumptions::CompilerAssumptions, react::ReactOptions, typescript::TypeScriptOptions,
 };
 
 #[derive(Debug, Default, Clone)]
@@ -11,9 +10,6 @@ pub struct TransformOptions {
     pub assumptions: CompilerAssumptions,
 
     // Plugins
-    /// [proposal-decorators](https://babeljs.io/docs/babel-plugin-proposal-decorators)
-    pub decorators: DecoratorsOptions,
-
     /// [preset-typescript](https://babeljs.io/docs/babel-preset-typescript)
     pub typescript: TypeScriptOptions,
 

diff --git a/tasks/transform_conformance/src/test_case.rs b/tasks/transform_conformance/src/test_case.rs
@@ -13,9 +13,7 @@ use oxc_parser::Parser;
 use oxc_semantic::SemanticBuilder;
 use oxc_span::{SourceType, VALID_EXTENSIONS};
 use oxc_tasks_common::{normalize_path, print_diff_in_terminal, BabelOptions};
-use oxc_transformer::{
-    DecoratorsOptions, ReactOptions, TransformOptions, Transformer, TypeScriptOptions,
-};
+use oxc_transformer::{ReactOptions, TransformOptions, Transformer, TypeScriptOptions};
 
 use crate::{fixture_root, root, TestRunnerEnv, PLUGINS_NOT_SUPPORTED_YET};
 
@@ -98,11 +96,6 @@ fn transform_options(options: &BabelOptions) -> serde_json::Result<TransformOpti
 
     Ok(TransformOptions {
         assumptions: serde_json::from_value(options.assumptions.clone()).unwrap_or_default(),
-        decorators: options
-            .get_plugin("proposal-decorators")
-            .map(get_options::<DecoratorsOptions>)
-            .transpose()?
-            .unwrap_or_default(),
         typescript: options
             .get_plugin("transform-typescript")
             .map(get_options::<TypeScriptOptions>)