@unocss/rule-utils 0.62.3 → 0.62.4

package/dist/index.d.mts

@@ -37,10 +37,6 @@ declare function parseCssColor(str?: string): CSSColorValue | undefined;
 declare function colorOpacityToString(color: CSSColorValue): string | number;
 declare function colorToString(color: CSSColorValue | string, alphaOverride?: string | number): string;
 
-declare function getBracket(str: string, open: string, close: string): string[] | undefined;
-declare function getStringComponent(str: string, open: string, close: string, separators: string | string[]): string[] | undefined;
-declare function getStringComponents(str: string, separators: string | string[], limit?: number): string[] | undefined;
-
 type ValueHandlerCallback = (str: string) => string | number | undefined;
 type ValueHandler<K extends string> = {
     [S in K]: ValueHandler<K>;
@@ -52,14 +48,18 @@ type ValueHandler<K extends string> = {
 };
 declare function createValueHandler<K extends string>(handlers: Record<K, ValueHandlerCallback>): ValueHandler<K>;
 
-declare function variantMatcher(name: string, handler: (input: VariantHandlerContext) => Record<string, any>): VariantObject;
-declare function variantParentMatcher(name: string, parent: string): VariantObject;
-declare function variantGetBracket(prefix: string, matcher: string, separators: string[]): string[] | undefined;
-declare function variantGetParameter(prefix: string, matcher: string, separators: string[]): string[] | undefined;
-
 declare const themeFnRE: RegExp;
 declare function hasThemeFn(str: string): boolean;
 declare function transformThemeFn(code: string, theme: Record<string, any>, throwOnMissing?: boolean): string;
 declare function transformThemeString(code: string, theme: Record<string, any>, throwOnMissing?: boolean): string | undefined;
 
+declare function getBracket(str: string, open: string, close: string): string[] | undefined;
+declare function getStringComponent(str: string, open: string, close: string, separators: string | string[]): string[] | undefined;
+declare function getStringComponents(str: string, separators: string | string[], limit?: number): string[] | undefined;
+
+declare function variantMatcher(name: string, handler: (input: VariantHandlerContext) => Record<string, any>): VariantObject;
+declare function variantParentMatcher(name: string, parent: string): VariantObject;
+declare function variantGetBracket(prefix: string, matcher: string, separators: string[]): string[] | undefined;
+declare function variantGetParameter(prefix: string, matcher: string, separators: string[]): string[] | undefined;
+
 export { type CSSColorValue, type ParsedColorValue, type RGBAColorValue, type ValueHandler, type ValueHandlerCallback, colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hasThemeFn, hex2rgba, parseCssColor, themeFnRE, transformThemeFn, transformThemeString, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };

package/dist/index.d.ts

@@ -37,10 +37,6 @@ declare function parseCssColor(str?: string): CSSColorValue | undefined;
 declare function colorOpacityToString(color: CSSColorValue): string | number;
 declare function colorToString(color: CSSColorValue | string, alphaOverride?: string | number): string;
 
-declare function getBracket(str: string, open: string, close: string): string[] | undefined;
-declare function getStringComponent(str: string, open: string, close: string, separators: string | string[]): string[] | undefined;
-declare function getStringComponents(str: string, separators: string | string[], limit?: number): string[] | undefined;
-
 type ValueHandlerCallback = (str: string) => string | number | undefined;
 type ValueHandler<K extends string> = {
     [S in K]: ValueHandler<K>;
@@ -52,14 +48,18 @@ type ValueHandler<K extends string> = {
 };
 declare function createValueHandler<K extends string>(handlers: Record<K, ValueHandlerCallback>): ValueHandler<K>;
 
-declare function variantMatcher(name: string, handler: (input: VariantHandlerContext) => Record<string, any>): VariantObject;
-declare function variantParentMatcher(name: string, parent: string): VariantObject;
-declare function variantGetBracket(prefix: string, matcher: string, separators: string[]): string[] | undefined;
-declare function variantGetParameter(prefix: string, matcher: string, separators: string[]): string[] | undefined;
-
 declare const themeFnRE: RegExp;
 declare function hasThemeFn(str: string): boolean;
 declare function transformThemeFn(code: string, theme: Record<string, any>, throwOnMissing?: boolean): string;
 declare function transformThemeString(code: string, theme: Record<string, any>, throwOnMissing?: boolean): string | undefined;
 
+declare function getBracket(str: string, open: string, close: string): string[] | undefined;
+declare function getStringComponent(str: string, open: string, close: string, separators: string | string[]): string[] | undefined;
+declare function getStringComponents(str: string, separators: string | string[], limit?: number): string[] | undefined;
+
+declare function variantMatcher(name: string, handler: (input: VariantHandlerContext) => Record<string, any>): VariantObject;
+declare function variantParentMatcher(name: string, parent: string): VariantObject;
+declare function variantGetBracket(prefix: string, matcher: string, separators: string[]): string[] | undefined;
+declare function variantGetParameter(prefix: string, matcher: string, separators: string[]): string[] | undefined;
+
 export { type CSSColorValue, type ParsedColorValue, type RGBAColorValue, type ValueHandler, type ValueHandlerCallback, colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hasThemeFn, hex2rgba, parseCssColor, themeFnRE, transformThemeFn, transformThemeString, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };

package/dist/index.mjs

@@ -295,6 +295,49 @@ function createValueHandler(handlers) {
   return handler;
 }
 
+const themeFnRE = /theme\(\s*(['"])?(.*?)\1?\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[2];
+    if (!rawArg)
+      throw new Error("theme() expect exact one argument, but got 0");
+    const value = transformThemeString(rawArg, theme, throwOnMissing);
+    if (value) {
+      s.overwrite(
+        match.index,
+        match.index + match[0].length,
+        value
+      );
+    }
+  }
+  return s.toString();
+}
+function transformThemeString(code, theme, throwOnMissing = true) {
+  const [rawKey, alpha] = code.split("/");
+  const keys = rawKey.trim().split(".");
+  let value = keys.reduce((t, k) => t?.[k], theme);
+  if (typeof value === "object") {
+    value = value.DEFAULT;
+  }
+  if (typeof value === "string") {
+    if (alpha) {
+      const color = parseCssColor(value);
+      if (color)
+        value = colorToString(color, alpha);
+    }
+    return value;
+  } else if (throwOnMissing) {
+    throw new Error(`theme of "${code}" did not found`);
+  }
+}
+
 function variantMatcher(name, handler) {
   let re;
   return {
@@ -371,47 +414,4 @@ function variantGetParameter(prefix, matcher, separators) {
   }
 }
 
-const themeFnRE = /theme\(\s*(['"])?(.*?)\1?\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[2];
-    if (!rawArg)
-      throw new Error("theme() expect exact one argument, but got 0");
-    const value = transformThemeString(rawArg, theme, throwOnMissing);
-    if (value) {
-      s.overwrite(
-        match.index,
-        match.index + match[0].length,
-        value
-      );
-    }
-  }
-  return s.toString();
-}
-function transformThemeString(code, theme, throwOnMissing = true) {
-  const [rawKey, alpha] = code.split("/");
-  const keys = rawKey.trim().split(".");
-  let value = keys.reduce((t, k) => t?.[k], theme);
-  if (typeof value === "object") {
-    value = value.DEFAULT;
-  }
-  if (typeof value === "string") {
-    if (alpha) {
-      const color = parseCssColor(value);
-      if (color)
-        value = colorToString(color, alpha);
-    }
-    return value;
-  } else if (throwOnMissing) {
-    throw new Error(`theme of "${code}" did not found`);
-  }
-}
-
 export { colorOpacityToString, colorToString, createValueHandler, getBracket, getStringComponent, getStringComponents, hasThemeFn, hex2rgba, parseCssColor, themeFnRE, transformThemeFn, transformThemeString, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/rule-utils",
   "type": "module",
-  "version": "0.62.3",
+  "version": "0.62.4",
   "description": "Utilities for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "magic-string": "^0.30.11",
-    "@unocss/core": "^0.62.3"
+    "@unocss/core": "^0.62.4"
   },
   "scripts": {
     "build": "unbuild",