@kbach/react 0.6.14 → 0.6.16

package/dist/vite-plugin.js

@@ -671,25 +671,6 @@ function resolveColor(value, colors, isArbitrary) {
       }
     }
   }
-  if (hex && !hex.startsWith("#") && !hex.startsWith("rgb") && hex !== "transparent" && hex !== "currentColor") {
-    if (hex in colors) {
-      const alias = colors[hex];
-      if (typeof alias === "string") hex = alias;
-      else if (typeof alias === "object" && "6" in alias) hex = alias["6"] ?? hex;
-    } else {
-      const aliasLastDash = hex.lastIndexOf("-");
-      if (aliasLastDash > 0) {
-        const aliasColorName = hex.slice(0, aliasLastDash);
-        const aliasShade = hex.slice(aliasLastDash + 1);
-        const aliasScale = colors[aliasColorName];
-        if (aliasScale && typeof aliasScale === "object") {
-          hex = aliasScale[aliasShade] ?? null;
-        } else if (typeof aliasScale === "string") {
-          hex = aliasScale;
-        }
-      }
-    }
-  }
   if (!hex) return null;
   if (!opacityPart) {
     if (!getEffectiveIsWeb() && hex.startsWith("#") && hex.length === 9) {
@@ -705,6 +686,8 @@ function resolveColor(value, colors, isArbitrary) {
     alpha = parseFloat(opacityPart) / 100;
   }
   if (isNaN(alpha)) return hex;
+  if (alpha < 0) alpha = 0;
+  else if (alpha > 1) alpha = 1;
   return hexToRgba(hex, alpha);
 }
 function parseHexRgb(hex) {
@@ -2223,7 +2206,7 @@ var RESOLVERS = {
   "translate-x": ({ value, negative, isArbitrary }, { spacing }) => {
     const v = resolveSpacing(value, negative, spacing, isArbitrary);
     if (v === null) return null;
-    if (getEffectiveIsWeb()) return { transform: `translateX(${v})` };
+    if (getEffectiveIsWeb()) return { transform: `translateX(${typeof v === "number" ? `${v}px` : v})` };
     if (typeof v === "string") {
       const n = parseFloat(v);
       return isNaN(n) ? null : { transform: [{ translateX: n }] };
@@ -2233,7 +2216,7 @@ var RESOLVERS = {
   "translate-y": ({ value, negative, isArbitrary }, { spacing }) => {
     const v = resolveSpacing(value, negative, spacing, isArbitrary);
     if (v === null) return null;
-    if (getEffectiveIsWeb()) return { transform: `translateY(${v})` };
+    if (getEffectiveIsWeb()) return { transform: `translateY(${typeof v === "number" ? `${v}px` : v})` };
     if (typeof v === "string") {
       const n = parseFloat(v);
       return isNaN(n) ? null : { transform: [{ translateY: n }] };
@@ -2519,6 +2502,14 @@ function isKnownModifier(name) {
 }
 
 // src/core/parser.ts
+var UNSAFE_ARBITRARY_VALUE = /[{};\\]|\/\*|\*\//;
+function isSafeArbitraryValue(value) {
+  if (!UNSAFE_ARBITRARY_VALUE.test(value)) return true;
+  if (process.env.NODE_ENV !== "production") {
+    kbachWarn(`Unsafe arbitrary value rejected: "${value}"`);
+  }
+  return false;
+}
 function parseClass(className) {
   const trimmed = className.trim();
   if (!trimmed) return null;
@@ -2557,6 +2548,7 @@ function parseClass(className) {
   if (bracketStart > 0 && remaining[bracketStart - 1] === "-" && remaining.endsWith("]")) {
     const utility = remaining.slice(0, bracketStart - 1);
     const value = remaining.slice(bracketStart + 1, -1).replace(/_/g, " ");
+    if (!isSafeArbitraryValue(value)) return null;
     return { original: trimmed, modifiers, negative, important, utility, value, isArbitrary: true };
   }
   if (remaining.endsWith("]") && bracketStart === -1) {
@@ -2566,6 +2558,7 @@ function parseClass(className) {
   }
   if (remaining.startsWith("[") && remaining.endsWith("]")) {
     const value = remaining.slice(1, -1).replace(/_/g, " ");
+    if (!isSafeArbitraryValue(value)) return null;
     return { original: trimmed, modifiers, negative, important, utility: "", value, isArbitrary: true };
   }
   if (getBuiltinStandaloneNames().has(remaining)) {
@@ -2701,17 +2694,20 @@ function setDefaultFontFamily(font) {
   globalThis[FONT_KEY] = font;
 }
 var _styleEl = null;
+var _ruleIndexByKey = /* @__PURE__ */ new Map();
 function evictInjectedRule(rule) {
+  const idx = _ruleIndexByKey.get(rule);
+  _ruleIndexByKey.delete(rule);
+  if (idx === void 0) return;
   const sheet = _styleEl?.sheet;
   if (!sheet) return;
-  for (let i = 0; i < sheet.cssRules.length; i++) {
-    if (sheet.cssRules[i].cssText === rule) {
-      try {
-        sheet.deleteRule(i);
-      } catch {
-      }
-      return;
-    }
+  try {
+    sheet.deleteRule(idx);
+  } catch {
+    return;
+  }
+  for (const [key, i] of _ruleIndexByKey) {
+    if (i > idx) _ruleIndexByKey.set(key, i - 1);
   }
 }
 var _injectedRules = new LRUCache(5e4, evictInjectedRule);

package/dist/vite-plugin.mjs

@@ -637,25 +637,6 @@ function resolveColor(value, colors, isArbitrary) {
       }
     }
   }
-  if (hex && !hex.startsWith("#") && !hex.startsWith("rgb") && hex !== "transparent" && hex !== "currentColor") {
-    if (hex in colors) {
-      const alias = colors[hex];
-      if (typeof alias === "string") hex = alias;
-      else if (typeof alias === "object" && "6" in alias) hex = alias["6"] ?? hex;
-    } else {
-      const aliasLastDash = hex.lastIndexOf("-");
-      if (aliasLastDash > 0) {
-        const aliasColorName = hex.slice(0, aliasLastDash);
-        const aliasShade = hex.slice(aliasLastDash + 1);
-        const aliasScale = colors[aliasColorName];
-        if (aliasScale && typeof aliasScale === "object") {
-          hex = aliasScale[aliasShade] ?? null;
-        } else if (typeof aliasScale === "string") {
-          hex = aliasScale;
-        }
-      }
-    }
-  }
   if (!hex) return null;
   if (!opacityPart) {
     if (!getEffectiveIsWeb() && hex.startsWith("#") && hex.length === 9) {
@@ -671,6 +652,8 @@ function resolveColor(value, colors, isArbitrary) {
     alpha = parseFloat(opacityPart) / 100;
   }
   if (isNaN(alpha)) return hex;
+  if (alpha < 0) alpha = 0;
+  else if (alpha > 1) alpha = 1;
   return hexToRgba(hex, alpha);
 }
 function parseHexRgb(hex) {
@@ -2189,7 +2172,7 @@ var RESOLVERS = {
   "translate-x": ({ value, negative, isArbitrary }, { spacing }) => {
     const v = resolveSpacing(value, negative, spacing, isArbitrary);
     if (v === null) return null;
-    if (getEffectiveIsWeb()) return { transform: `translateX(${v})` };
+    if (getEffectiveIsWeb()) return { transform: `translateX(${typeof v === "number" ? `${v}px` : v})` };
     if (typeof v === "string") {
       const n = parseFloat(v);
       return isNaN(n) ? null : { transform: [{ translateX: n }] };
@@ -2199,7 +2182,7 @@ var RESOLVERS = {
   "translate-y": ({ value, negative, isArbitrary }, { spacing }) => {
     const v = resolveSpacing(value, negative, spacing, isArbitrary);
     if (v === null) return null;
-    if (getEffectiveIsWeb()) return { transform: `translateY(${v})` };
+    if (getEffectiveIsWeb()) return { transform: `translateY(${typeof v === "number" ? `${v}px` : v})` };
     if (typeof v === "string") {
       const n = parseFloat(v);
       return isNaN(n) ? null : { transform: [{ translateY: n }] };
@@ -2485,6 +2468,14 @@ function isKnownModifier(name) {
 }
 
 // src/core/parser.ts
+var UNSAFE_ARBITRARY_VALUE = /[{};\\]|\/\*|\*\//;
+function isSafeArbitraryValue(value) {
+  if (!UNSAFE_ARBITRARY_VALUE.test(value)) return true;
+  if (process.env.NODE_ENV !== "production") {
+    kbachWarn(`Unsafe arbitrary value rejected: "${value}"`);
+  }
+  return false;
+}
 function parseClass(className) {
   const trimmed = className.trim();
   if (!trimmed) return null;
@@ -2523,6 +2514,7 @@ function parseClass(className) {
   if (bracketStart > 0 && remaining[bracketStart - 1] === "-" && remaining.endsWith("]")) {
     const utility = remaining.slice(0, bracketStart - 1);
     const value = remaining.slice(bracketStart + 1, -1).replace(/_/g, " ");
+    if (!isSafeArbitraryValue(value)) return null;
     return { original: trimmed, modifiers, negative, important, utility, value, isArbitrary: true };
   }
   if (remaining.endsWith("]") && bracketStart === -1) {
@@ -2532,6 +2524,7 @@ function parseClass(className) {
   }
   if (remaining.startsWith("[") && remaining.endsWith("]")) {
     const value = remaining.slice(1, -1).replace(/_/g, " ");
+    if (!isSafeArbitraryValue(value)) return null;
     return { original: trimmed, modifiers, negative, important, utility: "", value, isArbitrary: true };
   }
   if (getBuiltinStandaloneNames().has(remaining)) {
@@ -2667,17 +2660,20 @@ function setDefaultFontFamily(font) {
   globalThis[FONT_KEY] = font;
 }
 var _styleEl = null;
+var _ruleIndexByKey = /* @__PURE__ */ new Map();
 function evictInjectedRule(rule) {
+  const idx = _ruleIndexByKey.get(rule);
+  _ruleIndexByKey.delete(rule);
+  if (idx === void 0) return;
   const sheet = _styleEl?.sheet;
   if (!sheet) return;
-  for (let i = 0; i < sheet.cssRules.length; i++) {
-    if (sheet.cssRules[i].cssText === rule) {
-      try {
-        sheet.deleteRule(i);
-      } catch {
-      }
-      return;
-    }
+  try {
+    sheet.deleteRule(idx);
+  } catch {
+    return;
+  }
+  for (const [key, i] of _ruleIndexByKey) {
+    if (i > idx) _ruleIndexByKey.set(key, i - 1);
   }
 }
 var _injectedRules = new LRUCache(5e4, evictInjectedRule);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kbach/react",
-  "version": "0.6.14",
+  "version": "0.6.16",
   "description": "React / React Native components and hooks for the Kbach framework",
   "source": "./src/index.ts",
   "main": "./dist/index.js",