Skip to content
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

Jump to bottom

refactor(preset-attributify): improve ternary extraction #1921

Merged
merged 1 commit into from
Nov 29, 2022
Merged

refactor(preset-attributify): improve ternary extraction #1921

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/preset-attributify/src/extractor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const strippedPrefixes = [

const splitterRE = /[\s'"`;]+/g
const elementRE = /<\w(?=.*>)[\w:\.$-]*\s((?:['"`\{].*?['"`\}]|.*?)*?)>/gs
const valuedAttributeRE = /([?]|(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:!%-]+)(?:={?(["'])([^\2]*?)\2}?)?/g
const valuedAttributeRE = /([?]|(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:!%-]+)=?(?:["]([^"]*)["]|[']([^']*)[']|[{]([^}]*)[}])?/gms

export const defaultIgnoreAttributes = ['placeholder']

Expand All @@ -23,7 +23,9 @@ export const extractorAttributify = (options?: AttributifyOptions): Extractor =>
extract({ code }) {
const result = Array.from(code.matchAll(elementRE))
.flatMap(match => Array.from((match[1] || '').matchAll(valuedAttributeRE)))
.flatMap(([, name, _, content]) => {
.flatMap(([, name, ...contents]) => {
const content = contents.filter(Boolean).join('')

if (ignoreAttributes.includes(name))
return []

Expand All @@ -50,8 +52,9 @@ export const extractorAttributify = (options?: AttributifyOptions): Extractor =>
.filter(isValidSelector)
}
else {
return content
.split(splitterRE)
const extractTernary = Array.from(content.matchAll(/(?:[\?:].*?)(["'])([^\1]*?)\1/gms))
.map(([,,v]) => v.split(splitterRE)).flat()
return (extractTernary.length ? extractTernary : content.split(splitterRE))
.filter(Boolean)
.map(v => `[${name}~="${v}"]`)
}
Expand Down
20 changes: 10 additions & 10 deletions test/__snapshots__/preset-attributify.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@ Set {
"[border~=\\"rounded-xl\\"]",
"[border~=\\"x-1\\"]",
"[border~=\\"x-style-dashed\\"]",
"[font~=\\"foo\\"]",
"[font~=\\">\\"]",
"[font~=\\"bar\\"]",
"[font~=\\"?\\"]",
"[font~=\\"mono\\"]",
"[font~=\\":\\"]",
"[font~=\\"sans\\"]",
"[p~=\\"y-2\\"]",
"[p~=\\"x-4\\"]",
Expand Down Expand Up @@ -128,6 +123,11 @@ Set {
"fixed",
"[important~=\\"text-red\\"]",
"[important~=\\"bg-red\\"]",
"[bg~=\\"sky-400\\"]",
"[bg~=\\"hover:sky-500\\"]",
"[bg~=\\"transparent\\"]",
"[font~=\\"mono\\"]",
"[font~=\\"sans\\"]",
"[bg~=\\"blue-400\\"]",
"[bg~=\\"hover:blue-500\\"]",
"[bg~=\\"dark:!blue-500\\"]",
Expand Down Expand Up @@ -301,10 +301,15 @@ exports[`attributify > fixture4 1`] = `
.dark [bg~=\\"dark\\\\:hover\\\\:blue-600\\"]:hover{--un-bg-opacity:1;background-color:rgba(37,99,235,var(--un-bg-opacity));}
[bg~=\\"blue-400\\"]{--un-bg-opacity:1;background-color:rgba(96,165,250,var(--un-bg-opacity));}
[bg~=\\"hover\\\\:blue-500\\"]:hover{--un-bg-opacity:1;background-color:rgba(59,130,246,var(--un-bg-opacity));}
[bg~=\\"hover\\\\:sky-500\\"]:hover{--un-bg-opacity:1;background-color:rgba(14,165,233,var(--un-bg-opacity));}
[bg~=\\"sky-400\\"]{--un-bg-opacity:1;background-color:rgba(56,189,248,var(--un-bg-opacity));}
[bg~=\\"transparent\\"]{background-color:transparent;}
[important~=\\"bg-red\\"]{--un-bg-opacity:1 !important;background-color:rgba(248,113,113,var(--un-bg-opacity)) !important;}
[p~=\\"t-2\\"],
[pt~=\\"\\\\32 \\"],
[pt2=\\"\\"]{padding-top:0.5rem;}
[font~=\\"mono\\"]{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,\\"Liberation Mono\\",\\"Courier New\\",monospace;}
[font~=\\"sans\\"]{font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,\\"Segoe UI\\",Roboto,\\"Helvetica Neue\\",Arial,\\"Noto Sans\\",sans-serif,\\"Apple Color Emoji\\",\\"Segoe UI Emoji\\",\\"Segoe UI Symbol\\",\\"Noto Color Emoji\\";}
[text~=\\"sm\\"]{font-size:0.875rem;line-height:1.25rem;}
[important~=\\"text-red\\"]{--un-text-opacity:1 !important;color:rgba(248,113,113,var(--un-text-opacity)) !important;}
[text~=\\"white\\"]{--un-text-opacity:1;color:rgba(255,255,255,var(--un-text-opacity));}
Expand Down Expand Up @@ -345,12 +350,7 @@ exports[`attributify > variant 1`] = `
"border-rounded-xl",
"border-x-1",
"border-x-style-dashed",
"font-foo",
"font->",
"font-bar",
"font-?",
"font-mono",
"font-:",
"font-sans",
"p-y-2",
"p-x-4",
Expand Down
2 changes: 2 additions & 0 deletions test/preset-attributify.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ describe('attributify', () => {
lg={"bg-blue-600"}
class={"absolute fixed"}
important={"text-red bg-red"}
bg={ withBg ? "sky-400 hover:sky-500" : "transparent" }
font={foo > bar ? 'mono' : 'sans'}
bg={"blue-400 hover:blue-500 dark:!blue-500 dark:hover:blue-600"}
text={"sm white"}
flex="!~ col"
Expand Down