postcss-normalize-positions 8.0.1 → 8.0.3

package/LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) Ben Briggs <beneb.info@gmail.com> (http://beneb.info)
+Copyright (c) Ben Briggs <beneb.info@gmail.com> (https://beneb.info)
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

package/README.md

@@ -39,6 +39,6 @@ See [CONTRIBUTORS.md](https://github.com/cssnano/cssnano/blob/master/CONTRIBUTOR
 
 ## License
 
-MIT © [Ben Briggs](http://beneb.info)
+MIT © [Ben Briggs](https://beneb.info)
 
 [postcss]: https://github.com/postcss/postcss

package/package.json

@@ -1,9 +1,17 @@
 {
   "name": "postcss-normalize-positions",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "description": "Normalize keyword values for position into length values.",
-  "main": "src/index.js",
-  "types": "types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./types/index.d.ts",
+      "default": "./src/index.js"
+    },
+    "./src": "./src/index.js",
+    "./src/index": "./src/index.js",
+    "./src/index.js": "./src/index.js",
+    "./package.json": "./package.json"
+  },
   "files": [
     "src",
     "LICENSE-MIT",
@@ -19,9 +27,12 @@
   "author": {
     "name": "Ben Briggs",
     "email": "beneb.info@gmail.com",
-    "url": "http://beneb.info"
+    "url": "https://beneb.info"
+  },
+  "repository": {
+    "type": "git",
+    "url": "cssnano/cssnano"
   },
-  "repository": "cssnano/cssnano",
   "dependencies": {
     "postcss-value-parser": "^4.2.0"
   },
@@ -32,9 +43,12 @@
     "node": "^22.11.0 || ^24.11.0 || >=26.0"
   },
   "devDependencies": {
-    "postcss": "^8.5.15"
+    "postcss": "^8.5.26"
   },
   "peerDependencies": {
-    "postcss": "^8.5.15"
+    "postcss": "^8.5.26"
+  },
+  "scripts": {
+    "test": "node --test"
   }
 }

package/src/index.js

@@ -14,6 +14,9 @@ const verticalValue = new Map([
 ]);
 const mathFunctions = new Set(['calc', 'min', 'max', 'clamp']);
 const variableFunctions = new Set(['var', 'env', 'constant']);
+const propFilterRegex =
+  /^(background(-position)?|(-\w+-)?perspective-origin)$/i;
+
 /**
  * @param {valueParser.Node} node
  * @return {boolean}
@@ -83,22 +86,36 @@ function isDimensionNode(node) {
  */
 function transform(value) {
   const parsed = valueParser(value);
-  /** @type {({start: number, end: number} | {start: null, end: null})[]} */
+  const ranges = collectRanges(parsed.nodes);
+
+  for (const range of ranges) {
+    normalizeRange(parsed, range);
+  }
+
+  return parsed.toString();
+}
+
+/**
+ * @param {valueParser.Node[]} nodes
+ * @return {{start: number | null, end: number | null}[]}
+ */
+function collectRanges(nodes) {
+  /** @type {{start: number | null, end: number | null}[]} */
   const ranges = [];
   let rangeIndex = 0;
   let shouldContinue = true;
 
-  parsed.nodes.forEach((node, index) => {
+  for (const [index, node] of nodes.entries()) {
     // After comma (`,`) follows next background
     if (isCommaNode(node)) {
       rangeIndex += 1;
       shouldContinue = true;
 
-      return;
+      continue;
     }
 
     if (!shouldContinue) {
-      return;
+      continue;
     }
 
     // After separator (`/`) follows `background-size` values
@@ -106,7 +123,7 @@ function transform(value) {
     if (node.type === 'div' && node.value === '/') {
       shouldContinue = false;
 
-      return;
+      continue;
     }
 
     if (!ranges[rangeIndex]) {
@@ -122,7 +139,7 @@ function transform(value) {
       ranges[rangeIndex].start = null;
       ranges[rangeIndex].end = null;
 
-      return;
+      continue;
     }
 
     const isPositionKeyword =
@@ -136,113 +153,130 @@ function transform(value) {
       ranges[rangeIndex].start = index;
       ranges[rangeIndex].end = index;
 
-      return;
+      continue;
     }
 
     if (ranges[rangeIndex].start !== null) {
-      if (node.type === 'space') {
-        return;
-      } else if (isPositionKeyword) {
+      if (node.type !== 'space' && isPositionKeyword) {
         ranges[rangeIndex].end = index;
-
-        return;
       }
-
-      return;
     }
-  });
+  }
 
-  ranges.forEach((range) => {
-    if (range.start === null) {
-      return;
-    }
+  return ranges;
+}
 
-    const nodes = parsed.nodes.slice(range.start, range.end + 1);
+/**
+ * @param {{nodes: valueParser.Node[]}} parsed
+ * @param {{start: number | null, end: number | null}} range
+ * @return {void}
+ */
+function normalizeRange(parsed, range) {
+  if (range.start === null || range.end === null) {
+    return;
+  }
 
-    if (nodes.length > 3) {
-      return;
-    }
+  const nodes = parsed.nodes.slice(range.start, range.end + 1);
 
-    const firstNode = nodes[0].value.toLowerCase();
-    const secondNode =
-      nodes[2] && nodes[2].value ? nodes[2].value.toLowerCase() : null;
+  if (nodes.length > 3) {
+    return;
+  }
 
-    if (nodes.length === 1 || secondNode === 'center') {
-      if (secondNode) {
-        nodes[2].value = nodes[1].value = '';
-      }
+  const firstNode = nodes[0].value.toLowerCase();
+  const secondNode =
+    nodes[2] && nodes[2].value ? nodes[2].value.toLowerCase() : null;
 
-      const map = new Map([...horizontal, ['center', center]]);
+  if (nodes.length === 1 || secondNode === 'center') {
+    normalizeSinglePosition(nodes, firstNode, secondNode);
+    return;
+  }
 
-      if (map.has(firstNode)) {
-        nodes[0].value = /** @type {string}*/ (map.get(firstNode));
-      }
+  normalizePairPosition(nodes, firstNode, secondNode);
+}
 
-      return;
-    }
+/**
+ * @param {valueParser.Node[]} nodes
+ * @param {string} firstNode
+ * @param {string | null} secondNode
+ * @return {void}
+ */
+function normalizeSinglePosition(nodes, firstNode, secondNode) {
+  if (secondNode) {
+    nodes[2].value = nodes[1].value = '';
+  }
 
-    if (secondNode !== null) {
-      if (firstNode === 'center' && directionKeywords.has(secondNode)) {
-        nodes[0].value = nodes[1].value = '';
+  const map = new Map([...horizontal, ['center', center]]);
 
-        if (horizontal.has(secondNode)) {
-          nodes[2].value = /** @type {string} */ (horizontal.get(secondNode));
-        }
-        return;
-      }
+  if (map.has(firstNode)) {
+    nodes[0].value = /** @type {string}*/ (map.get(firstNode));
+  }
+}
 
-      if (horizontal.has(firstNode) && verticalValue.has(secondNode)) {
-        nodes[0].value = /** @type {string} */ (horizontal.get(firstNode));
-        nodes[2].value = /** @type {string} */ (verticalValue.get(secondNode));
+/**
+ * @param {valueParser.Node[]} nodes
+ * @param {string} firstNode
+ * @param {string | null} secondNode
+ * @return {void}
+ */
+function normalizePairPosition(nodes, firstNode, secondNode) {
+  if (secondNode === null) {
+    return;
+  }
 
-        return;
-      } else if (verticalValue.has(firstNode) && horizontal.has(secondNode)) {
-        nodes[0].value = /** @type {string} */ (horizontal.get(secondNode));
-        nodes[2].value = /** @type {string} */ (verticalValue.get(firstNode));
+  if (firstNode === 'center' && directionKeywords.has(secondNode)) {
+    nodes[0].value = nodes[1].value = '';
 
-        return;
-      }
+    if (horizontal.has(secondNode)) {
+      nodes[2].value = /** @type {string} */ (horizontal.get(secondNode));
     }
-  });
+    return;
+  }
 
-  return parsed.toString();
+  if (horizontal.has(firstNode) && verticalValue.has(secondNode)) {
+    nodes[0].value = /** @type {string} */ (horizontal.get(firstNode));
+    nodes[2].value = /** @type {string} */ (verticalValue.get(secondNode));
+  } else if (verticalValue.has(firstNode) && horizontal.has(secondNode)) {
+    nodes[0].value = /** @type {string} */ (horizontal.get(secondNode));
+    nodes[2].value = /** @type {string} */ (verticalValue.get(firstNode));
+  }
 }
 
 /**
- * @type {import('postcss').PluginCreator<void>}
  * @return {import('postcss').Plugin}
  */
 function pluginCreator() {
   return {
     postcssPlugin: 'postcss-normalize-positions',
 
+    /**
+     * @param {import('postcss').Root} css
+     */
     OnceExit(css) {
       const cache = new Map();
 
-      css.walkDecls(
-        /^(background(-position)?|(-\w+-)?perspective-origin)$/i,
-        (decl) => {
-          const value = decl.value;
+      css.walkDecls(propFilterRegex, (decl) => {
+        const value = decl.value;
 
-          if (!value) {
-            return;
-          }
+        if (!value) {
+          return;
+        }
 
-          if (cache.has(value)) {
-            decl.value = cache.get(value);
+        if (cache.has(value)) {
+          decl.value = cache.get(value);
 
-            return;
-          }
+          return;
+        }
 
-          const result = transform(value);
+        const result = transform(value);
 
-          decl.value = result;
-          cache.set(value, result);
-        }
-      );
+        decl.value = result;
+        cache.set(value, result);
+      });
     },
   };
 }
 
 pluginCreator.postcss = true;
-module.exports = pluginCreator;
+module.exports = /** @type {import('postcss').PluginCreator<void>}*/ (
+  pluginCreator
+);

package/types/index.d.ts

@@ -1,10 +1,3 @@
-export = pluginCreator;
-/**
- * @type {import('postcss').PluginCreator<void>}
- * @return {import('postcss').Plugin}
- */
-declare function pluginCreator(): import("postcss").Plugin;
-declare namespace pluginCreator {
-    let postcss: true;
-}
+declare const _exports: import("postcss").PluginCreator<void>;
+export = _exports;
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";AAkNA;;;GAGG;AACH,kCAFY,OAAO,SAAS,EAAE,MAAM,CAgCnC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":""}