cssstyle 4.4.0 → 4.5.0

package/lib/generated/implementedProperties.js

@@ -1,5 +1,5 @@
 "use strict";
-// autogenerated - 2025-06-08
+// autogenerated - 2025-06-20
 // https://www.w3.org/Style/CSS/all-properties.en.html
 
 module.exports = new Set([

package/lib/generated/properties.js

@@ -1,5 +1,5 @@
 "use strict";
-// autogenerated - 2025-06-08
+// autogenerated - 2025-06-20
 // https://www.w3.org/Style/CSS/all-properties.en.html
 
 var external_dependency_parsers_0 = require("../parsers.js");
@@ -18,7 +18,7 @@ backgroundImage_export_definition = {
     v = external_dependency_parsers_0.prepareValue(v, this._global);
     if (external_dependency_parsers_0.hasVarFunc(v)) {
       this._setProperty("background", "");
-      this._setProperty("backgound-image", v);
+      this._setProperty("background-image", v);
     } else {
       this._setProperty("background-image", backgroundImage_export_parse(v));
     }
@@ -65,7 +65,7 @@ backgroundPosition_export_definition = {
     v = external_dependency_parsers_0.prepareValue(v, this._global);
     if (external_dependency_parsers_0.hasVarFunc(v)) {
       this._setProperty("background", "");
-      this._setProperty("backgound-position", v);
+      this._setProperty("background-position", v);
     } else {
       this._setProperty("background-position", backgroundPosition_export_parse(v));
     }
@@ -92,7 +92,7 @@ backgroundRepeat_export_definition = {
     v = external_dependency_parsers_0.prepareValue(v, this._global);
     if (external_dependency_parsers_0.hasVarFunc(v)) {
       this._setProperty("background", "");
-      this._setProperty("backgound-repeat", v);
+      this._setProperty("background-repeat", v);
     } else {
       this._setProperty("background-repeat", backgroundRepeat_export_parse(v));
     }
@@ -119,7 +119,7 @@ backgroundAttachment_export_definition = {
     v = external_dependency_parsers_0.prepareValue(v, this._global);
     if (external_dependency_parsers_0.hasVarFunc(v)) {
       this._setProperty("background", "");
-      this._setProperty("backgound-attachemnt", v);
+      this._setProperty("background-attachment", v);
     } else {
       this._setProperty("background-attachment", backgroundAttachment_export_parse(v));
     }
@@ -149,7 +149,7 @@ backgroundColor_export_definition = {
     v = external_dependency_parsers_0.prepareValue(v, this._global);
     if (external_dependency_parsers_0.hasVarFunc(v)) {
       this._setProperty("background", "");
-      this._setProperty("backgound-color", v);
+      this._setProperty("background-color", v);
     } else {
       this._setProperty("background-color", backgroundColor_export_parse(v));
     }
@@ -1427,7 +1427,7 @@ fontFamily_export_parse = function parse(v) {
   if (v === "") {
     return v;
   }
-  const keywords = ["serif", "sans-serif", "system-ui", "cursive", "fantasy", "monospace"];
+  const keywords = ["serif", "sans-serif", "cursive", "fantasy", "monospace", "system-ui", "math", "ui-serif", "ui-sans-serif", "ui-monospace", "ui-rounded"];
   const val = external_dependency_parsers_0.splitValue(v, {
     delimiter: ","
   });
@@ -1446,16 +1446,15 @@ fontFamily_export_parse = function parse(v) {
       valid = true;
       continue;
     }
-    // This implementation does not strictly follow the specification. The spec
-    // does not require the first letter of the font-family to be capitalized.
-    // Also, unquoted font-family names are not restricted to ASCII only.
+    // This implementation does not strictly follow the specification.
+    // The spec does not require the first letter of the font-family to be
+    // capitalized, and unquoted font-family names are not restricted to ASCII.
     // However, in the real world, the first letter of the ASCII font-family
-    // names are always capitalized, and unquoted font-family names do not
-    // contain spaces, e.g. `Times`, and AFAIK, non-ASCII font-family names are
-    // always quoted even without spaces, e.g. `"メイリオ"`.
-    // Therefore, it is unlikely that this implementation will cause problems.
+    // names are capitalized, and unquoted font-family names do not contain
+    // spaces, e.g. `Times`. And non-ASCII font-family names are quoted even
+    // without spaces, e.g. `"メイリオ"`.
     // @see https://drafts.csswg.org/css-fonts/#font-family-prop
-    if (/^\s*(?:[A-Z][A-Za-z\d\s-]+)\s*$/.test(i)) {
+    if (i !== "undefined" && /^(?:[A-Z][A-Za-z\d-]+(?:\s+[A-Z][A-Za-z\d-]+)*|-?[a-z][a-z-]+)$/.test(i)) {
       font.push(i.trim());
       valid = true;
       continue;
@@ -1523,50 +1522,138 @@ font_export_parse = function parse(v) {
   const [fontBlock, ...families] = external_dependency_parsers_0.splitValue(v, {
     delimiter: ","
   });
-  let blockA, blockB;
-  if (fontBlock.includes("/")) {
-    [blockA, blockB] = external_dependency_parsers_0.splitValue(fontBlock, {
-      delimiter: "/"
-    });
-  } else {
-    blockA = fontBlock.trim();
-  }
-  const obj = external_dependency_parsers_0.parseShorthand(blockA, font_local_var_shorthandFor, true);
-  if (!obj) {
-    return;
-  }
-  const font = {};
+  const [fontBlockA, fontBlockB] = external_dependency_parsers_0.splitValue(fontBlock, {
+    delimiter: "/"
+  });
+  const font = {
+    "font-style": "normal",
+    "font-variant": "normal",
+    "font-weight": "normal"
+  };
   const fontFamilies = new Set();
-  for (const [property, value] of Object.entries(obj)) {
-    if (property === "font-family") {
-      if (!blockB) {
-        fontFamilies.add(value);
-      }
-    } else {
-      font[property] = value;
+  if (fontBlockB) {
+    const [lineB, ...familiesB] = fontBlockB.trim().split(" ");
+    if (!lineB || !{
+      parse: lineHeight_export_parse,
+      isValid: lineHeight_export_isValid,
+      definition: lineHeight_export_definition
+    }.isValid(lineB) || !familiesB.length) {
+      return;
     }
-  }
-  // blockB, if matched, includes line-height and first font-family
-  if (blockB) {
-    const [lineheight, family] = external_dependency_parsers_0.splitValue(blockB);
-    if ({
+    const lineHeightB = {
       parse: lineHeight_export_parse,
       isValid: lineHeight_export_isValid,
       definition: lineHeight_export_definition
-    }.isValid(lineheight)) {
-      font["line-height"] = {
-        parse: lineHeight_export_parse,
-        isValid: lineHeight_export_isValid,
-        definition: lineHeight_export_definition
-      }.parse(lineheight);
+    }.parse(lineB);
+    const familyB = familiesB.join(" ");
+    if ({
+      parse: fontFamily_export_parse,
+      isValid: fontFamily_export_isValid,
+      definition: fontFamily_export_definition
+    }.isValid(familyB)) {
+      fontFamilies.add({
+        parse: fontFamily_export_parse,
+        isValid: fontFamily_export_isValid,
+        definition: fontFamily_export_definition
+      }.parse(familyB));
     } else {
       return;
     }
-    if ({
+    const parts = external_dependency_parsers_0.splitValue(fontBlockA.trim());
+    const properties = ["font-style", "font-variant", "font-weight", "font-size"];
+    for (const part of parts) {
+      if (part === "normal") {
+        continue;
+      } else {
+        for (const property of properties) {
+          switch (property) {
+            case "font-style":
+            case "font-variant":
+            case "font-weight":
+              {
+                const value = font_local_var_shorthandFor.get(property);
+                if (value.isValid(part)) {
+                  font[property] = value.parse(part);
+                }
+                break;
+              }
+            case "font-size":
+              {
+                const value = font_local_var_shorthandFor.get(property);
+                if (value.isValid(part)) {
+                  font[property] = value.parse(part);
+                }
+                break;
+              }
+            default:
+          }
+        }
+      }
+    }
+    if (Object.hasOwn(font, "font-size")) {
+      font["line-height"] = lineHeightB;
+    } else {
+      return;
+    }
+  } else {
+    // FIXME: Switch to toReversed() when we can drop Node.js 18 support.
+    const revParts = [...external_dependency_parsers_0.splitValue(fontBlockA.trim())].reverse();
+    const revFontFamily = [];
+    const properties = ["font-style", "font-variant", "font-weight", "line-height"];
+    font["font-style"] = "normal";
+    font["font-variant"] = "normal";
+    font["font-weight"] = "normal";
+    font["line-height"] = "normal";
+    let fontSizeA;
+    for (const part of revParts) {
+      if (fontSizeA) {
+        if (part === "normal") {
+          continue;
+        } else {
+          for (const property of properties) {
+            switch (property) {
+              case "font-style":
+              case "font-variant":
+              case "font-weight":
+              case "line-height":
+                {
+                  const value = font_local_var_shorthandFor.get(property);
+                  if (value.isValid(part)) {
+                    font[property] = value.parse(part);
+                  }
+                  break;
+                }
+              default:
+            }
+          }
+        }
+      } else if ({
+        parse: fontSize_export_parse,
+        isValid: fontSize_export_isValid,
+        definition: fontSize_export_definition
+      }.isValid(part)) {
+        fontSizeA = {
+          parse: fontSize_export_parse,
+          isValid: fontSize_export_isValid,
+          definition: fontSize_export_definition
+        }.parse(part);
+      } else if ({
+        parse: fontFamily_export_parse,
+        isValid: fontFamily_export_isValid,
+        definition: fontFamily_export_definition
+      }.isValid(part)) {
+        revFontFamily.push(part);
+      } else {
+        return;
+      }
+    }
+    const family = revFontFamily.reverse().join(" ");
+    if (fontSizeA && {
       parse: fontFamily_export_parse,
       isValid: fontFamily_export_isValid,
       definition: fontFamily_export_definition
     }.isValid(family)) {
+      font["font-size"] = fontSizeA;
       fontFamilies.add({
         parse: fontFamily_export_parse,
         isValid: fontFamily_export_isValid,
@@ -1597,7 +1684,7 @@ font_export_parse = function parse(v) {
 font_export_definition = {
   set(v) {
     v = external_dependency_parsers_0.prepareValue(v, this._global);
-    if (external_dependency_parsers_0.hasVarFunc(v)) {
+    if (v === "" || external_dependency_parsers_0.hasVarFunc(v)) {
       for (const [key] of font_local_var_shorthandFor) {
         this._setProperty(key, "");
       }
@@ -1612,7 +1699,7 @@ font_export_definition = {
         const val = obj[key];
         if (typeof val === "string") {
           this._setProperty(key, val);
-          if (val && !str.has(val)) {
+          if (val && val !== "normal" && !str.has(val)) {
             if (key === "line-height") {
               str.add(`/ ${val}`);
             } else {
@@ -1635,7 +1722,7 @@ font_export_definition = {
       if (external_dependency_parsers_0.hasVarFunc(v)) {
         return "";
       }
-      if (v && !str.has(v)) {
+      if (v && v !== "normal" && !str.has(v)) {
         if (key === "line-height") {
           str.add(`/ ${v}`);
         } else {

package/lib/properties/backgroundAttachment.js

@@ -19,7 +19,7 @@ module.exports.definition = {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
       this._setProperty("background", "");
-      this._setProperty("backgound-attachemnt", v);
+      this._setProperty("background-attachment", v);
     } else {
       this._setProperty("background-attachment", module.exports.parse(v));
     }

package/lib/properties/backgroundColor.js

@@ -22,7 +22,7 @@ module.exports.definition = {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
       this._setProperty("background", "");
-      this._setProperty("backgound-color", v);
+      this._setProperty("background-color", v);
     } else {
       this._setProperty("background-color", module.exports.parse(v));
     }

package/lib/properties/backgroundImage.js

@@ -18,7 +18,7 @@ module.exports.definition = {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
       this._setProperty("background", "");
-      this._setProperty("backgound-image", v);
+      this._setProperty("background-image", v);
     } else {
       this._setProperty("background-image", module.exports.parse(v));
     }

package/lib/properties/backgroundPosition.js

@@ -39,7 +39,7 @@ module.exports.definition = {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
       this._setProperty("background", "");
-      this._setProperty("backgound-position", v);
+      this._setProperty("background-position", v);
     } else {
       this._setProperty("background-position", module.exports.parse(v));
     }

package/lib/properties/backgroundRepeat.js

@@ -19,7 +19,7 @@ module.exports.definition = {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
       this._setProperty("background", "");
-      this._setProperty("backgound-repeat", v);
+      this._setProperty("background-repeat", v);
     } else {
       this._setProperty("background-repeat", module.exports.parse(v));
     }

package/lib/properties/font.js

@@ -26,38 +26,103 @@ module.exports.parse = function parse(v) {
   const [fontBlock, ...families] = parsers.splitValue(v, {
     delimiter: ","
   });
-  let blockA, blockB;
-  if (fontBlock.includes("/")) {
-    [blockA, blockB] = parsers.splitValue(fontBlock, {
-      delimiter: "/"
-    });
-  } else {
-    blockA = fontBlock.trim();
-  }
-  const obj = parsers.parseShorthand(blockA, shorthandFor, true);
-  if (!obj) {
-    return;
-  }
-  const font = {};
+  const [fontBlockA, fontBlockB] = parsers.splitValue(fontBlock, {
+    delimiter: "/"
+  });
+  const font = {
+    "font-style": "normal",
+    "font-variant": "normal",
+    "font-weight": "normal"
+  };
   const fontFamilies = new Set();
-  for (const [property, value] of Object.entries(obj)) {
-    if (property === "font-family") {
-      if (!blockB) {
-        fontFamilies.add(value);
-      }
+  if (fontBlockB) {
+    const [lineB, ...familiesB] = fontBlockB.trim().split(" ");
+    if (!lineB || !lineHeight.isValid(lineB) || !familiesB.length) {
+      return;
+    }
+    const lineHeightB = lineHeight.parse(lineB);
+    const familyB = familiesB.join(" ");
+    if (fontFamily.isValid(familyB)) {
+      fontFamilies.add(fontFamily.parse(familyB));
     } else {
-      font[property] = value;
+      return;
     }
-  }
-  // blockB, if matched, includes line-height and first font-family
-  if (blockB) {
-    const [lineheight, family] = parsers.splitValue(blockB);
-    if (lineHeight.isValid(lineheight)) {
-      font["line-height"] = lineHeight.parse(lineheight);
+    const parts = parsers.splitValue(fontBlockA.trim());
+    const properties = ["font-style", "font-variant", "font-weight", "font-size"];
+    for (const part of parts) {
+      if (part === "normal") {
+        continue;
+      } else {
+        for (const property of properties) {
+          switch (property) {
+            case "font-style":
+            case "font-variant":
+            case "font-weight": {
+              const value = shorthandFor.get(property);
+              if (value.isValid(part)) {
+                font[property] = value.parse(part);
+              }
+              break;
+            }
+            case "font-size": {
+              const value = shorthandFor.get(property);
+              if (value.isValid(part)) {
+                font[property] = value.parse(part);
+              }
+              break;
+            }
+            default:
+          }
+        }
+      }
+    }
+    if (Object.hasOwn(font, "font-size")) {
+      font["line-height"] = lineHeightB;
     } else {
       return;
     }
-    if (fontFamily.isValid(family)) {
+  } else {
+    // FIXME: Switch to toReversed() when we can drop Node.js 18 support.
+    const revParts = [...parsers.splitValue(fontBlockA.trim())].reverse();
+    const revFontFamily = [];
+    const properties = ["font-style", "font-variant", "font-weight", "line-height"];
+    font["font-style"] = "normal";
+    font["font-variant"] = "normal";
+    font["font-weight"] = "normal";
+    font["line-height"] = "normal";
+    let fontSizeA;
+    for (const part of revParts) {
+      if (fontSizeA) {
+        if (part === "normal") {
+          continue;
+        } else {
+          for (const property of properties) {
+            switch (property) {
+              case "font-style":
+              case "font-variant":
+              case "font-weight":
+              case "line-height": {
+                const value = shorthandFor.get(property);
+                if (value.isValid(part)) {
+                  font[property] = value.parse(part);
+                }
+                break;
+              }
+              default:
+            }
+          }
+        }
+      } else if (fontSize.isValid(part)) {
+        fontSizeA = fontSize.parse(part);
+      } else if (fontFamily.isValid(part)) {
+        revFontFamily.push(part);
+      } else {
+        return;
+      }
+    }
+    const family = revFontFamily.reverse().join(" ");
+    if (fontSizeA && fontFamily.isValid(family)) {
+      font["font-size"] = fontSizeA;
       fontFamilies.add(fontFamily.parse(family));
     } else {
       return;
@@ -77,7 +142,7 @@ module.exports.parse = function parse(v) {
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
-    if (parsers.hasVarFunc(v)) {
+    if (v === "" || parsers.hasVarFunc(v)) {
       for (const [key] of shorthandFor) {
         this._setProperty(key, "");
       }
@@ -92,7 +157,7 @@ module.exports.definition = {
         const val = obj[key];
         if (typeof val === "string") {
           this._setProperty(key, val);
-          if (val && !str.has(val)) {
+          if (val && val !== "normal" && !str.has(val)) {
             if (key === "line-height") {
               str.add(`/ ${val}`);
             } else {
@@ -115,7 +180,7 @@ module.exports.definition = {
       if (parsers.hasVarFunc(v)) {
         return "";
       }
-      if (v && !str.has(v)) {
+      if (v && v !== "normal" && !str.has(v)) {
         if (key === "line-height") {
           str.add(`/ ${v}`);
         } else {

package/lib/properties/fontFamily.js

@@ -6,7 +6,19 @@ module.exports.parse = function parse(v) {
   if (v === "") {
     return v;
   }
-  const keywords = ["serif", "sans-serif", "system-ui", "cursive", "fantasy", "monospace"];
+  const keywords = [
+    "serif",
+    "sans-serif",
+    "cursive",
+    "fantasy",
+    "monospace",
+    "system-ui",
+    "math",
+    "ui-serif",
+    "ui-sans-serif",
+    "ui-monospace",
+    "ui-rounded"
+  ];
   const val = parsers.splitValue(v, {
     delimiter: ","
   });
@@ -25,16 +37,18 @@ module.exports.parse = function parse(v) {
       valid = true;
       continue;
     }
-    // This implementation does not strictly follow the specification. The spec
-    // does not require the first letter of the font-family to be capitalized.
-    // Also, unquoted font-family names are not restricted to ASCII only.
+    // This implementation does not strictly follow the specification.
+    // The spec does not require the first letter of the font-family to be
+    // capitalized, and unquoted font-family names are not restricted to ASCII.
     // However, in the real world, the first letter of the ASCII font-family
-    // names are always capitalized, and unquoted font-family names do not
-    // contain spaces, e.g. `Times`, and AFAIK, non-ASCII font-family names are
-    // always quoted even without spaces, e.g. `"メイリオ"`.
-    // Therefore, it is unlikely that this implementation will cause problems.
+    // names are capitalized, and unquoted font-family names do not contain
+    // spaces, e.g. `Times`. And non-ASCII font-family names are quoted even
+    // without spaces, e.g. `"メイリオ"`.
     // @see https://drafts.csswg.org/css-fonts/#font-family-prop
-    if (/^\s*(?:[A-Z][A-Za-z\d\s-]+)\s*$/.test(i)) {
+    if (
+      i !== "undefined" &&
+      /^(?:[A-Z][A-Za-z\d-]+(?:\s+[A-Z][A-Za-z\d-]+)*|-?[a-z][a-z-]+)$/.test(i)
+    ) {
       font.push(i.trim());
       valid = true;
       continue;

package/package.json

@@ -6,7 +6,7 @@
     "CSSStyleDeclaration",
     "StyleSheet"
   ],
-  "version": "4.4.0",
+  "version": "4.5.0",
   "homepage": "https://github.com/jsdom/cssstyle",
   "maintainers": [
     {