From e921df619981b00bedcd466f08a21182c20f9f02 Mon Sep 17 00:00:00 2001 From: Boshen <1430279+Boshen@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:00:51 +0000 Subject: [PATCH] refactor(transformer): rename `EnvOptions` to `BabelEnvOptions` (#7036) --- crates/oxc_transformer/examples/transformer.rs | 6 +++--- crates/oxc_transformer/src/lib.rs | 2 +- crates/oxc_transformer/src/options/babel/env/mod.rs | 4 ++-- crates/oxc_transformer/src/options/mod.rs | 8 ++++---- crates/oxc_wasm/src/lib.rs | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/crates/oxc_transformer/examples/transformer.rs b/crates/oxc_transformer/examples/transformer.rs index 67afa6bce..2d0dbbba1 100644 --- a/crates/oxc_transformer/examples/transformer.rs +++ b/crates/oxc_transformer/examples/transformer.rs @@ -6,7 +6,7 @@ use oxc_codegen::CodeGenerator; use oxc_parser::Parser; use oxc_semantic::SemanticBuilder; use oxc_span::SourceType; -use oxc_transformer::{EnvOptions, Targets, TransformOptions, Transformer}; +use oxc_transformer::{BabelEnvOptions, Targets, TransformOptions, Transformer}; use pico_args::Arguments; // Instruction: @@ -55,9 +55,9 @@ fn main() { let (symbols, scopes) = ret.semantic.into_symbol_table_and_scope_tree(); let transform_options = if let Some(targets) = &targets { - TransformOptions::try_from(&EnvOptions { + TransformOptions::try_from(&BabelEnvOptions { targets: Targets::try_from_query(targets).unwrap(), - ..EnvOptions::default() + ..BabelEnvOptions::default() }) .unwrap() } else { diff --git a/crates/oxc_transformer/src/lib.rs b/crates/oxc_transformer/src/lib.rs index 2e00443b0..f14af3072 100644 --- a/crates/oxc_transformer/src/lib.rs +++ b/crates/oxc_transformer/src/lib.rs @@ -54,7 +54,7 @@ pub use crate::{ compiler_assumptions::CompilerAssumptions, es2015::{ArrowFunctionsOptions, ES2015Options}, jsx::{JsxOptions, JsxRuntime, ReactRefreshOptions}, - options::{BabelOptions, EnvOptions, Targets, TransformOptions}, + options::{BabelEnvOptions, BabelOptions, Targets, TransformOptions}, plugins::*, typescript::{RewriteExtensionsMode, TypeScriptOptions}, }; diff --git a/crates/oxc_transformer/src/options/babel/env/mod.rs b/crates/oxc_transformer/src/options/babel/env/mod.rs index 4c300836b..95d2ea355 100644 --- a/crates/oxc_transformer/src/options/babel/env/mod.rs +++ b/crates/oxc_transformer/src/options/babel/env/mod.rs @@ -12,7 +12,7 @@ fn default_as_true() -> bool { #[derive(Default, Debug, Clone, Deserialize)] #[serde(default, rename_all = "camelCase", deny_unknown_fields)] -pub struct EnvOptions { +pub struct BabelEnvOptions { #[serde(default)] pub targets: Targets, @@ -56,7 +56,7 @@ pub struct EnvOptions { pub shipped_proposals: bool, } -impl EnvOptions { +impl BabelEnvOptions { pub fn can_enable_plugin(&self, plugin_name: &str) -> bool { let versions = if self.bugfixes { bugfix_features().get(plugin_name).unwrap_or_else(|| &features()[plugin_name]) diff --git a/crates/oxc_transformer/src/options/mod.rs b/crates/oxc_transformer/src/options/mod.rs index 2208fe7e2..f4434aeb9 100644 --- a/crates/oxc_transformer/src/options/mod.rs +++ b/crates/oxc_transformer/src/options/mod.rs @@ -22,7 +22,7 @@ use crate::{ }; pub use babel::{ - env::{EnvOptions, Targets}, + env::{BabelEnvOptions, Targets}, BabelOptions, }; @@ -121,11 +121,11 @@ impl TransformOptions { } } -impl TryFrom<&EnvOptions> for TransformOptions { +impl TryFrom<&BabelEnvOptions> for TransformOptions { type Error = Vec; /// If there are any errors in the `options.targets``, they will be returned as a list of errors. - fn try_from(o: &EnvOptions) -> Result { + fn try_from(o: &BabelEnvOptions) -> Result { Ok(Self { regexp: RegExpOptions { sticky_flag: o.can_enable_plugin("transform-sticky-regex"), @@ -255,7 +255,7 @@ impl TryFrom<&BabelOptions> for TransformOptions { .get_preset("env") .flatten() .and_then(|value| { - serde_json::from_value::(value) + serde_json::from_value::(value) .inspect_err(|err| report_error("env", err, true, &mut errors)) .ok() }) diff --git a/crates/oxc_wasm/src/lib.rs b/crates/oxc_wasm/src/lib.rs index d0dd9e70f..a61ee8595 100644 --- a/crates/oxc_wasm/src/lib.rs +++ b/crates/oxc_wasm/src/lib.rs @@ -21,7 +21,7 @@ use oxc::{ ScopeFlags, ScopeId, ScopeTree, SemanticBuilder, SymbolTable, }, span::SourceType, - transformer::{EnvOptions, Targets, TransformOptions, Transformer}, + transformer::{BabelEnvOptions, Targets, TransformOptions, Transformer}, }; use oxc_index::Idx; use oxc_linter::Linter; @@ -242,9 +242,9 @@ impl Oxc { } if run_options.transform.unwrap_or_default() { - if let Ok(options) = TransformOptions::try_from(&EnvOptions { + if let Ok(options) = TransformOptions::try_from(&BabelEnvOptions { targets: Targets::try_from_query("chrome 51").unwrap_or_default(), - ..EnvOptions::default() + ..BabelEnvOptions::default() }) { let result = Transformer::new(&allocator, &path, options) .build_with_symbols_and_scopes(symbols, scopes, &mut program);