@decantr/css 1.0.5 → 2.0.0

package/dist/index.js

@@ -786,6 +786,36 @@ function semanticColorDecl(prop, rawToken) {
   }
   return `${prop}:${value}`;
 }
+function compactSemanticColorToken(name, prefix) {
+  if (!name.startsWith(prefix) || name.length === prefix.length) return null;
+  const token = name.slice(prefix.length);
+  const slashIndex = token.indexOf("/");
+  if (slashIndex !== -1) {
+    if (slashIndex === 0 || slashIndex === token.length - 1) return null;
+    if (token.indexOf("/", slashIndex + 1) !== -1) return null;
+    if (!isCompactColorName(token.slice(0, slashIndex))) return null;
+    if (!isAsciiDigitString(token.slice(slashIndex + 1))) return null;
+    return token;
+  }
+  return isCompactColorName(token) ? token : null;
+}
+function isCompactColorName(value) {
+  if (!value) return false;
+  for (const char of value) {
+    const codePoint = char.charCodeAt(0);
+    const isAllowed = codePoint >= 48 && codePoint <= 57 || codePoint >= 65 && codePoint <= 90 || codePoint >= 97 && codePoint <= 122 || char === "-";
+    if (!isAllowed) return false;
+  }
+  return true;
+}
+function isAsciiDigitString(value) {
+  if (!value) return false;
+  for (const char of value) {
+    const codePoint = char.charCodeAt(0);
+    if (codePoint < 48 || codePoint > 57) return false;
+  }
+  return true;
+}
 function resolveTailwindishDecl(name) {
   if (TAILWIND_DIRECT[name]) return TAILWIND_DIRECT[name];
   const arbitraryMatch = name.match(/^([a-z]+(?:-[a-z]+)*)-\[([^\]]+)\]$/);
@@ -874,15 +904,15 @@ function resolveTailwindishDecl(name) {
     const decl = semanticColorDecl("border-color", borderColorMatch[1]);
     if (decl) return decl;
   }
-  const compactBorderColorMatch = name.match(/^border([a-zA-Z0-9-]+\/?\d*)$/);
-  if (compactBorderColorMatch) {
-    const decl = semanticColorDecl("border-color", compactBorderColorMatch[1]);
+  const compactBorderColor = compactSemanticColorToken(name, "border");
+  if (compactBorderColor) {
+    const decl = semanticColorDecl("border-color", compactBorderColor);
     if (decl) return decl;
   }
-  const compactFgMatch = name.match(/^fg([a-zA-Z0-9-]+\/?\d*)$/);
-  if (compactFgMatch) return semanticColorDecl("color", compactFgMatch[1]);
-  const compactBgMatch = name.match(/^bg([a-zA-Z0-9-]+\/?\d*)$/);
-  if (compactBgMatch) return semanticColorDecl("background", compactBgMatch[1]);
+  const compactFg = compactSemanticColorToken(name, "fg");
+  if (compactFg) return semanticColorDecl("color", compactFg);
+  const compactBg = compactSemanticColorToken(name, "bg");
+  if (compactBg) return semanticColorDecl("background", compactBg);
   const borderSideWidthMatch = name.match(/^border-([trbl])-(\d+)$/);
   if (borderSideWidthMatch) {
     const side = { t: "top", r: "right", b: "bottom", l: "left" }[borderSideWidthMatch[1]];
@@ -1316,7 +1346,33 @@ function injectMediaQuery(className, declaration, query) {
   scheduleFlush();
 }
 function escapeSelector(className) {
-  return className.replace(/:/g, "\\:").replace(/\./g, "\\.").replace(/\//g, "\\/").replace(/\[/g, "\\[").replace(/\]/g, "\\]").replace(/#/g, "\\#").replace(/%/g, "\\%").replace(/\(/g, "\\(").replace(/\)/g, "\\)").replace(/,/g, "\\,").replace(/\+/g, "\\+");
+  const chars = Array.from(className);
+  let escaped = "";
+  for (let index = 0; index < chars.length; index += 1) {
+    const char = chars[index];
+    const codePoint = char.codePointAt(0) ?? 0;
+    const firstChar = chars[0];
+    const isControl = codePoint >= 1 && codePoint <= 31 || codePoint === 127;
+    const needsNumericEscape = isControl || index === 0 && isAsciiDigit(codePoint) || index === 1 && firstChar === "-" && isAsciiDigit(codePoint);
+    if (codePoint === 0) {
+      escaped += "\uFFFD";
+    } else if (needsNumericEscape) {
+      escaped += `\\${codePoint.toString(16)} `;
+    } else if (index === 0 && char === "-" && chars.length === 1) {
+      escaped += "\\-";
+    } else if (isCssNameCodePoint(codePoint)) {
+      escaped += char;
+    } else {
+      escaped += `\\${char}`;
+    }
+  }
+  return escaped;
+}
+function isAsciiDigit(codePoint) {
+  return codePoint >= 48 && codePoint <= 57;
+}
+function isCssNameCodePoint(codePoint) {
+  return codePoint >= 128 || codePoint === 45 || codePoint === 95 || isAsciiDigit(codePoint) || codePoint >= 65 && codePoint <= 90 || codePoint >= 97 && codePoint <= 122;
 }
 function extractCSS() {
   flushBuffers();
@@ -1500,7 +1556,33 @@ function resolveAtom(atomPart) {
   return null;
 }
 function escapeClass(cls) {
-  return cls.replace(/:/g, "\\:").replace(/\./g, "\\.").replace(/\//g, "\\/").replace(/\[/g, "\\[").replace(/\]/g, "\\]").replace(/#/g, "\\#").replace(/%/g, "\\%").replace(/\(/g, "\\(").replace(/\)/g, "\\)").replace(/,/g, "\\,").replace(/\+/g, "\\+");
+  const chars = Array.from(cls);
+  let escaped = "";
+  for (let index = 0; index < chars.length; index += 1) {
+    const char = chars[index];
+    const codePoint = char.codePointAt(0) ?? 0;
+    const firstChar = chars[0];
+    const isControl = codePoint >= 1 && codePoint <= 31 || codePoint === 127;
+    const needsNumericEscape = isControl || index === 0 && isAsciiDigit2(codePoint) || index === 1 && firstChar === "-" && isAsciiDigit2(codePoint);
+    if (codePoint === 0) {
+      escaped += "\uFFFD";
+    } else if (needsNumericEscape) {
+      escaped += `\\${codePoint.toString(16)} `;
+    } else if (index === 0 && char === "-" && chars.length === 1) {
+      escaped += "\\-";
+    } else if (isCssNameCodePoint2(codePoint)) {
+      escaped += char;
+    } else {
+      escaped += `\\${char}`;
+    }
+  }
+  return escaped;
+}
+function isAsciiDigit2(codePoint) {
+  return codePoint >= 48 && codePoint <= 57;
+}
+function isCssNameCodePoint2(codePoint) {
+  return codePoint >= 128 || codePoint === 45 || codePoint === 95 || isAsciiDigit2(codePoint) || codePoint >= 65 && codePoint <= 90 || codePoint >= 97 && codePoint <= 122;
 }
 function css(...classes) {
   const result = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decantr/css",
-  "version": "1.0.5",
+  "version": "2.0.0",
   "description": "Framework-agnostic CSS atom runtime for Decantr projects",
   "author": "Decantr AI",
   "bugs": {
@@ -24,6 +24,9 @@
   "files": [
     "dist"
   ],
+  "engines": {
+    "node": ">=20"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -36,10 +39,10 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "jsdom": "^26.0.0",
+    "jsdom": "^29.1.1",
     "tsup": "^8.0.0",
-    "typescript": "^5.0.0",
-    "vitest": "^3.0.0"
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.5"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm --dts",