@unocss/preset-mini 0.57.6 → 0.58.0

package/dist/variants.d.cts

@@ -3,7 +3,7 @@ import { PresetMiniOptions } from './index.cjs';
 import { T as Theme } from './shared/preset-mini.7XoWRZIl.cjs';
 import './shared/preset-mini.5-XKlNyK.cjs';
 import './colors.cjs';
-import './shared/preset-mini.Jpc0QYPj.cjs';
+import './shared/preset-mini.WoiFygE2.cjs';
 
 declare const variantAria: VariantObject;
 
@@ -17,7 +17,7 @@ declare const variantContainerQuery: VariantObject;
 declare function variantColorsMediaOrClass(options?: PresetMiniOptions): Variant[];
 
 declare const variantDataAttribute: VariantObject;
-declare const variantGroupDataAttribute: Variant;
+declare const variantTaggedDataAttributes: Variant[];
 
 declare function variants(options: PresetMiniOptions): Variant<Theme>[];
 
@@ -43,4 +43,4 @@ declare const variantPartClasses: VariantObject;
 
 declare const variantSupports: VariantObject;
 
-export { calcMaxWidthBySize, variantAria, variantBreakpoints, variantColorsMediaOrClass, variantCombinators, variantContainerQuery, variantCssLayer, variantCustomMedia, variantDataAttribute, variantGroupDataAttribute, variantImportant, variantInternalLayer, variantLanguageDirections, variantNegative, variantPartClasses, variantPrint, variantPseudoClassFunctions, variantPseudoClassesAndElements, variantScope, variantSelector, variantSupports, variantTaggedPseudoClasses, variantVariables, variants };
+export { calcMaxWidthBySize, variantAria, variantBreakpoints, variantColorsMediaOrClass, variantCombinators, variantContainerQuery, variantCssLayer, variantCustomMedia, variantDataAttribute, variantImportant, variantInternalLayer, variantLanguageDirections, variantNegative, variantPartClasses, variantPrint, variantPseudoClassFunctions, variantPseudoClassesAndElements, variantScope, variantSelector, variantSupports, variantTaggedDataAttributes, variantTaggedPseudoClasses, variantVariables, variants };

package/dist/variants.d.mts

@@ -3,7 +3,7 @@ import { PresetMiniOptions } from './index.mjs';
 import { T as Theme } from './shared/preset-mini.7XoWRZIl.mjs';
 import './shared/preset-mini.4DxDu2I8.mjs';
 import './colors.mjs';
-import './shared/preset-mini.XmVozI6N.mjs';
+import './shared/preset-mini.WMGBnRDa.mjs';
 
 declare const variantAria: VariantObject;
 
@@ -17,7 +17,7 @@ declare const variantContainerQuery: VariantObject;
 declare function variantColorsMediaOrClass(options?: PresetMiniOptions): Variant[];
 
 declare const variantDataAttribute: VariantObject;
-declare const variantGroupDataAttribute: Variant;
+declare const variantTaggedDataAttributes: Variant[];
 
 declare function variants(options: PresetMiniOptions): Variant<Theme>[];
 
@@ -43,4 +43,4 @@ declare const variantPartClasses: VariantObject;
 
 declare const variantSupports: VariantObject;
 
-export { calcMaxWidthBySize, variantAria, variantBreakpoints, variantColorsMediaOrClass, variantCombinators, variantContainerQuery, variantCssLayer, variantCustomMedia, variantDataAttribute, variantGroupDataAttribute, variantImportant, variantInternalLayer, variantLanguageDirections, variantNegative, variantPartClasses, variantPrint, variantPseudoClassFunctions, variantPseudoClassesAndElements, variantScope, variantSelector, variantSupports, variantTaggedPseudoClasses, variantVariables, variants };
+export { calcMaxWidthBySize, variantAria, variantBreakpoints, variantColorsMediaOrClass, variantCombinators, variantContainerQuery, variantCssLayer, variantCustomMedia, variantDataAttribute, variantImportant, variantInternalLayer, variantLanguageDirections, variantNegative, variantPartClasses, variantPrint, variantPseudoClassFunctions, variantPseudoClassesAndElements, variantScope, variantSelector, variantSupports, variantTaggedDataAttributes, variantTaggedPseudoClasses, variantVariables, variants };

package/dist/variants.d.ts

@@ -3,7 +3,7 @@ import { PresetMiniOptions } from './index.js';
 import { T as Theme } from './shared/preset-mini.7XoWRZIl.js';
 import './shared/preset-mini.5daNC9yh.js';
 import './colors.js';
-import './shared/preset-mini.QW22c5Df.js';
+import './shared/preset-mini.zVYE2D2j.js';
 
 declare const variantAria: VariantObject;
 
@@ -17,7 +17,7 @@ declare const variantContainerQuery: VariantObject;
 declare function variantColorsMediaOrClass(options?: PresetMiniOptions): Variant[];
 
 declare const variantDataAttribute: VariantObject;
-declare const variantGroupDataAttribute: Variant;
+declare const variantTaggedDataAttributes: Variant[];
 
 declare function variants(options: PresetMiniOptions): Variant<Theme>[];
 
@@ -43,4 +43,4 @@ declare const variantPartClasses: VariantObject;
 
 declare const variantSupports: VariantObject;
 
-export { calcMaxWidthBySize, variantAria, variantBreakpoints, variantColorsMediaOrClass, variantCombinators, variantContainerQuery, variantCssLayer, variantCustomMedia, variantDataAttribute, variantGroupDataAttribute, variantImportant, variantInternalLayer, variantLanguageDirections, variantNegative, variantPartClasses, variantPrint, variantPseudoClassFunctions, variantPseudoClassesAndElements, variantScope, variantSelector, variantSupports, variantTaggedPseudoClasses, variantVariables, variants };
+export { calcMaxWidthBySize, variantAria, variantBreakpoints, variantColorsMediaOrClass, variantCombinators, variantContainerQuery, variantCssLayer, variantCustomMedia, variantDataAttribute, variantImportant, variantInternalLayer, variantLanguageDirections, variantNegative, variantPartClasses, variantPrint, variantPseudoClassFunctions, variantPseudoClassesAndElements, variantScope, variantSelector, variantSupports, variantTaggedDataAttributes, variantTaggedPseudoClasses, variantVariables, variants };

package/dist/variants.mjs

@@ -1,5 +1,5 @@
 import { variantGetParameter, variantGetBracket, variantMatcher, variantParentMatcher, getBracket, getStringComponent } from '@unocss/rule-utils';
-import { h, r as resolveBreakpoints, C as CONTROL_MINI_NO_NEGATIVE } from './shared/preset-mini.Stl9mkMB.mjs';
+import { h, resolveBreakpoints, CONTROL_MINI_NO_NEGATIVE, cssMathFnRE } from './utils.mjs';
 import { warnOnce, escapeRegExp, escapeSelector } from '@unocss/core';
 
 const variantAria = {
@@ -183,21 +183,29 @@ const variantDataAttribute = {
     }
   }
 };
-const variantGroupDataAttribute = {
-  name: "group-data",
-  match(matcher, ctx) {
-    const variant = variantGetParameter("group-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: `group-[[data-${dataAttribute}]]:${rest}`
-        };
+function taggedData(tagName) {
+  return {
+    name: `${tagName}-data`,
+    match(matcher, ctx) {
+      const variant = variantGetParameter(`${tagName}-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: `${tagName}-[[data-${dataAttribute}]]:${rest}`
+          };
+        }
       }
     }
-  }
-};
+  };
+}
+const variantTaggedDataAttributes = [
+  taggedData("group"),
+  taggedData("peer"),
+  taggedData("parent"),
+  taggedData("previous")
+];
 
 const variantLanguageDirections = [
   variantMatcher("rtl", (input) => ({ prefix: `[dir="rtl"] $$ ${input.prefix}` })),
@@ -310,18 +318,30 @@ const variantVariables = {
   multiPass: true
 };
 
-const numberRE = /[0-9.]+(?:[a-z]+|%)?/;
+const anchoredNumberRE = /^-?[0-9.]+(?:[a-z]+|%)?$/;
+const numberRE = /-?[0-9.]+(?:[a-z]+|%)?/;
 const ignoreProps = [
-  /opacity|color|flex/
+  /\b(opacity|color|flex|backdrop-filter|^filter|transform)\b/
 ];
-function negateFunctions(value) {
-  const match = value.match(/^(calc|clamp|max|min)\s*(\(.*)/);
+function negateMathFunction(value) {
+  const match = value.match(cssMathFnRE);
   if (match) {
-    const [fnBody, rest] = getStringComponent(match[2], "(", ")", " ") ?? [];
+    const [fnBody, rest] = getStringComponent(`(${match[2]})${match[3]}`, "(", ")", " ") ?? [];
     if (fnBody)
       return `calc(${match[1]}${fnBody} * -1)${rest ? ` ${rest}` : ""}`;
   }
 }
+const negateFunctionBodyRE = /\b(hue-rotate)\s*(\(.*)/;
+function negateFunctionBody(value) {
+  const match = value.match(negateFunctionBodyRE);
+  if (match) {
+    const [fnBody, rest] = getStringComponent(match[2], "(", ")", " ") ?? [];
+    if (fnBody) {
+      const body = anchoredNumberRE.test(fnBody.slice(1, -1)) ? fnBody.replace(numberRE, (i) => i.startsWith("-") ? i.slice(1) : `-${i}`) : `(calc(${fnBody} * -1))`;
+      return `${match[1]}${body}${rest ? ` ${rest}` : ""}`;
+    }
+  }
+}
 const variantNegative = {
   name: "negative",
   match(matcher) {
@@ -337,14 +357,22 @@ const variantNegative = {
           const value = v[1]?.toString();
           if (!value || value === "0")
             return;
-          if (ignoreProps.some((i) => v[0].match(i)))
+          if (ignoreProps.some((i) => i.test(v[0])))
             return;
-          const negated = negateFunctions(value);
-          if (negated) {
-            v[1] = negated;
+          const negatedFn = negateMathFunction(value);
+          if (negatedFn) {
+            v[1] = negatedFn;
             changed = true;
-          } else if (numberRE.test(value)) {
-            v[1] = value.replace(numberRE, (i) => `-${i}`);
+            return;
+          }
+          const negatedBody = negateFunctionBody(value);
+          if (negatedBody) {
+            v[1] = negatedBody;
+            changed = true;
+            return;
+          }
+          if (anchoredNumberRE.test(value)) {
+            v[1] = value.replace(numberRE, (i) => i.startsWith("-") ? i.slice(1) : `-${i}`);
             changed = true;
           }
         });
@@ -664,11 +692,14 @@ function variantPseudoClassFunctions() {
 }
 function variantTaggedPseudoClasses(options = {}) {
   const attributify = !!options?.attributifyPseudo;
+  let firstPrefix = options?.prefix ?? "";
+  firstPrefix = (Array.isArray(firstPrefix) ? firstPrefix : [firstPrefix]).filter(Boolean)[0] ?? "";
+  const tagWithPrefix = (tag, combinator) => taggedPseudoClassMatcher(tag, attributify ? `[${firstPrefix}${tag}=""]` : `.${firstPrefix}${tag}`, combinator);
   return [
-    taggedPseudoClassMatcher("group", attributify ? '[group=""]' : ".group", " "),
-    taggedPseudoClassMatcher("peer", attributify ? '[peer=""]' : ".peer", "~"),
-    taggedPseudoClassMatcher("parent", attributify ? '[parent=""]' : ".parent", ">"),
-    taggedPseudoClassMatcher("previous", attributify ? '[previous=""]' : ".previous", "+")
+    tagWithPrefix("group", " "),
+    tagWithPrefix("peer", "~"),
+    tagWithPrefix("parent", ">"),
+    tagWithPrefix("previous", "+")
   ];
 }
 const PartClassesRE = /(part-\[(.+)]:)(.+)/;
@@ -709,8 +740,8 @@ function variants(options) {
     variantScope,
     variantContainerQuery,
     variantVariables,
-    variantGroupDataAttribute
+    ...variantTaggedDataAttributes
   ];
 }
 
-export { calcMaxWidthBySize, variantAria, variantBreakpoints, variantColorsMediaOrClass, variantCombinators, variantContainerQuery, variantCssLayer, variantCustomMedia, variantDataAttribute, variantGroupDataAttribute, variantImportant, variantInternalLayer, variantLanguageDirections, variantNegative, variantPartClasses, variantPrint, variantPseudoClassFunctions, variantPseudoClassesAndElements, variantScope, variantSelector, variantSupports, variantTaggedPseudoClasses, variantVariables, variants };
+export { calcMaxWidthBySize, variantAria, variantBreakpoints, variantColorsMediaOrClass, variantCombinators, variantContainerQuery, variantCssLayer, variantCustomMedia, variantDataAttribute, variantImportant, variantInternalLayer, variantLanguageDirections, variantNegative, variantPartClasses, variantPrint, variantPseudoClassFunctions, variantPseudoClassesAndElements, variantScope, variantSelector, variantSupports, variantTaggedDataAttributes, variantTaggedPseudoClasses, variantVariables, variants };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-mini",
-  "version": "0.57.6",
+  "version": "0.58.0",
   "description": "The minimal preset for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -61,9 +61,9 @@
     "dist"
   ],
   "dependencies": {
-    "@unocss/core": "0.57.6",
-    "@unocss/extractor-arbitrary-variants": "0.57.6",
-    "@unocss/rule-utils": "0.57.6"
+    "@unocss/core": "0.58.0",
+    "@unocss/extractor-arbitrary-variants": "0.58.0",
+    "@unocss/rule-utils": "0.58.0"
   },
   "scripts": {
     "build": "unbuild",