postcss-normalize-positions 4.0.2 → 5.0.0

package/CHANGELOG.md

@@ -0,0 +1,71 @@
+# 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-positions@5.0.0-rc.2...postcss-normalize-positions@5.0.0) (2021-04-06)
+
+**Note:** Version bump only for package postcss-normalize-positions
+
+
+
+
+
+# [5.0.0-rc.2](https://github.com/cssnano/cssnano/compare/postcss-normalize-positions@5.0.0-rc.1...postcss-normalize-positions@5.0.0-rc.2) (2021-03-15)
+
+**Note:** Version bump only for package postcss-normalize-positions
+
+
+
+
+
+# [5.0.0-rc.1](https://github.com/cssnano/cssnano/compare/postcss-normalize-positions@5.0.0-rc.0...postcss-normalize-positions@5.0.0-rc.1) (2021-03-04)
+
+**Note:** Version bump only for package postcss-normalize-positions
+
+
+
+
+
+# 5.0.0-rc.0 (2021-02-19)
+
+
+### Bug Fixes
+
+* **postcss-normalize-positions:** correct optimize math (`calc` and etc) and variable functions (`var` and `env`) ([#750](https://github.com/cssnano/cssnano/issues/750)) ([a81e8df](https://github.com/cssnano/cssnano/commit/a81e8dfc1ad26067d5a9efab8081072cd4b15c44))
+* **postcss-normalize-repeat-style:** better handle css variables ([#753](https://github.com/cssnano/cssnano/issues/753)) ([7e18b0c](https://github.com/cssnano/cssnano/commit/7e18b0cbcd7cb5de58e60ab4ef1900a4d8eeefec))
+
+
+### 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-positions:** increase perf ([#694](https://github.com/cssnano/cssnano/issues/694)) ([95639da](https://github.com/cssnano/cssnano/commit/95639da5659aef112586b9334a1e13ac0b61a525))
+
+
+
+## 4.1.1 (2018-09-24)
+
+
+### Bug Fixes
+
+* handle uppercase property and values on `postcss-normalize-positions` ([#607](https://github.com/cssnano/cssnano/issues/607)) ([c521423](https://github.com/cssnano/cssnano/commit/c521423d5939039b771ba1b12fad5fe377a6c612))
+* **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)

package/dist/index.js

@@ -1,149 +1,209 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
-    value: true
+  value: true
 });
+exports.default = void 0;
 
-var _postcss = require('postcss');
+var _postcssValueParser = _interopRequireWildcard(require("postcss-value-parser"));
 
-var _postcssValueParser = require('postcss-value-parser');
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
-var _postcssValueParser2 = _interopRequireDefault(_postcssValueParser);
-
-var _cssnanoUtilGetArguments = require('cssnano-util-get-arguments');
-
-var _cssnanoUtilGetArguments2 = _interopRequireDefault(_cssnanoUtilGetArguments);
-
-var _has = require('has');
-
-var _has2 = _interopRequireDefault(_has);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const directions = ['top', 'right', 'bottom', 'left', 'center'];
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const directionKeywords = ['top', 'right', 'bottom', 'left', 'center'];
 const center = '50%';
-
 const horizontal = {
-    right: '100%',
-    left: '0'
+  right: '100%',
+  left: '0'
 };
-
-const vertical = {
-    bottom: '100%',
-    top: '0'
+const verticalValue = {
+  bottom: '100%',
+  top: '0'
 };
 
-function transform(value) {
-    const parsed = (0, _postcssValueParser2.default)(value);
-    const args = (0, _cssnanoUtilGetArguments2.default)(parsed);
-    const relevant = [];
-
-    args.forEach(arg => {
-        relevant.push({
-            start: null,
-            end: null
-        });
-
-        arg.forEach((part, index) => {
-            const isPosition = ~directions.indexOf(part.value.toLowerCase()) || (0, _postcssValueParser.unit)(part.value);
-            const len = relevant.length - 1;
-
-            if (relevant[len].start === null && isPosition) {
-                relevant[len].start = index;
-                relevant[len].end = index;
-
-                return;
-            }
-
-            if (relevant[len].start !== null) {
-                if (part.type === 'space') {
-                    return;
-                } else if (isPosition) {
-                    relevant[len].end = index;
-
-                    return;
-                }
-
-                return;
-            }
-        });
-    });
-
-    relevant.forEach((range, index) => {
-        if (range.start === null) {
-            return;
-        }
-
-        const position = args[index].slice(range.start, range.end + 1);
-
-        if (position.length > 3) {
-            return;
-        }
-
-        const firstValue = position[0].value.toLowerCase();
-        const secondValue = position[2] && position[2].value ? position[2].value.toLowerCase() : null;
+function isCommaNode(node) {
+  return node.type === 'div' && node.value === ',';
+}
 
-        if (position.length === 1 || secondValue === 'center') {
-            if (secondValue) {
-                position[2].value = position[1].value = '';
-            }
+function isVariableFunctionNode(node) {
+  if (node.type !== 'function') {
+    return false;
+  }
 
-            const map = Object.assign({}, horizontal, {
-                center
-            });
+  return ['var', 'env'].includes(node.value.toLowerCase());
+}
 
-            if ((0, _has2.default)(map, firstValue)) {
-                position[0].value = map[firstValue];
-            }
+function isMathFunctionNode(node) {
+  if (node.type !== 'function') {
+    return false;
+  }
 
-            return;
-        }
+  return ['calc', 'min', 'max', 'clamp'].includes(node.value.toLowerCase());
+}
 
-        if (firstValue === 'center' && ~directions.indexOf(secondValue)) {
-            position[0].value = position[1].value = '';
+function isNumberNode(node) {
+  if (node.type !== 'word') {
+    return false;
+  }
 
-            if ((0, _has2.default)(horizontal, secondValue)) {
-                position[2].value = horizontal[secondValue];
-            }
+  const value = parseFloat(node.value);
+  return !isNaN(value);
+}
 
-            return;
-        }
+function isDimensionNode(node) {
+  if (node.type !== 'word') {
+    return false;
+  }
 
-        if ((0, _has2.default)(horizontal, firstValue) && (0, _has2.default)(vertical, secondValue)) {
-            position[0].value = horizontal[firstValue];
-            position[2].value = vertical[secondValue];
+  const parsed = (0, _postcssValueParser.unit)(node.value);
 
-            return;
-        } else if ((0, _has2.default)(vertical, firstValue) && (0, _has2.default)(horizontal, secondValue)) {
-            position[0].value = horizontal[secondValue];
-            position[2].value = vertical[firstValue];
+  if (!parsed) {
+    return false;
+  }
 
-            return;
-        }
-    });
+  return parsed.unit !== '';
+}
 
-    return parsed.toString();
+function transform(value) {
+  const parsed = (0, _postcssValueParser.default)(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;
+    }
+
+    if (!shouldContinue) {
+      return;
+    } // After separator (`/`) follows `background-size` values
+    // Avoid them
+
+
+    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
+
+
+    if (isVariableFunctionNode(node)) {
+      shouldContinue = false;
+      ranges[rangeIndex].start = null;
+      ranges[rangeIndex].end = null;
+      return;
+    }
+
+    const isPositionKeyword = node.type === 'word' && directionKeywords.includes(node.value.toLowerCase()) || isDimensionNode(node) || isNumberNode(node) || isMathFunctionNode(node);
+
+    if (ranges[rangeIndex].start === null && isPositionKeyword) {
+      ranges[rangeIndex].start = index;
+      ranges[rangeIndex].end = index;
+      return;
+    }
+
+    if (ranges[rangeIndex].start !== null) {
+      if (node.type === 'space') {
+        return;
+      } else if (isPositionKeyword) {
+        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 firstNode = nodes[0].value.toLowerCase();
+    const secondNode = nodes[2] && nodes[2].value ? nodes[2].value.toLowerCase() : null;
+
+    if (nodes.length === 1 || secondNode === 'center') {
+      if (secondNode) {
+        nodes[2].value = nodes[1].value = '';
+      }
+
+      const map = Object.assign({}, horizontal, {
+        center
+      });
+
+      if (Object.prototype.hasOwnProperty.call(map, firstNode)) {
+        nodes[0].value = map[firstNode];
+      }
+
+      return;
+    }
+
+    if (firstNode === 'center' && directionKeywords.includes(secondNode)) {
+      nodes[0].value = nodes[1].value = '';
+
+      if (Object.prototype.hasOwnProperty.call(horizontal, secondNode)) {
+        nodes[2].value = horizontal[secondNode];
+      }
+
+      return;
+    }
+
+    if (Object.prototype.hasOwnProperty.call(horizontal, firstNode) && Object.prototype.hasOwnProperty.call(verticalValue, secondNode)) {
+      nodes[0].value = horizontal[firstNode];
+      nodes[2].value = verticalValue[secondNode];
+      return;
+    } else if (Object.prototype.hasOwnProperty.call(verticalValue, firstNode) && Object.prototype.hasOwnProperty.call(horizontal, secondNode)) {
+      nodes[0].value = horizontal[secondNode];
+      nodes[2].value = verticalValue[firstNode];
+      return;
+    }
+  });
+  return parsed.toString();
 }
 
-exports.default = (0, _postcss.plugin)('postcss-normalize-positions', () => {
-    return css => {
-        const cache = {};
+function pluginCreator() {
+  return {
+    postcssPlugin: 'postcss-normalize-positions',
 
-        css.walkDecls(/^(background(-position)?|(-webkit-)?perspective-origin)$/i, decl => {
-            const value = decl.value;
+    OnceExit(css) {
+      const cache = {};
+      css.walkDecls(/^(background(-position)?|(-\w+-)?perspective-origin)$/i, decl => {
+        const value = decl.value;
 
-            if (cache[value]) {
-                decl.value = cache[value];
+        if (!value) {
+          return;
+        }
 
-                return;
-            }
+        if (cache[value]) {
+          decl.value = cache[value];
+          return;
+        }
 
-            const result = transform(value);
+        const result = transform(value);
+        decl.value = result;
+        cache[value] = result;
+      });
+    }
 
-            decl.value = result;
-            cache[value] = result;
-        });
-    };
-});
-module.exports = exports['default'];
+  };
+}
+
+pluginCreator.postcss = true;
+var _default = pluginCreator;
+exports.default = _default;
+module.exports = exports.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-normalize-positions",
-  "version": "4.0.2",
+  "version": "5.0.0",
   "description": "Normalize keyword values for position into length values.",
   "main": "dist/index.js",
   "files": [
@@ -8,7 +8,9 @@
     "LICENSE-MIT"
   ],
   "scripts": {
-    "prepublish": "cross-env BABEL_ENV=publish babel src --out-dir dist --ignore /__tests__/"
+    "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",
@@ -16,10 +18,6 @@
     "postcss-plugin"
   ],
   "license": "MIT",
-  "devDependencies": {
-    "babel-cli": "^6.0.0",
-    "cross-env": "^5.0.0"
-  },
   "homepage": "https://github.com/cssnano/cssnano",
   "author": {
     "name": "Ben Briggs",
@@ -28,15 +26,19 @@
   },
   "repository": "cssnano/cssnano",
   "dependencies": {
-    "cssnano-util-get-arguments": "^4.0.0",
-    "has": "^1.0.0",
-    "postcss": "^7.0.0",
-    "postcss-value-parser": "^3.0.0"
+    "postcss-value-parser": "^4.1.0"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
   },
   "engines": {
-    "node": ">=6.9.0"
-  }
+    "node": "^10 || ^12 || >=14.0"
+  },
+  "devDependencies": {
+    "postcss": "^8.2.1"
+  },
+  "peerDependencies": {
+    "postcss": "^8.2.1"
+  },
+  "gitHead": "0e2c3bf5835bafcdc8783bef66f730a24194c8f3"
 }