Skip to content

Commit f5d6330

Browse files
kwonojkwonoj
authored
Merge pull request #249 from ronakj/chore/upgrade-swc
2 parents 27a87ee + 9df07e0 commit f5d6330

File tree

14 files changed

+443
-528
lines changed

14 files changed

+443
-528
lines changed

‎Cargo.lock

Lines changed: 351 additions & 448 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ resolver = "2"
2121
serde = { version = "1.0.203" }
2222
serde-wasm-bindgen = { version = "0.6.5" }
2323
serde_json = { version = "1.0.120" }
24-
swc_core = { version = "0.96.2" }
24+
swc_core = { version = "0.102.0" }
2525
tracing = { version = "0.1.37" }
2626
tracing-subscriber = { version = "0.3.17" }
2727
wasm-bindgen = { version = "0.2.92" }

‎package-lock.json

Lines changed: 48 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"devDependencies": {
5959
"@napi-rs/cli": "^2.11.0",
6060
"@swc-node/register": "^1.6.5",
61-
"@swc/core": "^1.4.0",
61+
"@swc/core": "^1.7.26",
6262
"@taplo/cli": "^0.7.0",
6363
"@types/chai": "^4.3.3",
6464
"@types/js-yaml": "^4.0.5",

‎packages/swc-coverage-instrument/src/coverage_template/create_coverage_data_object.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub fn create_num_lit_expr(value: u32) -> Expr {
3535

3636
pub fn create_ident_key_value_prop(key: &Ident, value: Expr) -> PropOrSpread {
3737
PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
38-
key: PropName::Ident(key.clone()),
38+
key: PropName::Ident(key.clone().into()),
3939
value: Box::new(value),
4040
})))
4141
}

‎packages/swc-coverage-instrument/src/coverage_template/create_coverage_fn_decl.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,15 @@ pub fn create_coverage_fn_ident(value: &str) {
3333
value.hash(&mut s);
3434
let var_name_hash = format!("cov_{}", s.finish());
3535

36-
COVERAGE_FN_IDENT.get_or_init(|| Ident::new(var_name_hash.clone().into(), DUMMY_SP));
37-
COVERAGE_FN_TRUE_TEMP_IDENT
38-
.get_or_init(|| Ident::new(format!("{}_temp", var_name_hash).into(), DUMMY_SP));
36+
COVERAGE_FN_IDENT
37+
.get_or_init(|| Ident::new(var_name_hash.clone().into(), DUMMY_SP, Default::default()));
38+
COVERAGE_FN_TRUE_TEMP_IDENT.get_or_init(|| {
39+
Ident::new(
40+
format!("{}_temp", var_name_hash).into(),
41+
DUMMY_SP,
42+
Default::default(),
43+
)
44+
});
3945
}
4046

4147
/// Creates a function declaration for actual coverage collection.
@@ -85,7 +91,7 @@ pub fn create_coverage_fn_decl<C: Clone + Comments>(
8591
let coverage_data_stmt = create_assignment_stmt(&IDENT_COVERAGE_DATA, coverage_data_object);
8692
stmts.push(coverage_data_stmt);
8793

88-
let coverage_ident = Ident::new("coverage".into(), DUMMY_SP);
94+
let coverage_ident = Ident::new("coverage".into(), DUMMY_SP, Default::default());
8995
stmts.push(quote!(
9096
"var $coverage = $global[$gcv] || ($global[$gcv] = {})" as Stmt,
9197
coverage = coverage_ident.clone(),
@@ -106,7 +112,7 @@ if (!$coverage[$path] || $coverage[$path].$hash !== $hash) {
106112
));
107113

108114
// var actualCoverage = coverage[path];
109-
let actual_coverage_ident = Ident::new("actualCoverage".into(), DUMMY_SP);
115+
let actual_coverage_ident = Ident::new("actualCoverage".into(), DUMMY_SP, Default::default());
110116
stmts.push(quote!(
111117
"var $actual_coverage = $coverage[$path];" as Stmt,
112118
actual_coverage = actual_coverage_ident.clone(),
@@ -130,6 +136,7 @@ if (!$coverage[$path] || $coverage[$path].$hash !== $hash) {
130136
span: DUMMY_SP,
131137
arg: Some(Box::new(Expr::Ident(actual_coverage_ident.clone()))),
132138
})],
139+
..BlockStmt::dummy()
133140
}),
134141
..Function::dummy()
135142
}),
@@ -177,6 +184,7 @@ if (!$coverage[$path] || $coverage[$path].$hash !== $hash) {
177184
body: Some(BlockStmt {
178185
span: DUMMY_SP,
179186
stmts,
187+
..BlockStmt::dummy()
180188
}),
181189
..Function::dummy()
182190
}),

‎packages/swc-coverage-instrument/src/coverage_template/create_global_stmt_template.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn create_global_stmt_template(coverage_global_scope: &str) -> Stmt {
1313
// Note: we don't support function template based on scoped binding
1414
// like https://github.com/istanbuljs/istanbuljs/blob/c7693d4608979ab73ebb310e0a1647e2c51f31b6/packages/istanbul-lib-instrument/src/visitor.js#L793=
1515
// due to scope checking is tricky.
16-
let fn_ctor = quote_ident!("((function(){}).constructor)");
16+
let fn_ctor = quote_ident!(Default::default(), "((function(){}).constructor)");
1717

1818
let expr = Expr::New(NewExpr {
1919
callee: Box::new(Expr::Ident(fn_ctor)),

‎packages/swc-coverage-instrument/src/instrument/create_increase_counter_expr.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ pub fn create_increase_counter_expr(
1515
callee: Callee::Expr(Box::new(Expr::Ident(var_name.clone()))),
1616
args: vec![],
1717
type_args: None,
18+
..Default::default()
1819
};
1920

2021
let c = MemberExpr {
2122
span: DUMMY_SP,
2223
obj: Box::new(Expr::Call(call)),
23-
prop: MemberProp::Ident(type_ident.clone()),
24+
prop: MemberProp::Ident(type_ident.clone().into()),
2425
};
2526

2627
let expr = MemberExpr {

‎packages/swc-coverage-instrument/src/instrument/create_increase_true_expr.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub fn create_increase_true_expr(
2020
callee: Callee::Expr(Box::new(Expr::Ident(var_name.clone()))),
2121
..CallExpr::dummy()
2222
})),
23-
prop: MemberProp::Ident(temp_var_name.clone()),
23+
prop: MemberProp::Ident(temp_var_name.clone().into()),
2424
..MemberExpr::dummy()
2525
};
2626

@@ -65,7 +65,7 @@ fn validate_true_non_trivial(var_name: &Ident, temp_var_name: &Ident) -> Expr {
6565
callee: Callee::Expr(Box::new(Expr::Ident(var_name.clone()))),
6666
..CallExpr::dummy()
6767
})),
68-
prop: MemberProp::Ident(temp_var_name.clone()),
68+
prop: MemberProp::Ident(temp_var_name.clone().into()),
6969
..MemberExpr::dummy()
7070
});
7171

@@ -81,9 +81,9 @@ fn validate_true_non_trivial(var_name: &Ident, temp_var_name: &Ident) -> Expr {
8181
sym: "Array".into(),
8282
..Ident::dummy()
8383
})),
84-
prop: MemberProp::Ident(Ident {
84+
prop: MemberProp::Ident(IdentName {
8585
sym: "isArray".into(),
86-
..Ident::dummy()
86+
..IdentName::dummy()
8787
}),
8888
..MemberExpr::dummy()
8989
}))),
@@ -97,9 +97,9 @@ fn validate_true_non_trivial(var_name: &Ident, temp_var_name: &Ident) -> Expr {
9797
})),
9898
right: Box::new(Expr::Member(MemberExpr {
9999
obj: Box::new(member.clone()),
100-
prop: MemberProp::Ident(Ident {
100+
prop: MemberProp::Ident(IdentName {
101101
sym: "length".into(),
102-
..Ident::dummy()
102+
..IdentName::dummy()
103103
}),
104104
..MemberExpr::dummy()
105105
})),
@@ -117,9 +117,9 @@ fn validate_true_non_trivial(var_name: &Ident, temp_var_name: &Ident) -> Expr {
117117
sym: "Object".into(),
118118
..Ident::dummy()
119119
})),
120-
prop: MemberProp::Ident(Ident {
120+
prop: MemberProp::Ident(IdentName {
121121
sym: "getPrototypeOf".into(),
122-
..Ident::dummy()
122+
..IdentName::dummy()
123123
}),
124124
..MemberExpr::dummy()
125125
}))),
@@ -134,9 +134,9 @@ fn validate_true_non_trivial(var_name: &Ident, temp_var_name: &Ident) -> Expr {
134134
sym: "Object".into(),
135135
..Ident::dummy()
136136
})),
137-
prop: MemberProp::Ident(Ident {
137+
prop: MemberProp::Ident(IdentName {
138138
sym: "prototype".into(),
139-
..Ident::dummy()
139+
..IdentName::dummy()
140140
}),
141141
..MemberExpr::dummy()
142142
})),
@@ -149,9 +149,9 @@ fn validate_true_non_trivial(var_name: &Ident, temp_var_name: &Ident) -> Expr {
149149
sym: "Object".into(),
150150
..Ident::dummy()
151151
})),
152-
prop: MemberProp::Ident(Ident {
152+
prop: MemberProp::Ident(IdentName {
153153
sym: "values".into(),
154-
..Ident::dummy()
154+
..IdentName::dummy()
155155
}),
156156
..MemberExpr::dummy()
157157
}))),
@@ -161,9 +161,9 @@ fn validate_true_non_trivial(var_name: &Ident, temp_var_name: &Ident) -> Expr {
161161
}],
162162
..CallExpr::dummy()
163163
})),
164-
prop: MemberProp::Ident(Ident {
164+
prop: MemberProp::Ident(IdentName {
165165
sym: "length".into(),
166-
..Ident::dummy()
166+
..IdentName::dummy()
167167
}),
168168
..MemberExpr::dummy()
169169
})),

0 commit comments

Comments
 (0)