chore: pref

examples/uniapp_vue3/package.json

@@ -56,7 +56,7 @@
     "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3070020230117001",
     "@iconify/json": "^2.2.70",
     "typescript": "^5.0.4",
-    "unocss": "^0.53.4",
+    "unocss": "^0.53.6",
     "unocss-preset-weapp": "link:../../",
     "vite": "^4.0.3"
   }

package.json

@@ -90,25 +90,25 @@
   },
   "dependencies": {
     "@rollup/pluginutils": "^5.0.2",
-    "@unocss/core": "^0.53.5",
-    "@unocss/extractor-arbitrary-variants": "^0.53.5",
+    "@unocss/core": "^0.53.6",
+    "@unocss/extractor-arbitrary-variants": "^0.53.6",
     "unplugin-attributify-to-class": "^0.2.4",
-    "unplugin-transform-class": "^0.4.1"
+    "unplugin-transform-class": "^0.5.1"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.39.8",
     "@antfu/ni": "^0.21.5",
-    "@types/node": "^20.4.2",
-    "@unocss/autocomplete": "^0.53.5",
+    "@types/node": "^20.4.3",
+    "@unocss/autocomplete": "^0.53.6",
     "bumpp": "^9.1.1",
     "eslint": "^8.45.0",
     "eslint-formatter-mo": "^1.2.0",
     "magic-string": "^0.30.1",
-    "msw": "^1.2.2",
+    "msw": "^1.2.3",
     "taze": "^0.11.2",
     "typescript": "^5.1.6",
     "unbuild": "^1.2.1",
-    "vite": "^4.4.4",
+    "vite": "^4.4.6",
     "vitest": "^0.33.0"
   }
 }

src/index.ts

@@ -1,5 +1,5 @@
 import type { Preset, PresetOptions } from '@unocss/core'
-import { defaultRules, transformEscapESelector } from 'unplugin-transform-class/utils'
+import { cacheTransformEscapESelector, defaultRules } from 'unplugin-transform-class/utils'
 import { extractorArbitraryVariants } from '@unocss/extractor-arbitrary-variants'
 import preflights from './preflights'
 import { rules } from './rules'
@@ -173,7 +173,7 @@ export function presetWeapp(options: PresetWeappOptions = {}): Preset<Theme> {
     postprocess(css) {
       // 是否转义class
       if (options.transform)
-        css.selector = transformEscapESelector(css.selector, options.transformRules)
+        css.selector = cacheTransformEscapESelector(css.selector, options.transformRules)
 
       // 设置变量前缀
       if (options.variablePrefix !== 'un-')

src/rules/animation.ts

@@ -1,5 +1,5 @@
 import type { Rule } from '@unocss/core'
-import { restoreSelector } from 'unplugin-transform-class/utils'
+import { cacheRestoreSelector } from 'unplugin-transform-class/utils'
 import { globalKeywords, handler as h, makeGlobalStaticRules } from '../utils'
 import type { Theme } from '../'
 
@@ -15,7 +15,7 @@ export const animations: Rule<Theme>[] = [
   }, { autocomplete: ['animate-keyframes-$animation.keyframes', 'keyframes-$animation.keyframes'] }],
 
   [/^animate-(.+)$/, ([, name], { theme }) => {
-    name = restoreSelector(name, theme.transformRules)
+    name = cacheRestoreSelector(name, theme.transformRules)
     const kf = theme.animation?.keyframes?.[name]
 
     if (kf) {

src/rules/background.ts

@@ -1,5 +1,5 @@
 import type { CSSColorValue, Rule, RuleContext } from '@unocss/core'
-import { restoreSelector } from 'unplugin-transform-class/utils'
+import { cacheRestoreSelector } from 'unplugin-transform-class/utils'
 import { colorOpacityToString, colorToString, globalKeywords, handler as h, makeGlobalStaticRules, parseColor, positionMap } from '../utils'
 import type { Theme } from '../'
 
@@ -72,7 +72,7 @@ const bgLengthRE = /^\[length:.+\]$/
 const bgPositionRE = /^\[position:.+\]$/
 export const backgroundStyles: Rule<Theme>[] = [
   [/^bg-(.+)$/, ([, d], { theme }) => {
-    d = restoreSelector(d, theme?.transformRules)
+    d = cacheRestoreSelector(d, theme?.transformRules)
     if (bgUrlRE.test(d))
       return { '--un-url': h.bracket(d), 'background-image': 'var(--un-url)' }
     if (bgLengthRE.test(d) && h.bracketOfLength(d) != null)

src/rules/border.ts

@@ -1,5 +1,5 @@
 import type { CSSEntries, CSSObject, Rule, RuleContext } from '@unocss/core'
-import { restoreSelector } from 'unplugin-transform-class/utils'
+import { cacheRestoreSelector } from 'unplugin-transform-class/utils'
 import type { Theme } from '../theme'
 import { colorOpacityToString, colorToString, cornerMap, directionMap, globalKeywords, handler as h, hasParseableColor, parseColor } from '../utils'
 
@@ -113,7 +113,8 @@ function handlerBorderOpacity([, a = '', opacity]: string[]): CSSEntries | undef
 }
 
 function handlerRounded([, a = '', s]: string[], { theme }: RuleContext<Theme>): CSSEntries | undefined {
-  s = restoreSelector(s, theme?.transformRules)
+  s = cacheRestoreSelector(s, theme?.transformRules)
+
   const v = theme.borderRadius?.[s || 'DEFAULT'] || h.bracket.cssvar.global.fraction.remToRpx(s || '1')
   if (a in cornerMap && v != null)
     return cornerMap[a].map(i => [`border${i}-radius`, v])

src/rules/flex.ts

@@ -1,5 +1,5 @@
 import type { Rule } from '@unocss/core'
-import { restoreSelector } from 'unplugin-transform-class/utils'
+import { cacheRestoreSelector } from 'unplugin-transform-class/utils'
 import type { Theme } from '../theme'
 import { handler as h } from '../utils'
 
@@ -11,7 +11,7 @@ export const flex: Rule<Theme>[] = [
 
   // flex
   [/^flex-(.*)$/, ([, d], { theme }) => {
-    d = restoreSelector(d, theme?.transformRules)
+    d = cacheRestoreSelector(d, theme?.transformRules)
 
     return { flex: h.bracket(d) != null ? h.bracket(d)!.split(' ').map(e => h.cssvar.fraction(e) ?? e).join(' ') : h.cssvar.fraction(d) }
   }],
@@ -24,7 +24,7 @@ export const flex: Rule<Theme>[] = [
   [/^(?:flex-)?shrink(?:-(.*))?$/, ([, d = '']) => ({ 'flex-shrink': h.bracket.cssvar.number(d) ?? 1 }), { autocomplete: ['flex-shrink-<num>', 'shrink-<num>'] }],
   [/^(?:flex-)?grow(?:-(.*))?$/, ([, d = '']) => ({ 'flex-grow': h.bracket.cssvar.number(d) ?? 1 }), { autocomplete: ['flex-grow-<num>', 'grow-<num>'] }],
   [/^(?:flex-)?basis-(.+)$/, ([, d], { theme }) => {
-    d = restoreSelector(d, theme?.transformRules)
+    d = cacheRestoreSelector(d, theme?.transformRules)
     return { 'flex-basis': theme.spacing?.[d] ?? h.bracket.cssvar.auto.fraction.remToRpx(d) }
   },
   { autocomplete: ['flex-basis-$spacing', 'basis-$spacing'] }],

src/rules/position.ts

@@ -1,5 +1,5 @@
 import type { CSSEntries, Rule, RuleContext, StaticRule } from '@unocss/core'
-import { restoreSelector } from 'unplugin-transform-class/utils'
+import { cacheRestoreSelector } from 'unplugin-transform-class/utils'
 import type { Theme } from '../theme'
 import { globalKeywords, handler as h, insetMap, makeGlobalStaticRules } from '../utils'
 
@@ -109,7 +109,7 @@ export const flexGridJustifiesAlignments = [...justifies, ...alignments]
   ])
 
 function handleInsetValue(v: string, { theme }: RuleContext<Theme>): string | number | undefined {
-  v = restoreSelector(v, theme?.transformRules)
+  v = cacheRestoreSelector(v, theme?.transformRules)
   return theme.spacing?.[v] ?? (theme?.whRpx ? h.bracket.cssvar.global.auto.fraction.rpx(v) : h.bracket.cssvar.global.auto.fraction.remToRpx(v))
 }
 

src/rules/shadow.ts

@@ -1,5 +1,5 @@
 import type { Rule } from '@unocss/core'
-import { restoreSelector } from 'unplugin-transform-class/utils'
+import { cacheRestoreSelector } from 'unplugin-transform-class/utils'
 import type { Theme } from '../theme'
 import { colorResolver, colorableShadows, handler as h, hasParseableColor } from '../utils'
 import { varEmpty } from './static'
@@ -15,7 +15,7 @@ export const boxShadows: Rule<Theme>[] = [
   [/^shadow(?:-(.+))?$/, (match, context) => {
     let [, d] = match
     const { theme } = context
-    d = restoreSelector(d, theme.transformRules)
+    d = cacheRestoreSelector(d, theme.transformRules)
 
     const v = theme.boxShadow?.[d || 'DEFAULT']
     const c = d ? h.bracket.cssvar(d) : undefined

src/rules/size.ts

@@ -1,5 +1,5 @@
 import type { Rule } from '@unocss/core'
-import { restoreSelector } from 'unplugin-transform-class/utils'
+import { cacheRestoreSelector } from 'unplugin-transform-class/utils'
 import type { Theme } from '../theme'
 import { handler as h, resolveBreakpoints, resolveVerticalBreakpoints } from '../utils'
 
@@ -17,7 +17,7 @@ function getPropName(minmax: string, hw: string) {
 type SizeProps = 'width' | 'height' | 'maxWidth' | 'maxHeight' | 'minWidth' | 'minHeight' | 'inlineSize' | 'blockSize' | 'maxInlineSize' | 'maxBlockSize' | 'minInlineSize' | 'minBlockSize'
 
 function getSizeValue(minmax: string, hw: string, theme: Theme, prop: string) {
-  prop = restoreSelector(prop, theme?.transformRules)
+  prop = cacheRestoreSelector(prop, theme?.transformRules)
 
   const str = getPropName(minmax, hw)
     .replace(/-(\w)/g, (_, p) => p.toUpperCase()) as SizeProps