@unocss/rule-utils 0.56.5 → 0.57.1

package/dist/index.cjs

@@ -1,6 +1,11 @@
 'use strict';
 
 const core = require('@unocss/core');
+const MagicString = require('magic-string');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+
+const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 
 function getBracket(str, open, close) {
   if (str === "")
@@ -108,8 +113,6 @@ function parseCssColor(str = "") {
   const type = casedType.toLowerCase();
   if (components.length === 0)
     return;
-  if (["rgba", "hsla"].includes(type) && alpha == null)
-    return;
   if (cssColorFunctions.includes(type) && ![1, 3].includes(components.length))
     return;
   return {
@@ -129,8 +132,8 @@ function colorToString(color, alphaOverride) {
   let { alpha, type } = color;
   alpha = alphaOverride ?? alpha;
   type = type.toLowerCase();
-  if (["hsla", "hsl", "rgba", "rgb"].includes(type))
-    return `${type.replace("a", "")}a(${components.join(",")}${alpha == null ? "" : `,${alpha}`})`;
+  if (["hsla", "rgba"].includes(type))
+    return `${type}(${components.join(", ")}${alpha == null ? "" : `, ${alpha}`})`;
   alpha = alpha == null ? "" : ` / ${alpha}`;
   if (cssColorFunctions.includes(type))
     return `${type}(${components.join(" ")}${alpha})`;
@@ -373,14 +376,51 @@ function variantGetParameter(prefix, matcher, separators) {
   }
 }
 
+const themeFnRE = /theme\(\s*['"]?(.*?)['"]?\s*\)/g;
+function hasThemeFn(str) {
+  return str.includes("theme(") && str.includes(")");
+}
+function transformThemeFn(code, theme, throwOnMissing = true) {
+  const matches = Array.from(code.toString().matchAll(themeFnRE));
+  if (!matches.length)
+    return code;
+  const s = new MagicString__default(code);
+  for (const match of matches) {
+    const rawArg = match[1];
+    if (!rawArg)
+      throw new Error("theme() expect exact one argument, but got 0");
+    const [rawKey, alpha] = rawArg.split("/");
+    const keys = rawKey.trim().split(".");
+    let value = keys.reduce((t, k) => t?.[k], theme);
+    if (typeof value === "string") {
+      if (alpha) {
+        const color = parseCssColor(value);
+        if (color)
+          value = colorToString(color, alpha);
+      }
+      s.overwrite(
+        match.index,
+        match.index + match[0].length,
+        value
+      );
+    } else if (throwOnMissing) {
+      throw new Error(`theme of "${rawArg}" did not found`);
+    }
+  }
+  return s.toString();
+}
+
 exports.colorOpacityToString = colorOpacityToString;
 exports.colorToString = colorToString;
 exports.createValueHandler = createValueHandler;
 exports.getBracket = getBracket;
 exports.getStringComponent = getStringComponent;
 exports.getStringComponents = getStringComponents;
+exports.hasThemeFn = hasThemeFn;
 exports.hex2rgba = hex2rgba;
 exports.parseCssColor = parseCssColor;
+exports.themeFnRE = themeFnRE;
+exports.transformThemeFn = transformThemeFn;
 exports.variantGetBracket = variantGetBracket;
 exports.variantGetParameter = variantGetParameter;
 exports.variantMatcher = variantMatcher;

package/dist/index.d.cts

@@ -25,4 +25,8 @@ declare function variantParentMatcher(name: string, parent: string): VariantObje
 declare function variantGetBracket(prefix: string, matcher: string, separators: string[]): string[] | undefined;
 declare function variantGetParameter(prefix: string, matcher: string, separators: string[]): string[] | undefined;
 
-export { type ValueHandler, type ValueHandlerCallback, colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hex2rgba, parseCssColor, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };
+declare const themeFnRE: RegExp;
+declare function hasThemeFn(str: string): boolean;
+declare function transformThemeFn(code: string, theme: Record<string, any>, throwOnMissing?: boolean): string;
+
+export { type ValueHandler, type ValueHandlerCallback, colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hasThemeFn, hex2rgba, parseCssColor, themeFnRE, transformThemeFn, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };

package/dist/index.d.mts

@@ -25,4 +25,8 @@ declare function variantParentMatcher(name: string, parent: string): VariantObje
 declare function variantGetBracket(prefix: string, matcher: string, separators: string[]): string[] | undefined;
 declare function variantGetParameter(prefix: string, matcher: string, separators: string[]): string[] | undefined;
 
-export { type ValueHandler, type ValueHandlerCallback, colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hex2rgba, parseCssColor, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };
+declare const themeFnRE: RegExp;
+declare function hasThemeFn(str: string): boolean;
+declare function transformThemeFn(code: string, theme: Record<string, any>, throwOnMissing?: boolean): string;
+
+export { type ValueHandler, type ValueHandlerCallback, colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hasThemeFn, hex2rgba, parseCssColor, themeFnRE, transformThemeFn, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };

package/dist/index.d.ts

@@ -25,4 +25,8 @@ declare function variantParentMatcher(name: string, parent: string): VariantObje
 declare function variantGetBracket(prefix: string, matcher: string, separators: string[]): string[] | undefined;
 declare function variantGetParameter(prefix: string, matcher: string, separators: string[]): string[] | undefined;
 
-export { type ValueHandler, type ValueHandlerCallback, colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hex2rgba, parseCssColor, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };
+declare const themeFnRE: RegExp;
+declare function hasThemeFn(str: string): boolean;
+declare function transformThemeFn(code: string, theme: Record<string, any>, throwOnMissing?: boolean): string;
+
+export { type ValueHandler, type ValueHandlerCallback, colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hasThemeFn, hex2rgba, parseCssColor, themeFnRE, transformThemeFn, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };

package/dist/index.mjs

@@ -1,4 +1,5 @@
 import { isString, escapeRegExp } from '@unocss/core';
+import MagicString from 'magic-string';
 
 function getBracket(str, open, close) {
   if (str === "")
@@ -106,8 +107,6 @@ function parseCssColor(str = "") {
   const type = casedType.toLowerCase();
   if (components.length === 0)
     return;
-  if (["rgba", "hsla"].includes(type) && alpha == null)
-    return;
   if (cssColorFunctions.includes(type) && ![1, 3].includes(components.length))
     return;
   return {
@@ -127,8 +126,8 @@ function colorToString(color, alphaOverride) {
   let { alpha, type } = color;
   alpha = alphaOverride ?? alpha;
   type = type.toLowerCase();
-  if (["hsla", "hsl", "rgba", "rgb"].includes(type))
-    return `${type.replace("a", "")}a(${components.join(",")}${alpha == null ? "" : `,${alpha}`})`;
+  if (["hsla", "rgba"].includes(type))
+    return `${type}(${components.join(", ")}${alpha == null ? "" : `, ${alpha}`})`;
   alpha = alpha == null ? "" : ` / ${alpha}`;
   if (cssColorFunctions.includes(type))
     return `${type}(${components.join(" ")}${alpha})`;
@@ -371,4 +370,38 @@ function variantGetParameter(prefix, matcher, separators) {
   }
 }
 
-export { colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hex2rgba, parseCssColor, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };
+const themeFnRE = /theme\(\s*['"]?(.*?)['"]?\s*\)/g;
+function hasThemeFn(str) {
+  return str.includes("theme(") && str.includes(")");
+}
+function transformThemeFn(code, theme, throwOnMissing = true) {
+  const matches = Array.from(code.toString().matchAll(themeFnRE));
+  if (!matches.length)
+    return code;
+  const s = new MagicString(code);
+  for (const match of matches) {
+    const rawArg = match[1];
+    if (!rawArg)
+      throw new Error("theme() expect exact one argument, but got 0");
+    const [rawKey, alpha] = rawArg.split("/");
+    const keys = rawKey.trim().split(".");
+    let value = keys.reduce((t, k) => t?.[k], theme);
+    if (typeof value === "string") {
+      if (alpha) {
+        const color = parseCssColor(value);
+        if (color)
+          value = colorToString(color, alpha);
+      }
+      s.overwrite(
+        match.index,
+        match.index + match[0].length,
+        value
+      );
+    } else if (throwOnMissing) {
+      throw new Error(`theme of "${rawArg}" did not found`);
+    }
+  }
+  return s.toString();
+}
+
+export { colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hasThemeFn, hex2rgba, parseCssColor, themeFnRE, transformThemeFn, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/rule-utils",
-  "version": "0.56.5",
+  "version": "0.57.1",
   "description": "Utilities for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -33,7 +33,8 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@unocss/core": "^0.56.5"
+    "magic-string": "^0.30.5",
+    "@unocss/core": "^0.57.1"
   },
   "scripts": {
     "build": "unbuild",