postcss-normalize-repeat-style 4.0.0-nightly.2020.9.9 → 4.0.1

package/CHANGELOG.md

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

package/dist/index.js

@@ -1,145 +1,89 @@
-"use strict";
+'use strict';
 
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
-exports.default = void 0;
 
-var _postcss = _interopRequireDefault(require("postcss"));
+var _postcss = require('postcss');
 
-var _postcssValueParser = _interopRequireDefault(require("postcss-value-parser"));
+var _postcss2 = _interopRequireDefault(_postcss);
 
-var _cssnanoUtils = require("cssnano-utils");
+var _postcssValueParser = require('postcss-value-parser');
 
-var _map = _interopRequireDefault(require("./lib/map"));
+var _postcssValueParser2 = _interopRequireDefault(_postcssValueParser);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function evenValues(list, index) {
-  return index % 2 === 0;
-}
-
-const repeatKeywords = _map.default.map(mapping => mapping[0]);
-
-const getMatch = (0, _cssnanoUtils.getMatch)(_map.default);
-
-function isCommaNode(node) {
-  return node.type === 'div' && node.value === ',';
-}
-
-function isVariableFunctionNode(node) {
-  if (node.type !== 'function') {
-    return false;
-  }
+var _cssnanoUtilGetArguments = require('cssnano-util-get-arguments');
 
-  return ['var', 'env'].includes(node.value.toLowerCase());
-}
+var _cssnanoUtilGetArguments2 = _interopRequireDefault(_cssnanoUtilGetArguments);
 
-function transform(value) {
-  const parsed = (0, _postcssValueParser.default)(value);
-
-  if (parsed.nodes.length === 1) {
-    return value;
-  }
-
-  const ranges = [];
-  let rangeIndex = 0;
-  let shouldContinue = true;
-  parsed.nodes.forEach((node, index) => {
-    // After comma (`,`) follows next background
-    if (isCommaNode(node)) {
-      rangeIndex += 1;
-      shouldContinue = true;
-      return;
-    }
+var _cssnanoUtilGetMatch = require('cssnano-util-get-match');
 
-    if (!shouldContinue) {
-      return;
-    } // After separator (`/`) follows `background-size` values
-    // Avoid them
+var _cssnanoUtilGetMatch2 = _interopRequireDefault(_cssnanoUtilGetMatch);
 
+var _map = require('./lib/map');
 
-    if (node.type === 'div' && node.value === '/') {
-      shouldContinue = false;
-      return;
-    }
-
-    if (!ranges[rangeIndex]) {
-      ranges[rangeIndex] = {
-        start: null,
-        end: null
-      };
-    } // Do not try to be processed `var and `env` function inside background
+var _map2 = _interopRequireDefault(_map);
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-    if (isVariableFunctionNode(node)) {
-      shouldContinue = false;
-      ranges[rangeIndex].start = null;
-      ranges[rangeIndex].end = null;
-      return;
-    }
+function evenValues(list, index) {
+    return index % 2 === 0;
+}
 
-    const isRepeatKeyword = node.type === 'word' && repeatKeywords.includes(node.value.toLowerCase());
+const repeatKeywords = _map2.default.map(mapping => mapping[0]);
 
-    if (ranges[rangeIndex].start === null && isRepeatKeyword) {
-      ranges[rangeIndex].start = index;
-      ranges[rangeIndex].end = index;
-      return;
-    }
+const getMatch = (0, _cssnanoUtilGetMatch2.default)(_map2.default);
 
-    if (ranges[rangeIndex].start !== null) {
-      if (node.type === 'space') {
+function transform(decl) {
+    const values = (0, _postcssValueParser2.default)(decl.value);
+    if (values.nodes.length === 1) {
         return;
-      } else if (isRepeatKeyword) {
-        ranges[rangeIndex].end = index;
-        return;
-      }
-
-      return;
-    }
-  });
-  ranges.forEach(range => {
-    if (range.start === null) {
-      return;
-    }
-
-    const nodes = parsed.nodes.slice(range.start, range.end + 1);
-
-    if (nodes.length !== 3) {
-      return;
-    }
-
-    const match = getMatch(nodes.filter(evenValues).map(n => n.value.toLowerCase()));
-
-    if (match) {
-      nodes[0].value = match;
-      nodes[1].value = nodes[2].value = '';
     }
-  });
-  return parsed.toString();
+    const args = (0, _cssnanoUtilGetArguments2.default)(values);
+    const relevant = [];
+    args.forEach(arg => {
+        relevant.push({
+            start: null,
+            end: null
+        });
+        arg.forEach((part, index) => {
+            const isRepeat = ~repeatKeywords.indexOf(part.value.toLowerCase());
+            const len = relevant.length - 1;
+            if (relevant[len].start === null && isRepeat) {
+                relevant[len].start = index;
+                relevant[len].end = index;
+                return;
+            }
+            if (relevant[len].start !== null) {
+                if (part.type === 'space') {
+                    return;
+                } else if (isRepeat) {
+                    relevant[len].end = index;
+                    return;
+                }
+                return;
+            }
+        });
+    });
+    relevant.forEach((range, index) => {
+        if (range.start === null) {
+            return;
+        }
+        const val = args[index].slice(range.start, range.end + 1);
+        if (val.length !== 3) {
+            return;
+        }
+        const match = getMatch(val.filter(evenValues).map(n => n.value.toLowerCase()));
+        if (match) {
+            args[index][range.start].value = match;
+            args[index][range.start + 1].value = '';
+            args[index][range.end].value = '';
+        }
+    });
+    decl.value = values.toString();
 }
 
-var _default = _postcss.default.plugin('postcss-normalize-repeat-style', () => {
-  return css => {
-    const cache = {};
-    css.walkDecls(/^(background(-repeat)?|(-\w+-)?mask-repeat)$/i, decl => {
-      const value = decl.value;
-
-      if (!value) {
-        return;
-      }
-
-      if (cache[value]) {
-        decl.value = cache[value];
-        return;
-      }
-
-      const result = transform(value);
-      decl.value = result;
-      cache[value] = result;
-    });
-  };
+exports.default = _postcss2.default.plugin('postcss-normalize-repeat-style', () => {
+    return css => css.walkDecls(/background(-repeat)?|(-webkit-)?mask-repeat/i, transform);
 });
-
-exports.default = _default;
-module.exports = exports.default;
+module.exports = exports['default'];

package/dist/lib/map.js

@@ -1,9 +1,7 @@
-"use strict";
+'use strict';
 
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
-exports.default = void 0;
-var _default = [['repeat-x', ['repeat', 'no-repeat']], ['repeat-y', ['no-repeat', 'repeat']], ['repeat', ['repeat', 'repeat']], ['space', ['space', 'space']], ['round', ['round', 'round']], ['no-repeat', ['no-repeat', 'no-repeat']]];
-exports.default = _default;
-module.exports = exports.default;
+exports.default = [['repeat-x', ['repeat', 'no-repeat']], ['repeat-y', ['no-repeat', 'repeat']], ['repeat', ['repeat', 'repeat']], ['space', ['space', 'space']], ['round', ['round', 'round']], ['no-repeat', ['no-repeat', 'no-repeat']]];
+module.exports = exports['default'];

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "postcss-normalize-repeat-style",
-  "version": "4.0.0-nightly.2020.9.9",
+  "version": "4.0.1",
   "description": "Convert two value syntax for repeat-style into one value.",
   "main": "dist/index.js",
   "scripts": {
-    "prebuild": "",
-    "build": "cross-env BABEL_ENV=publish babel src --config-file ../../babel.config.js --out-dir dist --ignore \"**/__tests__/\"",
-    "prepublish": ""
+    "prepublish": "cross-env BABEL_ENV=publish babel src --out-dir dist --ignore /__tests__/"
   },
   "files": [
     "LICENSE-MIT",
@@ -14,9 +12,14 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "cssnano-utils": "nightly",
-    "postcss": "^7.0.16",
-    "postcss-value-parser": "^3.3.1"
+    "cssnano-util-get-arguments": "^4.0.0",
+    "cssnano-util-get-match": "^4.0.0",
+    "postcss": "^7.0.0",
+    "postcss-value-parser": "^3.0.0"
+  },
+  "devDependencies": {
+    "babel-cli": "^6.0.0",
+    "cross-env": "^5.0.0"
   },
   "author": {
     "name": "Ben Briggs",
@@ -29,6 +32,6 @@
   },
   "homepage": "https://github.com/cssnano/cssnano",
   "engines": {
-    "node": ">=10.13.0"
+    "node": ">=6.9.0"
   }
-}
+}