Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: define env #1551

Merged
merged 3 commits into from
Aug 30, 2024
Merged

fix: define env #1551

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d601269
fix: define env
xusd320 Aug 29, 2024
8a9a179
test: update test cases for env_replace
xusd320 Aug 30, 2024
793327e
fix: typos
xusd320 Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 108 additions & 20 deletions crates/mako/src/visitors/env_replacer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,42 +49,49 @@
let mut member_visit_path = match prop {
MemberProp::Ident(Ident { sym, .. }) => sym.to_string(),
MemberProp::Computed(ComputedPropName {
expr: expr_computed,
..
}) => match expr_computed.as_ref() {
expr: expr_compute, ..
}) => match expr_compute.as_ref() {
Expr::Lit(Lit::Str(Str { value, .. })) => value.to_string(),

Expr::Lit(Lit::Num(Number { value, .. })) => value.to_string(),
_ => return,
_ => {
obj.visit_mut_with(self);
expr_compute.visit_mut_with(self);
return;
}
},
_ => return,
};

let mut current_member_obj = obj.as_ref();
let mut current_member_obj = obj.as_mut();

while let Expr::Member(MemberExpr { obj, prop, .. }) = current_member_obj {
match prop {
MemberProp::Ident(Ident { sym, .. }) => {
member_visit_path.push('.');
member_visit_path.push_str(sym.as_ref());
}
MemberProp::Computed(ComputedPropName { expr, .. }) => {
match expr.as_ref() {
Expr::Lit(Lit::Str(Str { value, .. })) => {
member_visit_path.push('.');
member_visit_path.push_str(value.as_ref());
}

Expr::Lit(Lit::Num(Number { value, .. })) => {
member_visit_path.push('.');
member_visit_path.push_str(&value.to_string());
}
_ => return,
MemberProp::Computed(ComputedPropName {
expr: expr_compute, ..
}) => match expr_compute.as_ref() {
Expr::Lit(Lit::Str(Str { value, .. })) => {
member_visit_path.push('.');
member_visit_path.push_str(value.as_ref());
}
}

Expr::Lit(Lit::Num(Number { value, .. })) => {
member_visit_path.push('.');
member_visit_path.push_str(&value.to_string());
}
_ => {
obj.visit_mut_with(self);
expr_compute.visit_mut_with(self);
return;
}
},
_ => return,
}
current_member_obj = obj.as_ref();
current_member_obj = obj.as_mut();
}

if let Expr::Ident(Ident { sym, .. }) = current_member_obj {
Expand Down Expand Up @@ -378,7 +385,7 @@
}

#[test]
fn test_complicated() {
fn test_computed_after_ident() {
assert_eq!(
run(
r#"log(A.v["v"])"#,
Expand All @@ -390,6 +397,87 @@
);
}

#[test]
fn test_computed_as_member_key() {
assert_eq!(
run(
r#"log(A[v])"#,
hashmap! {
"v".to_string() => json!(1)
}
),
r#"log(A[1]);"#
);
}

#[test]
fn test_complited_computed_as_member_key() {
assert_eq!(
run(
r#"log(A[v.v])"#,
hashmap! {
"v.v".to_string() => json!(1)
}
),
r#"log(A[1]);"#
);
}

#[test]
fn test_computed_nested() {
assert_eq!(
run(
r#"log(A[v].B[v][v].C[v][v][v])"#,
hashmap! {
"v".to_string() => json!(1)
}
),
r#"log(A[1].B[1][1].C[1][1][1]);"#
);
}

#[test]
fn test_should_not_replace_exsited() {

Check warning on line 440 in crates/mako/src/visitors/env_replacer.rs

View workflow job for this annotation

GitHub Actions / Spell Check 

"exsited" should be "existed" or "excited".
assert_eq!(
run(
r#"let v = 2;log(A[v])"#,
hashmap! {
"v".to_string() => json!(1)
}
),
r#"let v = 2;
log(A[v]);"#
);
}

#[test]
fn test_should_define_before_computed() {
assert_eq!(
run(
r#"log(A[B].v)"#,
hashmap! {
"A.B".to_string() => json!("{\"v\": 1}")
}
),
r#"log(x[({
"v": 1
}).v]);"#
);
}

#[test]
fn test_should_not_replace_as_member_ident() {
assert_eq!(
run(
r#"log(A.v)"#,
hashmap! {
"v".to_string() => json!(1)
}
),
r#"log(A.v);"#
);
}

fn run(js_code: &str, envs: HashMap<String, Value>) -> String {
let mut test_utils = TestUtils::gen_js_ast(js_code);
let envs = build_env_map(envs, &test_utils.context).unwrap();
Expand Down
Loading