Skip to content

Commit 44d4d99

Browse files
owjs3901owjs3901
committed
Update package
1 parent 748f588 commit 44d4d99

File tree

14 files changed

+375
-257
lines changed

14 files changed

+375
-257
lines changed

‎Cargo.lock‎

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

‎bindings/devup-ui-wasm/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ crate-type = ["cdylib"]
1515
default = []
1616

1717
[dependencies]
18-
wasm-bindgen = "0.2.114"
18+
wasm-bindgen = "0.2.117"
1919
extractor = { path = "../../libs/extractor" }
2020
sheet = { path = "../../libs/sheet" }
2121
css = { path = "../../libs/css" }
@@ -27,15 +27,15 @@ rustc-hash = "2"
2727
# code size when deploying.
2828
console_error_panic_hook = { version = "0.1.7", optional = true }
2929
bimap = { version = "0.6.3", features = ["serde"] }
30-
js-sys = "0.3.91"
30+
js-sys = "0.3.94"
3131
serde_json = "1.0.149"
3232
serde-wasm-bindgen = "0.6.5"
3333
getrandom = { version = "0.3", features = ["wasm_js"] }
3434

3535
[dev-dependencies]
36-
wasm-bindgen-test = "0.3.64"
36+
wasm-bindgen-test = "0.3.67"
3737
serial_test = "3.4.0"
38-
insta = "1.46.3"
38+
insta = "1.47.2"
3939
rstest = "0.26.1"
4040

4141
[lints.rust]

‎libs/extractor/Cargo.toml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ version = "0.1.0"
44
edition = "2024"
55

66
[dependencies]
7-
oxc_parser = "0.122.0"
8-
oxc_syntax = "0.122.0"
9-
oxc_span = "0.122.0"
10-
oxc_allocator = "0.122.0"
11-
oxc_ast = "0.122.0"
12-
oxc_ast_visit = "0.122.0"
13-
oxc_codegen = "0.122.0"
14-
oxc_transformer = "0.122.0"
15-
oxc_semantic = "0.122.0"
7+
oxc_parser = "0.123.0"
8+
oxc_syntax = "0.123.0"
9+
oxc_span = "0.123.0"
10+
oxc_allocator = "0.123.0"
11+
oxc_ast = "0.123.0"
12+
oxc_ast_visit = "0.123.0"
13+
oxc_codegen = "0.123.0"
14+
oxc_transformer = "0.123.0"
15+
oxc_semantic = "0.123.0"
1616
css = { path = "../css" }
1717
phf = "0.13"
1818
strum = "0.28.0"
@@ -23,7 +23,7 @@ rustc-hash = "2"
2323
smallvec = "1"
2424

2525
[dev-dependencies]
26-
insta = "1.46.3"
26+
insta = "1.47.2"
2727
serial_test = "3.4.0"
2828
rstest = "0.26.1"
2929
criterion = { version = "0.8", features = ["html_reports"] }

‎libs/extractor/src/as_visit.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl<'a> AsVisitor<'a> {
2222
}
2323

2424
fn change_element_name<'a>(ast: &AstBuilder<'a>, element: &mut JSXElement<'a>, element_name: &str) {
25-
let element_name = ast.jsx_element_name_identifier(SPAN, ast.atom(element_name));
25+
let element_name = ast.jsx_element_name_identifier(SPAN, ast.str(element_name));
2626
element.opening_element.name = element_name.clone_in(ast.allocator);
2727
if let Some(el) = &mut element.closing_element {
2828
el.name = element_name;

‎libs/extractor/src/css_utils.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ pub fn css_to_style_literal<'a>(
155155
expression_to_code(&wrap_direct_call(
156156
&ast_builder,
157157
expr,
158-
&[ast_builder.expression_identifier(SPAN, ast_builder.atom("rest"))],
158+
&[ast_builder.expression_identifier(SPAN, ast_builder.str("rest"))],
159159
))
160160
} else {
161161
expression_to_code(expr)
@@ -200,7 +200,7 @@ pub fn css_to_style_literal<'a>(
200200
&ast_builder,
201201
expr,
202202
&[ast_builder
203-
.expression_identifier(SPAN, ast_builder.atom("rest"))],
203+
.expression_identifier(SPAN, ast_builder.str("rest"))],
204204
))
205205
} else {
206206
expression_to_code(expr)

‎libs/extractor/src/extractor/extract_style_from_expression.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ pub fn extract_style_from_expression<'a>(
442442
ast_builder.template_element(
443443
SPAN,
444444
TemplateElementValue {
445-
raw: ast_builder.atom("typo-"),
445+
raw: ast_builder.str("typo-"),
446446
cooked: None,
447447
},
448448
false,
@@ -451,7 +451,7 @@ pub fn extract_style_from_expression<'a>(
451451
ast_builder.template_element(
452452
SPAN,
453453
TemplateElementValue {
454-
raw: ast_builder.atom(""),
454+
raw: ast_builder.str(""),
455455
cooked: None,
456456
},
457457
true,
@@ -492,7 +492,7 @@ pub fn extract_style_from_expression<'a>(
492492
ast_builder.template_element(
493493
SPAN,
494494
TemplateElementValue {
495-
raw: ast_builder.atom("typo-"),
495+
raw: ast_builder.str("typo-"),
496496
cooked: None,
497497
},
498498
false,
@@ -501,7 +501,7 @@ pub fn extract_style_from_expression<'a>(
501501
ast_builder.template_element(
502502
SPAN,
503503
TemplateElementValue {
504-
raw: ast_builder.atom(""),
504+
raw: ast_builder.str(""),
505505
cooked: None,
506506
},
507507
true,

‎libs/extractor/src/extractor/extract_style_from_styled.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pub fn extract_style_from_styled<'a>(
9393
styles: props_styles,
9494
tag: Some(ast_builder.expression_string_literal(
9595
SPAN,
96-
ast_builder.atom(&tag_name),
96+
ast_builder.str(&tag_name),
9797
None,
9898
)),
9999
style_order: None,
@@ -200,7 +200,7 @@ fn create_styled_component<'a>(
200200
SPAN,
201201
ast_builder.binding_pattern_binding_identifier(
202202
SPAN,
203-
ast_builder.atom("rest"),
203+
ast_builder.str("rest"),
204204
),
205205
),
206206
),
@@ -226,20 +226,20 @@ fn create_styled_component<'a>(
226226
SPAN,
227227
ast_builder.alloc_jsx_opening_element(
228228
SPAN,
229-
ast_builder.jsx_element_name_identifier(SPAN, ast_builder.atom(tag_name)),
229+
ast_builder.jsx_element_name_identifier(SPAN, ast_builder.str(tag_name)),
230230
None::<oxc_allocator::Box<oxc_ast::ast::TSTypeParameterInstantiation<'a>>>,
231231
oxc_allocator::Vec::from_iter_in(
232232
vec![
233233
ast_builder.jsx_attribute_item_spread_attribute(
234234
SPAN,
235235
ast_builder
236-
.expression_identifier(SPAN, ast_builder.atom("rest")),
236+
.expression_identifier(SPAN, ast_builder.str("rest")),
237237
),
238238
ast_builder.jsx_attribute_item_attribute(
239239
SPAN,
240240
ast_builder.jsx_attribute_name_identifier(
241241
SPAN,
242-
ast_builder.atom("className"),
242+
ast_builder.str("className"),
243243
),
244244
Some(
245245
ast_builder.jsx_attribute_value_expression_container(
@@ -255,7 +255,7 @@ fn create_styled_component<'a>(
255255
),
256256
ast_builder.expression_identifier(
257257
SPAN,
258-
ast_builder.atom("className"),
258+
ast_builder.str("className"),
259259
),
260260
],
261261
)
@@ -264,7 +264,7 @@ fn create_styled_component<'a>(
264264
.unwrap_or_else(|| {
265265
ast_builder.expression_identifier(
266266
SPAN,
267-
ast_builder.atom("className"),
267+
ast_builder.str("className"),
268268
)
269269
})
270270
.into(),
@@ -275,7 +275,7 @@ fn create_styled_component<'a>(
275275
SPAN,
276276
ast_builder.jsx_attribute_name_identifier(
277277
SPAN,
278-
ast_builder.atom("style"),
278+
ast_builder.str("style"),
279279
),
280280
Some(
281281
ast_builder.jsx_attribute_value_expression_container(
@@ -291,7 +291,7 @@ fn create_styled_component<'a>(
291291
),
292292
ast_builder.expression_identifier(
293293
SPAN,
294-
ast_builder.atom("style"),
294+
ast_builder.str("style"),
295295
),
296296
],
297297
)
@@ -300,7 +300,7 @@ fn create_styled_component<'a>(
300300
.unwrap_or_else(|| {
301301
ast_builder.expression_identifier(
302302
SPAN,
303-
ast_builder.atom("style"),
303+
ast_builder.str("style"),
304304
)
305305
})
306306
.into(),

‎libs/extractor/src/gen_class_name.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fn gen_class_name<'a>(
3737
PropertyKind::Init,
3838
PropertyKey::StringLiteral(ast_builder.alloc_string_literal(
3939
SPAN,
40-
ast_builder.atom(key),
40+
ast_builder.str(key),
4141
None,
4242
)),
4343
merge_expression_for_class_name(
@@ -74,7 +74,7 @@ fn gen_class_name<'a>(
7474
st.set_style_order(style_order);
7575
}
7676
st.extract(filename).map(|style| {
77-
let v = ast_builder.atom(&match style {
77+
let v = ast_builder.str(&match style {
7878
StyleProperty::ClassName(cls) => cls,
7979
StyleProperty::Variable { class_name, .. } => class_name,
8080
});
@@ -134,7 +134,7 @@ fn gen_class_name<'a>(
134134
PropertyKey::StringLiteral(
135135
ast_builder.alloc_string_literal(
136136
SPAN,
137-
ast_builder.atom(key),
137+
ast_builder.str(key),
138138
None,
139139
),
140140
),
@@ -184,7 +184,7 @@ pub fn merge_expression_for_class_name<'a>(
184184
for idx in 0..unknown_expr.len() + 1 {
185185
let tail = idx == unknown_expr.len();
186186
let t = TemplateElementValue {
187-
raw: ast_builder.atom(if idx == 0 {
187+
raw: ast_builder.str(if idx == 0 {
188188
if class_name.is_empty() {
189189
""
190190
} else {
@@ -210,6 +210,6 @@ pub fn merge_expression_for_class_name<'a>(
210210
} else if class_name.is_empty() {
211211
None
212212
} else {
213-
Some(ast_builder.expression_string_literal(SPAN, ast_builder.atom(&class_name), None))
213+
Some(ast_builder.expression_string_literal(SPAN, ast_builder.str(&class_name), None))
214214
}
215215
}

‎libs/extractor/src/gen_style.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ fn gen_style<'a>(
4444
PropertyKind::Init,
4545
PropertyKey::StringLiteral(ast_builder.alloc_string_literal(
4646
SPAN,
47-
ast_builder.atom(&variable_name),
47+
ast_builder.str(&variable_name),
4848
None,
4949
)),
50-
ast_builder.expression_identifier(SPAN, ast_builder.atom(&identifier)),
50+
ast_builder.expression_identifier(SPAN, ast_builder.str(&identifier)),
5151
false,
5252
false,
5353
false,
@@ -176,7 +176,7 @@ fn gen_style<'a>(
176176
for (key, value) in tmp_map {
177177
let v = if value.len() == 1 {
178178
// do not create object expression when property is single
179-
ast_builder.expression_identifier(SPAN, ast_builder.atom(&value[0].1))
179+
ast_builder.expression_identifier(SPAN, ast_builder.str(&value[0].1))
180180
} else {
181181
Expression::ComputedMemberExpression(
182182
ast_builder.alloc_computed_member_expression(
@@ -192,10 +192,10 @@ fn gen_style<'a>(
192192
PropertyKind::Init,
193193
ast_builder.property_key_static_identifier(
194194
SPAN,
195-
ast_builder.atom(&k),
195+
ast_builder.str(&k),
196196
),
197197
ast_builder
198-
.expression_identifier(SPAN, ast_builder.atom(&v)),
198+
.expression_identifier(SPAN, ast_builder.str(&v)),
199199
false,
200200
false,
201201
false,
@@ -215,7 +215,7 @@ fn gen_style<'a>(
215215
PropertyKind::Init,
216216
PropertyKey::StringLiteral(ast_builder.alloc_string_literal(
217217
SPAN,
218-
ast_builder.atom(&key),
218+
ast_builder.str(&key),
219219
None,
220220
)),
221221
v,

‎libs/extractor/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14236,8 +14236,8 @@ export { c as Lib };"#,
1423614236
let allocator = Allocator::default();
1423714237
let builder = oxc_ast::AstBuilder::new(&allocator);
1423814238

14239-
let make_cond = || builder.expression_identifier(SPAN, builder.atom("cond"));
14240-
let make_str = |s| builder.expression_string_literal(SPAN, builder.atom(s), None);
14239+
let make_cond = || builder.expression_identifier(SPAN, builder.str("cond"));
14240+
let make_str = |s| builder.expression_string_literal(SPAN, builder.str(s), None);
1424114241

1424214242
// (Some, Some) — both branches have classNames
1424314243
let result = combine_conditional_class_name(

0 commit comments

Comments
 (0)