@unocss/preset-mini 66.3.1 → 66.3.3

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { entriesToCss, toArray, definePreset } from '@unocss/core';
 import { extractorArbitraryVariants } from '@unocss/extractor-arbitrary-variants';
 import { g as globalKeywords } from './shared/preset-mini.DrfPDgwn.mjs';
 export { k as parseColor } from './shared/preset-mini.DrfPDgwn.mjs';
-import { i as variants } from './shared/preset-mini.CvGCoT1c.mjs';
+import { i as variants } from './shared/preset-mini.DbGR1fYK.mjs';
 import { r as rules } from './shared/preset-mini.BbFVnwVO.mjs';
 import { t as theme } from './shared/preset-mini.BsxsSmTL.mjs';
 export { colors } from './colors.mjs';

package/dist/shared/{preset-mini.CvGCoT1c.mjs → preset-mini.DbGR1fYK.mjs}

@@ -1,6 +1,6 @@
+import { escapeSelector, escapeRegExp, toArray } from '@unocss/core';
 import { variantGetParameter, calcMaxWidthBySize, variantMatcher, variantGetBracket, variantParentMatcher, getBracket, hasThemeFn, transformThemeFn, getStringComponent, createPartClasses, createPseudoClassesAndElements, createPseudoClassFunctions, createTaggedPseudoClasses } from '@unocss/rule-utils';
 import { a as h, r as resolveBreakpoints, C as CONTROL_MINI_NO_NEGATIVE, e as cssMathFnRE, f as cssVarFnRE } from './preset-mini.DrfPDgwn.mjs';
-import { toArray } from '@unocss/core';
 
 const variantAria = {
   name: "aria",
@@ -19,30 +19,87 @@ const variantAria = {
   },
   multiPass: true
 };
-function taggedAria(tagName) {
+function taggedAria(tagName, combinator, options = {}) {
   return {
     name: `${tagName}-aria`,
     match(matcher, ctx) {
       const variant = variantGetParameter(`${tagName}-aria-`, matcher, ctx.generator.config.separators);
+      if (variant) {
+        const [match, rest, label] = variant;
+        const ariaAttribute = h.bracket(match) ?? ctx.theme.aria?.[match] ?? "";
+        if (ariaAttribute) {
+          const attributify = !!options?.attributifyPseudo;
+          let firstPrefix = options?.prefix ?? "";
+          firstPrefix = (Array.isArray(firstPrefix) ? firstPrefix : [firstPrefix]).filter(Boolean)[0] ?? "";
+          const parent = `${attributify ? `[${firstPrefix}${tagName}=""]` : `.${firstPrefix}${tagName}`}`;
+          const escapedLabel = escapeSelector(label ? `/${label}` : "");
+          return {
+            matcher: rest,
+            handle: (input, next) => {
+              const regexp = new RegExp(`${escapeRegExp(parent)}${escapeRegExp(escapedLabel)}(?:\\[.+?\\])+`);
+              const match2 = input.prefix.match(regexp);
+              let nextPrefix;
+              if (match2) {
+                const insertIndex = (match2.index ?? 0) + parent.length + escapedLabel.length;
+                nextPrefix = [
+                  input.prefix.slice(0, insertIndex),
+                  `[aria-${ariaAttribute}]`,
+                  input.prefix.slice(insertIndex)
+                ].join("");
+              } else {
+                const prefixGroupIndex = Math.max(input.prefix.indexOf(parent), 0);
+                nextPrefix = [
+                  input.prefix.slice(0, prefixGroupIndex),
+                  parent,
+                  escapedLabel,
+                  `[aria-${ariaAttribute}]`,
+                  combinator,
+                  input.prefix.slice(prefixGroupIndex)
+                ].join("");
+              }
+              return next({
+                ...input,
+                prefix: nextPrefix
+              });
+            }
+          };
+        }
+      }
+    },
+    multiPass: true
+  };
+}
+function taggedHasAria() {
+  return {
+    name: "has-aria",
+    match(matcher, ctx) {
+      const variant = variantGetParameter("has-aria-", matcher, ctx.generator.config.separators);
       if (variant) {
         const [match, rest] = variant;
         const ariaAttribute = h.bracket(match) ?? ctx.theme.aria?.[match] ?? "";
         if (ariaAttribute) {
           return {
-            matcher: `${tagName}-[[aria-${ariaAttribute}]]:${rest}`
+            matcher: rest,
+            handle: (input, next) => next({
+              ...input,
+              pseudo: `${input.pseudo}:has([aria-${ariaAttribute}])`
+            })
           };
         }
       }
-    }
+    },
+    multiPass: true
   };
 }
-const variantTaggedAriaAttributes = [
-  taggedAria("group"),
-  taggedAria("peer"),
-  taggedAria("parent"),
-  taggedAria("previous"),
-  taggedAria("has")
-];
+function variantTaggedAriaAttributes(options = {}) {
+  return [
+    taggedAria("group", " ", options),
+    taggedAria("peer", "~", options),
+    taggedAria("parent", ">", options),
+    taggedAria("previous", "+", options),
+    taggedHasAria()
+  ];
+}
 
 const sizePseudo = /(max|min)-\[([^\]]*)\]:/;
 function variantBreakpoints() {
@@ -218,7 +275,7 @@ const variantDataAttribute = {
   },
   multiPass: true
 };
-function taggedData(tagName) {
+function taggedData(tagName, combinator, options = {}) {
   return {
     name: `${tagName}-data`,
     match(matcher, ctx) {
@@ -227,21 +284,78 @@ function taggedData(tagName) {
         const [match, rest, label] = variant;
         const dataAttribute = h.bracket(match) ?? ctx.theme.data?.[match] ?? "";
         if (dataAttribute) {
+          const attributify = !!options?.attributifyPseudo;
+          let firstPrefix = options?.prefix ?? "";
+          firstPrefix = (Array.isArray(firstPrefix) ? firstPrefix : [firstPrefix]).filter(Boolean)[0] ?? "";
+          const parent = `${attributify ? `[${firstPrefix}${tagName}=""]` : `.${firstPrefix}${tagName}`}`;
+          const escapedLabel = escapeSelector(label ? `/${label}` : "");
           return {
-            matcher: `${tagName}-[[data-${dataAttribute}]]${label ? `/${label}` : ""}:${rest}`
+            matcher: rest,
+            handle: (input, next) => {
+              const regexp = new RegExp(`${escapeRegExp(parent)}${escapeRegExp(escapedLabel)}(?:\\[.+?\\])+`);
+              const match2 = input.prefix.match(regexp);
+              let nextPrefix;
+              if (match2) {
+                const insertIndex = (match2.index ?? 0) + parent.length + escapedLabel.length;
+                nextPrefix = [
+                  input.prefix.slice(0, insertIndex),
+                  `[data-${dataAttribute}]`,
+                  input.prefix.slice(insertIndex)
+                ].join("");
+              } else {
+                const prefixGroupIndex = Math.max(input.prefix.indexOf(parent), 0);
+                nextPrefix = [
+                  input.prefix.slice(0, prefixGroupIndex),
+                  parent,
+                  escapedLabel,
+                  `[data-${dataAttribute}]`,
+                  combinator,
+                  input.prefix.slice(prefixGroupIndex)
+                ].join("");
+              }
+              return next({
+                ...input,
+                prefix: nextPrefix
+              });
+            }
           };
         }
       }
-    }
+    },
+    multiPass: true
   };
 }
-const variantTaggedDataAttributes = [
-  taggedData("group"),
-  taggedData("peer"),
-  taggedData("parent"),
-  taggedData("previous"),
-  taggedData("has")
-];
+function taggedHasData() {
+  return {
+    name: "has-data",
+    match(matcher, ctx) {
+      const variant = variantGetParameter("has-data-", matcher, ctx.generator.config.separators);
+      if (variant) {
+        const [match, rest] = variant;
+        const dataAttribute = h.bracket(match) ?? ctx.theme.data?.[match] ?? "";
+        if (dataAttribute) {
+          return {
+            matcher: rest,
+            handle: (input, next) => next({
+              ...input,
+              pseudo: `${input.pseudo}:has([data-${dataAttribute}])`
+            })
+          };
+        }
+      }
+    },
+    multiPass: true
+  };
+}
+function variantTaggedDataAttributes(options = {}) {
+  return [
+    taggedData("group", " ", options),
+    taggedData("peer", "~", options),
+    taggedData("parent", ">", options),
+    taggedData("previous", "+", options),
+    taggedHasData()
+  ];
+}
 
 const variantLanguageDirections = [
   variantMatcher("rtl", (input) => ({ prefix: `[dir="rtl"] $$ ${input.prefix}` })),
@@ -570,8 +684,8 @@ function variants(options) {
     ...variantChildren,
     variantContainerQuery,
     variantVariables,
-    ...variantTaggedDataAttributes,
-    ...variantTaggedAriaAttributes,
+    ...variantTaggedDataAttributes(options),
+    ...variantTaggedAriaAttributes(options),
     variantTheme
   ];
 }

package/dist/variants.d.mts

@@ -7,7 +7,7 @@ import './shared/preset-mini.oF7XTPi1.mjs';
 import '@unocss/rule-utils';
 
 declare const variantAria: VariantObject;
-declare const variantTaggedAriaAttributes: Variant[];
+declare function variantTaggedAriaAttributes(options?: PresetMiniOptions): Variant[];
 
 declare function variantBreakpoints(): VariantObject;
 
@@ -20,7 +20,7 @@ declare const variantContainerQuery: VariantObject;
 declare function variantColorsMediaOrClass(options?: PresetMiniOptions): Variant[];
 
 declare const variantDataAttribute: VariantObject;
-declare const variantTaggedDataAttributes: Variant[];
+declare function variantTaggedDataAttributes(options?: PresetMiniOptions): Variant[];
 
 declare function variants(options: PresetMiniOptions): Variant<Theme>[];
 

package/dist/variants.d.ts

@@ -7,7 +7,7 @@ import './shared/preset-mini.CRliz1QB.js';
 import '@unocss/rule-utils';
 
 declare const variantAria: VariantObject;
-declare const variantTaggedAriaAttributes: Variant[];
+declare function variantTaggedAriaAttributes(options?: PresetMiniOptions): Variant[];
 
 declare function variantBreakpoints(): VariantObject;
 
@@ -20,7 +20,7 @@ declare const variantContainerQuery: VariantObject;
 declare function variantColorsMediaOrClass(options?: PresetMiniOptions): Variant[];
 
 declare const variantDataAttribute: VariantObject;
-declare const variantTaggedDataAttributes: Variant[];
+declare function variantTaggedDataAttributes(options?: PresetMiniOptions): Variant[];
 
 declare function variants(options: PresetMiniOptions): Variant<Theme>[];
 

package/dist/variants.mjs

@@ -1,4 +1,4 @@
-export { v as variantAria, b as variantBreakpoints, c as variantChildren, f as variantColorsMediaOrClass, d as variantCombinators, e as variantContainerQuery, o as variantCssLayer, m as variantCustomMedia, g as variantDataAttribute, k as variantImportant, p as variantInternalLayer, j as variantLanguageDirections, t as variantNegative, y as variantPartClasses, l as variantPrint, w as variantPseudoClassFunctions, u as variantPseudoClassesAndElements, q as variantScope, n as variantSelector, z as variantStartingStyle, A as variantSupports, a as variantTaggedAriaAttributes, h as variantTaggedDataAttributes, x as variantTaggedPseudoClasses, s as variantTheme, r as variantVariables, i as variants } from './shared/preset-mini.CvGCoT1c.mjs';
+export { v as variantAria, b as variantBreakpoints, c as variantChildren, f as variantColorsMediaOrClass, d as variantCombinators, e as variantContainerQuery, o as variantCssLayer, m as variantCustomMedia, g as variantDataAttribute, k as variantImportant, p as variantInternalLayer, j as variantLanguageDirections, t as variantNegative, y as variantPartClasses, l as variantPrint, w as variantPseudoClassFunctions, u as variantPseudoClassesAndElements, q as variantScope, n as variantSelector, z as variantStartingStyle, A as variantSupports, a as variantTaggedAriaAttributes, h as variantTaggedDataAttributes, x as variantTaggedPseudoClasses, s as variantTheme, r as variantVariables, i as variants } from './shared/preset-mini.DbGR1fYK.mjs';
+import '@unocss/core';
 import '@unocss/rule-utils';
 import './shared/preset-mini.DrfPDgwn.mjs';
-import '@unocss/core';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/preset-mini",
   "type": "module",
-  "version": "66.3.1",
+  "version": "66.3.3",
   "description": "The minimal preset for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -9,7 +9,7 @@
   "homepage": "https://unocss.dev",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/unocss/unocss",
+    "url": "git+https://github.com/unocss/unocss.git",
     "directory": "packages-presets/preset-mini"
   },
   "bugs": {
@@ -56,9 +56,9 @@
     "dist"
   ],
   "dependencies": {
-    "@unocss/core": "66.3.1",
-    "@unocss/extractor-arbitrary-variants": "66.3.1",
-    "@unocss/rule-utils": "66.3.1"
+    "@unocss/extractor-arbitrary-variants": "66.3.3",
+    "@unocss/rule-utils": "66.3.3",
+    "@unocss/core": "66.3.3"
   },
   "scripts": {
     "build": "unbuild",