Skip to content

Fix duplicate issue #45

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
Jan 21, 2025
Merged

Fix duplicate issue #45

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 .changeset/slimy-walls-melt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@devup-ui/wasm": patch
---

Fix duplicate props issue
24 changes: 24 additions & 0 deletions libs/css/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,37 @@ pub fn to_kebab_case(value: &str) -> String {
.collect()
}

pub fn to_camel_case(value: &str) -> String {
value
.split('-')
.enumerate()
.map(|(i, s)| {
if i == 0 {
s.to_string()
} else {
format!("{}{}", s[0..1].to_uppercase(), &s[1..])
}
})
.collect()
}

pub fn convert_property(property: &str) -> PropertyType {
GLOBAL_STYLE_PROPERTY
.get(property)
.cloned()
.unwrap_or_else(|| to_kebab_case(property).into())
}

pub fn sort_to_long(property: &str) -> String {
GLOBAL_STYLE_PROPERTY
.get(property)
.map(|v| match v {
PropertyType::Single(value) => to_camel_case(value),
PropertyType::Multi(_) => property.to_string(),
})
.unwrap_or_else(|| property.to_string())
}

pub fn sheet_to_classname(
property: &str,
level: u8,
Expand Down
8 changes: 5 additions & 3 deletions libs/extractor/src/extract_style/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use crate::utils::convert_value;
use crate::StyleProperty;
use css::{css_to_classname, sheet_to_classname, sheet_to_variable_name, StyleSelector};
use css::{
css_to_classname, sheet_to_classname, sheet_to_variable_name, sort_to_long, StyleSelector,
};
use once_cell::sync::Lazy;
use std::collections::HashSet;

Expand Down Expand Up @@ -37,7 +39,7 @@ impl ExtractStaticStyle {
} else {
convert_value(value)
},
property: property.to_string(),
property: sort_to_long(property),
level,
selector,
basic: false,
Expand Down Expand Up @@ -134,7 +136,7 @@ impl ExtractDynamicStyle {
selector: Option<StyleSelector>,
) -> Self {
Self {
property: property.to_string(),
property: sort_to_long(property),
level,
identifier: identifier.to_string(),
selector,
Expand Down
17 changes: 17 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 @@ -1312,4 +1312,21 @@ PROCESS_DATA.map(({ id, title, content }, idx) => (
)
.unwrap());
}

#[test]
#[serial]
fn test_duplicate_style_props() {
reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box bg="red" background="red" />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());
}
}
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__backtick_prop-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExtractOutput {
styles: [
Dynamic(
ExtractDynamicStyle {
property: "bg",
property: "background",
level: 0,
identifier: "`${variable}`",
selector: None,
Expand Down
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__backtick_prop.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "black",
level: 0,
selector: None,
Expand Down
18 changes: 18 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__duplicate_style_props.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
source: libs/extractor/src/lib.rs
expression: "extract(\"test.js\",\nr#\"import {Box} from '@devup-ui/core'\n <Box bg=\"red\" background=\"red\" />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
---
ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "background",
value: "red",
level: 0,
selector: None,
basic: false,
},
),
],
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0\" />;\n",
}
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__extract_compound_responsive_style_props.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "red",
level: 0,
selector: None,
Expand Down
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__extract_static_css_class_name_props-3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "red",
level: 0,
selector: None,
Expand Down
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__extract_static_css_class_name_props-4.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "red",
level: 0,
selector: None,
Expand Down
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__group_selector_props.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "red",
level: 0,
selector: Some(
Expand Down
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__props_direct_select-10.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ExtractOutput {
),
Dynamic(
ExtractDynamicStyle {
property: "bg",
property: "background",
level: 0,
identifier: "[`var(--red)`, `${variable}`][idx]",
selector: None,
Expand Down
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__props_direct_select-11.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ExtractOutput {
),
Dynamic(
ExtractDynamicStyle {
property: "bg",
property: "background",
level: 0,
identifier: "[\n\t\"var(--webBg)\",\n\t\"var(--appBg)\",\n\t\"var(--solutionBg)\"\n][categoryId - 1]",
selector: None,
Expand Down
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__props_direct_select-9.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ExtractOutput {
),
Dynamic(
ExtractDynamicStyle {
property: "bg",
property: "background",
level: 0,
identifier: "[\"var(--red)\", \"var(--blue)\"][idx]",
selector: None,
Expand Down
6 changes: 3 additions & 3 deletions libs/extractor/src/snapshots/extractor__tests__support_transpile_cjs-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "blue",
level: 0,
selector: Some(
Expand All @@ -19,7 +19,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "$text",
level: 0,
selector: None,
Expand Down Expand Up @@ -49,7 +49,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "mt",
property: "marginTop",
value: "8px",
level: 0,
selector: None,
Expand Down
6 changes: 3 additions & 3 deletions libs/extractor/src/snapshots/extractor__tests__support_transpile_cjs-3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "blue",
level: 0,
selector: Some(
Expand All @@ -19,7 +19,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "$text",
level: 0,
selector: None,
Expand Down Expand Up @@ -49,7 +49,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "mt",
property: "marginTop",
value: "8px",
level: 0,
selector: None,
Expand Down
6 changes: 3 additions & 3 deletions libs/extractor/src/snapshots/extractor__tests__support_transpile_cjs.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "blue",
level: 0,
selector: Some(
Expand All @@ -19,7 +19,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "$text",
level: 0,
selector: None,
Expand Down Expand Up @@ -49,7 +49,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "mt",
property: "marginTop",
value: "8px",
level: 0,
selector: None,
Expand Down
6 changes: 3 additions & 3 deletions libs/extractor/src/snapshots/extractor__tests__support_transpile_mjs-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "blue",
level: 0,
selector: Some(
Expand All @@ -19,7 +19,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "$text",
level: 0,
selector: None,
Expand Down Expand Up @@ -49,7 +49,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "mt",
property: "marginTop",
value: "8px",
level: 0,
selector: None,
Expand Down
6 changes: 3 additions & 3 deletions libs/extractor/src/snapshots/extractor__tests__support_transpile_mjs.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "blue",
level: 0,
selector: Some(
Expand All @@ -19,7 +19,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "$text",
level: 0,
selector: None,
Expand Down Expand Up @@ -49,7 +49,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "mt",
property: "marginTop",
value: "8px",
level: 0,
selector: None,
Expand Down
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__ternary_operator_in_selector-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "red",
level: 0,
selector: Some(
Expand Down
2 changes: 1 addition & 1 deletion libs/extractor/src/snapshots/extractor__tests__ternary_operator_in_selector.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ExtractOutput {
),
Static(
ExtractStaticStyle {
property: "bg",
property: "background",
value: "red",
level: 0,
selector: Some(
Expand Down
Loading
Loading