cssstyle 4.6.0 → 5.0.0

package/lib/properties/backgroundPosition.js

@@ -3,27 +3,151 @@
 const parsers = require("../parsers");
 
 module.exports.parse = function parse(v) {
-  const parts = parsers.splitValue(v);
-  if (!parts.length || parts.length > 2) {
-    return;
+  if (v === "") {
+    return v;
   }
-  const validKeywordsX = ["left", "center", "right"];
-  const validKeywordsY = ["top", "center", "bottom"];
-  if (parts.length === 1) {
-    const dim = parsers.parseMeasurement(parts[0]);
-    if (dim) {
-      return dim;
+  const values = parsers.splitValue(v, {
+    delimiter: ","
+  });
+  const keyX = ["left", "right"];
+  const keyY = ["top", "bottom"];
+  const keywordsX = ["center", ...keyX];
+  const keywordsY = ["center", ...keyY];
+  const keywords = ["center", ...keyX, ...keyY];
+  const parsedValues = [];
+  for (const value of values) {
+    const parts = parsers.splitValue(value);
+    if (!parts.length || parts.length > 4) {
+      return;
     }
-    const validKeywords = new Set([...validKeywordsX, ...validKeywordsY]);
-    return parsers.parseKeyword(v, [...validKeywords]);
-  }
-  const [partX, partY] = parts;
-  const posX = parsers.parseMeasurement(partX) || parsers.parseKeyword(partX, validKeywordsX);
-  if (posX) {
-    const posY = parsers.parseMeasurement(partY) || parsers.parseKeyword(partY, validKeywordsY);
-    if (posY) {
-      return `${posX} ${posY}`;
+    let parsedValue = "";
+    switch (parts.length) {
+      case 1: {
+        const [part] = parts;
+        const val = parsers.parseMeasurement(part) || parsers.parseKeyword(part, keywords);
+        if (val) {
+          if (val === "center") {
+            parsedValue = `${val} ${val}`;
+          } else if (val === "top" || val === "bottom") {
+            parsedValue = `center ${val}`;
+          } else {
+            parsedValue = `${val} center`;
+          }
+        }
+        break;
+      }
+      case 2: {
+        const [part1, part2] = parts;
+        const val1 = parsers.parseMeasurement(part1) || parsers.parseKeyword(part1, keywords);
+        const val2 = parsers.parseMeasurement(part2) || parsers.parseKeyword(part2, keywords);
+        if (val1 && val2) {
+          if (keywordsY.includes(val1) && keywordsX.includes(val2)) {
+            parsedValue = `${val2} ${val1}`;
+          } else if (keywordsX.includes(val1)) {
+            if (val2 === "center" || !keywordsX.includes(val2)) {
+              parsedValue = `${val1} ${val2}`;
+            }
+          } else if (keywordsY.includes(val2)) {
+            if (!keywordsY.includes(val1)) {
+              parsedValue = `${val1} ${val2}`;
+            }
+          } else if (!keywordsY.includes(val1) && !keywordsX.includes(val2)) {
+            parsedValue = `${val1} ${val2}`;
+          }
+        }
+        break;
+      }
+      case 3: {
+        const [part1, part2, part3] = parts;
+        const val1 = parsers.parseKeyword(part1, keywords);
+        const val2 = parsers.parseMeasurement(part2) || parsers.parseKeyword(part2, keywords);
+        const val3 = parsers.parseMeasurement(part3) || parsers.parseKeyword(part3, keywords);
+        if (val1 && val2 && val3) {
+          let posX = "";
+          let offX = "";
+          let posY = "";
+          let offY = "";
+          if (keywordsX.includes(val1)) {
+            if (keyY.includes(val2)) {
+              if (!keywords.includes(val3)) {
+                posX = val1;
+                posY = val2;
+                offY = val3;
+              }
+            } else if (keyY.includes(val3)) {
+              if (!keywords.includes(val2)) {
+                posX = val1;
+                offX = val2;
+                posY = val3;
+              }
+            }
+          } else if (keywordsY.includes(val1)) {
+            if (keyX.includes(val2)) {
+              if (!keywords.includes(val3)) {
+                posX = val2;
+                offX = val3;
+                posY = val1;
+              }
+            } else if (keyX.includes(val3)) {
+              if (!keywords.includes(val2)) {
+                posX = val3;
+                posY = val1;
+                offY = val2;
+              }
+            }
+          }
+          if (posX && posY) {
+            if (offX) {
+              parsedValue = `${posX} ${offX} ${posY}`;
+            } else if (offY) {
+              parsedValue = `${posX} ${posY} ${offY}`;
+            }
+          }
+        }
+        break;
+      }
+      case 4:
+      default: {
+        const [part1, part2, part3, part4] = parts;
+        const val1 = parsers.parseKeyword(part1, keywords);
+        const val2 = parsers.parseMeasurement(part2);
+        const val3 = parsers.parseKeyword(part3, keywords);
+        const val4 = parsers.parseMeasurement(part4);
+        if (val1 && val2 && val3 && val4) {
+          let posX = "";
+          let offX = "";
+          let posY = "";
+          let offY = "";
+          if (keywordsX.includes(val1) && keyY.includes(val3)) {
+            posX = val1;
+            offX = val2;
+            posY = val3;
+            offY = val4;
+          } else if (keyX.includes(val1) && keywordsY.includes(val3)) {
+            posX = val1;
+            offX = val2;
+            posY = val3;
+            offY = val4;
+          } else if (keyY.includes(val1) && keywordsX.includes(val3)) {
+            posX = val3;
+            offX = val4;
+            posY = val1;
+            offY = val2;
+          }
+          if (posX && offX && posY && offY) {
+            parsedValue = `${posX} ${offX} ${posY} ${offY}`;
+          }
+        }
+      }
     }
+    if (parsedValue) {
+      parsedValues.push(parsedValue);
+    } else {
+      return;
+    }
+  }
+  if (parsedValues.length) {
+    return parsedValues.join(", ");
   }
 };
 

package/lib/properties/backgroundRepeat.js

@@ -3,8 +3,58 @@
 const parsers = require("../parsers");
 
 module.exports.parse = function parse(v) {
-  const keywords = ["repeat", "repeat-x", "repeat-y", "no-repeat", "space", "round"];
-  return parsers.parseKeyword(v, keywords);
+  if (v === "") {
+    return v;
+  }
+  const values = parsers.splitValue(v, {
+    delimiter: ","
+  });
+  const keywordsAxis = ["repeat-x", "repeat-y"];
+  const keywordsRepeat = ["repeat", "no-repeat", "space", "round"];
+  const keywords = [...keywordsAxis, ...keywordsRepeat];
+  const parsedValues = [];
+  for (const value of values) {
+    const parts = parsers.splitValue(value);
+    if (!parts.length || parts.length > 2) {
+      return;
+    }
+    let parsedValue = "";
+    switch (parts.length) {
+      case 1: {
+        const [part] = parts;
+        const val = parsers.parseKeyword(part, keywords);
+        if (val) {
+          parsedValue = val;
+        }
+        break;
+      }
+      case 2:
+      default: {
+        const [part1, part2] = parts;
+        const val1 = parsers.parseKeyword(part1, keywordsRepeat);
+        const val2 = parsers.parseKeyword(part2, keywordsRepeat);
+        if (val1 && val2) {
+          if (val1 === "repeat" && val2 === "no-repeat") {
+            parsedValue = "repeat-x";
+          } else if (val1 === "no-repeat" && val2 === "repeat") {
+            parsedValue = "repeat-y";
+          } else if (val1 === val2) {
+            parsedValue = val1;
+          } else {
+            parsedValue = `${val1} ${val2}`;
+          }
+        }
+      }
+    }
+    if (parsedValue) {
+      parsedValues.push(parsedValue);
+    } else {
+      return;
+    }
+  }
+  if (parsedValues.length) {
+    return parsedValues.join(", ");
+  }
 };
 
 module.exports.isValid = function isValid(v) {

package/lib/properties/backgroundSize.js

@@ -0,0 +1,80 @@
+"use strict";
+
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  if (v === "") {
+    return v;
+  }
+  const values = parsers.splitValue(v, {
+    delimiter: ","
+  });
+  const keywordsRatio = ["contain", "cover"];
+  const keywordsRepeat = ["auto"];
+  const keywords = [...keywordsRatio, ...keywordsRepeat];
+  const parsedValues = [];
+  for (const value of values) {
+    const parts = parsers.splitValue(value);
+    if (!parts.length || parts.length > 2) {
+      return;
+    }
+    let parsedValue = "";
+    switch (parts.length) {
+      case 1: {
+        const [part] = parts;
+        const val = parsers.parseMeasurement(part, true) || parsers.parseKeyword(part, keywords);
+        if (val) {
+          parsedValue = val;
+        }
+        break;
+      }
+      case 2:
+      default: {
+        const [part1, part2] = parts;
+        const val1 =
+          parsers.parseMeasurement(part1, true) || parsers.parseKeyword(part1, keywordsRepeat);
+        const val2 =
+          parsers.parseMeasurement(part2, true) || parsers.parseKeyword(part2, keywordsRepeat);
+        if (val1 && val2) {
+          if (val2 === "auto") {
+            parsedValue = val1;
+          } else {
+            parsedValue = `${val1} ${val2}`;
+          }
+        }
+      }
+    }
+    if (parsedValue) {
+      parsedValues.push(parsedValue);
+    } else {
+      return;
+    }
+  }
+  if (parsedValues.length) {
+    return parsedValues.join(", ");
+  }
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
+};
+
+module.exports.definition = {
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("background", "");
+      this._setProperty("background-size", v);
+    } else {
+      this._setProperty("background-size", module.exports.parse(v));
+    }
+  },
+  get() {
+    return this.getPropertyValue("background-size");
+  },
+  enumerable: true,
+  configurable: true
+};

package/lib/properties/border.js

@@ -5,7 +5,7 @@ const borderWidth = require("./borderWidth");
 const borderStyle = require("./borderStyle");
 const borderColor = require("./borderColor");
 
-const shorthandFor = new Map([
+module.exports.shorthandFor = new Map([
   ["border-width", borderWidth],
   ["border-style", borderStyle],
   ["border-color", borderColor]
@@ -18,12 +18,17 @@ module.exports.definition = {
       v = "";
     }
     if (parsers.hasVarFunc(v)) {
-      for (const [key] of shorthandFor) {
+      for (const [key] of module.exports.shorthandFor) {
         this._setProperty(key, "");
       }
       this._setProperty("border", v);
     } else {
-      this._midShorthandSetter("border", v, shorthandFor, ["top", "right", "bottom", "left"]);
+      this._midShorthandSetter("border", v, module.exports.shorthandFor, [
+        "top",
+        "right",
+        "bottom",
+        "left"
+      ]);
     }
   },
   get() {
@@ -31,7 +36,7 @@ module.exports.definition = {
     if (parsers.hasVarFunc(val)) {
       return val;
     }
-    val = this._shorthandGetter("border", shorthandFor);
+    val = this._shorthandGetter("border", module.exports.shorthandFor);
     if (parsers.hasVarFunc(val)) {
       return "";
     }

package/lib/properties/borderBottom.js

@@ -5,7 +5,7 @@ const borderTopWidth = require("./borderTopWidth");
 const borderTopStyle = require("./borderTopStyle");
 const borderTopColor = require("./borderTopColor");
 
-const shorthandFor = new Map([
+module.exports.shorthandFor = new Map([
   ["border-bottom-width", borderTopWidth],
   ["border-bottom-style", borderTopStyle],
   ["border-bottom-color", borderTopColor]
@@ -15,13 +15,13 @@ module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      for (const [key] of shorthandFor) {
+      for (const [key] of module.exports.shorthandFor) {
         this._setProperty(key, "");
       }
       this._setProperty("border", "");
       this._setProperty("border-bottom", v);
     } else {
-      this._shorthandSetter("border-bottom", v, shorthandFor);
+      this._shorthandSetter("border-bottom", v, module.exports.shorthandFor);
     }
   },
   get() {
@@ -29,7 +29,7 @@ module.exports.definition = {
     if (parsers.hasVarFunc(val)) {
       return val;
     }
-    val = this._shorthandGetter("border-bottom", shorthandFor);
+    val = this._shorthandGetter("border-bottom", module.exports.shorthandFor);
     if (parsers.hasVarFunc(val)) {
       return "";
     }

package/lib/properties/borderLeft.js

@@ -5,7 +5,7 @@ const borderTopWidth = require("./borderTopWidth");
 const borderTopStyle = require("./borderTopStyle");
 const borderTopColor = require("./borderTopColor");
 
-const shorthandFor = new Map([
+module.exports.shorthandFor = new Map([
   ["border-left-width", borderTopWidth],
   ["border-left-style", borderTopStyle],
   ["border-left-color", borderTopColor]
@@ -15,13 +15,13 @@ module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      for (const [key] of shorthandFor) {
+      for (const [key] of module.exports.shorthandFor) {
         this._setProperty(key, "");
       }
       this._setProperty("border", "");
       this._setProperty("border-left", v);
     } else {
-      this._shorthandSetter("border-left", v, shorthandFor);
+      this._shorthandSetter("border-left", v, module.exports.shorthandFor);
     }
   },
   get() {
@@ -29,7 +29,7 @@ module.exports.definition = {
     if (parsers.hasVarFunc(val)) {
       return val;
     }
-    val = this._shorthandGetter("border-left", shorthandFor);
+    val = this._shorthandGetter("border-left", module.exports.shorthandFor);
     if (parsers.hasVarFunc(val)) {
       return "";
     }

package/lib/properties/borderRight.js

@@ -5,7 +5,7 @@ const borderTopWidth = require("./borderTopWidth");
 const borderTopStyle = require("./borderTopStyle");
 const borderTopColor = require("./borderTopColor");
 
-const shorthandFor = new Map([
+module.exports.shorthandFor = new Map([
   ["border-right-width", borderTopWidth],
   ["border-right-style", borderTopStyle],
   ["border-right-color", borderTopColor]
@@ -15,13 +15,13 @@ module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      for (const [key] of shorthandFor) {
+      for (const [key] of module.exports.shorthandFor) {
         this._setProperty(key, "");
       }
       this._setProperty("border", "");
       this._setProperty("border-right", v);
     } else {
-      this._shorthandSetter("border-right", v, shorthandFor);
+      this._shorthandSetter("border-right", v, module.exports.shorthandFor);
     }
   },
   get() {
@@ -29,7 +29,7 @@ module.exports.definition = {
     if (parsers.hasVarFunc(val)) {
       return val;
     }
-    val = this._shorthandGetter("border-right", shorthandFor);
+    val = this._shorthandGetter("border-right", module.exports.shorthandFor);
     if (parsers.hasVarFunc(val)) {
       return "";
     }

package/lib/properties/borderTop.js

@@ -5,7 +5,7 @@ const borderTopWidth = require("./borderTopWidth");
 const borderTopStyle = require("./borderTopStyle");
 const borderTopColor = require("./borderTopColor");
 
-const shorthandFor = new Map([
+module.exports.shorthandFor = new Map([
   ["border-top-width", borderTopWidth],
   ["border-top-style", borderTopStyle],
   ["border-top-color", borderTopColor]
@@ -15,13 +15,13 @@ module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      for (const [key] of shorthandFor) {
+      for (const [key] of module.exports.shorthandFor) {
         this._setProperty(key, "");
       }
       this._setProperty("border", "");
       this._setProperty("border-top", v);
     } else {
-      this._shorthandSetter("border-top", v, shorthandFor);
+      this._shorthandSetter("border-top", v, module.exports.shorthandFor);
     }
   },
   get() {
@@ -29,7 +29,7 @@ module.exports.definition = {
     if (parsers.hasVarFunc(val)) {
       return val;
     }
-    val = this._shorthandGetter("border-top", shorthandFor);
+    val = this._shorthandGetter("border-top", module.exports.shorthandFor);
     if (parsers.hasVarFunc(val)) {
       return "";
     }

package/lib/properties/flex.js

@@ -5,7 +5,7 @@ const flexGrow = require("./flexGrow");
 const flexShrink = require("./flexShrink");
 const flexBasis = require("./flexBasis");
 
-const shorthandFor = new Map([
+module.exports.shorthandFor = new Map([
   ["flex-grow", flexGrow],
   ["flex-shrink", flexShrink],
   ["flex-basis", flexBasis]
@@ -25,7 +25,7 @@ module.exports.parse = function parse(v) {
     }
     return;
   }
-  const obj = parsers.parseShorthand(v, shorthandFor);
+  const obj = parsers.parseShorthand(v, module.exports.shorthandFor);
   if (obj) {
     const flex = {
       "flex-grow": "1",
@@ -51,10 +51,10 @@ module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._shorthandSetter("flex", "", shorthandFor);
+      this._shorthandSetter("flex", "", module.exports.shorthandFor);
       this._setProperty("flex", v);
     } else {
-      this._shorthandSetter("flex", module.exports.parse(v), shorthandFor);
+      this._shorthandSetter("flex", module.exports.parse(v), module.exports.shorthandFor);
     }
   },
   get() {
@@ -62,7 +62,7 @@ module.exports.definition = {
     if (parsers.hasVarFunc(val)) {
       return val;
     }
-    val = this._shorthandGetter("flex", shorthandFor);
+    val = this._shorthandGetter("flex", module.exports.shorthandFor);
     if (parsers.hasVarFunc(val)) {
       return "";
     }

package/lib/properties/font.js

@@ -8,7 +8,7 @@ const fontSize = require("./fontSize");
 const lineHeight = require("./lineHeight");
 const fontFamily = require("./fontFamily");
 
-const shorthandFor = new Map([
+module.exports.shorthandFor = new Map([
   ["font-style", fontStyle],
   ["font-variant", fontVariant],
   ["font-weight", fontWeight],
@@ -59,7 +59,7 @@ module.exports.parse = function parse(v) {
             case "font-variant":
             case "font-weight":
             case "font-size": {
-              const value = shorthandFor.get(property);
+              const value = module.exports.shorthandFor.get(property);
               if (value.isValid(part)) {
                 font[property] = value.parse(part);
               }
@@ -76,8 +76,7 @@ module.exports.parse = function parse(v) {
       return;
     }
   } else {
-    // FIXME: Switch to toReversed() when we can drop Node.js 18 support.
-    const revParts = [...parsers.splitValue(fontBlockA.trim())].reverse();
+    const revParts = parsers.splitValue(fontBlockA.trim()).toReversed();
     const revFontFamily = [];
     const properties = ["font-style", "font-variant", "font-weight", "line-height"];
     font["font-style"] = "normal";
@@ -96,7 +95,7 @@ module.exports.parse = function parse(v) {
               case "font-variant":
               case "font-weight":
               case "line-height": {
-                const value = shorthandFor.get(property);
+                const value = module.exports.shorthandFor.get(property);
                 if (value.isValid(part)) {
                   font[property] = value.parse(part);
                 }
@@ -137,7 +136,7 @@ module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (v === "" || parsers.hasVarFunc(v)) {
-      for (const [key] of shorthandFor) {
+      for (const [key] of module.exports.shorthandFor) {
         this._setProperty(key, "");
       }
       this._setProperty("font", v);
@@ -147,7 +146,7 @@ module.exports.definition = {
         return;
       }
       const str = new Set();
-      for (const [key] of shorthandFor) {
+      for (const [key] of module.exports.shorthandFor) {
         const val = obj[key];
         if (typeof val === "string") {
           this._setProperty(key, val);
@@ -169,7 +168,7 @@ module.exports.definition = {
       return val;
     }
     const str = new Set();
-    for (const [key] of shorthandFor) {
+    for (const [key] of module.exports.shorthandFor) {
       const v = this.getPropertyValue(key);
       if (parsers.hasVarFunc(v)) {
         return "";

package/lib/shorthandProperties.js

@@ -0,0 +1,21 @@
+"use strict";
+
+const background = require("./properties/background");
+const border = require("./properties/border");
+const borderTop = require("./properties/borderTop");
+const borderRight = require("./properties/borderRight");
+const borderBottom = require("./properties/borderBottom");
+const borderLeft = require("./properties/borderLeft");
+const flex = require("./properties/flex");
+const font = require("./properties/font");
+
+module.exports.shorthandProperties = new Map([
+  ["background", background.shorthandFor],
+  ["border", border.shorthandFor],
+  ["border-top", borderTop.shorthandFor],
+  ["border-right", borderRight.shorthandFor],
+  ["border-bottom", borderBottom.shorthandFor],
+  ["border-left", borderLeft.shorthandFor],
+  ["flex", flex.shorthandFor],
+  ["font", font.shorthandFor]
+]);

package/package.json

@@ -6,7 +6,7 @@
     "CSSStyleDeclaration",
     "StyleSheet"
   ],
-  "version": "4.6.0",
+  "version": "5.0.0",
   "homepage": "https://github.com/jsdom/cssstyle",
   "maintainers": [
     {
@@ -67,6 +67,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   }
 }