Skip to content

Fix underscore issue #494

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 1 commit into from
Nov 18, 2025
Merged

Fix underscore issue #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .changepacks/changepack_log_aGWCTsZEAqVKwqmGlTexZ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"changes": { "bindings/devup-ui-wasm/package.json": "Patch" },
"note": "Fix selectors normialized class when including underscore(_)",
"date": "2025-11-18T08:18:08.445637Z"
}
10 changes: 9 additions & 1 deletion libs/css/src/selector_separator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use crate::constant::DOUBLE_SEPARATOR;
pub enum SelectorSeparator {
Single,
Double,
Space,
None,
}
impl Display for SelectorSeparator {
Expand All @@ -15,17 +16,24 @@ impl Display for SelectorSeparator {
match self {
SelectorSeparator::Single => ":",
SelectorSeparator::Double => "::",
SelectorSeparator::Space => " ",
SelectorSeparator::None => "",
}
)
}
}
impl From<&str> for SelectorSeparator {
fn from(value: &str) -> Self {
if value.starts_with(":") || value.is_empty() || value.starts_with("[") {
if value.starts_with(":")
|| value.is_empty()
|| value.starts_with("[")
|| value.starts_with(" ")
{
SelectorSeparator::None
} else if DOUBLE_SEPARATOR.contains(value) {
SelectorSeparator::Double
} else if value.starts_with("#") || value.starts_with(".") || value.starts_with("*") {
SelectorSeparator::Space
} else {
SelectorSeparator::Single
}
Expand Down
4 changes: 0 additions & 4 deletions libs/extractor/src/css_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,24 +149,20 @@ pub fn optimize_css_block(css: &str) -> String {
.join("}")
.split(";")
.map(|s| {
println!("s: {}", s);
let parts = s.split("{").collect::<Vec<&str>>();
let first_part = if parts.len() == 1 {
"".to_string()
} else {
format!("{}{{", parts.first().unwrap().trim())
};
println!("first_part: {}", first_part);
let last_part = parts.last().unwrap().trim();
if !last_part.contains(":") {
println!("last_part: {}", last_part);
format!("{first_part}{last_part}")
} else {
let mut iter = last_part.split(":");
let property = iter.next().unwrap().trim();
let value = iter.next().unwrap().trim();

println!("property: {}, value: {}", property, value);
let value = if check_multi_css_optimize(property.split("{").last().unwrap()) {
optimize_mutli_css_value(value)
} else {
Expand Down
15 changes: 10 additions & 5 deletions libs/extractor/src/extractor/extract_style_from_expression.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,25 +204,30 @@ pub fn extract_style_from_expression<'a>(
if name.starts_with("_") {
if name.starts_with("_theme") {
StyleSelector::from([
to_kebab_case(name.replace("_", "").as_str()).as_str(),
to_kebab_case(name.strip_prefix("_").unwrap_or(name))
.as_str(),
&selector.to_string(),
])
.to_string()
} else {
StyleSelector::from([
&selector.to_string(),
to_kebab_case(name.replace("_", "").as_str()).as_str(),
to_kebab_case(name.strip_prefix("_").unwrap_or(name))
.as_str(),
])
.to_string()
}
} else {
name.replace("&", &selector.to_string())
}
} else if name.starts_with("_") {
StyleSelector::from(to_kebab_case(&name.replace("_", "")).as_str())
.to_string()
StyleSelector::from(
to_kebab_case(name.strip_prefix("_").unwrap_or(name)).as_str(),
)
.to_string()
} else {
StyleSelector::from(name.replace("_", "").as_str()).to_string()
StyleSelector::from(name.strip_prefix("_").unwrap_or(name))
.to_string()
}
})
.collect::<Vec<_>>()
Expand Down
21 changes: 21 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 @@ -2289,6 +2289,27 @@ import clsx from 'clsx'
)
.unwrap()
));

reset_class_map();
assert_debug_snapshot!(ToBTreeSet::from(
extract(
"test.tsx",
r#"import {Box} from '@devup-ui/core'
<Box selectors={{
".test-picker__day--keyboard-selected": {
bg: "$primary"
}
}} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_dir: "@devup-ui/core".to_string(),
single_css: true,
import_main_css: false
}
)
.unwrap()
));
}

#[test]
Expand Down
22 changes: 22 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__extract_selector-13.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
source: libs/extractor/src/lib.rs
expression: "ToBTreeSet::from(extract(\"test.tsx\",\nr#\"import {Box} from '@devup-ui/core'\n <Box selectors={{\n \".test-picker__day--keyboard-selected\": {\n bg: \"$primary\"\n }\n }} />\n \"#,\nExtractOption\n{\n package: \"@devup-ui/core\".to_string(), css_dir:\n \"@devup-ui/core\".to_string(), single_css: true, import_main_css: false\n}).unwrap())"
---
ToBTreeSet {
styles: {
Static(
ExtractStaticStyle {
property: "background",
value: "$primary",
level: 0,
selector: Some(
Selector(
"& .test-picker__day--keyboard-selected",
),
),
style_order: None,
},
),
},
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"a\" />;\n",
}