refactor(transformer): isolate babel options logic

oxc-project · Oct 31, 2024 · 2207299 · 2207299
1 parent 12aa910
commit 2207299
Show file tree

Hide file tree

Showing 16 changed files with 408 additions and 411 deletions.
diff --git a/crates/oxc_transformer/src/env/data/mod.rs b/crates/oxc_transformer/src/env/data/mod.rs
diff --git a/crates/oxc_transformer/src/env/mod.rs b/crates/oxc_transformer/src/env/mod.rs
diff --git a/crates/oxc_transformer/src/lib.rs b/crates/oxc_transformer/src/lib.rs
@@ -19,8 +19,8 @@ mod common;
 mod compiler_assumptions;
 mod context;
 mod options;
+
 // Presets: <https://babel.dev/docs/presets>
-mod env;
 mod es2015;
 mod es2016;
 mod es2017;
@@ -52,10 +52,9 @@ use typescript::TypeScript;
 pub use crate::{
     common::helper_loader::HelperLoaderMode,
     compiler_assumptions::CompilerAssumptions,
-    env::{EnvOptions, Targets},
     es2015::{ArrowFunctionsOptions, ES2015Options},
     jsx::{JsxOptions, JsxRuntime, ReactRefreshOptions},
-    options::{BabelOptions, TransformOptions},
+    options::{BabelOptions, EnvOptions, Targets, TransformOptions},
     plugins::*,
     typescript::{RewriteExtensionsMode, TypeScriptOptions},
 };

diff --git a/...bel/compat_data/data/plugin_bugfixes.json → ...bel/compat_data/data/plugin_bugfixes.json b/...bel/compat_data/data/plugin_bugfixes.json → ...bel/compat_data/data/plugin_bugfixes.json
diff --git a/...data/@babel/compat_data/data/plugins.json → ...data/@babel/compat_data/data/plugins.json b/...data/@babel/compat_data/data/plugins.json → ...data/@babel/compat_data/data/plugins.json
diff --git a/...mer/src/env/data/core_js_compat/data.json → ...s/babel/env/data/core_js_compat/data.json b/...mer/src/env/data/core_js_compat/data.json → ...s/babel/env/data/core_js_compat/data.json
diff --git a/.../src/env/data/core_js_compat/entries.json → ...abel/env/data/core_js_compat/entries.json b/.../src/env/data/core_js_compat/entries.json → ...abel/env/data/core_js_compat/entries.json
diff --git a/...a/core_js_compat/modules_by_versions.json → ...a/core_js_compat/modules_by_versions.json b/...a/core_js_compat/modules_by_versions.json → ...a/core_js_compat/modules_by_versions.json
diff --git a/...former/src/env/data/esbuild/features.json → ...ions/babel/env/data/esbuild/features.json b/...former/src/env/data/esbuild/features.json → ...ions/babel/env/data/esbuild/features.json
diff --git a/crates/oxc_transformer/src/env/data/babel.rs → ...sformer/src/options/babel/env/data/mod.rs b/crates/oxc_transformer/src/env/data/babel.rs → ...sformer/src/options/babel/env/data/mod.rs
@@ -2,7 +2,7 @@ use std::sync::OnceLock;
 
 use rustc_hash::FxHashMap;
 
-use crate::env::{Targets, Version};
+use super::{Targets, Version};
 
 /// Reference: <https://github.com/swc-project/swc/blob/ea14fc8e5996dcd736b8deb4cc99262d07dfff44/crates/swc_ecma_preset_env/src/transform_data.rs#L194-L218>
 pub fn features() -> &'static FxHashMap<String, Targets> {

diff --git a/crates/oxc_transformer/src/env/options.rs → ..._transformer/src/options/babel/env/mod.rs b/crates/oxc_transformer/src/env/options.rs → ..._transformer/src/options/babel/env/mod.rs
@@ -1,6 +1,10 @@
-use serde::Deserialize;
+mod data;
+mod targets;
+
+pub use data::{bugfix_features, features};
+pub use targets::{Targets, Version};
 
-use crate::env::{bugfix_features, features, Targets};
+use serde::Deserialize;
 
 fn default_as_true() -> bool {
     true

diff --git a/...es/oxc_transformer/src/env/targets/mod.rs → ...rmer/src/options/babel/env/targets/mod.rs b/...es/oxc_transformer/src/env/targets/mod.rs → ...rmer/src/options/babel/env/targets/mod.rs
@@ -168,7 +168,7 @@ impl TryFrom<BabelTargets> for Targets {
 
 #[cfg(test)]
 mod tests {
-    use crate::env::{targets::Version, Targets};
+    use super::{Targets, Version};
 
     #[test]
     fn should_enable_android_falls_back_to_chrome() {

diff --git a/.../oxc_transformer/src/env/targets/query.rs → ...er/src/options/babel/env/targets/query.rs b/.../oxc_transformer/src/env/targets/query.rs → ...er/src/options/babel/env/targets/query.rs
diff --git a/crates/oxc_transformer/src/options/babel.rs → .../oxc_transformer/src/options/babel/mod.rs b/crates/oxc_transformer/src/options/babel.rs → .../oxc_transformer/src/options/babel/mod.rs
@@ -1,3 +1,5 @@
+pub mod env;
+
 use std::path::{Path, PathBuf};
 
 use serde::Deserialize;