postcss-colormin 9.0.4 → 9.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-colormin",
-  "version": "9.0.4",
+  "version": "9.0.6",
   "description": "Minify colors in your CSS files with PostCSS.",
   "exports": {
     ".": {
@@ -45,9 +45,9 @@
   "dependencies": {
     "@colordx/core": "^7.2.0",
     "@csstools/css-tokenizer": "^4.0.2",
-    "browserslist": "^4.29.1",
+    "browserslist": "^4.29.3",
     "caniuse-api": "^4.0.0",
-    "cssnano-utils": "^8.0.0"
+    "cssnano-utils": "^8.0.2"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
@@ -65,6 +65,6 @@
   "type": "module",
   "scripts": {
     "test": "node --test",
-    "acquire": "node ./script/acquire.mjs"
+    "acquire": "node ./script/acquire.js"
   }
 }

package/src/index.js

@@ -1,9 +1,8 @@
 import getBrowsersList from '#getBrowsersList';
 import caniuseApi from 'caniuse-api';
-import { colordx as colord } from '@colordx/core';
+import { tryMinifyColor } from './minifyColor.js';
 import cssnanoUtils from 'cssnano-utils';
 import colorPropertiesData from './data/colorProperties.json' with { type: 'json' };
-import minifyColor from './minifyColor.js';
 
 /** @import {CSSToken} from '@csstools/css-tokenizer' */
 const { isSupported } = caniuseApi;
@@ -39,6 +38,28 @@ const tokensRequiringSeparator = new Set([
   TokenType.Percentage,
 ]);
 
+/**
+ * Fast-path check for valid CSS hex colors (CSS Color 4 § 5.2):
+ * Must be 3, 4, 6, or 8 hexadecimal digits.
+ * @param {string} value
+ * @return {boolean}
+ */
+function isHexColor(value) {
+  const len = value.length;
+  if (len !== 3 && len !== 4 && len !== 6 && len !== 8) return false;
+  for (let i = 0; i < len; i++) {
+    const code = value.charCodeAt(i);
+    if (
+      !(code >= 48 && code <= 57) &&
+      !(code >= 65 && code <= 70) &&
+      !(code >= 97 && code <= 102)
+    ) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /** @param {string} value @param {Options} options @return {string} */
 function transform(value, options) {
   const structure = balancedTokens(value);
@@ -76,43 +97,29 @@ function transform(value, options) {
         const raw = value.slice(tokenStart(t), tokenEnd(closeToken));
         const inputForMinify =
           name + '(' + value.slice(tokenEnd(t), tokenEnd(closeToken));
-        if (colord(inputForMinify).isValid()) {
-          const out = minifyColor(inputForMinify, options);
-          if (out !== raw) {
-            replacements.push({
-              start: tokenStart(t),
-              end: tokenEnd(closeToken),
-              text: out + separator(tokenEnd(closeToken), closeIndex),
-            });
-          }
-        }
-        i = closeIndex;
-        continue;
-      }
-    } else if (t[0] === TokenType.Ident) {
-      const dec = decoded(t);
-      if (!dec.startsWith('#') && colord(dec).isValid()) {
-        const out = minifyColor(dec, options);
-        if (out !== t[1] && out.length <= t[1].length) {
+        const out = tryMinifyColor(inputForMinify, options);
+        if (out !== undefined && out !== raw) {
           replacements.push({
             start: tokenStart(t),
-            end: tokenEnd(t),
-            text: out + separator(tokenEnd(t), i),
+            end: tokenEnd(closeToken),
+            text: out + separator(tokenEnd(closeToken), closeIndex),
           });
         }
+        i = closeIndex;
+        continue;
       }
-    } else if (t[0] === TokenType.Hash) {
+    } else if (t[0] === TokenType.Ident || t[0] === TokenType.Hash) {
       const dec = decoded(t);
-      const hexCandidate = '#' + dec;
-      if (colord(hexCandidate).isValid()) {
-        const out = minifyColor(hexCandidate, options);
-        if (out !== t[1] && out.length <= t[1].length) {
-          replacements.push({
-            start: tokenStart(t),
-            end: tokenEnd(t),
-            text: out + separator(tokenEnd(t), i),
-          });
-        }
+      const isHash = t[0] === TokenType.Hash;
+      if (isHash ? !isHexColor(dec) : dec.startsWith('#')) continue;
+      const candidate = isHash ? '#' + dec : dec;
+      const out = tryMinifyColor(candidate, options);
+      if (out !== undefined && out !== t[1] && out.length <= t[1].length) {
+        replacements.push({
+          start: tokenStart(t),
+          end: tokenEnd(t),
+          text: out + separator(tokenEnd(t), i),
+        });
       }
     }
   }

package/src/minifyColor.js

@@ -6,13 +6,13 @@ import minifierPlugin from '@colordx/core/plugins/minify';
 extend(/** @type {any[]} */ ([hwbPlugin, namesPlugin, minifierPlugin]));
 
 /**
- * Performs color value minification
+ * Performs color value minification if input is a valid CSS color
  *
  * @param {string} input - CSS value
- * @param {import('./index.js').MinifyColorOptions} options - object with colordx.minify() options
- * @return {string}
+ * @param {import('./index.js').MinifyColorOptions} [options] - object with colordx.minify() options
+ * @return {string | undefined}
  */
-function minifyColor(input, options = {}) {
+export function tryMinifyColor(input, options = {}) {
   const instance = colord(input);
 
   if (instance.isValid()) {
@@ -21,10 +21,18 @@ function minifyColor(input, options = {}) {
 
     // Fall back to the original input if it's smaller or has equal length
     return minified.length < input.length ? minified : input.toLowerCase();
-  } else {
-    // Possibly malformed, so pass through
-    return input;
   }
 }
 
+/**
+ * Performs color value minification
+ *
+ * @param {string} input - CSS value
+ * @param {import('./index.js').MinifyColorOptions} [options] - object with colordx.minify() options
+ * @return {string}
+ */
+function minifyColor(input, options = {}) {
+  return tryMinifyColor(input, options) ?? input;
+}
+
 export default minifyColor;

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAmBI,OAAQ,KAAA,YAAY,MAAM,cAAc,CAAA;AAwHzC,YAAkB,kBAAkB,GACpC;IAAqB,GAAG,AAAxB,CACA,EADW,OAAO,CAClB;IAAqB,QAAQ,AAA7B,CACA,EADW,OAAO,CAClB;IAAqB,GAAG,AAAxB,CACA,EADW,OAAO,CAClB;IAAqB,GAAG,AAAxB,CACA,EADW,OAAO,CAClB;IAAqB,IAAI,AAAzB,CACA,EADW,OAAO,CAClB;IAAqB,WAAW,AAAhC,CACA,EADW,OAAO,CAClB;;;;IAAqB,yBAAyB,AAA9C,CACF,EADa,OAAO,CACpB;CAAA,CAAA;AAGE,YAAwD,mBAAmB,GAAjE;IAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAqB;AAC3E,YAAgE,mBAAmB,GAAzE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,CAAqB;AACnF,YAA0E,OAAO,GAAvE,kBAAkB,GAAG,mBAAmB,GAAG,mBAAmB,CAAS;AAdpF;;;;;;;;;GASG;AAEH;;;;GAIG;AAEH;;;GAGG;AACH,iBAAS,aAAa,CAAC,MAAM,GAHlB,OAGuB,GAFtB,OAAO,SAAS,EAAE,MAAM,CAsEnC;kBApEQ,aAAa;iBAqEX,IAAI;;AAEf,QAAA,MAAM,aAAa,sBAAgB,CAAC;AAEpC,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,aAAa,IAAI,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAkBI,OAAQ,KAAA,YAAY,MAAM,cAAc,CAAA;AAgIzC,YAAkB,kBAAkB,GACpC;IAAqB,GAAG,AAAxB,CACA,EADW,OAAO,CAClB;IAAqB,QAAQ,AAA7B,CACA,EADW,OAAO,CAClB;IAAqB,GAAG,AAAxB,CACA,EADW,OAAO,CAClB;IAAqB,GAAG,AAAxB,CACA,EADW,OAAO,CAClB;IAAqB,IAAI,AAAzB,CACA,EADW,OAAO,CAClB;IAAqB,WAAW,AAAhC,CACA,EADW,OAAO,CAClB;;;;IAAqB,yBAAyB,AAA9C,CACF,EADa,OAAO,CACpB;CAAA,CAAA;AAGE,YAAwD,mBAAmB,GAAjE;IAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAqB;AAC3E,YAAgE,mBAAmB,GAAzE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,CAAqB;AACnF,YAA0E,OAAO,GAAvE,kBAAkB,GAAG,mBAAmB,GAAG,mBAAmB,CAAS;AAdpF;;;;;;;;;GASG;AAEH;;;;GAIG;AAEH;;;GAGG;AACH,iBAAS,aAAa,CAAC,MAAM,GAHlB,OAGuB,GAFtB,OAAO,SAAS,EAAE,MAAM,CAsEnC;kBApEQ,aAAa;iBAqEX,IAAI;;AAEf,QAAA,MAAM,aAAa,sBAAgB,CAAC;AAEpC,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,aAAa,IAAI,gBAAgB,EAAE,CAAC"}

package/types/minifyColor.d.ts

@@ -1,8 +1,16 @@
+/**
+ * Performs color value minification if input is a valid CSS color
+ *
+ * @param {string} input - CSS value
+ * @param {import('./index.js').MinifyColorOptions} [options] - object with colordx.minify() options
+ * @return {string | undefined}
+ */
+export declare function tryMinifyColor(input: string, options?: import('./index.js').MinifyColorOptions): string | undefined;
 /**
  * Performs color value minification
  *
  * @param {string} input - CSS value
- * @param {import('./index.js').MinifyColorOptions} options - object with colordx.minify() options
+ * @param {import('./index.js').MinifyColorOptions} [options] - object with colordx.minify() options
  * @return {string}
  */
 declare function minifyColor(input: string, options?: import('./index.js').MinifyColorOptions): string;

package/types/minifyColor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"minifyColor.d.ts","sourceRoot":"","sources":["../src/minifyColor.js"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,iBAAS,WAAW,CAAC,KAAK,EAJf,MAIe,EAAE,OAAO,GAHxB,OAAO,YAAY,EAAE,kBAGQ,GAF5B,MAAM,CAejB;eAEc,WAAW"}
+{"version":3,"file":"minifyColor.d.ts","sourceRoot":"","sources":["../src/minifyColor.js"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAJzB,MAIyB,EAAE,OAAO,AAH1C,CACA,EADQ,OAAO,YAAY,EAAE,kBAGkB,GAFtC,MAAM,GAAG,SAAS,CAY7B;AAED;;;;;;GAMG;AACH,iBAAS,WAAW,CAAC,KAAK,EAJf,MAIe,EAAE,OAAO,AAHhC,CACA,EADQ,OAAO,YAAY,EAAE,kBAGQ,GAF5B,MAAM,CAIjB;eAEc,WAAW"}