postcss-normalize-string 4.0.0-rc.0 → 4.0.2

package/README.md

@@ -50,7 +50,7 @@ console.log(postcss(normalize({preferredQuote: 'single'})).process(css).css);
 
 ## Contributors
 
-See [CONTRIBUTORS.md](https://github.com/ben-eb/cssnano/blob/master/CONTRIBUTORS.md).
+See [CONTRIBUTORS.md](https://github.com/cssnano/cssnano/blob/master/CONTRIBUTORS.md).
 
 ## License
 

package/dist/index.js

@@ -18,73 +18,68 @@ var _has2 = _interopRequireDefault(_has);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
-
 /*
  * Constants (parser usage)
  */
 
-var SINGLE_QUOTE = '\''.charCodeAt(0);
-var DOUBLE_QUOTE = '"'.charCodeAt(0);
-var BACKSLASH = '\\'.charCodeAt(0);
-var NEWLINE = '\n'.charCodeAt(0);
-var SPACE = ' '.charCodeAt(0);
-var FEED = '\f'.charCodeAt(0);
-var TAB = '\t'.charCodeAt(0);
-var CR = '\r'.charCodeAt(0);
+const SINGLE_QUOTE = '\''.charCodeAt(0);
+const DOUBLE_QUOTE = '"'.charCodeAt(0);
+const BACKSLASH = '\\'.charCodeAt(0);
+const NEWLINE = '\n'.charCodeAt(0);
+const SPACE = ' '.charCodeAt(0);
+const FEED = '\f'.charCodeAt(0);
+const TAB = '\t'.charCodeAt(0);
+const CR = '\r'.charCodeAt(0);
 
-var WORD_END = /[ \n\t\r\f'"\\]/g;
+const WORD_END = /[ \n\t\r\f'"\\]/g;
 
 /*
  * Constants (node type strings)
  */
 
-var C_STRING = 'string';
-var C_ESCAPED_SINGLE_QUOTE = 'escapedSingleQuote';
-var C_ESCAPED_DOUBLE_QUOTE = 'escapedDoubleQuote';
-var C_SINGLE_QUOTE = 'singleQuote';
-var C_DOUBLE_QUOTE = 'doubleQuote';
-var C_NEWLINE = 'newline';
-var C_SINGLE = 'single';
+const C_STRING = 'string';
+const C_ESCAPED_SINGLE_QUOTE = 'escapedSingleQuote';
+const C_ESCAPED_DOUBLE_QUOTE = 'escapedDoubleQuote';
+const C_SINGLE_QUOTE = 'singleQuote';
+const C_DOUBLE_QUOTE = 'doubleQuote';
+const C_NEWLINE = 'newline';
+const C_SINGLE = 'single';
 
 /*
  * Literals
  */
 
-var L_SINGLE_QUOTE = `'`;
-var L_DOUBLE_QUOTE = `"`;
-var L_NEWLINE = `\\\n`;
+const L_SINGLE_QUOTE = `'`;
+const L_DOUBLE_QUOTE = `"`;
+const L_NEWLINE = `\\\n`;
 
 /*
  * Parser nodes
  */
 
-var T_ESCAPED_SINGLE_QUOTE = { type: C_ESCAPED_SINGLE_QUOTE, value: `\\'` };
-var T_ESCAPED_DOUBLE_QUOTE = { type: C_ESCAPED_DOUBLE_QUOTE, value: `\\"` };
-var T_SINGLE_QUOTE = { type: C_SINGLE_QUOTE, value: L_SINGLE_QUOTE };
-var T_DOUBLE_QUOTE = { type: C_DOUBLE_QUOTE, value: L_DOUBLE_QUOTE };
-var T_NEWLINE = { type: C_NEWLINE, value: L_NEWLINE };
+const T_ESCAPED_SINGLE_QUOTE = { type: C_ESCAPED_SINGLE_QUOTE, value: `\\'` };
+const T_ESCAPED_DOUBLE_QUOTE = { type: C_ESCAPED_DOUBLE_QUOTE, value: `\\"` };
+const T_SINGLE_QUOTE = { type: C_SINGLE_QUOTE, value: L_SINGLE_QUOTE };
+const T_DOUBLE_QUOTE = { type: C_DOUBLE_QUOTE, value: L_DOUBLE_QUOTE };
+const T_NEWLINE = { type: C_NEWLINE, value: L_NEWLINE };
 
 function stringify(ast) {
-    return ast.nodes.reduce(function (str, _ref) {
-        var value = _ref.value;
-
+    return ast.nodes.reduce((str, { value }) => {
         // Collapse multiple line strings automatically
         if (value === L_NEWLINE) {
             return str;
         }
+
         return str + value;
     }, '');
 }
 
 function parse(str) {
-    var code = void 0,
-        next = void 0,
-        value = void 0;
-    var pos = 0;
-    var len = str.length;
+    let code, next, value;
+    let pos = 0;
+    let len = str.length;
 
-    var ast = {
+    const ast = {
         nodes: [],
         types: {
             escapedSingleQuote: 0,
@@ -97,12 +92,14 @@ function parse(str) {
 
     while (pos < len) {
         code = str.charCodeAt(pos);
+
         switch (code) {
             case SPACE:
             case TAB:
             case CR:
             case FEED:
                 next = pos;
+
                 do {
                     next += 1;
                     code = str.charCodeAt(next);
@@ -126,6 +123,7 @@ function parse(str) {
                 break;
             case BACKSLASH:
                 next = pos + 1;
+
                 if (str.charCodeAt(next) === SINGLE_QUOTE) {
                     ast.nodes.push(T_ESCAPED_SINGLE_QUOTE);
                     ast.types[C_ESCAPED_SINGLE_QUOTE]++;
@@ -173,7 +171,7 @@ function parse(str) {
 }
 
 function changeWrappingQuotes(node, ast) {
-    var types = ast.types;
+    const { types } = ast;
 
     if (types[C_SINGLE_QUOTE] || types[C_DOUBLE_QUOTE]) {
         return;
@@ -187,14 +185,16 @@ function changeWrappingQuotes(node, ast) {
         node.quote = L_SINGLE_QUOTE;
     }
 
-    ast.nodes = ast.nodes.reduce(function (newAst, child) {
+    ast.nodes = ast.nodes.reduce((newAst, child) => {
         if (child.type === C_ESCAPED_DOUBLE_QUOTE && node.quote === L_SINGLE_QUOTE) {
-            return [].concat(_toConsumableArray(newAst), [T_DOUBLE_QUOTE]);
+            return [...newAst, T_DOUBLE_QUOTE];
         }
+
         if (child.type === C_ESCAPED_SINGLE_QUOTE && node.quote === L_DOUBLE_QUOTE) {
-            return [].concat(_toConsumableArray(newAst), [T_SINGLE_QUOTE]);
+            return [...newAst, T_SINGLE_QUOTE];
         }
-        return [].concat(_toConsumableArray(newAst), [child]);
+
+        return [...newAst, child];
     }, []);
 }
 
@@ -202,11 +202,14 @@ function normalize(value, preferredQuote) {
     if (!value || !value.length) {
         return value;
     }
-    return (0, _postcssValueParser2.default)(value).walk(function (child) {
+
+    return (0, _postcssValueParser2.default)(value).walk(child => {
         if (child.type !== C_STRING) {
             return;
         }
-        var ast = parse(child.value);
+
+        const ast = parse(child.value);
+
         if (ast.quotes) {
             changeWrappingQuotes(child, ast);
         } else if (preferredQuote === C_SINGLE) {
@@ -214,29 +217,42 @@ function normalize(value, preferredQuote) {
         } else {
             child.quote = L_DOUBLE_QUOTE;
         }
+
         child.value = stringify(ast);
     }).toString();
 }
 
-var params = {
+const params = {
     rule: 'selector',
     decl: 'value',
     atrule: 'params'
 };
 
-exports.default = _postcss2.default.plugin('postcss-normalize-string', function (opts) {
-    var _Object$assign = Object.assign({}, {
+exports.default = _postcss2.default.plugin('postcss-normalize-string', opts => {
+    const { preferredQuote } = Object.assign({}, {
         preferredQuote: 'double'
-    }, opts),
-        preferredQuote = _Object$assign.preferredQuote;
+    }, opts);
 
-    return function (css) {
-        css.walk(function (node) {
-            var type = node.type;
+    return css => {
+        const cache = {};
+
+        css.walk(node => {
+            const { type } = node;
 
             if ((0, _has2.default)(params, type)) {
-                var param = params[type];
-                node[param] = normalize(node[param], preferredQuote);
+                const param = params[type];
+                const key = node[param] + '|' + preferredQuote;
+
+                if (cache[key]) {
+                    node[param] = cache[key];
+
+                    return;
+                }
+
+                const result = normalize(node[param], preferredQuote);
+
+                node[param] = result;
+                cache[key] = result;
             }
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-normalize-string",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.2",
   "description": "Normalize wrapping quotes for CSS string literals.",
   "main": "dist/index.js",
   "files": [
@@ -18,24 +18,24 @@
   "license": "MIT",
   "devDependencies": {
     "babel-cli": "^6.0.0",
-    "cross-env": "^3.0.0"
+    "cross-env": "^5.0.0"
   },
-  "homepage": "https://github.com/ben-eb/cssnano",
+  "homepage": "https://github.com/cssnano/cssnano",
   "author": {
     "name": "Ben Briggs",
     "email": "beneb.info@gmail.com",
     "url": "http://beneb.info"
   },
-  "repository": "ben-eb/cssnano",
+  "repository": "cssnano/cssnano",
   "dependencies": {
     "has": "^1.0.0",
-    "postcss": "^6.0.0",
+    "postcss": "^7.0.0",
     "postcss-value-parser": "^3.0.0"
   },
   "bugs": {
-    "url": "https://github.com/ben-eb/cssnano/issues"
+    "url": "https://github.com/cssnano/cssnano/issues"
   },
   "engines": {
-    "node": ">=4"
+    "node": ">=6.9.0"
   }
 }

package/CHANGELOG.md

@@ -1,4 +0,0 @@
-# 4.0.0-rc.0
-
-* Initial commit. This module was previously part of other cssnano modules and
-  has been extracted out.