cssstyle 5.3.5 → 5.3.6

package/lib/properties/font.js

@@ -11,15 +11,15 @@ const fontFamily = require("./fontFamily");
 const property = "font";
 
 module.exports.shorthandFor = new Map([
-  ["font-style", fontStyle],
-  ["font-variant", fontVariant],
-  ["font-weight", fontWeight],
-  ["font-size", fontSize],
-  ["line-height", lineHeight],
-  ["font-family", fontFamily]
+  [fontStyle.property, fontStyle],
+  [fontVariant.property, fontVariant],
+  [fontWeight.property, fontWeight],
+  [fontSize.property, fontSize],
+  [lineHeight.property, lineHeight],
+  [fontFamily.property, fontFamily]
 ]);
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -29,6 +29,7 @@ module.exports.parse = function parse(v, opt = {}) {
   if (!parsers.isValidPropertyValue(property, v)) {
     return;
   }
+  const { AST_TYPES } = parsers;
   const [fontBlock, ...families] = parsers.splitValue(v, {
     delimiter: ","
   });
@@ -36,9 +37,9 @@ module.exports.parse = function parse(v, opt = {}) {
     delimiter: "/"
   });
   const font = {
-    "font-style": "normal",
-    "font-variant": "normal",
-    "font-weight": "normal"
+    [fontStyle.property]: "normal",
+    [fontVariant.property]: "normal",
+    [fontWeight.property]: "normal"
   };
   const fontFamilies = new Set();
   if (fontBlockB) {
@@ -62,14 +63,19 @@ module.exports.parse = function parse(v, opt = {}) {
       return;
     }
     const parts = parsers.splitValue(fontBlockA.trim());
-    const properties = ["font-style", "font-variant", "font-weight", "font-size"];
+    const properties = [
+      fontStyle.property,
+      fontVariant.property,
+      fontWeight.property,
+      fontSize.property
+    ];
     for (const part of parts) {
       if (part === "normal") {
         continue;
       } else {
         for (const longhand of properties) {
           switch (longhand) {
-            case "font-size": {
+            case fontSize.property: {
               const parsedValue = fontSize.parse(part, {
                 globalObject
               });
@@ -78,8 +84,8 @@ module.exports.parse = function parse(v, opt = {}) {
               }
               break;
             }
-            case "font-style":
-            case "font-weight": {
+            case fontStyle.property:
+            case fontWeight.property: {
               if (font[longhand] === "normal") {
                 const longhandItem = module.exports.shorthandFor.get(longhand);
                 const parsedValue = longhandItem.parse(part, {
@@ -91,7 +97,7 @@ module.exports.parse = function parse(v, opt = {}) {
               }
               break;
             }
-            case "font-variant": {
+            case fontVariant.property: {
               if (font[longhand] === "normal") {
                 const parsedValue = fontVariant.parse(part, {
                   globalObject
@@ -111,8 +117,8 @@ module.exports.parse = function parse(v, opt = {}) {
         }
       }
     }
-    if (Object.hasOwn(font, "font-size")) {
-      font["line-height"] = lineHeightB;
+    if (Object.hasOwn(font, fontSize.property)) {
+      font[lineHeight.property] = lineHeightB;
     } else {
       return;
     }
@@ -126,20 +132,25 @@ module.exports.parse = function parse(v, opt = {}) {
       });
       if (Array.isArray(value) && value.length === 1) {
         const [{ name, type }] = value;
-        if (type === "GlobalKeyword") {
+        if (type === AST_TYPES.GLOBAL_KEYWORD) {
           return {
-            "font-style": name,
-            "font-variant": name,
-            "font-weight": name,
-            "font-size": name,
-            "line-height": name,
-            "font-family": name
+            [fontStyle.property]: name,
+            [fontVariant.property]: name,
+            [fontWeight.property]: name,
+            [fontSize.property]: name,
+            [lineHeight.property]: name,
+            [fontFamily.property]: name
           };
         }
       }
       return;
     }
-    const properties = ["font-style", "font-variant", "font-weight", "line-height"];
+    const properties = [
+      fontStyle.property,
+      fontVariant.property,
+      fontWeight.property,
+      lineHeight.property
+    ];
     for (const longhand of properties) {
       font[longhand] = "normal";
     }
@@ -152,9 +163,9 @@ module.exports.parse = function parse(v, opt = {}) {
         } else {
           for (const longhand of properties) {
             switch (longhand) {
-              case "font-style":
-              case "font-weight":
-              case "line-height": {
+              case fontStyle.property:
+              case fontWeight.property:
+              case lineHeight.property: {
                 if (font[longhand] === "normal") {
                   const longhandItem = module.exports.shorthandFor.get(longhand);
                   const parsedValue = longhandItem.parse(part, {
@@ -166,7 +177,7 @@ module.exports.parse = function parse(v, opt = {}) {
                 }
                 break;
               }
-              case "font-variant": {
+              case fontVariant.property: {
                 if (font[longhand] === "normal") {
                   const parsedValue = fontVariant.parse(part, {
                     globalObject
@@ -209,7 +220,7 @@ module.exports.parse = function parse(v, opt = {}) {
       caseSensitive: true
     });
     if (fontSizeA && family) {
-      font["font-size"] = fontSizeA;
+      font[fontSize.property] = fontSizeA;
       fontFamilies.add(fontFamily.parse(family));
     } else {
       return;
@@ -226,7 +237,7 @@ module.exports.parse = function parse(v, opt = {}) {
       return;
     }
   }
-  font["font-family"] = [...fontFamilies].join(", ");
+  font[fontFamily.property] = [...fontFamilies].join(", ");
   return font;
 };
 
@@ -252,7 +263,7 @@ module.exports.definition = {
         if (typeof val === "string") {
           this._setProperty(key, val, priority);
           if (val && val !== "normal" && !str.has(val)) {
-            if (key === "line-height") {
+            if (key === lineHeight.property) {
               str.add(`/ ${val}`);
             } else {
               str.add(val);
@@ -275,7 +286,7 @@ module.exports.definition = {
         return "";
       }
       if (v && v !== "normal" && !str.has(v)) {
-        if (key === "line-height") {
+        if (key === lineHeight.property) {
           str.add(`/ ${v}`);
         } else {
           str.add(`${v}`);
@@ -287,3 +298,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/fontFamily.js

@@ -5,11 +5,12 @@ const parsers = require("../parsers");
 const property = "font-family";
 const shorthand = "font";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
   }
+  const { AST_TYPES } = parsers;
   const values = parsers.splitValue(v, {
     delimiter: ","
   });
@@ -24,15 +25,16 @@ module.exports.parse = function parse(v, opt = {}) {
       if (value.length === 1) {
         const [{ name, type, value: itemValue }] = value;
         switch (type) {
-          case "Function": {
+          case AST_TYPES.FUNCTION: {
             parsedValues.push(`${name}(${itemValue})`);
             break;
           }
-          case "GlobalKeyword":
-          case "Identifier": {
-            if (name !== "undefined") {
-              parsedValues.push(name);
+          case AST_TYPES.GLOBAL_KEYWORD:
+          case AST_TYPES.IDENTIFIER: {
+            if (name === "undefined") {
+              return;
             }
+            parsedValues.push(name);
             break;
           }
           case "String": {
@@ -48,11 +50,10 @@ module.exports.parse = function parse(v, opt = {}) {
         const parts = [];
         for (const item of value) {
           const { name, type } = item;
-          if (type === "Identifier") {
-            parts.push(name);
-          } else {
+          if (type !== AST_TYPES.IDENTIFIER) {
             return;
           }
+          parts.push(name);
         }
         const parsedValue = parts.join(" ").replaceAll("\\", "").replaceAll('"', '\\"');
         parsedValues.push(`"${parsedValue}"`);
@@ -79,9 +80,10 @@ module.exports.definition = {
         globalObject: this._global
       });
       if (typeof val === "string") {
-        const shorthandPriority = this._priorities.get(shorthand);
-        const prior = this._priorities.get(property) ?? "";
-        const priority = shorthandPriority && prior ? "" : prior;
+        const priority =
+          !this._priorities.get(shorthand) && this._priorities.has(property)
+            ? this._priorities.get(property)
+            : "";
         this._setProperty(property, val, priority);
       }
     }
@@ -92,3 +94,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/fontSize.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "font-size";
 const shorthand = "font";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -15,24 +15,10 @@ module.exports.parse = function parse(v, opt = {}) {
     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
-        });
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0,
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -49,9 +35,10 @@ module.exports.definition = {
         globalObject: this._global
       });
       if (typeof val === "string") {
-        const shorthandPriority = this._priorities.get(shorthand);
-        const prior = this._priorities.get(property) ?? "";
-        const priority = shorthandPriority && prior ? "" : prior;
+        const priority =
+          !this._priorities.get(shorthand) && this._priorities.has(property)
+            ? this._priorities.get(property)
+            : "";
         this._setProperty(property, val, priority);
       }
     }
@@ -62,3 +49,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/fontStyle.js

@@ -5,11 +5,12 @@ const parsers = require("../parsers");
 const property = "font-style";
 const shorthand = "font";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
   }
+  const { AST_TYPES } = parsers;
   const value = parsers.parsePropertyValue(property, v, {
     globalObject,
     inArray: true
@@ -18,16 +19,18 @@ module.exports.parse = function parse(v, opt = {}) {
     if (value.length === 1) {
       const [{ name, type }] = value;
       switch (type) {
-        case "GlobalKeyword":
-        case "Identifier": {
+        case AST_TYPES.GLOBAL_KEYWORD:
+        case AST_TYPES.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]);
+      const val1 = part1.type === AST_TYPES.IDENTIFIER && part1.name;
+      const val2 = parsers.resolveNumericValue([part2], {
+        type: "angle"
+      });
       if (val1 && val1 === "oblique" && val2) {
         return `${val1} ${val2}`;
       }
@@ -48,9 +51,10 @@ module.exports.definition = {
         globalObject: this._global
       });
       if (typeof val === "string") {
-        const shorthandPriority = this._priorities.get(shorthand);
-        const prior = this._priorities.get(property) ?? "";
-        const priority = shorthandPriority && prior ? "" : prior;
+        const priority =
+          !this._priorities.get(shorthand) && this._priorities.has(property)
+            ? this._priorities.get(property)
+            : "";
         this._setProperty(property, val, priority);
       }
     }
@@ -61,3 +65,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/fontVariant.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "font-variant";
 const shorthand = "font";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -18,21 +18,11 @@ module.exports.parse = function parse(v, opt = {}) {
       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;
-        }
+      const parsedValue = parsers.resolveFunctionValue(value);
+      if (!parsedValue) {
+        return;
       }
+      parsedValues.push(parsedValue);
     } else if (typeof value === "string") {
       parsedValues.push(value);
     }
@@ -58,9 +48,10 @@ module.exports.definition = {
         globalObject: this._global
       });
       if (typeof val === "string") {
-        const shorthandPriority = this._priorities.get(shorthand);
-        const prior = this._priorities.get(property) ?? "";
-        const priority = shorthandPriority && prior ? "" : prior;
+        const priority =
+          !this._priorities.get(shorthand) && this._priorities.has(property)
+            ? this._priorities.get(property)
+            : "";
         this._setProperty(property, val, priority);
       }
     }
@@ -71,3 +62,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/fontWeight.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "font-weight";
 const shorthand = "font";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -15,28 +15,14 @@ module.exports.parse = function parse(v, opt = {}) {
     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;
-        }
-      }
+    const parsedValue = parsers.resolveNumericValue(value, {
+      min: 1,
+      max: 1000
+    });
+    if (!parsedValue) {
+      return;
     }
+    return parsedValue;
   } else if (typeof value === "string") {
     return value;
   }
@@ -53,9 +39,10 @@ module.exports.definition = {
         globalObject: this._global
       });
       if (typeof val === "string") {
-        const shorthandPriority = this._priorities.get(shorthand);
-        const prior = this._priorities.get(property) ?? "";
-        const priority = shorthandPriority && prior ? "" : prior;
+        const priority =
+          !this._priorities.get(shorthand) && this._priorities.has(property)
+            ? this._priorities.get(property)
+            : "";
         this._setProperty(property, val, priority);
       }
     }
@@ -66,3 +53,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/height.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "height";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,22 +14,10 @@ module.exports.parse = function parse(v, opt = {}) {
     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);
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0,
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -56,3 +44,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/left.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "left";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,22 +14,9 @@ module.exports.parse = function parse(v, opt = {}) {
     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);
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -56,3 +43,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/lightingColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "lighting-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/lineHeight.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "line-height";
 const shorthand = "font";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -15,26 +15,9 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type, value: itemValue }] = value;
-    switch (type) {
-      case "Calc": {
-        return `${name}(${itemValue})`;
-      }
-      case "GlobalKeyword":
-      case "Identifier": {
-        return name;
-      }
-      case "Number": {
-        return parsers.parseNumber(value, {
-          min: 0
-        });
-      }
-      default: {
-        return parsers.parseLengthPercentage(value, {
-          min: 0
-        });
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -51,9 +34,10 @@ module.exports.definition = {
         globalObject: this._global
       });
       if (typeof val === "string") {
-        const shorthandPriority = this._priorities.get(shorthand);
-        const prior = this._priorities.get(property) ?? "";
-        const priority = shorthandPriority && prior ? "" : prior;
+        const priority =
+          !this._priorities.get(shorthand) && this._priorities.has(property)
+            ? this._priorities.get(property)
+            : "";
         this._setProperty(property, val, priority);
       }
     }
@@ -64,3 +48,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;