postcss-normalize-string 5.0.0 → 5.0.4

package/package.json

@@ -1,17 +1,12 @@
 {
   "name": "postcss-normalize-string",
-  "version": "5.0.0",
+  "version": "5.0.4",
   "description": "Normalize wrapping quotes for CSS string literals.",
-  "main": "dist/index.js",
+  "main": "src/index.js",
   "files": [
-    "dist",
+    "src",
     "LICENSE-MIT"
   ],
-  "scripts": {
-    "prebuild": "del-cli dist",
-    "build": "cross-env BABEL_ENV=publish babel src --config-file ../../babel.config.js --out-dir dist --ignore \"**/__tests__/\"",
-    "prepublish": "yarn build"
-  },
   "keywords": [
     "css",
     "postcss",
@@ -26,7 +21,7 @@
   },
   "repository": "cssnano/cssnano",
   "dependencies": {
-    "postcss-value-parser": "^4.1.0"
+    "postcss-value-parser": "^4.2.0"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
@@ -35,10 +30,10 @@
     "node": "^10 || ^12 || >=14.0"
   },
   "devDependencies": {
-    "postcss": "^8.2.1"
+    "postcss": "^8.2.15"
   },
   "peerDependencies": {
-    "postcss": "^8.2.1"
+    "postcss": "^8.2.15"
   },
-  "gitHead": "0e2c3bf5835bafcdc8783bef66f730a24194c8f3"
-}
+  "readme": "# [postcss][postcss]-normalize-string\n\n> Normalize strings with PostCSS.\n\n## Install\n\nWith [npm](https://npmjs.org/package/postcss-normalize-string) do:\n\n```\nnpm install postcss-normalize-string --save\n```\n\n## Example\n\n### Input\n\n```css\np:after{ content: '\\\\'string\\\\' is intact' }\n```\n\n### Output\n\n```css\np:after{ content:\"'string' is intact\" }\n```\n\n## Usage\n\nSee the [PostCSS documentation](https://github.com/postcss/postcss#usage) for\nexamples for your environment.\n\n## API\n\n### normalize([options])\n\n#### options\n\n##### preferredQuote\n\nType: `string`\nDefault: `double`\n\nSets what type of quote to prefer. Possible values are `single` and `double`.\n\n```js\nvar css = 'p:after{content:\"\"}';\nconsole.log(postcss(normalize({preferredQuote: 'single'})).process(css).css);\n//=> p:after{content:''}\n```\n\n## Contributors\n\nSee [CONTRIBUTORS.md](https://github.com/cssnano/cssnano/blob/master/CONTRIBUTORS.md).\n\n## License\n\nMIT © [Ben Briggs](http://beneb.info)\n\n[postcss]: https://github.com/postcss/postcss\n"
+}

package/{dist → src}/index.js

@@ -1,17 +1,10 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _postcssValueParser = _interopRequireDefault(require("postcss-value-parser"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+'use strict';
+const valueParser = require('postcss-value-parser');
 
 /*
  * Constants (parser usage)
  */
+
 const SINGLE_QUOTE = "'".charCodeAt(0);
 const DOUBLE_QUOTE = '"'.charCodeAt(0);
 const BACKSLASH = '\\'.charCodeAt(0);
@@ -20,7 +13,9 @@ const SPACE = ' '.charCodeAt(0);
 const FEED = '\f'.charCodeAt(0);
 const TAB = '\t'.charCodeAt(0);
 const CR = '\r'.charCodeAt(0);
+
 const WORD_END = /[ \n\t\r\f'"\\]/g;
+
 /*
  * Constants (node type strings)
  */
@@ -32,6 +27,7 @@ const C_SINGLE_QUOTE = 'singleQuote';
 const C_DOUBLE_QUOTE = 'doubleQuote';
 const C_NEWLINE = 'newline';
 const C_SINGLE = 'single';
+
 /*
  * Literals
  */
@@ -39,35 +35,19 @@ const C_SINGLE = 'single';
 const L_SINGLE_QUOTE = `'`;
 const L_DOUBLE_QUOTE = `"`;
 const L_NEWLINE = `\\\n`;
+
 /*
  * Parser nodes
  */
 
-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
-};
+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((str, {
-    value
-  }) => {
+  return ast.nodes.reduce((str, { value }) => {
     // Collapse multiple line strings automatically
     if (value === L_NEWLINE) {
       return str;
@@ -81,15 +61,16 @@ function parse(str) {
   let code, next, value;
   let pos = 0;
   let len = str.length;
+
   const ast = {
     nodes: [],
     types: {
       escapedSingleQuote: 0,
       escapedDoubleQuote: 0,
       singleQuote: 0,
-      doubleQuote: 0
+      doubleQuote: 0,
     },
-    quotes: false
+    quotes: false,
   };
 
   while (pos < len) {
@@ -105,27 +86,30 @@ function parse(str) {
         do {
           next += 1;
           code = str.charCodeAt(next);
-        } while (code === SPACE || code === NEWLINE || code === TAB || code === CR || code === FEED);
+        } while (
+          code === SPACE ||
+          code === NEWLINE ||
+          code === TAB ||
+          code === CR ||
+          code === FEED
+        );
 
         ast.nodes.push({
           type: 'space',
-          value: str.slice(pos, next)
+          value: str.slice(pos, next),
         });
         pos = next - 1;
         break;
-
       case SINGLE_QUOTE:
         ast.nodes.push(T_SINGLE_QUOTE);
         ast.types[C_SINGLE_QUOTE]++;
         ast.quotes = true;
         break;
-
       case DOUBLE_QUOTE:
         ast.nodes.push(T_DOUBLE_QUOTE);
         ast.types[C_DOUBLE_QUOTE]++;
         ast.quotes = true;
         break;
-
       case BACKSLASH:
         next = pos + 1;
 
@@ -146,12 +130,10 @@ function parse(str) {
           pos = next;
           break;
         }
-
       /*
        * We need to fall through here to handle the token as
        * a whole word. The missing 'break' is intentional.
        */
-
       default:
         WORD_END.lastIndex = pos + 1;
         WORD_END.test(str);
@@ -163,13 +145,14 @@ function parse(str) {
         }
 
         value = str.slice(pos, next + 1);
+
         ast.nodes.push({
           type: C_STRING,
-          value
+          value,
         });
+
         pos = next;
     }
-
     pos++;
   }
 
@@ -177,33 +160,51 @@ function parse(str) {
 }
 
 function changeWrappingQuotes(node, ast) {
-  const {
-    types
-  } = ast;
+  const { types } = ast;
 
   if (types[C_SINGLE_QUOTE] || types[C_DOUBLE_QUOTE]) {
     return;
   }
 
-  if (node.quote === L_SINGLE_QUOTE && types[C_ESCAPED_SINGLE_QUOTE] > 0 && !types[C_ESCAPED_DOUBLE_QUOTE]) {
+  if (
+    node.quote === L_SINGLE_QUOTE &&
+    types[C_ESCAPED_SINGLE_QUOTE] > 0 &&
+    !types[C_ESCAPED_DOUBLE_QUOTE]
+  ) {
     node.quote = L_DOUBLE_QUOTE;
   }
 
-  if (node.quote === L_DOUBLE_QUOTE && types[C_ESCAPED_DOUBLE_QUOTE] > 0 && !types[C_ESCAPED_SINGLE_QUOTE]) {
+  if (
+    node.quote === L_DOUBLE_QUOTE &&
+    types[C_ESCAPED_DOUBLE_QUOTE] > 0 &&
+    !types[C_ESCAPED_SINGLE_QUOTE]
+  ) {
     node.quote = L_SINGLE_QUOTE;
   }
 
-  ast.nodes = ast.nodes.reduce((newAst, child) => {
-    if (child.type === C_ESCAPED_DOUBLE_QUOTE && node.quote === L_SINGLE_QUOTE) {
-      return [...newAst, T_DOUBLE_QUOTE];
-    }
-
-    if (child.type === C_ESCAPED_SINGLE_QUOTE && node.quote === L_DOUBLE_QUOTE) {
-      return [...newAst, T_SINGLE_QUOTE];
+  ast.nodes = changeChildQuotes(ast.nodes, node.quote);
+}
+/**
+ * @param {string} parentQuote
+ */
+function changeChildQuotes(childNodes, parentQuote) {
+  const updatedChildren = [];
+  for (const child of childNodes) {
+    if (
+      child.type === C_ESCAPED_DOUBLE_QUOTE &&
+      parentQuote === L_SINGLE_QUOTE
+    ) {
+      updatedChildren.push(T_DOUBLE_QUOTE);
+    } else if (
+      child.type === C_ESCAPED_SINGLE_QUOTE &&
+      parentQuote === L_DOUBLE_QUOTE
+    ) {
+      updatedChildren.push(T_SINGLE_QUOTE);
+    } else {
+      updatedChildren.push(child);
     }
-
-    return [...newAst, child];
-  }, []);
+  }
+  return updatedChildren;
 }
 
 function normalize(value, preferredQuote) {
@@ -211,67 +212,68 @@ function normalize(value, preferredQuote) {
     return value;
   }
 
-  return (0, _postcssValueParser.default)(value).walk(child => {
-    if (child.type !== C_STRING) {
-      return;
-    }
-
-    const ast = parse(child.value);
-
-    if (ast.quotes) {
-      changeWrappingQuotes(child, ast);
-    } else if (preferredQuote === C_SINGLE) {
-      child.quote = L_SINGLE_QUOTE;
-    } else {
-      child.quote = L_DOUBLE_QUOTE;
-    }
-
-    child.value = stringify(ast);
-  }).toString();
+  return valueParser(value)
+    .walk((child) => {
+      if (child.type !== C_STRING) {
+        return;
+      }
+
+      const ast = parse(child.value);
+
+      if (ast.quotes) {
+        changeWrappingQuotes(child, ast);
+      } else if (preferredQuote === C_SINGLE) {
+        child.quote = L_SINGLE_QUOTE;
+      } else {
+        child.quote = L_DOUBLE_QUOTE;
+      }
+
+      child.value = stringify(ast);
+    })
+    .toString();
 }
 
-const params = {
-  rule: 'selector',
-  decl: 'value',
-  atrule: 'params'
-};
+function minify(original, cache, preferredQuote) {
+  const key = original + '|' + preferredQuote;
+  if (cache.has(key)) {
+    return cache.get(key);
+  }
+  const newValue = normalize(original, preferredQuote);
+  cache.set(key, newValue);
+  return newValue;
+}
 
 function pluginCreator(opts) {
-  const {
-    preferredQuote
-  } = Object.assign({}, {
-    preferredQuote: 'double'
-  }, opts);
+  const { preferredQuote } = Object.assign(
+    {},
+    {
+      preferredQuote: 'double',
+    },
+    opts
+  );
+
   return {
     postcssPlugin: 'postcss-normalize-string',
 
     OnceExit(css) {
-      const cache = {};
-      css.walk(node => {
-        const {
-          type
-        } = node;
-
-        if (Object.prototype.hasOwnProperty.call(params, type)) {
-          const param = params[type];
-          const key = node[param] + '|' + preferredQuote;
-
-          if (cache[key]) {
-            node[param] = cache[key];
-            return;
-          }
-
-          const newValue = normalize(node[param], preferredQuote);
-          node[param] = newValue;
-          cache[key] = newValue;
+      const cache = new Map();
+
+      css.walk((node) => {
+        switch (node.type) {
+          case 'rule':
+            node.selector = minify(node.selector, cache, preferredQuote);
+            break;
+          case 'decl':
+            node.value = minify(node.value, cache, preferredQuote);
+            break;
+          case 'atrule':
+            node.params = minify(node.params, cache, preferredQuote);
+            break;
         }
       });
-    }
-
+    },
   };
 }
 
 pluginCreator.postcss = true;
-var _default = pluginCreator;
-exports.default = _default;
-module.exports = exports.default;
+module.exports = pluginCreator;

package/CHANGELOG.md

@@ -1,69 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [5.0.0](https://github.com/cssnano/cssnano/compare/postcss-normalize-string@5.0.0-rc.2...postcss-normalize-string@5.0.0) (2021-04-06)
-
-**Note:** Version bump only for package postcss-normalize-string
-
-
-
-
-
-# [5.0.0-rc.2](https://github.com/cssnano/cssnano/compare/postcss-normalize-string@5.0.0-rc.1...postcss-normalize-string@5.0.0-rc.2) (2021-03-15)
-
-**Note:** Version bump only for package postcss-normalize-string
-
-
-
-
-
-# [5.0.0-rc.1](https://github.com/cssnano/cssnano/compare/postcss-normalize-string@5.0.0-rc.0...postcss-normalize-string@5.0.0-rc.1) (2021-03-04)
-
-**Note:** Version bump only for package postcss-normalize-string
-
-
-
-
-
-# 5.0.0-rc.0 (2021-02-19)
-
-
-### Bug Fixes
-
-* **postcss-ordered-values:** columns transform returning string instead of the AST ([#928](https://github.com/cssnano/cssnano/issues/928)) ([a5d6d36](https://github.com/cssnano/cssnano/commit/a5d6d364e0815ecb198a95de301f3554ccce4f78))
-
-
-### chore
-
-* minimum require version of node is 10.13 ([#871](https://github.com/cssnano/cssnano/issues/871)) ([28bda24](https://github.com/cssnano/cssnano/commit/28bda243e32ce3ba89b3c358a5f78727b3732f11))
-
-
-### Features
-
-* migarete to PostCSS 8 ([#975](https://github.com/cssnano/cssnano/issues/975)) ([40b82dc](https://github.com/cssnano/cssnano/commit/40b82dca7f53ac02cd4fe62846dec79b898ccb49))
-
-
-### BREAKING CHANGES
-
-* minimum supported `postcss` version is `8.2.1`
-* minimum require version of node is 10.13
-
-
-
-## 4.1.9 (2019-02-12)
-
-
-### Performance Improvements
-
-* **postcss-normalize-string:** increase perf ([#689](https://github.com/cssnano/cssnano/issues/689)) ([07948cb](https://github.com/cssnano/cssnano/commit/07948cb3ff433825682c499516640abeeec7383a))
-
-
-
-## 4.1.1 (2018-09-24)
-
-
-### Bug Fixes
-
-* **postcss-merge-longhand:** not mangle border output ([#555](https://github.com/cssnano/cssnano/issues/555)) ([9a70605](https://github.com/cssnano/cssnano/commit/9a706050b621e7795a9bf74eb7110b5c81804ffe)), closes [#553](https://github.com/cssnano/cssnano/issues/553) [#554](https://github.com/cssnano/cssnano/issues/554)