@unocss/preset-mini 0.18.0 → 0.20.1

package/dist/chunks/pseudo.mjs

@@ -45,23 +45,30 @@ const PseudoElements = [
   "first-line",
   "selection"
 ];
+const PseudoClassFunctions = [
+  "not",
+  "is",
+  "where",
+  "has"
+];
 const PartClassesRE = /(part-\[(.+)]:)(.+)/;
 const PseudoElementsRE = new RegExp(`^(${PseudoElements.join("|")})[:-]`);
 const PseudoClassesStr = Object.keys(PseudoClasses).join("|");
+const PseudoClassFunctionsStr = PseudoClassFunctions.join("|");
 const PseudoClassesRE = new RegExp(`^(${PseudoClassesStr})[:-]`);
-const PseudoClassesNotRE = new RegExp(`^not-(${PseudoClassesStr})[:-]`);
+const PseudoClassFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesStr})[:-]`);
 function shouldAdd(entires) {
   return !entires.find((i) => i[0] === CONTROL_BYPASS_PSEUDO_CLASS) || void 0;
 }
-function taggedPseudoClassMatcher(tag, parent, combinator) {
-  const re = new RegExp(`^${tag}-((not-)?(${PseudoClassesStr}))[:-]`);
+const taggedPseudoClassMatcher = (tag, parent, combinator) => {
+  const re = new RegExp(`^${tag}-((?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesStr}))[:-]`);
   const rawRe = new RegExp(`^${escapeRegExp(parent)}:`);
   return (input) => {
     const match = input.match(re);
     if (match) {
       let pseudo = PseudoClasses[match[3]] || match[3];
       if (match[2])
-        pseudo = `not(:${pseudo})`;
+        pseudo = `${match[2]}(:${pseudo})`;
       return {
         matcher: input.slice(match[1].length + tag.length + 2),
         selector: (s, body) => {
@@ -70,7 +77,7 @@ function taggedPseudoClassMatcher(tag, parent, combinator) {
       };
     }
   };
-}
+};
 const variantPseudoElements = (input) => {
   const match = input.match(PseudoElementsRE);
   if (match) {
@@ -82,7 +89,7 @@ const variantPseudoElements = (input) => {
 };
 const variantPseudoClasses = {
   match: (input) => {
-    let match = input.match(PseudoClassesRE);
+    const match = input.match(PseudoClassesRE);
     if (match) {
       const pseudo = PseudoClasses[match[1]] || match[1];
       return {
@@ -90,29 +97,34 @@ const variantPseudoClasses = {
         selector: (s, body) => shouldAdd(body) && `${s}:${pseudo}`
       };
     }
-    match = input.match(PseudoClassesNotRE);
+  },
+  multiPass: true
+};
+const variantPseudoClassFunctions = {
+  match: (input) => {
+    const match = input.match(PseudoClassFunctionsRE);
     if (match) {
-      const pseudo = PseudoClasses[match[1]] || match[1];
+      const fn = match[1];
+      const pseudo = PseudoClasses[match[2]] || match[2];
       return {
-        matcher: input.slice(match[1].length + 5),
-        selector: (s, body) => shouldAdd(body) && `${s}:not(:${pseudo})`
+        matcher: input.slice(match[1].length + match[2].length + 2),
+        selector: (s, body) => shouldAdd(body) && `${s}:${fn}(:${pseudo})`
       };
     }
   },
   multiPass: true
 };
-const variantTaggedPseudoClasses = (options = {}) => ({
-  match: (input) => {
-    const attributify = !!options?.attributifyPseudo;
-    const g = taggedPseudoClassMatcher("group", attributify ? '[group=""]' : ".group", " ")(input);
+const variantTaggedPseudoClasses = {
+  match: (input, { options: { attributifyPseudo } }) => {
+    const g = taggedPseudoClassMatcher("group", attributifyPseudo ? '[group=""]' : ".group", " ")(input);
     if (g)
       return g;
-    const p = taggedPseudoClassMatcher("peer", attributify ? '[peer=""]' : ".peer", "~")(input);
+    const p = taggedPseudoClassMatcher("peer", attributifyPseudo ? '[peer=""]' : ".peer", "~")(input);
     if (p)
       return p;
   },
   multiPass: true
-});
+};
 const partClasses = {
   match: (input) => {
     const match = input.match(PartClassesRE);
@@ -129,4 +141,4 @@ const partClasses = {
   multiPass: true
 };
 
-export { CONTROL_BYPASS_PSEUDO_CLASS as C, PseudoClasses as P, variantTaggedPseudoClasses as a, variantPseudoElements as b, partClasses as p, variantPseudoClasses as v };
+export { CONTROL_BYPASS_PSEUDO_CLASS as C, variantPseudoClassFunctions as a, variantTaggedPseudoClasses as b, variantPseudoElements as c, partClasses as p, variantPseudoClasses as v };

package/dist/chunks/utilities.cjs

@@ -225,8 +225,10 @@ const parseColor = (body, theme) => {
   const bracketOrMain = bracket || main;
   if (bracketOrMain.startsWith("#"))
     color = bracketOrMain.slice(1);
-  if (bracketOrMain.startsWith("hex-"))
+  else if (bracketOrMain.startsWith("hex-"))
     color = bracketOrMain.slice(4);
+  else if (main.startsWith("$"))
+    color = handler.cssvar(main);
   color = color || bracket;
   let no = "DEFAULT";
   if (!color) {
@@ -271,7 +273,7 @@ const colorResolver = (property, varName) => ([, body], { theme }) => {
       };
     } else {
       return {
-        [`--un-${varName}-opacity`]: 1,
+        [`--un-${varName}-opacity`]: (opacity && handler.cssvar(opacity)) ?? 1,
         [property]: `rgba(${rgba.slice(0, 3).join(",")},var(--un-${varName}-opacity))`
       };
     }

package/dist/chunks/utilities.mjs

@@ -223,8 +223,10 @@ const parseColor = (body, theme) => {
   const bracketOrMain = bracket || main;
   if (bracketOrMain.startsWith("#"))
     color = bracketOrMain.slice(1);
-  if (bracketOrMain.startsWith("hex-"))
+  else if (bracketOrMain.startsWith("hex-"))
     color = bracketOrMain.slice(4);
+  else if (main.startsWith("$"))
+    color = handler.cssvar(main);
   color = color || bracket;
   let no = "DEFAULT";
   if (!color) {
@@ -269,7 +271,7 @@ const colorResolver = (property, varName) => ([, body], { theme }) => {
       };
     } else {
       return {
-        [`--un-${varName}-opacity`]: 1,
+        [`--un-${varName}-opacity`]: (opacity && handler.cssvar(opacity)) ?? 1,
         [property]: `rgba(${rgba.slice(0, 3).join(",")},var(--un-${varName}-opacity))`
       };
     }

package/dist/chunks/variants.cjs

@@ -1,16 +1,31 @@
 'use strict';
 
+const core = require('@unocss/core');
+
 const variantMatcher = (name, selector) => {
-  const re = new RegExp(`^(${name})[:-]`);
+  const re = new RegExp(`^${core.escapeRegExp(name)}[:-]`);
   return (input) => {
     const match = input.match(re);
     if (match) {
       return {
-        matcher: input.slice(match[1].length + 1),
+        matcher: input.slice(match[0].length),
         selector
       };
     }
   };
 };
+const variantParentMatcher = (name, parent) => {
+  const re = new RegExp(`^${core.escapeRegExp(name)}[:-]`);
+  return (input) => {
+    const match = input.match(re);
+    if (match) {
+      return {
+        matcher: input.slice(match[0].length),
+        parent
+      };
+    }
+  };
+};
 
 exports.variantMatcher = variantMatcher;
+exports.variantParentMatcher = variantParentMatcher;

package/dist/chunks/variants.mjs

@@ -1,14 +1,28 @@
+import { escapeRegExp } from '@unocss/core';
+
 const variantMatcher = (name, selector) => {
-  const re = new RegExp(`^(${name})[:-]`);
+  const re = new RegExp(`^${escapeRegExp(name)}[:-]`);
   return (input) => {
     const match = input.match(re);
     if (match) {
       return {
-        matcher: input.slice(match[1].length + 1),
+        matcher: input.slice(match[0].length),
         selector
       };
     }
   };
 };
+const variantParentMatcher = (name, parent) => {
+  const re = new RegExp(`^${escapeRegExp(name)}[:-]`);
+  return (input) => {
+    const match = input.match(re);
+    if (match) {
+      return {
+        matcher: input.slice(match[0].length),
+        parent
+      };
+    }
+  };
+};
 
-export { variantMatcher as v };
+export { variantParentMatcher as a, variantMatcher as v };

package/dist/{colors-d6b5a5b4.d.ts → colors-6d634692.d.ts}

@@ -1,4 +1,4 @@
-import { T as Theme } from './types-7963d0b3';
+import { T as Theme } from './types-a2d2b52f';
 
 declare const colors: Theme['colors'];
 

package/dist/colors.d.ts

@@ -1,2 +1,2 @@
-export { c as colors } from './colors-d6b5a5b4';
-import './types-7963d0b3';
+export { c as colors } from './colors-6d634692';
+import './types-a2d2b52f';

package/dist/{default-c7c67d23.d.ts → default-958434b6.d.ts}

@@ -1,4 +1,4 @@
-import { T as Theme } from './types-7963d0b3';
+import { T as Theme } from './types-a2d2b52f';
 
 declare const theme: Theme;
 

package/dist/index.cjs

@@ -11,13 +11,27 @@ require('@unocss/core');
 require('./chunks/pseudo.cjs');
 require('./chunks/variants.cjs');
 
-const presetMini = (options = {}) => ({
-  name: "@unocss/preset-mini",
-  theme: _default.theme,
-  rules: _default$1.rules,
-  variants: _default$2.variants(options),
-  options
-});
+const presetMini = (options = {}) => {
+  options.dark = options.dark ?? "class";
+  options.attributifyPseudo = options.attributifyPseudo ?? false;
+  return {
+    name: "@unocss/preset-mini",
+    theme: _default.theme,
+    rules: _default$1.rules,
+    variants: _default$2.variants,
+    options,
+    postprocess: options.variablePrefix && options.variablePrefix !== "un-" ? VarPrefixPostprocessor(options.variablePrefix) : void 0
+  };
+};
+function VarPrefixPostprocessor(prefix) {
+  return (obj) => {
+    obj.entries.forEach((i) => {
+      i[0] = i[0].replace(/^--un-/, `--${prefix}`);
+      if (typeof i[1] === "string")
+        i[1] = i[1].replace(/var\(--un-/g, `var(--${prefix}`);
+    });
+  };
+}
 
 exports.theme = _default.theme;
 exports.colors = colors.colors;

package/dist/index.d.ts

@@ -1,10 +1,10 @@
-import { Preset } from '@unocss/core';
-import { T as Theme } from './types-7963d0b3';
-export { T as Theme } from './types-7963d0b3';
-export { t as theme } from './default-c7c67d23';
-export { c as colors } from './colors-d6b5a5b4';
+import { PresetOptions, Preset } from '@unocss/core';
+import { T as Theme } from './types-a2d2b52f';
+export { T as Theme, a as ThemeAnimation } from './types-a2d2b52f';
+export { t as theme } from './default-958434b6';
+export { c as colors } from './colors-6d634692';
 
-interface PresetMiniOptions {
+interface PresetMiniOptions extends PresetOptions {
     /**
      * @default 'class'
      */
@@ -13,6 +13,10 @@ interface PresetMiniOptions {
      * @default false
      */
     attributifyPseudo?: Boolean;
+    /**
+     * @default 'un-'
+     */
+    variablePrefix?: string;
 }
 declare const presetMini: (options?: PresetMiniOptions) => Preset<Theme>;
 

package/dist/index.mjs

@@ -8,12 +8,26 @@ import '@unocss/core';
 import './chunks/pseudo.mjs';
 import './chunks/variants.mjs';
 
-const presetMini = (options = {}) => ({
-  name: "@unocss/preset-mini",
-  theme,
-  rules,
-  variants: variants(options),
-  options
-});
+const presetMini = (options = {}) => {
+  options.dark = options.dark ?? "class";
+  options.attributifyPseudo = options.attributifyPseudo ?? false;
+  return {
+    name: "@unocss/preset-mini",
+    theme,
+    rules,
+    variants,
+    options,
+    postprocess: options.variablePrefix && options.variablePrefix !== "un-" ? VarPrefixPostprocessor(options.variablePrefix) : void 0
+  };
+};
+function VarPrefixPostprocessor(prefix) {
+  return (obj) => {
+    obj.entries.forEach((i) => {
+      i[0] = i[0].replace(/^--un-/, `--${prefix}`);
+      if (typeof i[1] === "string")
+        i[1] = i[1].replace(/var\(--un-/g, `var(--${prefix}`);
+    });
+  };
+}
 
 export { presetMini as default, presetMini };

package/dist/rules.d.ts

@@ -1,5 +1,5 @@
 import { Rule } from '@unocss/core';
-import { T as Theme } from './types-7963d0b3';
+import { T as Theme } from './types-a2d2b52f';
 
 declare const verticalAligns: Rule[];
 declare const textAligns: Rule[];

package/dist/theme.d.ts

@@ -1,7 +1,7 @@
-export { c as colors } from './colors-d6b5a5b4';
-export { t as theme } from './default-c7c67d23';
-import { T as Theme } from './types-7963d0b3';
-export { T as Theme } from './types-7963d0b3';
+export { c as colors } from './colors-6d634692';
+export { t as theme } from './default-958434b6';
+import { T as Theme } from './types-a2d2b52f';
+export { T as Theme, a as ThemeAnimation } from './types-a2d2b52f';
 
 declare const blur: {
     DEFAULT: string;

package/dist/{types-7963d0b3.d.ts → types-a2d2b52f.d.ts}

@@ -1,3 +1,9 @@
+interface ThemeAnimation {
+    keyframes?: Record<string, string>;
+    durations?: Record<string, string>;
+    timingFns?: Record<string, string>;
+    properties?: Record<string, object>;
+}
 interface Theme {
     width?: Record<string, string>;
     height?: Record<string, string>;
@@ -19,6 +25,7 @@ interface Theme {
     textStrokeWidth?: Record<string, string>;
     blur?: Record<string, string>;
     dropShadow?: Record<string, string | string[]>;
+    animation?: ThemeAnimation;
 }
 
-export { Theme as T };
+export { Theme as T, ThemeAnimation as a };

package/dist/utils.cjs

@@ -19,3 +19,4 @@ exports.parseColor = utilities.parseColor;
 exports.valueHandlers = utilities.valueHandlers;
 exports.xyzMap = utilities.xyzMap;
 exports.variantMatcher = variants.variantMatcher;
+exports.variantParentMatcher = variants.variantParentMatcher;

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
 import * as _unocss_core from '@unocss/core';
 import { VariantHandler, DynamicMatcher, ParsedColorValue } from '@unocss/core';
-import { T as Theme } from './types-7963d0b3';
+import { T as Theme } from './types-a2d2b52f';
 
 declare const directionMap: Record<string, string[]>;
 declare const cornerMap: Record<string, string[]>;
@@ -52,6 +52,7 @@ declare const handler: _unocss_core.ValueHandler<"number" | "auto" | "numberWith
 declare const h: _unocss_core.ValueHandler<"number" | "auto" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "cssvar" | "time" | "global" | "properties">;
 
 declare const variantMatcher: (name: string, selector?: ((input: string) => string | undefined) | undefined) => (input: string) => VariantHandler | undefined;
+declare const variantParentMatcher: (name: string, parent: string) => (input: string) => VariantHandler | undefined;
 
 declare function capitalize<T extends string>(str: T): Capitalize<T>;
 /**
@@ -105,4 +106,4 @@ declare const parseColor: (body: string, theme: Theme) => ParsedColorValue | und
  */
 declare const colorResolver: (property: string, varName: string) => DynamicMatcher;
 
-export { capitalize, colorResolver, cornerMap, directionMap, directionSize, h, handler, parseColor, handlers as valueHandlers, variantMatcher, xyzMap };
+export { capitalize, colorResolver, cornerMap, directionMap, directionSize, h, handler, parseColor, handlers as valueHandlers, variantMatcher, variantParentMatcher, xyzMap };

package/dist/utils.mjs

@@ -1,3 +1,3 @@
 export { b as capitalize, c as colorResolver, a as cornerMap, d as directionMap, e as directionSize, f as h, h as handler, p as parseColor, v as valueHandlers, x as xyzMap } from './chunks/utilities.mjs';
-export { v as variantMatcher } from './chunks/variants.mjs';
+export { v as variantMatcher, a as variantParentMatcher } from './chunks/variants.mjs';
 import '@unocss/core';

package/dist/variants.cjs

@@ -10,16 +10,16 @@ require('@unocss/core');
 
 
 exports.variantBreakpoints = _default.variantBreakpoints;
-exports.variantColorsClass = _default.variantColorsClass;
-exports.variantColorsMedia = _default.variantColorsMedia;
+exports.variantColorsMediaOrClass = _default.variantColorsMediaOrClass;
 exports.variantCombinators = _default.variantCombinators;
 exports.variantImportant = _default.variantImportant;
 exports.variantNegative = _default.variantNegative;
+exports.variantPrint = _default.variantPrint;
 exports.variantSpace = _default.variantSpace;
 exports.variants = _default.variants;
 exports.CONTROL_BYPASS_PSEUDO_CLASS = pseudo.CONTROL_BYPASS_PSEUDO_CLASS;
-exports.PseudoClasses = pseudo.PseudoClasses;
 exports.partClasses = pseudo.partClasses;
+exports.variantPseudoClassFunctions = pseudo.variantPseudoClassFunctions;
 exports.variantPseudoClasses = pseudo.variantPseudoClasses;
 exports.variantPseudoElements = pseudo.variantPseudoElements;
 exports.variantTaggedPseudoClasses = pseudo.variantTaggedPseudoClasses;

package/dist/variants.d.ts

@@ -1,27 +1,26 @@
+import * as _unocss_core from '@unocss/core';
 import { Variant, VariantFunction, VariantObject } from '@unocss/core';
-import { T as Theme } from './types-7963d0b3';
-import { PresetMiniOptions } from './index';
-import './default-c7c67d23';
-import './colors-d6b5a5b4';
+import { T as Theme } from './types-a2d2b52f';
 
 declare const variantBreakpoints: Variant<Theme>;
 
 declare const variantCombinators: Variant[];
 
-declare const variantColorsClass: Variant[];
-declare const variantColorsMedia: Variant[];
+declare const variantColorsMediaOrClass: Variant[];
 
-declare const variants: (options: PresetMiniOptions) => Variant<Theme>[];
+declare const variants: Variant<Theme>[];
 
 declare const variantImportant: Variant;
 declare const variantNegative: Variant;
 declare const variantSpace: Variant;
 
+declare const variantPrint: (input: string) => _unocss_core.VariantHandler | undefined;
+
 declare const CONTROL_BYPASS_PSEUDO_CLASS = "$$no-pseudo";
-declare const PseudoClasses: Record<string, string | undefined>;
 declare const variantPseudoElements: VariantFunction;
 declare const variantPseudoClasses: VariantObject;
-declare const variantTaggedPseudoClasses: (options?: PresetMiniOptions) => VariantObject;
+declare const variantPseudoClassFunctions: VariantObject;
+declare const variantTaggedPseudoClasses: VariantObject;
 declare const partClasses: VariantObject;
 
-export { CONTROL_BYPASS_PSEUDO_CLASS, PseudoClasses, partClasses, variantBreakpoints, variantColorsClass, variantColorsMedia, variantCombinators, variantImportant, variantNegative, variantPseudoClasses, variantPseudoElements, variantSpace, variantTaggedPseudoClasses, variants };
+export { CONTROL_BYPASS_PSEUDO_CLASS, partClasses, variantBreakpoints, variantColorsMediaOrClass, variantCombinators, variantImportant, variantNegative, variantPrint, variantPseudoClassFunctions, variantPseudoClasses, variantPseudoElements, variantSpace, variantTaggedPseudoClasses, variants };

package/dist/variants.mjs

@@ -1,4 +1,4 @@
-export { a as variantBreakpoints, c as variantColorsClass, d as variantColorsMedia, b as variantCombinators, e as variantImportant, f as variantNegative, g as variantSpace, v as variants } from './chunks/default3.mjs';
-export { C as CONTROL_BYPASS_PSEUDO_CLASS, P as PseudoClasses, p as partClasses, v as variantPseudoClasses, b as variantPseudoElements, a as variantTaggedPseudoClasses } from './chunks/pseudo.mjs';
+export { a as variantBreakpoints, c as variantColorsMediaOrClass, b as variantCombinators, d as variantImportant, e as variantNegative, g as variantPrint, f as variantSpace, v as variants } from './chunks/default3.mjs';
+export { C as CONTROL_BYPASS_PSEUDO_CLASS, p as partClasses, a as variantPseudoClassFunctions, v as variantPseudoClasses, c as variantPseudoElements, b as variantTaggedPseudoClasses } from './chunks/pseudo.mjs';
 import './chunks/variants.mjs';
 import '@unocss/core';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-mini",
-  "version": "0.18.0",
+  "version": "0.20.1",
   "description": "The minimal preset for UnoCSS",
   "keywords": [
     "unocss",
@@ -61,7 +61,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.18.0"
+    "@unocss/core": "0.20.1"
   },
   "scripts": {
     "build": "unbuild",