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

feat(preset-mini): support quoted arbitrary values #2226

Merged
merged 2 commits into from
Feb 22, 2023
Merged

feat(preset-mini): support quoted arbitrary values #2226

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
89dd0cd
feat(preset-mini): support quoted arbitrary values
sibbng Feb 21, 2023
74cd6e6
Merge branch 'main' into feat/quoted-arbitrary-values
sibbng Feb 21, 2023
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
2 changes: 1 addition & 1 deletion packages/core/src/extractors/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { extractorSplit, arbitraryPropertyRE } from './split'
export { extractorSplit, arbitraryPropertyRE, quotedArbitraryValuesRE } from './split'
export { extractorSvelte } from './svelte'
4 changes: 4 additions & 0 deletions packages/core/src/extractors/split.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { Extractor } from '../types'
import { isValidSelector } from '../utils'

const defaultSplitRE = /\\?[\s'"`;{}]+/g
export const quotedArbitraryValuesRE = /(?:[\w&:[\]-]|\[\S+=\S+\])+\[\\?['"]?\S+?['"]\]\]?[\w:-]*/g
export const arbitraryPropertyRE = /\[(\\\W|[\w-])+:['"]?\S+?['"]?\]/g
const arbitraryPropertyCandidateRE = new RegExp(`^${arbitraryPropertyRE.source}$`)

Expand All @@ -15,6 +16,9 @@ export const splitCode = (code: string) => {
result.add(match[0])
}

for (const match of code.matchAll(quotedArbitraryValuesRE))
result.add(match[0])

code.split(defaultSplitRE).forEach((match) => {
isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match) && result.add(match)
})
Expand Down
10 changes: 9 additions & 1 deletion packages/shared-common/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ExtractorContext, UnoGenerator } from '@unocss/core'
import { arbitraryPropertyRE, escapeRegExp, isAttributifySelector, makeRegexClassGroup } from '@unocss/core'
import { arbitraryPropertyRE, escapeRegExp, isAttributifySelector, makeRegexClassGroup, quotedArbitraryValuesRE } from '@unocss/core'
import MagicString from 'magic-string'

// https://github.com/dsblv/string-replace-async/blob/main/index.js
Expand Down Expand Up @@ -110,6 +110,14 @@ export function getMatchedPositions(code: string, matched: string[], hasVariantG
start = end
})

// highlight for qouted arbitrary values
for (const match of code.matchAll(quotedArbitraryValuesRE)) {
const start = match.index!
const end = start + match[0].length
if (plain.has(match[0]))
result.push([start, end, match[0]])
}

// highlight for arbitrary css properties
for (const match of code.matchAll(arbitraryPropertyRE)) {
const start = match.index!
Expand Down
5 changes: 5 additions & 0 deletions test/__snapshots__/preset-mini.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ unocss .scope-\\\\[unocss\\\\]\\\\:block{display:block;}
.opacity-\\\\$opa{opacity:var(--opa);}
.opacity-0{opacity:0;}
.placeholder-opacity-60::placeholder{opacity:0.6;}
.\\\\[\\\\&\\\\[data-active\\\\=\\\\\\"true\\\\\\"\\\\]\\\\]\\\\:bg-red[data-active=\\"true\\"]{--un-bg-opacity:1;background-color:rgba(248,113,113,var(--un-bg-opacity));}
.bg-\\\\[\\\\#153\\\\]\\\\/10,
.bg-\\\\[\\\\#1533\\\\]\\\\/10{background-color:rgba(17,85,51,0.1);}
.bg-\\\\[\\\\#1533\\\\]{--un-bg-opacity:0.2;background-color:rgba(17,85,51,var(--un-bg-opacity));}
Expand Down Expand Up @@ -335,6 +336,10 @@ unocss .scope-\\\\[unocss\\\\]\\\\:block{display:block;}
.content-visibility-unset{content-visibility:unset;}
.after\\\\:content-\\\\[quoted\\\\:unocss\\\\]::after,
.content-\\\\[quoted\\\\:unocss\\\\]{content:\\"unocss\\";}
.before\\\\:\\\\[\\\\&\\\\[data-active\\\\=\\\\'true\\\\'\\\\]\\\\]\\\\:content-\\\\[\\\\'test\\\\'\\\\][data-active='true']::before{content:'test';}
.content-\\\\[\\\\'quoted_with_space\\\\'\\\\]{content:'quoted with space';}
.content-\\\\[\\\\'quoted1\\\\'\\\\]{content:'quoted1';}
.content-\\\\[\\\\\\"quoted2\\\\\\"\\\\]{content:\\"quoted2\\";}
.content-\\\\[normal\\\\]{content:normal;}
.content-\\\\[quoted\\\\:\\\\!\\\\]{content:\\"!\\";}
.content-\\\\[string\\\\:attr\\\\(dashed-attr\\\\)\\\\]{content:attr(dashed-attr);}
Expand Down
5 changes: 5 additions & 0 deletions test/assets/preset-mini-targets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,9 @@ export const presetMiniTargets: string[] = [
'content-[normal]',
'content-[quoted:!]',
'content-[quoted:unocss]',
'content-[\'quoted1\']',
'content-[\'quoted_with_space\']',
'content-["quoted2"]',
'content-[string:attr(dashed-attr)]',
'content-[string:attr(underlined\\_attr)]',
'content-$unocss-var',
Expand Down Expand Up @@ -1040,6 +1043,8 @@ export const presetMiniTargets: string[] = [
'[*[open]:readonly_&]:[&[open]:disabled]:m-17',
'[@supports(display:grid)]:bg-red/33',
'[@supports(display:grid)]:[*+&]:bg-red/34',
'before:[&[data-active=\'true\']]:content-[\'test\']',
'[&[data-active="true"]]:bg-red',

// variants - combinators + pseudo
'checked:next:text-slate-100',
Expand Down