Skip to content

Negative issue #109

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
Feb 7, 2025
Merged

Negative issue #109

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
553d754
Add snapshot tests for negative and template literal props extraction
owjs3901 Feb 7, 2025
3d7bd1a
Add highlight to search
owjs3901 Feb 7, 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/rude-wasps-judge.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 negative issue, literal issue
21 changes: 18 additions & 3 deletions apps/landing/src/components/SearchModal/SearchContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { Box, Center, css, Flex, Text, VStack } from '@devup-ui/react'
import Link from 'next/link'
import { useSearchParams } from 'next/navigation'
import { Fragment, useEffect, useState } from 'react'
import { Fragment, useEffect, useMemo, useState } from 'react'

import { URL_PREFIX } from '../../constants'

Expand Down Expand Up @@ -38,6 +38,7 @@ export function SearchContent() {
)
}
}, [query])
const reg = useMemo(() => new RegExp(`(${query})`, 'gi'), [query])
if (!query) return
const inner = data ? (
<>
Expand All @@ -58,8 +59,22 @@ export function SearchContent() {
p="10px"
>
<Text typography="textSbold">{item.title}</Text>
<Text color="$search" typography="caption">
{item.text}
<Text color="$caption" typography="caption">
{item.text
.substring(0, 100)
.split(reg)
.map((part, idx) =>
part.toLowerCase() === query.toLowerCase() ? (
<Text key={idx} color="$search" fontWeight="bold">
{part}
</Text>
) : (
<Text key={idx} as="span">
{part}
</Text>
),
)}
...
</Text>
</VStack>
</Link>
Expand Down
176 changes: 166 additions & 10 deletions libs/extractor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,20 @@ mod prop_modify_utils;
mod style_extractor;
mod utils;
mod visit;

use oxc_codegen::Codegen;
use std::collections::BTreeMap;

use crate::extract_style::ExtractStyleValue;
use crate::visit::DevupVisitor;
use oxc_allocator::Allocator;
use oxc_ast::ast::Expression;
use oxc_ast::VisitMut;
use oxc_codegen::Codegen;
use oxc_parser::{Parser, ParserReturn};
use oxc_span::SourceType;
use std::collections::BTreeMap;
use std::error::Error;

/// result of extracting style properties from props
#[derive(Debug)]
pub enum ExtractStyleProp<'a> {
Static(ExtractStyleValue),
StaticArray(Vec<ExtractStyleProp<'a>>),
/// static + static ex) margin={test?"4px":"8px"} --> className={test?"margin-4px-0":"margin-8px-0"}
/// static + dynamic ex) margin={test?a:"8px"} --> className={test?"margin-0":"margin-8px-0"} style={{ "--margin-0": a }}
/// dynamic + dynamic ex) margin={test?a:b} --> className="margin-0" style={{ "--margin-0": test?a:b }}
/// issue case: dynamic + dynamic ex) margin={test?a:(b ? "8px": c)} --> className="margin-0" style={{ "--margin-0": test?a:(b ? "8px": c) }}
Conditional {
condition: Expression<'a>,
consequent: Option<Box<ExtractStyleProp<'a>>>,
Expand All @@ -42,6 +34,7 @@ pub enum ExtractStyleProp<'a> {
expression: Expression<'a>,
},
}

impl ExtractStyleProp<'_> {
pub fn extract(&self) -> Vec<ExtractStyleValue> {
match self {
Expand Down Expand Up @@ -345,6 +338,19 @@ mod tests {
}
)
.unwrap());

reset_class_map();
assert_debug_snapshot!(extract(
"test.tsx",
r"import {Flex} from '@devup-ui/core'
<Flex padding={('-1')}/>
",
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());
}

#[test]
Expand Down Expand Up @@ -1427,6 +1433,100 @@ export {
)
.unwrap());
}
#[test]
#[serial]
fn negative_props() {
reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box zIndex={-1} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());

reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box zIndex={-a} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());

reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box zIndex={-(1+a)} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());

reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box zIndex={-1*a} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());

reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box zIndex={-(1)} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());

reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box zIndex={(-1)} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());

reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box zIndex={[(-1),-2, -(3)]} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());
}

#[test]
#[serial]
Expand Down Expand Up @@ -1932,4 +2032,60 @@ import {Button} from '@devup/ui'
)
.unwrap());
}

#[test]
#[serial]
fn template_literal_props() {
reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box bg={`${"red"}`} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());

reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box m={`${1}`} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());

reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box m={`${-1}`} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());

reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Box} from '@devup-ui/core'
<Box m={`${1} ${2}`} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());
}
}
27 changes: 27 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__extract_style_props-6.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
source: libs/extractor/src/lib.rs
expression: "extract(\"test.tsx\",\nr\"import {Flex} from '@devup-ui/core'\n <Flex padding={('-1')}/>\n \",\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
---
ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "display",
value: "flex",
level: 0,
selector: None,
basic: true,
},
),
Static(
ExtractStaticStyle {
property: "padding",
value: "-4px",
level: 0,
selector: None,
basic: false,
},
),
],
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0 d1\" />;\n",
}
17 changes: 17 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__negative_props-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
source: libs/extractor/src/lib.rs
expression: "extract(\"test.js\",\nr#\"import {Box} from '@devup-ui/core'\n <Box zIndex={-a} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
---
ExtractOutput {
styles: [
Dynamic(
ExtractDynamicStyle {
property: "zIndex",
level: 0,
identifier: "-a",
selector: None,
},
),
],
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0\" style={{ \"--d1\": -a }} />;\n",
}
17 changes: 17 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__negative_props-3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
source: libs/extractor/src/lib.rs
expression: "extract(\"test.js\",\nr#\"import {Box} from '@devup-ui/core'\n <Box zIndex={-(1+a)} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
---
ExtractOutput {
styles: [
Dynamic(
ExtractDynamicStyle {
property: "zIndex",
level: 0,
identifier: "-(1 + a)",
selector: None,
},
),
],
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0\" style={{ \"--d1\": -(1 + a) }} />;\n",
}
17 changes: 17 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__negative_props-4.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
source: libs/extractor/src/lib.rs
expression: "extract(\"test.js\",\nr#\"import {Box} from '@devup-ui/core'\n <Box zIndex={-1*a} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
---
ExtractOutput {
styles: [
Dynamic(
ExtractDynamicStyle {
property: "zIndex",
level: 0,
identifier: "-1 * a",
selector: None,
},
),
],
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0\" style={{ \"--d1\": -1 * a }} />;\n",
}
18 changes: 18 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__negative_props-5.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 zIndex={-(1)} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
---
ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "zIndex",
value: "-1",
level: 0,
selector: None,
basic: false,
},
),
],
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0\" />;\n",
}
18 changes: 18 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__negative_props-6.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 zIndex={(-1)} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
---
ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "zIndex",
value: "-1",
level: 0,
selector: None,
basic: false,
},
),
],
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0\" />;\n",
}
Loading