Skip to content

Commit 7465ab0

Browse files
owjs3901owjs3901
committed
Fix suffix prefix
1 parent d4c44a1 commit 7465ab0

File tree

81 files changed

+91
-663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+91
-663
lines changed

‎libs/extractor/src/lib.rs‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,25 +1902,6 @@ e(o, { className: "a", bg: variable, style: { color: "blue" }, ...props })
19021902
));
19031903
}
19041904

1905-
#[test]
1906-
#[serial]
1907-
fn support_transpile_cjs22() {
1908-
reset_class_map();
1909-
assert_debug_snapshot!(ToBTreeSet::from(
1910-
extract(
1911-
"test.js",
1912-
r#"import { jsx as e } from "react/jsx-runtime";
1913-
import { Box as o } from "@devup-ui/core";
1914-
e(o, { className: "a", bg: variable, style: { color: "blue" }, ...props })
1915-
"#,
1916-
ExtractOption {
1917-
package: "@devup-ui/core".to_string(),
1918-
css_file: None
1919-
}
1920-
)
1921-
.unwrap()
1922-
));
1923-
}
19241905
#[test]
19251906
#[serial]
19261907
fn support_transpile_cjs() {

‎libs/extractor/src/prop_modify_utils.rs‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,14 @@ fn merge_string_expressions<'a>(
251251

252252
let mut string_literals: std::vec::Vec<String> = vec![];
253253
let mut other_expressions = vec![];
254+
let mut prev_str = false;
254255
for ex in expressions {
255-
string_literals.push("".to_string());
256+
if !prev_str {
257+
string_literals.push("".to_string());
258+
prev_str = false;
259+
}
256260
if let Expression::StringLiteral(literal) = ex {
261+
prev_str = true;
257262
if !string_literals.is_empty() {
258263
string_literals
259264
.last_mut()
@@ -314,12 +319,14 @@ fn merge_string_expressions<'a>(
314319
let trimmed = s.trim();
315320
if trimmed.is_empty() {
316321
"".to_string()
317-
} else if idx > 0 && idx == string_literals.len() - 1 {
318-
if string_literals.len() == other_expressions.len() {
319-
format!(" {trimmed} ")
322+
} else if idx == string_literals.len() - 1 {
323+
let prefix = if idx == 0 { "" } else { " " };
324+
let suffix = if string_literals.len() == other_expressions.len() {
325+
" "
320326
} else {
321-
format!(" {trimmed}")
322-
}
327+
""
328+
};
329+
format!("{prefix}{trimmed}{suffix}")
323330
} else if idx == string_literals.len() - 1 {
324331
trimmed.to_string()
325332
} else {

‎libs/extractor/src/snapshots/extractor__tests__avoid_same_name_component.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: libs/extractor/src/lib.rs
3-
expression: "ToBTreeSet::from(extract(\"test.js\",\nr#\"import {Box} from '@devup-ui/core'\nimport {Button} from '@devup/ui'\n ;<Box bg=\"red\" background=\"red\" />\n ;<Button bg=\"red\" background=\"red\" />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
3+
expression: "ToBTreeSet::from(extract(\"test.jsx\",\nr#\"import {Box} from '@devup-ui/core'\nimport {Button} from '@devup/ui'\n ;<Box bg=\"red\" background=\"red\" />\n ;<Button bg=\"red\" background=\"red\" />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
44
---
55
ToBTreeSet {
66
styles: {

‎libs/extractor/src/snapshots/extractor__tests__backtick_prop-2.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: libs/extractor/src/lib.rs
3-
expression: "ToBTreeSet::from(extract(\"test.js\",\nr#\"import {Box} from '@devup-ui/core'\n <Box bg={`${variable}`} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
3+
expression: "ToBTreeSet::from(extract(\"test.jsx\",\nr#\"import {Box} from '@devup-ui/core'\n <Box bg={`${variable}`} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
44
---
55
ToBTreeSet {
66
styles: {

‎libs/extractor/src/snapshots/extractor__tests__backtick_prop.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: libs/extractor/src/lib.rs
3-
expression: "ToBTreeSet::from(extract(\"test.js\",\nr#\"import {Box} from '@devup-ui/core'\n <Box bg={`black`} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
3+
expression: "ToBTreeSet::from(extract(\"test.jsx\",\nr#\"import {Box} from '@devup-ui/core'\n <Box bg={`black`} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
44
---
55
ToBTreeSet {
66
styles: {

‎libs/extractor/src/snapshots/extractor__tests__component_in_func.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: libs/extractor/src/lib.rs
3-
expression: "ToBTreeSet::from(extract(\"test.js\",\nr#\"import {Flex} from '@devup-ui/core'\nPROCESS_DATA.map(({ id, title, content }, idx) => (\n <MotionDiv key={idx}>\n <Flex alignItems=\"center\" gap={[3, null, 5, null, 10]}>\n </Flex>\n </MotionDiv>\n ))\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
3+
expression: "ToBTreeSet::from(extract(\"test.jsx\",\nr#\"import {Flex} from '@devup-ui/core'\nPROCESS_DATA.map(({ id, title, content }, idx) => (\n <MotionDiv key={idx}>\n <Flex alignItems=\"center\" gap={[3, null, 5, null, 10]}>\n </Flex>\n </MotionDiv>\n ))\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
44
---
55
ToBTreeSet {
66
styles: {

‎libs/extractor/src/snapshots/extractor__tests__css_props_destructuring_assignment-2.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: libs/extractor/src/lib.rs
3-
expression: "ToBTreeSet::from(extract(\"test.js\",\nr#\"import {css} from '@devup-ui/core'\n <div className={css({\n ...(a ? { bg: 'red', border: \"solid 1px red\" } : { bg: 'blue' }),\n ...({ p: 1,m: 1 }),\n })} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
3+
expression: "ToBTreeSet::from(extract(\"test.jsx\",\nr#\"import {css} from '@devup-ui/core'\n <div className={css({\n ...(a ? { bg: 'red', border: \"solid 1px red\" } : { bg: 'blue' }),\n ...({ p: 1,m: 1 }),\n })} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
44
---
55
ToBTreeSet {
66
styles: {

‎libs/extractor/src/snapshots/extractor__tests__css_props_destructuring_assignment.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: libs/extractor/src/lib.rs
3-
expression: "ToBTreeSet::from(extract(\"test.js\",\nr#\"import {css} from '@devup-ui/core'\n <div className={css({\n ...(a ? { bg: 'red' } : { bg: 'blue' }),\n ...({ p: 1 }),\n })} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
3+
expression: "ToBTreeSet::from(extract(\"test.jsx\",\nr#\"import {css} from '@devup-ui/core'\n <div className={css({\n ...(a ? { bg: 'red' } : { bg: 'blue' }),\n ...({ p: 1 }),\n })} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
44
---
55
ToBTreeSet {
66
styles: {

‎libs/extractor/src/snapshots/extractor__tests__custom_selector-2.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: libs/extractor/src/lib.rs
3-
expression: "ToBTreeSet::from(extract(\"test.js\",\nr#\"import {Box} from '@devup-ui/core'\n <Box selectors={{\n \"*[aria-diabled='true'] &:hover\": {\n opacity: 0.5\n }\n }} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
3+
expression: "ToBTreeSet::from(extract(\"test.jsx\",\nr#\"import {Box} from '@devup-ui/core'\n <Box selectors={{\n \"*[aria-diabled='true'] &:hover\": {\n opacity: 0.5\n }\n }} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
44
---
55
ToBTreeSet {
66
styles: {

‎libs/extractor/src/snapshots/extractor__tests__custom_selector-3.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: libs/extractor/src/lib.rs
3-
expression: "ToBTreeSet::from(extract(\"test.js\",\nr#\"import {Box} from '@devup-ui/core'\n <Box selectors={{\n \"*[aria-diabled='true'] &\": {\n opacity: 0.5\n }\n }} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
3+
expression: "ToBTreeSet::from(extract(\"test.jsx\",\nr#\"import {Box} from '@devup-ui/core'\n <Box selectors={{\n \"*[aria-diabled='true'] &\": {\n opacity: 0.5\n }\n }} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
44
---
55
ToBTreeSet {
66
styles: {

0 commit comments

Comments
 (0)