cssstyle 5.2.0 → 5.3.0

package/lib/properties/fontFamily.js

@@ -2,93 +2,92 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
+const property = "font-family";
+const shorthand = "font";
+
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
     return v;
   }
-  const keywords = [
-    "serif",
-    "sans-serif",
-    "cursive",
-    "fantasy",
-    "monospace",
-    "system-ui",
-    "math",
-    "ui-serif",
-    "ui-sans-serif",
-    "ui-monospace",
-    "ui-rounded"
-  ];
-  const genericValues = ["fangsong", "kai", "khmer-mul", "nastaliq"];
-  const val = parsers.splitValue(v, {
+  const values = parsers.splitValue(v, {
     delimiter: ","
   });
-  const font = [];
-  let valid = false;
-  for (const i of val) {
-    const str = parsers.parseString(i);
-    if (str) {
-      font.push(str);
-      valid = true;
-      continue;
-    }
-    const key = parsers.parseKeyword(i, keywords);
-    if (key) {
-      font.push(key);
-      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;
+  const parsedValues = [];
+  for (const val of values) {
+    const value = parsers.parsePropertyValue(property, val, {
+      globalObject,
+      caseSensitive: true,
+      inArray: true
+    });
+    if (Array.isArray(value) && value.length) {
+      if (value.length === 1) {
+        const [{ name, type, value: itemValue }] = value;
+        switch (type) {
+          case "Function": {
+            parsedValues.push(`${name}(${itemValue})`);
+            break;
+          }
+          case "GlobalKeyword":
+          case "Identifier": {
+            if (name !== "undefined") {
+              parsedValues.push(name);
+            }
+            break;
+          }
+          case "String": {
+            const parsedValue = itemValue.replaceAll("\\", "").replaceAll('"', '\\"');
+            parsedValues.push(`"${parsedValue}"`);
+            break;
+          }
+          default: {
+            return;
+          }
+        }
+      } else {
+        const parts = [];
+        for (const item of value) {
+          const { name, type } = item;
+          if (type === "Identifier") {
+            parts.push(name);
+          } else {
+            return;
+          }
+        }
+        const parsedValue = parts.join(" ").replaceAll("\\", "").replaceAll('"', '\\"');
+        parsedValues.push(`"${parsedValue}"`);
       }
-    }
-    // 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 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 (
-      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;
-    }
-    if (!valid) {
+    } else if (typeof value === "string") {
+      parsedValues.push(value);
+    } else {
       return;
     }
   }
-  return font.join(", ");
-};
-
-module.exports.isValid = function isValid(v) {
-  if (v === "") {
-    return true;
+  if (parsedValues.length) {
+    return parsedValues.join(", ");
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("font", "");
-      this._setProperty("font-family", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._setProperty("font-family", module.exports.parse(v));
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const shorthandPriority = this._priorities.get(shorthand);
+        const prior = this._priorities.get(property) ?? "";
+        const priority = shorthandPriority && prior ? "" : prior;
+        this._setProperty(property, val, priority);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("font-family");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/fontSize.js

@@ -2,45 +2,62 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v, true);
-  if (val) {
-    return val;
-  }
-  const keywords = [
-    "xx-small",
-    "x-small",
-    "small",
-    "medium",
-    "large",
-    "x-large",
-    "xx-large",
-    "xxx-large",
-    "smaller",
-    "larger"
-  ];
-  return parsers.parseKeyword(v, keywords);
-};
+const property = "font-size";
+const shorthand = "font";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    inArray: true
+  });
+  if (Array.isArray(value) && value.length === 1) {
+    const [{ isNumber, name, type, value: itemValue }] = value;
+    switch (type) {
+      case "Calc": {
+        if (isNumber) {
+          return;
+        }
+        return `${name}(${itemValue})`;
+      }
+      case "GlobalKeyword":
+      case "Identifier": {
+        return name;
+      }
+      default: {
+        return parsers.parseLengthPercentage(value, {
+          min: 0
+        });
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("font", "");
-      this._setProperty("font-size", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._setProperty("font-size", module.exports.parse(v));
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const shorthandPriority = this._priorities.get(shorthand);
+        const prior = this._priorities.get(property) ?? "";
+        const priority = shorthandPriority && prior ? "" : prior;
+        this._setProperty(property, val, priority);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("font-size");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/fontStyle.js

@@ -2,30 +2,61 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const keywords = ["normal", "italic", "oblique"];
-  return parsers.parseKeyword(v, keywords);
-};
+const property = "font-style";
+const shorthand = "font";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    inArray: true
+  });
+  if (Array.isArray(value) && value.length) {
+    if (value.length === 1) {
+      const [{ name, type }] = value;
+      switch (type) {
+        case "GlobalKeyword":
+        case "Identifier": {
+          return name;
+        }
+        default:
+      }
+    } else if (value.length === 2) {
+      const [part1, part2] = value;
+      const val1 = part1.type === "Identifier" && part1.name;
+      const val2 = parsers.parseAngle([part2]);
+      if (val1 && val1 === "oblique" && val2) {
+        return `${val1} ${val2}`;
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("font", "");
-      this._setProperty("font-style", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._setProperty("font-style", module.exports.parse(v));
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const shorthandPriority = this._priorities.get(shorthand);
+        const prior = this._priorities.get(property) ?? "";
+        const priority = shorthandPriority && prior ? "" : prior;
+        this._setProperty(property, val, priority);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("font-style");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/fontVariant.js

@@ -2,34 +2,71 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const num = parsers.parseNumber(v, true);
-  if (num && parseFloat(num) <= 1000) {
-    return num;
-  }
-  const keywords = ["normal", "none", "small-caps"];
-  return parsers.parseKeyword(v, keywords);
-};
+const property = "font-variant";
+const shorthand = "font";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const values = parsers.splitValue(v);
+  const parsedValues = [];
+  for (const val of values) {
+    const value = parsers.parsePropertyValue(property, val, {
+      globalObject,
+      inArray: true
+    });
+    if (Array.isArray(value) && value.length === 1) {
+      const [{ name, type, value: itemValue }] = value;
+      switch (type) {
+        case "Function": {
+          parsedValues.push(`${name}(${itemValue})`);
+          break;
+        }
+        case "GlobalKeyword":
+        case "Identifier": {
+          parsedValues.push(name);
+          break;
+        }
+        default: {
+          return;
+        }
+      }
+    } else if (typeof value === "string") {
+      parsedValues.push(value);
+    }
+  }
+  if (parsedValues.length) {
+    if (parsedValues.length > 1) {
+      if (parsedValues.includes("normal") || parsedValues.includes("none")) {
+        return;
+      }
+    }
+    return parsedValues.join(" ");
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("font", "");
-      this._setProperty("font-valiant", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._setProperty("font-variant", module.exports.parse(v));
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const shorthandPriority = this._priorities.get(shorthand);
+        const prior = this._priorities.get(property) ?? "";
+        const priority = shorthandPriority && prior ? "" : prior;
+        this._setProperty(property, val, priority);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("font-variant");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/fontWeight.js

@@ -2,34 +2,66 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const num = parsers.parseNumber(v, true);
-  if (num && parseFloat(num) <= 1000) {
-    return num;
-  }
-  const keywords = ["normal", "bold", "lighter", "bolder"];
-  return parsers.parseKeyword(v, keywords);
-};
+const property = "font-weight";
+const shorthand = "font";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    inArray: true
+  });
+  if (Array.isArray(value) && value.length === 1) {
+    const [{ isNumber, name, type, value: itemValue }] = value;
+    switch (type) {
+      case "Calc": {
+        if (isNumber) {
+          return `${name}(${itemValue})`;
+        }
+        break;
+      }
+      case "GlobalKeyword":
+      case "Identifier": {
+        return name;
+      }
+      default: {
+        const parsedValue = parsers.parseNumber(value, {
+          min: 1,
+          max: 1000
+        });
+        if (parsedValue) {
+          return parsedValue;
+        }
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("font", "");
-      this._setProperty("font-weight", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._setProperty("font-weight", module.exports.parse(v));
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const shorthandPriority = this._priorities.get(shorthand);
+        const prior = this._priorities.get(property) ?? "";
+        const priority = shorthandPriority && prior ? "" : prior;
+        this._setProperty(property, val, priority);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("font-weight");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/height.js

@@ -2,29 +2,56 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const dim = parsers.parseMeasurement(v, true);
-  if (dim) {
-    return dim;
-  }
-  const keywords = ["auto", "min-content", "max-content", "fit-content"];
-  return parsers.parseKeyword(v, keywords);
-};
+const property = "height";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    inArray: true
+  });
+  if (Array.isArray(value) && value.length === 1) {
+    const [{ isNumber, name, type, value: itemValue }] = value;
+    switch (type) {
+      case "Calc": {
+        if (isNumber) {
+          return;
+        }
+        return `${name}(${itemValue})`;
+      }
+      case "GlobalKeyword":
+      case "Identifier": {
+        return name;
+      }
+      default: {
+        return parsers.parseLengthPercentage(value);
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
-    this._setProperty("height", module.exports.parse(v));
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty(property, v);
+    } else {
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const priority = this._priorities.get(property) ?? "";
+        this._setProperty(property, val, priority);
+      }
+    }
   },
   get() {
-    return this.getPropertyValue("height");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/left.js

@@ -2,28 +2,56 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const dim = parsers.parseMeasurement(v);
-  if (dim) {
-    return dim;
-  }
-  return parsers.parseKeyword(v, ["auto"]);
-};
+const property = "left";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    inArray: true
+  });
+  if (Array.isArray(value) && value.length === 1) {
+    const [{ isNumber, name, type, value: itemValue }] = value;
+    switch (type) {
+      case "Calc": {
+        if (isNumber) {
+          return;
+        }
+        return `${name}(${itemValue})`;
+      }
+      case "GlobalKeyword":
+      case "Identifier": {
+        return name;
+      }
+      default: {
+        return parsers.parseLengthPercentage(value);
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
-    this._setProperty("left", module.exports.parse(v));
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty(property, v);
+    } else {
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const priority = this._priorities.get(property) ?? "";
+        this._setProperty(property, val, priority);
+      }
+    }
   },
   get() {
-    return this.getPropertyValue("left");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/lightingColor.js

@@ -2,28 +2,49 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const val = parsers.parseColor(v);
-  if (val) {
-    return val;
-  }
-  return parsers.parseKeyword(v);
-};
+const property = "lighting-color";
 
-module.exports.isValid = function isValid(v) {
-  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
-    return true;
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
+  if (v === "") {
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    inArray: true
+  });
+  if (Array.isArray(value) && value.length === 1) {
+    const [{ name, type }] = value;
+    switch (type) {
+      case "GlobalKeyword": {
+        return name;
+      }
+      default: {
+        return parsers.parseColor(value);
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return parsers.isValidColor(v);
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
-    this._setProperty("lighting-color", module.exports.parse(v));
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty(property, v);
+    } else {
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const priority = this._priorities.get(property) ?? "";
+        this._setProperty(property, val, priority);
+      }
+    }
   },
   get() {
-    return this.getPropertyValue("lighting-color");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true