Skip to content

Improve global css #285

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

Merged
owjs3901 merged 2 commits into from
Aug 6, 2025
Merged

Improve global css #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6b2fed
Improve global css
owjs3901 Aug 6, 2025
c81e2ac
Fix lint
owjs3901 Aug 6, 2025
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
5 changes: 5 additions & 0 deletions .changeset/four-ideas-enjoy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@devup-ui/wasm": patch
---

Support auto wrapping for src in font faces
6 changes: 6 additions & 0 deletions .changeset/hot-moose-count.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@devup-ui/react": patch
"@devup-ui/wasm": patch
---

Support \_ selector and typing in globalCss
3 changes: 3 additions & 0 deletions libs/css/src/constant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ pub(super) static ZERO_PERCENT_FUNCTION: phf::Set<&str> = phf_set! {
};

pub(super) static F_SPACE_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"\s*,\s*").unwrap());
pub(super) static CSS_FUNCTION_RE: Lazy<Regex> =
Lazy::new(|| Regex::new(r"^[a-zA-Z-]+(\(.*\))").unwrap());
pub(super) static CHECK_QUOTES_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"[()\s]").unwrap());

pub(super) static CSS_COMMENT_RE: Lazy<Regex> =
Lazy::new(|| Regex::new(r"/\*[\s\S]*?\*/").unwrap());
Expand Down
35 changes: 33 additions & 2 deletions libs/css/src/optimize_multi_css_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::constant::OPTIMIZE_MULTI_CSS_VALUE_PROPERTY;
use crate::constant::{CHECK_QUOTES_RE, CSS_FUNCTION_RE, OPTIMIZE_MULTI_CSS_VALUE_PROPERTY};

pub fn optimize_mutli_css_value(value: &str) -> String {
value
Expand All @@ -12,7 +12,7 @@ pub fn optimize_mutli_css_value(value: &str) -> String {
} else {
s.to_string()
};
if s.contains(" ") {
if CHECK_QUOTES_RE.is_match(&s) && !CSS_FUNCTION_RE.is_match(&s) {
format!("\"{s}\"")
} else {
s
Expand All @@ -22,6 +22,14 @@ pub fn optimize_mutli_css_value(value: &str) -> String {
.join(",")
}

pub fn wrap_url(s: &str) -> String {
if CSS_FUNCTION_RE.is_match(s) {
s.to_string()
} else {
format!("url({s})")
}
}

pub fn check_multi_css_optimize(property: &str) -> bool {
OPTIMIZE_MULTI_CSS_VALUE_PROPERTY.contains(property)
}
Expand Down Expand Up @@ -49,6 +57,8 @@ mod tests {
#[case("'A B', 'C D', E", "\"A B\",\"C D\",E")]
#[case("A,B,C", "A,B,C")]
#[case("A, B, C", "A,B,C")]
#[case("url(abc)", "url(abc)")]
#[case("url(\"a bc\")", "url(\"a bc\")")]
#[case("'A', 'B', 'C'", "A,B,C")]
#[case("\"A\", \"B\", \"C\"", "A,B,C")]
fn test_optimize_mutli_css_value(#[case] input: &str, #[case] expected: &str) {
Expand All @@ -66,4 +76,25 @@ mod tests {
fn test_check_multi_css_optimize(#[case] property: &str, #[case] expected: bool) {
assert_eq!(check_multi_css_optimize(property), expected);
}

#[rstest]
#[case("url('/fonts/Roboto-Regular.ttf')", "url('/fonts/Roboto-Regular.ttf')")]
#[case(
"url(\"/fonts/Roboto-Regular.ttf\")",
"url(\"/fonts/Roboto-Regular.ttf\")"
)]
#[case("//fonts/Roboto-Regular.ttf", "url(//fonts/Roboto-Regular.ttf)")]
#[case("fonts/Roboto-Regular.ttf", "url(fonts/Roboto-Regular.ttf)")]
#[case(
"local('fonts/Roboto Regular.ttf')",
"local('fonts/Roboto Regular.ttf')"
)]
#[case("(hello)", "url(\"(hello)\")")]
#[case("(hello world)", "url(\"(hello world)\")")]
fn test_wrap_url(#[case] input: &str, #[case] expected: &str) {
assert_eq!(
super::wrap_url(&super::optimize_mutli_css_value(input)),
expected
);
}
}
21 changes: 18 additions & 3 deletions libs/extractor/src/extractor/extract_global_style_from_expression.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::{
};
use css::{
disassemble_property,
optimize_multi_css_value::{check_multi_css_optimize, optimize_mutli_css_value},
optimize_multi_css_value::{check_multi_css_optimize, optimize_mutli_css_value, wrap_url},
style_selector::StyleSelector,
};
use oxc_ast::{
Expand Down Expand Up @@ -86,7 +86,15 @@ pub fn extract_global_style_from_expression<'a>(
&& let PropertyKey::StaticIdentifier(ident) = &o.key
&& let Some(s) = get_string_by_literal_expression(&o.value)
{
Some(disassemble_property(&ident.name).iter().map(|p| (p.to_string(), if check_multi_css_optimize(p) { optimize_mutli_css_value(&s) } else { s.clone() })).collect::<Vec<_>>())
Some(disassemble_property(&ident.name).iter().map(|p| {
let v= if check_multi_css_optimize(p) { optimize_mutli_css_value(&s) } else { s.clone() };
if *p == "src" {
(p.to_string(), wrap_url(&v))
}
else {
(p.to_string(), v)
}
}).collect::<Vec<_>>())
} else {
None
}
Expand Down Expand Up @@ -135,7 +143,14 @@ pub fn extract_global_style_from_expression<'a>(
None,
&mut o.value,
0,
&Some(StyleSelector::Global(name.clone(), file.to_string())),
&Some(StyleSelector::Global(
if let Some(name) = name.strip_prefix("_") {
StyleSelector::from(name).to_string().replace("&", "*")
} else {
name.to_string()
},
file.to_string(),
)),
)
.styles,
);
Expand Down
95 changes: 95 additions & 0 deletions libs/extractor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4684,6 +4684,63 @@ globalCss({
bg: "green"
}
})
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap()
));

reset_class_map();
assert_debug_snapshot!(ToBTreeSet::from(
extract(
"test.tsx",
r#"import { globalCss } from "@devup-ui/core";
globalCss({
_hover: {
bg: "red"
}
})
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap()
));

reset_class_map();
assert_debug_snapshot!(ToBTreeSet::from(
extract(
"test.tsx",
r#"import { globalCss } from "@devup-ui/core";
globalCss({
_placeholder: {
bg: "red"
}
})
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap()
));

reset_class_map();
assert_debug_snapshot!(ToBTreeSet::from(
extract(
"test.tsx",
r#"import { globalCss } from "@devup-ui/core";
globalCss({
_nthLastChild: {
bg: "red"
}
})
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
Expand Down Expand Up @@ -5209,6 +5266,44 @@ globalCss({
}
]
})
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap()
));

reset_class_map();
assert_debug_snapshot!(ToBTreeSet::from(
extract(
"test.tsx",
r#"import { globalCss } from "@devup-ui/core";
globalCss({
fontFaces: [
{
fontFamily: "Roboto Regular2",
src: "//fonts/Roboto-Regular.ttf",
fontWeight: 400,
},
{
fontFamily: "Roboto Regular",
src: "//fonts/Roboto Regular.ttf",
fontWeight: 400,
},
{
fontFamily: "Roboto Regular3",
src: "fonts/Roboto Regular.ttf",
fontWeight: 400,
},
{
fontFamily: "Roboto Regular4",
src: "local('fonts/Roboto Regular.ttf')",
fontWeight: 400,
},
]
})
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
Expand Down
25 changes: 25 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__extract_global_css-5.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
source: libs/extractor/src/lib.rs
expression: "ToBTreeSet::from(extract(\"test.tsx\",\nr#\"import { globalCss } from \"@devup-ui/core\";\nglobalCss({\n _hover: {\n bg: \"red\"\n }\n})\n\"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
---
ToBTreeSet {
styles: {
Static(
ExtractStaticStyle {
property: "background",
value: "red",
level: 0,
selector: Some(
Global(
"*:hover",
"test.tsx",
),
),
style_order: Some(
0,
),
},
),
},
code: "import \"@devup-ui/core/devup-ui.css\";\n;\n",
}
25 changes: 25 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__extract_global_css-6.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
source: libs/extractor/src/lib.rs
expression: "ToBTreeSet::from(extract(\"test.tsx\",\nr#\"import { globalCss } from \"@devup-ui/core\";\nglobalCss({\n _placeholder: {\n bg: \"red\"\n }\n})\n\"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
---
ToBTreeSet {
styles: {
Static(
ExtractStaticStyle {
property: "background",
value: "red",
level: 0,
selector: Some(
Global(
"*::placeholder",
"test.tsx",
),
),
style_order: Some(
0,
),
},
),
},
code: "import \"@devup-ui/core/devup-ui.css\";\n;\n",
}
25 changes: 25 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__extract_global_css-7.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
source: libs/extractor/src/lib.rs
expression: "ToBTreeSet::from(extract(\"test.tsx\",\nr#\"import { globalCss } from \"@devup-ui/core\";\nglobalCss({\n _nthLastChild: {\n bg: \"red\"\n }\n})\n\"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
---
ToBTreeSet {
styles: {
Static(
ExtractStaticStyle {
property: "background",
value: "red",
level: 0,
selector: Some(
Global(
"*:nth-last-child",
"test.tsx",
),
),
style_order: Some(
0,
),
},
),
},
code: "import \"@devup-ui/core/devup-ui.css\";\n;\n",
}
49 changes: 49 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__extract_global_css_with_font_faces-7.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
source: libs/extractor/src/lib.rs
expression: "ToBTreeSet::from(extract(\"test.tsx\",\nr#\"import { globalCss } from \"@devup-ui/core\";\nglobalCss({\n fontFaces: [\n {\n fontFamily: \"Roboto Regular2\",\n src: \"//fonts/Roboto-Regular.ttf\",\n fontWeight: 400,\n },\n {\n fontFamily: \"Roboto Regular\",\n src: \"//fonts/Roboto Regular.ttf\",\n fontWeight: 400,\n },\n {\n fontFamily: \"Roboto Regular3\",\n src: \"fonts/Roboto Regular.ttf\",\n fontWeight: 400,\n },\n {\n fontFamily: \"Roboto Regular4\",\n src: \"local('fonts/Roboto Regular.ttf')\",\n fontWeight: 400,\n },\n ]\n})\n\"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
---
ToBTreeSet {
styles: {
FontFace(
ExtractFontFace {
file: "test.tsx",
properties: {
"font-family": "\"Roboto Regular\"",
"font-weight": "400",
"src": "url(\"//fonts/Roboto Regular.ttf\")",
},
},
),
FontFace(
ExtractFontFace {
file: "test.tsx",
properties: {
"font-family": "\"Roboto Regular2\"",
"font-weight": "400",
"src": "url(//fonts/Roboto-Regular.ttf)",
},
},
),
FontFace(
ExtractFontFace {
file: "test.tsx",
properties: {
"font-family": "\"Roboto Regular3\"",
"font-weight": "400",
"src": "url(\"fonts/Roboto Regular.ttf\")",
},
},
),
FontFace(
ExtractFontFace {
file: "test.tsx",
properties: {
"font-family": "\"Roboto Regular4\"",
"font-weight": "400",
"src": "local('fonts/Roboto Regular.ttf')",
},
},
),
},
code: "import \"@devup-ui/core/devup-ui.css\";\n;\n",
}
4 changes: 2 additions & 2 deletions packages/react/src/types/props/selector/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ export type DevupThemeSelectorProps = keyof DevupTheme extends undefined
? Partial<Record<`_theme${string}`, SelectorProps>>
: Partial<Record<`_theme${PascalCase<keyof DevupTheme>}`, SelectorProps>>

type NormalSelector = Exclude<
export type NormalSelector = Exclude<
Pseudos,
`:-${string}` | `::-${string}` | `${string}()`
>
type ExtractSelector<T = NormalSelector> = T extends `::${infer R}`
export type ExtractSelector<T = NormalSelector> = T extends `::${infer R}`
? R
: T extends `:${infer R}`
? R
Expand Down
Loading