@unocss/preset-wind4 66.3.1 → 66.3.2

package/dist/index.mjs

@@ -1,14 +1,14 @@
 import { uniq, toArray, definePreset } from '@unocss/core';
 import { extractorArbitraryVariants } from '@unocss/extractor-arbitrary-variants';
-import { n as trackedProperties, k as themeTracking, M as compressCSS, z as getThemeByKey, m as detectThemeValue, t as trackedTheme, g as globalKeywords, P as PRESET_NAME } from './shared/preset-wind4.C9Rzs5jH.mjs';
+import { n as trackedProperties, k as themeTracking, M as compressCSS, z as getThemeByKey, m as detectThemeValue, t as trackedTheme, g as globalKeywords, P as PRESET_NAME } from './shared/preset-wind4.B6AdPBSv.mjs';
 import { alphaPlaceholdersRE } from '@unocss/rule-utils';
 import { postprocessors } from './postprocess.mjs';
-import { k as variants } from './shared/preset-wind4.B-qAdOhA.mjs';
+import { k as variants } from './shared/preset-wind4.CSYWJ8rI.mjs';
 import { theme as theme$1 } from './theme.mjs';
-import { s as shortcuts } from './shared/preset-wind4.B_j31qY9.mjs';
-import { r as rules } from './shared/preset-wind4.DkYonoU3.mjs';
+import { s as shortcuts } from './shared/preset-wind4.9XNkkElt.mjs';
+import { r as rules } from './shared/preset-wind4.CfYOwu2f.mjs';
 import './colors.mjs';
-import './shared/preset-wind4.BznxXpBJ.mjs';
+import './shared/preset-wind4.B7G_ZuoA.mjs';
 
 function properties() {
   return {

package/dist/rules.mjs

@@ -1,5 +1,5 @@
-export { d as accents, an as accessibility, I as alignments, a as animations, c as appearance, $ as appearances, V as aspectRatio, ak as backgroundBlendModes, b as backgroundStyles, m as bgColors, g as borderStyles, h as borders, T as boxShadows, O as boxSizing, a8 as breaks, e as carets, n as colorScheme, p as columns, a1 as contains, a6 as contentVisibility, a7 as contents, aD as cssProperty, aC as cssVariables, a0 as cursors, _ as displays, u as divides, am as dynamicViewportHeight, ao as fieldSizing, x as filters, y as flex, K as flexGridJustifiesAlignments, M as floats, ad as fontSmoothings, ac as fontStyles, aA as fontVariantNumeric, av as fonts, z as gaps, A as grids, j as handlerBorderStyle, ae as hyphens, i as imageRenderings, L as insets, ai as isolations, G as justifies, C as lineClamps, l as listStyle, X as margins, D as masks, al as mixBlendModes, Z as notLastChildSelector, aj as objectPositions, k as opacity, H as orders, o as outline, B as overflows, f as overscrolls, W as paddings, E as placeholders, J as placements, a2 as pointerEvents, F as positions, P as questionMark, a3 as resizes, Q as rings, r as rules, ah as screenReadersAccess, s as scrollBehaviors, R as scrolls, S as shadowProperties, U as sizes, Y as spaces, aB as splitShorthand, ap as svgUtilities, aw as tabSizes, aq as tables, t as textAligns, q as textDecorations, ax as textIndents, aa as textOverflows, az as textShadows, ay as textStrokes, ab as textTransforms, a9 as textWraps, ar as touchActions, as as transformBase, at as transforms, au as transitions, a4 as userSelects, v as verticalAligns, aE as viewTransition, a5 as whitespaces, w as willChange, af as writingModes, ag as writingOrientations, N as zIndexes } from './shared/preset-wind4.DkYonoU3.mjs';
-export { a as container, c as containerParent, b as containerShortcuts } from './shared/preset-wind4.BznxXpBJ.mjs';
-import './shared/preset-wind4.C9Rzs5jH.mjs';
+export { d as accents, an as accessibility, I as alignments, a as animations, c as appearance, $ as appearances, V as aspectRatio, ak as backgroundBlendModes, b as backgroundStyles, m as bgColors, g as borderStyles, h as borders, T as boxShadows, O as boxSizing, a8 as breaks, e as carets, n as colorScheme, p as columns, a1 as contains, a6 as contentVisibility, a7 as contents, aD as cssProperty, aC as cssVariables, a0 as cursors, _ as displays, u as divides, am as dynamicViewportHeight, ao as fieldSizing, x as filters, y as flex, K as flexGridJustifiesAlignments, M as floats, ad as fontSmoothings, ac as fontStyles, aA as fontVariantNumeric, av as fonts, z as gaps, A as grids, j as handlerBorderStyle, ae as hyphens, i as imageRenderings, L as insets, ai as isolations, G as justifies, C as lineClamps, l as listStyle, X as margins, D as masks, al as mixBlendModes, Z as notLastChildSelector, aj as objectPositions, k as opacity, H as orders, o as outline, B as overflows, f as overscrolls, W as paddings, E as placeholders, J as placements, a2 as pointerEvents, F as positions, P as questionMark, a3 as resizes, Q as rings, r as rules, ah as screenReadersAccess, s as scrollBehaviors, R as scrolls, S as shadowProperties, U as sizes, Y as spaces, aB as splitShorthand, ap as svgUtilities, aw as tabSizes, aq as tables, t as textAligns, q as textDecorations, ax as textIndents, aa as textOverflows, az as textShadows, ay as textStrokes, ab as textTransforms, a9 as textWraps, ar as touchActions, as as transformBase, at as transforms, au as transitions, a4 as userSelects, v as verticalAligns, aE as viewTransition, a5 as whitespaces, w as willChange, af as writingModes, ag as writingOrientations, N as zIndexes } from './shared/preset-wind4.CfYOwu2f.mjs';
+export { a as container, c as containerParent, b as containerShortcuts } from './shared/preset-wind4.B7G_ZuoA.mjs';
+import './shared/preset-wind4.B6AdPBSv.mjs';
 import '@unocss/core';
 import '@unocss/rule-utils';

package/dist/shared/{preset-wind4.B_j31qY9.mjs → preset-wind4.9XNkkElt.mjs}

@@ -1,4 +1,4 @@
-import { b as containerShortcuts } from './preset-wind4.BznxXpBJ.mjs';
+import { b as containerShortcuts } from './preset-wind4.B7G_ZuoA.mjs';
 
 const shortcuts = [
   ...containerShortcuts

package/dist/shared/{preset-wind4.C9Rzs5jH.mjs → preset-wind4.B6AdPBSv.mjs}

@@ -508,11 +508,20 @@ function parseColor(body, theme) {
   } else {
     opacity = opacityOrModifier;
   }
-  const colors = main.replace(/([a-z])(\d)/g, "$1-$2").split(/-/g);
+  const colors = main.replace(/([a-z])(\d)(?![-_a-z])/g, "$1-$2").split(/-/g);
   const [name] = colors;
   if (!name)
     return;
-  let { no, keys, color } = parseThemeColor(theme, colors) ?? {};
+  let parsed = parseThemeColor(theme, colors);
+  if (!parsed && colors.length >= 2) {
+    const last = colors.at(-1);
+    const secondLast = colors.at(-2);
+    if (/^\d+$/.test(last)) {
+      const keys2 = colors.slice(0, -2).concat([`${secondLast}${last}`]);
+      parsed = parseThemeColor(theme, keys2);
+    }
+  }
+  let { no, keys, color } = parsed ?? {};
   if (!color) {
     const bracket = h.bracketOfColor(main);
     const bracketOrMain = bracket || main;

package/dist/shared/{preset-wind4.BznxXpBJ.mjs → preset-wind4.B7G_ZuoA.mjs}

@@ -1,5 +1,5 @@
 import { isString } from '@unocss/core';
-import { r as resolveBreakpoints } from './preset-wind4.C9Rzs5jH.mjs';
+import { r as resolveBreakpoints } from './preset-wind4.B6AdPBSv.mjs';
 
 const containerParent = [
   [/^@container(?:\/(\w+))?(?:-(normal))?$/, ([, l, v]) => {

package/dist/shared/{preset-wind4.B-qAdOhA.mjs → preset-wind4.CSYWJ8rI.mjs}

@@ -1,5 +1,5 @@
 import { variantGetParameter, calcMaxWidthBySize, variantMatcher, variantGetBracket, variantParentMatcher, getBracket, hasThemeFn, transformThemeFn, getStringComponent, createPartClasses, createPseudoClassesAndElements, createPseudoClassFunctions, createTaggedPseudoClasses } from '@unocss/rule-utils';
-import { b as h, r as resolveBreakpoints, C as CONTROL_NO_NEGATIVE, f as cssMathFnRE, j as cssVarFnRE, E as hasParseableColor } from './preset-wind4.C9Rzs5jH.mjs';
+import { b as h, r as resolveBreakpoints, C as CONTROL_NO_NEGATIVE, f as cssMathFnRE, j as cssVarFnRE, E as hasParseableColor } from './preset-wind4.B6AdPBSv.mjs';
 import { toArray } from '@unocss/core';
 
 const variantAria = {
@@ -26,15 +26,29 @@ function taggedAria(tagName) {
     match(matcher, ctx) {
       const variant = variantGetParameter(`${tagName}-aria-`, matcher, ctx.generator.config.separators);
       if (variant) {
-        const [match, rest] = variant;
+        const [match, rest, label] = variant;
         const ariaAttribute = h.bracket(match) ?? ctx.theme.aria?.[match] ?? "";
         if (ariaAttribute) {
+          const tagSelectorMap = {
+            group: `&:is(:where(.group${label ? `\\/${label}` : ""})[aria-${ariaAttribute}] *)`,
+            peer: `&:is(:where(.peer${label ? `\\/${label}` : ""})[aria-${ariaAttribute}] ~ *)`,
+            previous: `:where(*[aria-${ariaAttribute}] + &)`,
+            parent: `:where(*[aria-${ariaAttribute}] > &)`,
+            has: `&:has(*[aria-${ariaAttribute}])`,
+            in: `:where(*[aria-${ariaAttribute}]) &`
+          };
           return {
-            matcher: `${tagName}-[[aria-${ariaAttribute}]]:${rest}`
+            matcher: rest,
+            handle: (input, next) => next({
+              ...input,
+              parent: `${input.parent ? `${input.parent} $$ ` : ""}${input.selector}`,
+              selector: tagSelectorMap[tagName]
+            })
           };
         }
       }
-    }
+    },
+    multiPass: true
   };
 }
 const variantTaggedAriaAttributes = [
@@ -240,12 +254,26 @@ function taggedData(tagName) {
         const [match, rest, label] = variant;
         const dataAttribute = h.bracket(match) ?? ctx.theme.data?.[match] ?? "";
         if (dataAttribute) {
+          const tagSelectorMap = {
+            group: `&:is(:where(.group${label ? `\\/${label}` : ""})[data-${dataAttribute}] *)`,
+            peer: `&:is(:where(.peer${label ? `\\/${label}` : ""})[data-${dataAttribute}] ~ *)`,
+            previous: `:where(*[data-${dataAttribute}] + &)`,
+            parent: `:where(*[data-${dataAttribute}] > &)`,
+            has: `&:has(*[data-${dataAttribute}])`,
+            in: `:where(*[data-${dataAttribute}]) &`
+          };
           return {
-            matcher: `${tagName}-[[data-${dataAttribute}]]${label ? `/${label}` : ""}:${rest}`
+            matcher: rest,
+            handle: (input, next) => next({
+              ...input,
+              parent: `${input.parent ? `${input.parent} $$ ` : ""}${input.selector}`,
+              selector: tagSelectorMap[tagName]
+            })
           };
         }
       }
-    }
+    },
+    multiPass: true
   };
 }
 const variantTaggedDataAttributes = [

package/dist/shared/{preset-wind4.DkYonoU3.mjs → preset-wind4.CfYOwu2f.mjs}

@@ -1,6 +1,6 @@
-import { g as globalKeywords, b as h, G as makeGlobalStaticRules, p as positionMap, w as parseColor, S as SpecialColorKey, l as generateThemeVariable, H as defineProperty, k as themeTracking, m as detectThemeValue, B as colorResolver, I as isCSSMathFn, d as directionMap, E as hasParseableColor, c as cornerMap, A as colorCSSGenerator, J as isSize, s as directionSize, q as numberResolver, D as colorableShadows, L as hyphenate, i as insetMap, r as resolveBreakpoints, C as CONTROL_NO_NEGATIVE, x as xyzMap, N as splitComma, e as xyzArray, O as bracketTypeRe } from './preset-wind4.C9Rzs5jH.mjs';
+import { g as globalKeywords, b as h, G as makeGlobalStaticRules, p as positionMap, w as parseColor, S as SpecialColorKey, l as generateThemeVariable, H as defineProperty, k as themeTracking, m as detectThemeValue, B as colorResolver, I as isCSSMathFn, d as directionMap, E as hasParseableColor, c as cornerMap, A as colorCSSGenerator, J as isSize, s as directionSize, q as numberResolver, D as colorableShadows, L as hyphenate, i as insetMap, r as resolveBreakpoints, C as CONTROL_NO_NEGATIVE, x as xyzMap, N as splitComma, e as xyzArray, O as bracketTypeRe } from './preset-wind4.B6AdPBSv.mjs';
 import { symbols, notNull } from '@unocss/core';
-import { a as container, c as containerParent } from './preset-wind4.BznxXpBJ.mjs';
+import { a as container, c as containerParent } from './preset-wind4.B7G_ZuoA.mjs';
 import { getStringComponent } from '@unocss/rule-utils';
 
 const verticalAlignAlias = {

package/dist/shortcuts.mjs

@@ -1,5 +1,5 @@
-export { s as shortcuts } from './shared/preset-wind4.B_j31qY9.mjs';
-import './shared/preset-wind4.BznxXpBJ.mjs';
+export { s as shortcuts } from './shared/preset-wind4.9XNkkElt.mjs';
+import './shared/preset-wind4.B7G_ZuoA.mjs';
 import '@unocss/core';
-import './shared/preset-wind4.C9Rzs5jH.mjs';
+import './shared/preset-wind4.B6AdPBSv.mjs';
 import '@unocss/rule-utils';

package/dist/utils.mjs

@@ -1,5 +1,5 @@
-import { a as remRE } from './shared/preset-wind4.C9Rzs5jH.mjs';
-export { C as CONTROL_NO_NEGATIVE, P as PRESET_NAME, S as SpecialColorKey, K as camelize, A as colorCSSGenerator, B as colorResolver, D as colorableShadows, M as compressCSS, c as cornerMap, f as cssMathFnRE, j as cssVarFnRE, H as defineProperty, m as detectThemeValue, d as directionMap, s as directionSize, l as generateThemeVariable, z as getThemeByKey, g as globalKeywords, b as h, h as handler, E as hasParseableColor, L as hyphenate, i as insetMap, I as isCSSMathFn, J as isSize, G as makeGlobalStaticRules, q as numberResolver, w as parseColor, y as parseThemeColor, p as positionMap, o as propertyTracking, r as resolveBreakpoints, F as resolveVerticalBreakpoints, u as splitShorthand, k as themeTracking, n as trackedProperties, t as trackedTheme, v as valueHandlers, e as xyzArray, x as xyzMap } from './shared/preset-wind4.C9Rzs5jH.mjs';
+import { a as remRE } from './shared/preset-wind4.B6AdPBSv.mjs';
+export { C as CONTROL_NO_NEGATIVE, P as PRESET_NAME, S as SpecialColorKey, K as camelize, A as colorCSSGenerator, B as colorResolver, D as colorableShadows, M as compressCSS, c as cornerMap, f as cssMathFnRE, j as cssVarFnRE, H as defineProperty, m as detectThemeValue, d as directionMap, s as directionSize, l as generateThemeVariable, z as getThemeByKey, g as globalKeywords, b as h, h as handler, E as hasParseableColor, L as hyphenate, i as insetMap, I as isCSSMathFn, J as isSize, G as makeGlobalStaticRules, q as numberResolver, w as parseColor, y as parseThemeColor, p as positionMap, o as propertyTracking, r as resolveBreakpoints, F as resolveVerticalBreakpoints, u as splitShorthand, k as themeTracking, n as trackedProperties, t as trackedTheme, v as valueHandlers, e as xyzArray, x as xyzMap } from './shared/preset-wind4.B6AdPBSv.mjs';
 export * from '@unocss/rule-utils';
 import '@unocss/core';
 

package/dist/variants.mjs

@@ -1,4 +1,4 @@
-export { F as placeholderModifier, v as variantAria, b as variantBreakpoints, c as variantChildren, g as variantColorsMediaOrClass, h as variantColorsScheme, d as variantCombinators, f as variantContainerQuery, r as variantContrasts, x as variantCssLayer, q as variantCustomMedia, i as variantDataAttribute, u as variantForcedColors, D as variantImplicitGroup, m as variantImportant, y as variantInternalLayer, l as variantLanguageDirections, s as variantMotions, E as variantNegative, n as variantNoscript, t as variantOrientations, J as variantPartClasses, p as variantPrint, H as variantPseudoClassFunctions, G as variantPseudoClassesAndElements, z as variantScope, o as variantScripting, w as variantSelector, K as variantStartingStyle, C as variantStickyHover, L as variantSupports, e as variantSvgCombinators, a as variantTaggedAriaAttributes, j as variantTaggedDataAttributes, I as variantTaggedPseudoClasses, B as variantTheme, A as variantVariables, k as variants } from './shared/preset-wind4.B-qAdOhA.mjs';
+export { F as placeholderModifier, v as variantAria, b as variantBreakpoints, c as variantChildren, g as variantColorsMediaOrClass, h as variantColorsScheme, d as variantCombinators, f as variantContainerQuery, r as variantContrasts, x as variantCssLayer, q as variantCustomMedia, i as variantDataAttribute, u as variantForcedColors, D as variantImplicitGroup, m as variantImportant, y as variantInternalLayer, l as variantLanguageDirections, s as variantMotions, E as variantNegative, n as variantNoscript, t as variantOrientations, J as variantPartClasses, p as variantPrint, H as variantPseudoClassFunctions, G as variantPseudoClassesAndElements, z as variantScope, o as variantScripting, w as variantSelector, K as variantStartingStyle, C as variantStickyHover, L as variantSupports, e as variantSvgCombinators, a as variantTaggedAriaAttributes, j as variantTaggedDataAttributes, I as variantTaggedPseudoClasses, B as variantTheme, A as variantVariables, k as variants } from './shared/preset-wind4.CSYWJ8rI.mjs';
 import '@unocss/rule-utils';
-import './shared/preset-wind4.C9Rzs5jH.mjs';
+import './shared/preset-wind4.B6AdPBSv.mjs';
 import '@unocss/core';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/preset-wind4",
   "type": "module",
-  "version": "66.3.1",
+  "version": "66.3.2",
   "description": "Tailwind 4 compact preset for UnoCSS",
   "authors": [
     {
@@ -74,9 +74,9 @@
     "dist"
   ],
   "dependencies": {
-    "@unocss/core": "66.3.1",
-    "@unocss/rule-utils": "66.3.1",
-    "@unocss/extractor-arbitrary-variants": "66.3.1"
+    "@unocss/core": "66.3.2",
+    "@unocss/extractor-arbitrary-variants": "66.3.2",
+    "@unocss/rule-utils": "66.3.2"
   },
   "scripts": {
     "build": "unbuild",