@unocss/inspector 0.57.5 → 0.57.6

package/dist/index.cjs

@@ -306,8 +306,8 @@ const valueHandlers = {
 const handler = ruleUtils.createValueHandler(valueHandlers);
 const h = handler;
 
-function getThemeColor(theme, colors) {
-  let obj = theme.colors;
+function getThemeColorForKey(theme, colors, key = "colors") {
+  let obj = theme[key];
   let index = -1;
   for (const c of colors) {
     index += 1;
@@ -324,6 +324,9 @@ function getThemeColor(theme, colors) {
   }
   return obj;
 }
+function getThemeColor(theme, colors, key) {
+  return getThemeColorForKey(theme, colors, key) || getThemeColorForKey(theme, colors, "colors");
+}
 function splitShorthand(body, type) {
   const split = body.split(/(?:\/|:)/);
   if (split[0] === `[${type}`) {
@@ -334,7 +337,7 @@ function splitShorthand(body, type) {
   }
   return split;
 }
-function parseColor(body, theme) {
+function parseColor(body, theme, key) {
   const [main, opacity] = splitShorthand(body, "color");
   const colors = main.replace(/([a-z])([0-9])/g, "$1-$2").split(/-/g);
   const [name] = colors;
@@ -353,7 +356,7 @@ function parseColor(body, theme) {
     color = h.cssvar(main);
   color = color || bracket;
   if (!color) {
-    const colorData = getThemeColor(theme, [main]);
+    const colorData = getThemeColor(theme, [main], key);
     if (typeof colorData === "string")
       color = colorData;
   }
@@ -363,16 +366,16 @@ function parseColor(body, theme) {
     const [scale] = colors.slice(-1);
     if (scale.match(/^\d+$/)) {
       no = scale;
-      colorData = getThemeColor(theme, colors.slice(0, -1));
+      colorData = getThemeColor(theme, colors.slice(0, -1), key);
       if (!colorData || typeof colorData === "string")
         color = void 0;
       else
         color = colorData[no];
     } else {
-      colorData = getThemeColor(theme, colors);
+      colorData = getThemeColor(theme, colors, key);
       if (!colorData && colors.length <= 2) {
         [, no = no] = colors;
-        colorData = getThemeColor(theme, [name]);
+        colorData = getThemeColor(theme, [name], key);
       }
       if (typeof colorData === "string")
         color = colorData;
@@ -735,7 +738,7 @@ async function analyzer(modules, ctx) {
     if (baseSelector) {
       const category = layer !== "default" ? layer : getSelectorCategory(baseSelector);
       const body = baseSelector.replace(/^ring-offset|outline-solid|outline-dotted/, "head").replace(/^\w+-/, "");
-      const parsedColor = parseColor(body, ctx.uno.config.theme);
+      const parsedColor = parseColor(body, ctx.uno.config.theme, "colors");
       if (parsedColor?.color && !ignoredColors.includes(parsedColor?.color)) {
         const existing = colors.find((c) => c.name === parsedColor.name && c.no === parsedColor.no);
         if (existing) {

package/dist/index.mjs

@@ -298,8 +298,8 @@ const valueHandlers = {
 const handler = createValueHandler(valueHandlers);
 const h = handler;
 
-function getThemeColor(theme, colors) {
-  let obj = theme.colors;
+function getThemeColorForKey(theme, colors, key = "colors") {
+  let obj = theme[key];
   let index = -1;
   for (const c of colors) {
     index += 1;
@@ -316,6 +316,9 @@ function getThemeColor(theme, colors) {
   }
   return obj;
 }
+function getThemeColor(theme, colors, key) {
+  return getThemeColorForKey(theme, colors, key) || getThemeColorForKey(theme, colors, "colors");
+}
 function splitShorthand(body, type) {
   const split = body.split(/(?:\/|:)/);
   if (split[0] === `[${type}`) {
@@ -326,7 +329,7 @@ function splitShorthand(body, type) {
   }
   return split;
 }
-function parseColor(body, theme) {
+function parseColor(body, theme, key) {
   const [main, opacity] = splitShorthand(body, "color");
   const colors = main.replace(/([a-z])([0-9])/g, "$1-$2").split(/-/g);
   const [name] = colors;
@@ -345,7 +348,7 @@ function parseColor(body, theme) {
     color = h.cssvar(main);
   color = color || bracket;
   if (!color) {
-    const colorData = getThemeColor(theme, [main]);
+    const colorData = getThemeColor(theme, [main], key);
     if (typeof colorData === "string")
       color = colorData;
   }
@@ -355,16 +358,16 @@ function parseColor(body, theme) {
     const [scale] = colors.slice(-1);
     if (scale.match(/^\d+$/)) {
       no = scale;
-      colorData = getThemeColor(theme, colors.slice(0, -1));
+      colorData = getThemeColor(theme, colors.slice(0, -1), key);
       if (!colorData || typeof colorData === "string")
         color = void 0;
       else
         color = colorData[no];
     } else {
-      colorData = getThemeColor(theme, colors);
+      colorData = getThemeColor(theme, colors, key);
       if (!colorData && colors.length <= 2) {
         [, no = no] = colors;
-        colorData = getThemeColor(theme, [name]);
+        colorData = getThemeColor(theme, [name], key);
       }
       if (typeof colorData === "string")
         color = colorData;
@@ -727,7 +730,7 @@ async function analyzer(modules, ctx) {
     if (baseSelector) {
       const category = layer !== "default" ? layer : getSelectorCategory(baseSelector);
       const body = baseSelector.replace(/^ring-offset|outline-solid|outline-dotted/, "head").replace(/^\w+-/, "");
-      const parsedColor = parseColor(body, ctx.uno.config.theme);
+      const parsedColor = parseColor(body, ctx.uno.config.theme, "colors");
       if (parsedColor?.color && !ignoredColors.includes(parsedColor?.color)) {
         const existing = colors.find((c) => c.name === parsedColor.name && c.no === parsedColor.no);
         if (existing) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/inspector",
-  "version": "0.57.5",
+  "version": "0.57.6",
   "description": "The inspector UI for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -36,8 +36,8 @@
   "dependencies": {
     "gzip-size": "^6.0.0",
     "sirv": "^2.0.3",
-    "@unocss/core": "0.57.5",
-    "@unocss/rule-utils": "0.57.5"
+    "@unocss/core": "0.57.6",
+    "@unocss/rule-utils": "0.57.6"
   },
   "scripts": {
     "build": "unbuild",