dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 12:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(transformer)!: API to TryFrom<&EnvOptions> for TransformOptions and TryFrom<&BabelOptions> TransformOptions (#7020)

Browse source 
…ions` and `TryFrom<&BabelOptions> TransformOptions`
This commit is contained in:
Boshen 2024-10-30 09:40:09 +00:00
parent 17a938ee1f
commit b8daab3663
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/oxc_transformer/examples/transformer.rs
View file

@ -55,7 +55,7 @@ fn main() {
let (symbols, scopes) = ret.semantic.into_symbol_table_and_scope_tree();
let transform_options = if let Some(targets) = &targets {
TransformOptions::from_preset_env(&EnvOptions {
TransformOptions::try_from(&EnvOptions {
targets: Targets::from_query(targets),
..EnvOptions::default()
})

22
crates/oxc_transformer/src/options/transformer.rs
View file

@ -109,16 +109,18 @@ impl TransformOptions {
},
}
}
}
impl TryFrom<&EnvOptions> for TransformOptions {
type Error = Vec<Error>;
/// # Errors
///
/// If there are any errors in the `options.targets``, they will be returned as a list of errors.
pub fn from_preset_env(env_options: &EnvOptions) -> Result<Self, Vec<Error>> {
let targets = match env_options.targets.clone().get_targets() {
fn try_from(options: &EnvOptions) -> Result<Self, Self::Error> {
let targets = match options.targets.clone().get_targets() {
Ok(targets) => Some(targets),
Err(err) => return Err(vec![err]),
};
let bugfixes = env_options.bugfixes;
let bugfixes = options.bugfixes;
let targets = targets.as_ref();
Ok(Self {
regexp: RegExpOptions {
@ -200,11 +202,13 @@ impl TransformOptions {
..Default::default()
})
}
}
impl TryFrom<&BabelOptions> for TransformOptions {
type Error = Vec<Error>;
/// # Errors
///
/// If the `options` contains any unknown fields, they will be returned as a list of errors.
pub fn from_babel_options(options: &BabelOptions) -> Result<Self, Vec<Error>> {
fn try_from(options: &BabelOptions) -> Result<Self, Self::Error> {
let mut errors = Vec::<Error>::new();
let assumptions = if options.assumptions.is_null() {
@ -447,7 +451,7 @@ fn test_deny_unknown_fields() {
"sourceType": "module"
});
let babel_options = serde_json::from_value::<BabelOptions>(options).unwrap();
let result = TransformOptions::from_babel_options(&babel_options);
let result = TransformOptions::try_from(&babel_options);
assert!(result.is_err());
let err_message =
result.err().unwrap().iter().map(ToString::to_string).collect::<Vec<_>>().join("\n");

2
crates/oxc_wasm/src/lib.rs
View file

@ -242,7 +242,7 @@ impl Oxc {
}
if run_options.transform.unwrap_or_default() {
if let Ok(options) = TransformOptions::from_preset_env(&EnvOptions {
if let Ok(options) = TransformOptions::try_from(&EnvOptions {
targets: Targets::from_query("chrome 51"),
..EnvOptions::default()
}) {

8
tasks/transform_conformance/src/test_case.rs
View file

@ -84,10 +84,6 @@ impl TestCaseKind {
}
}
fn transform_options(options: &BabelOptions) -> Result<TransformOptions, Vec<Error>> {
TransformOptions::from_babel_options(options)
}
pub trait TestCase {
fn new(cwd: &Path, path: &Path) -> Self;
@ -197,7 +193,7 @@ impl TestCase for ConformanceTestCase {
fn new(cwd: &Path, path: &Path) -> Self {
let mut options = BabelOptions::from_test_path(path.parent().unwrap());
options.cwd.replace(cwd.to_path_buf());
let transform_options = transform_options(&options);
let transform_options = TransformOptions::try_from(&options);
Self { path: path.to_path_buf(), options, transform_options, errors: vec![] }
}
@ -416,7 +412,7 @@ impl TestCase for ExecTestCase {
fn new(cwd: &Path, path: &Path) -> Self {
let mut options = BabelOptions::from_test_path(path.parent().unwrap());
options.cwd.replace(cwd.to_path_buf());
let transform_options = transform_options(&options);
let transform_options = TransformOptions::try_from(&options);
Self { path: path.to_path_buf(), options, transform_options, errors: vec![] }
}