postcss-normalize-timing-functions 8.0.2 → 8.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-normalize-timing-functions",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "description": "Normalize CSS animation/transition timing functions.",
   "exports": {
     ".": {
@@ -38,9 +38,12 @@
     "node": "^22.11.0 || ^24.11.0 || >=26.0"
   },
   "devDependencies": {
-    "postcss": "^8.5.25"
+    "postcss": "^8.5.26"
   },
   "peerDependencies": {
-    "postcss": "^8.5.25"
+    "postcss": "^8.5.26"
+  },
+  "scripts": {
+    "test": "node --test"
   }
 }

package/src/index.js

@@ -31,76 +31,86 @@ function reduce(node) {
   const lowerCasedValue = node.value.toLowerCase();
 
   if (lowerCasedValue === 'steps') {
-    // Don't bother checking the step-end case as it has the same length
-    // as steps(1)
-    if (
-      node.nodes[0].type === 'word' &&
-      getValue(node.nodes[0]) === 1 &&
-      node.nodes[2] &&
-      node.nodes[2].type === 'word' &&
-      (node.nodes[2].value.toLowerCase() === 'start' ||
-        node.nodes[2].value.toLowerCase() === 'jump-start')
-    ) {
-      /** @type string */ (node.type) = 'word';
-      node.value = 'step-start';
-
-      delete (/** @type Partial<valueParser.FunctionNode> */ (node).nodes);
-
-      return;
-    }
-
-    if (
-      node.nodes[0].type === 'word' &&
-      getValue(node.nodes[0]) === 1 &&
-      node.nodes[2] &&
-      node.nodes[2].type === 'word' &&
-      (node.nodes[2].value.toLowerCase() === 'end' ||
-        node.nodes[2].value.toLowerCase() === 'jump-end')
-    ) {
-      /** @type string */ (node.type) = 'word';
-      node.value = 'step-end';
-
-      delete (/** @type Partial<valueParser.FunctionNode> */ (node).nodes);
-
-      return;
-    }
-
-    // The end case is actually the browser default, so it isn't required.
-    if (
-      node.nodes[2] &&
-      node.nodes[2].type === 'word' &&
-      (node.nodes[2].value.toLowerCase() === 'end' ||
-        node.nodes[2].value.toLowerCase() === 'jump-end')
-    ) {
-      node.nodes = [node.nodes[0]];
-
-      return;
-    }
-
-    return false;
+    return normalizeSteps(node);
   }
 
   if (lowerCasedValue === 'cubic-bezier') {
-    const values = node.nodes
-      .filter((list, index) => {
-        return index % 2 === 0;
-      })
-      .map(getValue);
+    return normalizeCubicBezier(node);
+  }
+}
+
+/**
+ * @param {valueParser.FunctionNode} node
+ * @return {void | false}
+ */
+function normalizeSteps(node) {
+  const count = node.nodes[0];
+  const position = node.nodes[2];
+  const isSingleStep = count.type === 'word' && getValue(count) === 1;
 
-    if (values.length !== 4) {
-      return;
-    }
+  if (isSingleStep && isStepPosition(position, 'start', 'jump-start')) {
+    /** @type string */ (node.type) = 'word';
+    node.value = 'step-start';
 
-    const match = conversions.get(values.toString());
+    delete (/** @type Partial<valueParser.FunctionNode> */ (node).nodes);
+
+    return;
+  }
+
+  if (isSingleStep && isStepPosition(position, 'end', 'jump-end')) {
+    /** @type string */ (node.type) = 'word';
+    node.value = 'step-end';
+
+    delete (/** @type Partial<valueParser.FunctionNode> */ (node).nodes);
+
+    return;
+  }
+
+  // The end case is actually the browser default, so it isn't required.
+  if (isStepPosition(position, 'end', 'jump-end')) {
+    node.nodes = [count];
+
+    return;
+  }
+
+  return false;
+}
+
+/**
+ * @param {valueParser.Node | undefined} node
+ * @param {string} first
+ * @param {string} second
+ * @return {boolean}
+ */
+function isStepPosition(node, first, second) {
+  return (
+    node?.type === 'word' &&
+    (node.value.toLowerCase() === first || node.value.toLowerCase() === second)
+  );
+}
+
+/**
+ * @param {valueParser.FunctionNode} node
+ * @return {void}
+ */
+function normalizeCubicBezier(node) {
+  const values = node.nodes
+    .filter((list, index) => {
+      return index % 2 === 0;
+    })
+    .map(getValue);
+
+  if (values.length !== 4) {
+    return;
+  }
 
-    if (match) {
-      /** @type string */ (node.type) = 'word';
-      node.value = match;
+  const match = conversions.get(values.toString());
 
-      delete (/** @type Partial<valueParser.FunctionNode> */ (node).nodes);
+  if (match) {
+    /** @type string */ (node.type) = 'word';
+    node.value = match;
 
-      return;
-    }
+    delete (/** @type Partial<valueParser.FunctionNode> */ (node).nodes);
   }
 }