postcss-colormin 5.2.0 → 5.2.4

package/dist/index.js

@@ -36,16 +36,15 @@ function walk(parent, callback) {
  */
 
 
-function hasTransparentBug(browser) {
-  return ~['ie 8', 'ie 9'].indexOf(browser);
-}
+const browsersWithTransparentBug = new Set(['ie 8', 'ie 9']);
+const mathFunctions = new Set(['calc', 'min', 'max', 'clamp']);
 
 function isMathFunctionNode(node) {
   if (node.type !== 'function') {
     return false;
   }
 
-  return ['calc', 'min', 'max', 'clamp'].includes(node.value.toLowerCase());
+  return mathFunctions.has(node.value.toLowerCase());
 }
 
 function transform(value, options) {
@@ -76,22 +75,32 @@ function transform(value, options) {
   return parsed.toString();
 }
 
-function pluginCreator() {
+function addPluginDefaults(options, browsers) {
+  const defaults = {
+    // Does the browser support 4 & 8 character hex notation
+    transparent: browsers.some(b => browsersWithTransparentBug.has(b)) === false,
+    // Does the browser support "transparent" value properly
+    alphaHex: (0, _caniuseApi.isSupported)('css-rrggbbaa', browsers),
+    name: true
+  };
+  return { ...defaults,
+    ...options
+  };
+}
+
+function pluginCreator(config = {}) {
   return {
     postcssPlugin: 'postcss-colormin',
 
     prepare(result) {
-      const resultOpts = result.opts || {};
+      const resultOptions = result.opts || {};
       const browsers = (0, _browserslist.default)(null, {
-        stats: resultOpts.stats,
+        stats: resultOptions.stats,
         path: __dirname,
-        env: resultOpts.env
+        env: resultOptions.env
       });
-      const options = {
-        supportsTransparent: browsers.some(hasTransparentBug) === false,
-        supportsAlphaHex: (0, _caniuseApi.isSupported)('css-rrggbbaa', browsers)
-      };
-      const cache = {};
+      const cache = new Map();
+      const options = addPluginDefaults(config, browsers);
       return {
         OnceExit(css) {
           css.walkDecls(decl => {
@@ -111,14 +120,14 @@ function pluginCreator() {
               browsers
             });
 
-            if (cache[cacheKey]) {
-              decl.value = cache[cacheKey];
+            if (cache.has(cacheKey)) {
+              decl.value = cache.get(cacheKey);
               return;
             }
 
             const newValue = transform(value, options);
             decl.value = newValue;
-            cache[cacheKey] = newValue;
+            cache.set(cacheKey, newValue);
           });
         }
 

package/dist/minifyColor.js

@@ -5,31 +5,30 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = minifyColor;
 
-var _color = require("./lib/color");
+var _colord = require("colord");
 
-var _getShortestString = _interopRequireDefault(require("./lib/getShortestString"));
+var _names = _interopRequireDefault(require("colord/plugins/names"));
+
+var _minify = _interopRequireDefault(require("colord/plugins/minify"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+(0, _colord.extend)([_names.default, _minify.default]);
 /**
  * Performs color value minification
  *
  * @param {string} input - CSS value
- * @param {boolean} options.supportsAlphaHex - Does the browser support 4 & 8 character hex notation
- * @param {boolean} options.supportsTransparent – Does the browser support "transparent" value properly
+ * @param {boolean} options - object with colord.minify() options
  */
+
 function minifyColor(input, options = {}) {
-  const settings = {
-    supportsAlphaHex: false,
-    supportsTransparent: true,
-    ...options
-  };
-  const instance = (0, _color.process)(input);
+  const instance = (0, _colord.colord)(input);
 
   if (instance.isValid()) {
-    // Try to shorten the string if it is a valid CSS color value.
-    // Fall back to the original input if it's smaller or has equal length/
-    return (0, _getShortestString.default)([input.toLowerCase(), instance.toShortString(settings)]);
+    // Try to shorten the string if it is a valid CSS color value
+    const minified = instance.minify(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;

package/package.json

@@ -1,17 +1,12 @@
 {
   "name": "postcss-colormin",
-  "version": "5.2.0",
+  "version": "5.2.4",
   "description": "Minify colors in your CSS files with PostCSS.",
   "main": "dist/index.js",
   "files": [
     "dist",
     "LICENSE-MIT"
   ],
-  "scripts": {
-    "prebuild": "del-cli dist",
-    "build": "cross-env BABEL_ENV=publish babel src --config-file ../../babel.config.json --out-dir dist --ignore \"**/__tests__/\"",
-    "prepublish": "yarn build"
-  },
   "keywords": [
     "color",
     "colors",
@@ -32,8 +27,8 @@
   "dependencies": {
     "browserslist": "^4.16.6",
     "caniuse-api": "^3.0.0",
-    "colord": "^2.0.1",
-    "postcss-value-parser": "^4.1.0"
+    "colord": "^2.9.1",
+    "postcss-value-parser": "^4.2.0"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
@@ -47,5 +42,9 @@
   "peerDependencies": {
     "postcss": "^8.2.15"
   },
-  "gitHead": "9b3c54fd94f3e2bdb503d1e21f171d7fe02f33ca"
-}
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "babel src --config-file ../../babel.config.json --out-dir dist --ignore \"**/__tests__/\""
+  },
+  "readme": "# [postcss][postcss]-colormin\n\n> Minify colors in your CSS files with PostCSS.\n\n## Install\n\nWith [npm](https://npmjs.org/package/postcss-colormin) do:\n\n```\nnpm install postcss-colormin --save\n```\n\n\n## Example\n\n```js\nvar postcss = require('postcss')\nvar colormin = require('postcss-colormin');\n\nvar css = 'h1 {color: rgba(255, 0, 0, 1)}';\nconsole.log(postcss(colormin()).process(css).css);\n\n// => 'h1 {color:red}'\n```\n\nFor more examples see the [tests](src/__tests__/index.js).\n\n\n## Usage\n\nSee the [PostCSS documentation](https://github.com/postcss/postcss#usage) for\nexamples for your environment.\n\n\n## Contributors\n\nSee [CONTRIBUTORS.md](https://github.com/cssnano/cssnano/blob/master/CONTRIBUTORS.md).\n\n\n## License\n\nMIT © [Ben Briggs](http://beneb.info)\n\n\n[postcss]:  https://github.com/postcss/postcss\n"
+}

package/dist/lib/color.js

@@ -1,101 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "process", {
-  enumerable: true,
-  get: function () {
-    return _colord.colord;
-  }
-});
-Object.defineProperty(exports, "getFormat", {
-  enumerable: true,
-  get: function () {
-    return _colord.getFormat;
-  }
-});
-
-var _colord = require("colord");
-
-var _names = _interopRequireDefault(require("colord/plugins/names"));
-
-var _getShortestString = _interopRequireDefault(require("./getShortestString"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-let minifierPlugin = Colord => {
-  /**
-   * Shortens a color to 3 or 4 digit hexadecimal string if it's possible.
-   * Returns the original (6 or 8 digit) hex if the it can't be shortened.
-   */
-  Colord.prototype.toShortHex = function ({
-    formatAlpha
-  }) {
-    let hex = this.toHex();
-    let [, r1, r2, g1, g2, b1, b2, a1, a2] = hex.split(''); // Check if the string can be shorten
-
-    if (r1 === r2 && g1 === g2 && b1 === b2) {
-      if (this.alpha() === 1) {
-        // Express as 3 digit hexadecimal string if the color doesn't have an alpha channel
-        return '#' + r1 + g1 + b1;
-      } else if (formatAlpha && a1 === a2) {
-        // Format 4 digit hex
-        return '#' + r1 + g1 + b1 + a1;
-      }
-    }
-
-    return hex;
-  };
-  /**
-   * Returns the shortest representation of a color.
-   */
-
-
-  Colord.prototype.toShortString = function ({
-    supportsTransparent,
-    supportsAlphaHex
-  }) {
-    let {
-      r,
-      g,
-      b
-    } = this.toRgb();
-    let a = this.alpha(); // RGB[A] and HSL[A] functional notations
-
-    let options = [this.toRgbString(), // e.g. "rgb(128, 128, 128)" or "rgba(128, 128, 128, 0.5)"
-    this.toHslString() // e.g. "hsl(180, 50%, 50%)" or "hsla(180, 50%, 50%, 0.5)"
-    ]; // Hexadecimal notations
-
-    if (supportsAlphaHex && a < 1) {
-      let alphaHex = this.toShortHex({
-        formatAlpha: true
-      }); // e.g. "#7777" or "#80808080"
-      // Output 4 or 8 digit hex only if the color conversion is lossless
-
-      if ((0, _colord.colord)(alphaHex).alpha() === a) {
-        options.push(alphaHex);
-      }
-    } else if (a === 1) {
-      options.push(this.toShortHex({
-        formatAlpha: false
-      })); // e.g. "#777" or "#808080"
-    } // CSS keyword
-
-
-    if (supportsTransparent && r === 0 && g === 0 && b === 0 && a === 0) {
-      options.push('transparent');
-    } else if (a === 1) {
-      let name = this.toName(); // e.g. "gray"
-
-      if (name) {
-        options.push(name);
-      }
-    } // Find the shortest option available
-
-
-    return (0, _getShortestString.default)(options);
-  };
-};
-
-(0, _colord.extend)([_names.default, minifierPlugin]);

package/dist/lib/getShortestString.js

@@ -1,25 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-/**
- * Returns the shortest string in array
- */
-const getShortestString = strings => {
-  let shortest = null;
-
-  for (let string of strings) {
-    if (shortest === null || string.length < shortest.length) {
-      shortest = string;
-    }
-  }
-
-  return shortest;
-};
-
-var _default = getShortestString;
-exports.default = _default;
-module.exports = exports.default;