fix(preset-mini): simplify css props matcher, fix #2951

unocss · Aug 7, 2023 · b01eca9 · b01eca9
1 parent 93a0812
commit b01eca9
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 11 deletions.
diff --git a/packages/preset-mini/src/_rules/variables.ts b/packages/preset-mini/src/_rules/variables.ts
@@ -26,12 +26,50 @@ export const cssVariables: Rule[] = [
 ]
 
 export const cssProperty: Rule[] = [
-  [/^\[(--(\w|\\\W)+|[\w-]+):(("[^\s"]+?"|'[^\s']+?'|`[^\s`]+?`|[^\s:'"`;{}]+?)+)\]$/, ([match, prop,, value]) => {
-    if (!isURI(match.slice(1, -1)))
-      return { [prop]: h.bracket(`[${value}]`) }
+  [/^\[(.*)\]$/, ([_, body]) => {
+    if (!body.includes(':'))
+      return
+
+    const [prop, ...rest] = body.split(':')
+    const value = rest.join(':')
+    if (!isURI(body) && prop.match(/^[a-z-]+$/) && isValidCSSBody(value)) {
+      const parsed = h.bracket(`[${value}]`)
+      if (parsed)
+        return { [prop]: parsed }
+    }
   }],
 ]
 
+function isValidCSSBody(body: string) {
+  let i = 0
+  function findUntil(c: string) {
+    while (i < body.length) {
+      i += 1
+      const char = body[i]
+      if (char === c)
+        return true
+    }
+    return false
+  }
+
+  for (i = 0; i < body.length; i++) {
+    const c = body[i]
+    if ('"`\''.includes(c)) {
+      if (!findUntil(c))
+        return false
+    }
+    else if (c === '(') {
+      if (!findUntil(')'))
+        return false
+    }
+    else if ('[]{}:'.includes(c)) {
+      return false
+    }
+  }
+
+  return true
+}
+
 function isURI(declaration: string) {
   if (!declaration.includes('://'))
     return false

diff --git a/test/assets/output/preset-mini-targets.css b/test/assets/output/preset-mini-targets.css
@@ -7,7 +7,6 @@
 .items-\$size{align-items:var(--size);}
 .ws-\$variable{white-space:var(--variable);}
 .\[--css-variable\:\"wght\"_400\,_\"opsz\"_14\]{--css-variable:"wght" 400, "opsz" 14;}
-.\[--escaped\\\~variable\\\:\:100\%\]{--escaped\~variable\::100%;}
 .\[a\:b\]{a:b;}
 .\[background-image\:url\(star_transparent\.gif\)\,_url\(cat_front\.png\)\]{background-image:url(star_transparent.gif), url(cat_front.png);}
 .\[content\:attr\(attr_content\)\]{content:attr(attr content);}

diff --git a/test/assets/preset-mini-targets.ts b/test/assets/preset-mini-targets.ts
@@ -926,7 +926,6 @@ export const presetMiniTargets: string[] = [
   '[font-feature-settings:\'cv02\',\'cv03\',\'cv04\',\'cv11\']',
   '[font-variation-settings:"wght"_400,_"opsz"_14]',
   '[--css-variable:"wght"_400,_"opsz"_14]',
-  '[--escaped\\~variable\\::100%]',
 
   // variants
   'active:scale-4',
@@ -1145,6 +1144,8 @@ export const presetMiniNonTargets = [
   '[foo:\'bar\',"baz",`]',
   // escaped arbitrary css properties only allowed in css variables
   '[cant\~escape:me]',
+  // https://github.com/unocss/unocss/issues/2951
+  '[https://example.com/documentation/](https://example.com/documentation/)',
 
   // not exists
   'text-main/50',

diff --git a/test/pos.test.ts b/test/pos.test.ts
@@ -176,11 +176,6 @@ describe('matched-positions', async () => {
             37,
             "[color:'red']",
           ],
-          [
-            52,
-            71,
-            "[content:'bar:baz']",
-          ],
         ]
       `)
   })

diff --git a/test/preset-mini.test.ts b/test/preset-mini.test.ts
@@ -144,8 +144,8 @@ describe('preset-mini', () => {
   test('none targets', async () => {
     const { css, matched } = await uno.generate(new Set(presetMiniNonTargets), { minify: true, preflights: false })
 
-    expect(css).toEqual('')
     expect([...matched]).toEqual([])
+    expect(css).toEqual('')
   })
 
   test('fontSize theme', async () => {