cssstyle 4.5.0 → 5.0.0

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],
@@ -57,15 +57,9 @@ module.exports.parse = function parse(v) {
           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-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);
               }
@@ -82,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";
@@ -102,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);
                 }
@@ -143,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);
@@ -153,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);
@@ -175,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/properties/fontFamily.js

@@ -19,6 +19,7 @@ module.exports.parse = function parse(v) {
     "ui-monospace",
     "ui-rounded"
   ];
+  const genericValues = ["fangsong", "kai", "khmer-mul", "nastaliq"];
   const val = parsers.splitValue(v, {
     delimiter: ","
   });
@@ -37,6 +38,15 @@ module.exports.parse = function parse(v) {
       valid = true;
       continue;
     }
+    const obj = parsers.parseFunction(i);
+    if (obj) {
+      const { name, value } = obj;
+      if (name === "generic" && genericValues.includes(value)) {
+        font.push(`${name}(${value})`);
+        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, and unquoted font-family names are not restricted to ASCII.

package/lib/properties/margin.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const positions = ["top", "right", "bottom", "left"];
 
 module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v, true);
+  const val = parsers.parseMeasurement(v);
   if (val) {
     return val;
   }

package/lib/properties/marginBottom.js

@@ -3,7 +3,7 @@
 const parsers = require("../parsers");
 
 module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v, true);
+  const val = parsers.parseMeasurement(v);
   if (val) {
     return val;
   }

package/lib/properties/marginLeft.js

@@ -3,7 +3,7 @@
 const parsers = require("../parsers");
 
 module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v, true);
+  const val = parsers.parseMeasurement(v);
   if (val) {
     return val;
   }

package/lib/properties/marginRight.js

@@ -3,7 +3,7 @@
 const parsers = require("../parsers");
 
 module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v, true);
+  const val = parsers.parseMeasurement(v);
   if (val) {
     return val;
   }

package/lib/properties/marginTop.js

@@ -3,7 +3,7 @@
 const parsers = require("../parsers");
 
 module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v, true);
+  const val = parsers.parseMeasurement(v);
   if (val) {
     return val;
   }

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/lib/utils/camelize.js

@@ -1,5 +1,7 @@
 "use strict";
 
+const { asciiLowercase } = require("./strings");
+
 // Utility to translate from `border-width` to `borderWidth`.
 // NOTE: For values prefixed with webkit, e.g. `-webkit-foo`, we need to provide
 // both `webkitFoo` and `WebkitFoo`. Here we only return `webkitFoo`.
@@ -27,7 +29,7 @@ exports.camelCaseToDashed = function (camelCase) {
   if (camelCase.startsWith("--")) {
     return camelCase;
   }
-  const dashed = camelCase.replace(/(?<=[a-z])[A-Z]/g, "-$&").toLowerCase();
+  const dashed = asciiLowercase(camelCase.replace(/(?<=[a-z])[A-Z]/g, "-$&"));
   if (/^webkit-/.test(dashed)) {
     return `-${dashed}`;
   }

package/lib/utils/strings.js

@@ -0,0 +1,167 @@
+// Forked from https://github.com/jsdom/jsdom/blob/main/lib/jsdom/living/helpers/strings.js
+
+"use strict";
+
+// https://infra.spec.whatwg.org/#ascii-whitespace
+const asciiWhitespaceRe = /^[\t\n\f\r ]$/;
+exports.asciiWhitespaceRe = asciiWhitespaceRe;
+
+// https://infra.spec.whatwg.org/#ascii-lowercase
+exports.asciiLowercase = (s) => {
+  const len = s.length;
+  const out = new Array(len);
+  for (let i = 0; i < len; i++) {
+    const code = s.charCodeAt(i);
+    // If the character is between 'A' (65) and 'Z' (90), convert using bitwise OR with 32
+    out[i] = code >= 65 && code <= 90 ? String.fromCharCode(code | 32) : s[i];
+  }
+  return out.join("");
+};
+
+// https://infra.spec.whatwg.org/#ascii-uppercase
+exports.asciiUppercase = (s) => {
+  const len = s.length;
+  const out = new Array(len);
+  for (let i = 0; i < len; i++) {
+    const code = s.charCodeAt(i);
+    // If the character is between 'a' (97) and 'z' (122), convert using bitwise AND with ~32
+    out[i] = code >= 97 && code <= 122 ? String.fromCharCode(code & ~32) : s[i];
+  }
+  return out.join("");
+};
+
+// https://infra.spec.whatwg.org/#strip-newlines
+exports.stripNewlines = (s) => {
+  return s.replace(/[\n\r]+/g, "");
+};
+
+// https://infra.spec.whatwg.org/#strip-leading-and-trailing-ascii-whitespace
+exports.stripLeadingAndTrailingASCIIWhitespace = (s) => {
+  return s.replace(/^[ \t\n\f\r]+/, "").replace(/[ \t\n\f\r]+$/, "");
+};
+
+// https://infra.spec.whatwg.org/#strip-and-collapse-ascii-whitespace
+exports.stripAndCollapseASCIIWhitespace = (s) => {
+  return s
+    .replace(/[ \t\n\f\r]+/g, " ")
+    .replace(/^[ \t\n\f\r]+/, "")
+    .replace(/[ \t\n\f\r]+$/, "");
+};
+
+// https://html.spec.whatwg.org/multipage/infrastructure.html#valid-simple-colour
+exports.isValidSimpleColor = (s) => {
+  return /^#[a-fA-F\d]{6}$/.test(s);
+};
+
+// https://infra.spec.whatwg.org/#ascii-case-insensitive
+exports.asciiCaseInsensitiveMatch = (a, b) => {
+  if (a.length !== b.length) {
+    return false;
+  }
+
+  for (let i = 0; i < a.length; ++i) {
+    if ((a.charCodeAt(i) | 32) !== (b.charCodeAt(i) | 32)) {
+      return false;
+    }
+  }
+
+  return true;
+};
+
+// https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#rules-for-parsing-integers
+// Error is represented as null.
+const parseInteger = (exports.parseInteger = (input) => {
+  // The implementation here is slightly different from the spec's. We want to use parseInt(), but parseInt() trims
+  // Unicode whitespace in addition to just ASCII ones, so we make sure that the trimmed prefix contains only ASCII
+  // whitespace ourselves.
+  const numWhitespace = input.length - input.trimStart().length;
+  if (/[^\t\n\f\r ]/.test(input.slice(0, numWhitespace))) {
+    return null;
+  }
+  // We don't allow hexadecimal numbers here.
+  // eslint-disable-next-line radix
+  const value = parseInt(input, 10);
+  if (Number.isNaN(value)) {
+    return null;
+  }
+  // parseInt() returns -0 for "-0". Normalize that here.
+  return value === 0 ? 0 : value;
+});
+
+// https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#rules-for-parsing-non-negative-integers
+// Error is represented as null.
+exports.parseNonNegativeInteger = (input) => {
+  const value = parseInteger(input);
+  if (value === null) {
+    return null;
+  }
+  if (value < 0) {
+    return null;
+  }
+  return value;
+};
+
+// https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-floating-point-number
+const floatingPointNumRe = /^-?(?:\d+|\d*\.\d+)(?:[eE][-+]?\d+)?$/;
+exports.isValidFloatingPointNumber = (str) => floatingPointNumRe.test(str);
+
+// https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#rules-for-parsing-floating-point-number-values
+// Error is represented as null.
+exports.parseFloatingPointNumber = (str) => {
+  // The implementation here is slightly different from the spec's. We need to use parseFloat() in order to retain
+  // accuracy, but parseFloat() trims Unicode whitespace in addition to just ASCII ones, so we make sure that the
+  // trimmed prefix contains only ASCII whitespace ourselves.
+  const numWhitespace = str.length - str.trimStart().length;
+  if (/[^\t\n\f\r ]/.test(str.slice(0, numWhitespace))) {
+    return null;
+  }
+  const parsed = parseFloat(str);
+  return isFinite(parsed) ? parsed : null;
+};
+
+// https://infra.spec.whatwg.org/#split-on-ascii-whitespace
+exports.splitOnASCIIWhitespace = (str) => {
+  let position = 0;
+  const tokens = [];
+  while (position < str.length && asciiWhitespaceRe.test(str[position])) {
+    position++;
+  }
+  if (position === str.length) {
+    return tokens;
+  }
+  while (position < str.length) {
+    const start = position;
+    while (position < str.length && !asciiWhitespaceRe.test(str[position])) {
+      position++;
+    }
+    tokens.push(str.slice(start, position));
+    while (position < str.length && asciiWhitespaceRe.test(str[position])) {
+      position++;
+    }
+  }
+  return tokens;
+};
+
+// https://infra.spec.whatwg.org/#split-on-commas
+exports.splitOnCommas = (str) => {
+  let position = 0;
+  const tokens = [];
+  while (position < str.length) {
+    let start = position;
+    while (position < str.length && str[position] !== ",") {
+      position++;
+    }
+    let end = position;
+    while (start < str.length && asciiWhitespaceRe.test(str[start])) {
+      start++;
+    }
+    while (end > start && asciiWhitespaceRe.test(str[end - 1])) {
+      end--;
+    }
+    tokens.push(str.slice(start, end));
+    if (position < str.length) {
+      position++;
+    }
+  }
+  return tokens;
+};

package/package.json

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