cssstyle 5.3.5 → 5.3.7

package/lib/properties/flex.js

@@ -8,123 +8,124 @@ const flexBasis = require("./flexBasis");
 const property = "flex";
 
 module.exports.initialValues = new Map([
-  ["flex-grow", "0"],
-  ["flex-shrink", "1"],
-  ["flex-basis", "auto"]
+  [flexGrow.property, "0"],
+  [flexShrink.property, "1"],
+  [flexBasis.property, "auto"]
 ]);
 
 module.exports.shorthandFor = new Map([
-  ["flex-grow", flexGrow],
-  ["flex-shrink", flexShrink],
-  ["flex-basis", flexBasis]
+  [flexGrow.property, flexGrow],
+  [flexShrink.property, flexShrink],
+  [flexBasis.property, flexBasis]
 ]);
 
-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
   });
   if (Array.isArray(value) && value.length) {
     const flex = {
-      "flex-grow": "1",
-      "flex-shrink": "1",
-      "flex-basis": "0%"
+      [flexGrow.property]: "1",
+      [flexShrink.property]: "1",
+      [flexBasis.property]: "0%"
     };
     if (value.length === 1) {
       const [{ isNumber, name, type, unit, value: itemValue }] = value;
       switch (type) {
-        case "Calc": {
+        case AST_TYPES.CALC: {
           if (isNumber) {
-            flex["flex-grow"] = `${name}(${itemValue})`;
+            flex[flexGrow.property] = `${name}(${itemValue})`;
             return flex;
           }
-          flex["flex-basis"] = `${name}(${itemValue})`;
+          flex[flexBasis.property] = `${name}(${itemValue})`;
           return flex;
         }
-        case "Dimension": {
-          flex["flex-basis"] = `${itemValue}${unit}`;
+        case AST_TYPES.DIMENSION: {
+          flex[flexBasis.property] = `${itemValue}${unit}`;
           return flex;
         }
-        case "GlobalKeyword": {
+        case AST_TYPES.GLOBAL_KEYWORD: {
           return name;
         }
-        case "Identifier": {
+        case AST_TYPES.IDENTIFIER: {
           if (name === "none") {
             return {
-              "flex-grow": "0",
-              "flex-shrink": "0",
-              "flex-basis": "auto"
+              [flexGrow.property]: "0",
+              [flexShrink.property]: "0",
+              [flexBasis.property]: "auto"
             };
           }
-          flex["flex-basis"] = name;
+          flex[flexBasis.property] = name;
           return flex;
         }
-        case "Number": {
-          flex["flex-grow"] = itemValue;
+        case AST_TYPES.NUMBER: {
+          flex[flexGrow.property] = itemValue;
           return flex;
         }
-        case "Percentage": {
-          flex["flex-basis"] = `${itemValue}%`;
+        case AST_TYPES.PERCENTAGE: {
+          flex[flexBasis.property] = `${itemValue}%`;
           return flex;
         }
         default:
       }
     } else {
       const [val1, val2, val3] = value;
-      if (val1.type === "Calc" && val1.isNumber) {
-        flex["flex-grow"] = `${val1.name}(${val1.value})`;
-      } else if (val1.type === "Number") {
-        flex["flex-grow"] = val1.value;
+      if (val1.type === AST_TYPES.CALC && val1.isNumber) {
+        flex[flexGrow.property] = `${val1.name}(${val1.value})`;
+      } else if (val1.type === AST_TYPES.NUMBER) {
+        flex[flexGrow.property] = val1.value;
       } else {
         return;
       }
       if (val3) {
-        if (val2.type === "Calc" && val2.isNumber) {
-          flex["flex-shrink"] = `${val2.name}(${val2.value})`;
-        } else if (val2.type === "Number") {
-          flex["flex-shrink"] = val2.value;
+        if (val2.type === AST_TYPES.CALC && val2.isNumber) {
+          flex[flexShrink.property] = `${val2.name}(${val2.value})`;
+        } else if (val2.type === AST_TYPES.NUMBER) {
+          flex[flexShrink.property] = val2.value;
         } else {
           return;
         }
-        if (val3.type === "GlobalKeyword" || val3.type === "Identifier") {
-          flex["flex-basis"] = val3.name;
-        } else if (val3.type === "Calc" && !val3.isNumber) {
-          flex["flex-basis"] = `${val3.name}(${val3.value})`;
-        } else if (val3.type === "Dimension") {
-          flex["flex-basis"] = `${val3.value}${val3.unit}`;
-        } else if (val3.type === "Percentage") {
-          flex["flex-basis"] = `${val3.value}%`;
+        if (val3.type === AST_TYPES.GLOBAL_KEYWORD || val3.type === AST_TYPES.IDENTIFIER) {
+          flex[flexBasis.property] = val3.name;
+        } else if (val3.type === AST_TYPES.CALC && !val3.isNumber) {
+          flex[flexBasis.property] = `${val3.name}(${val3.value})`;
+        } else if (val3.type === AST_TYPES.DIMENSION) {
+          flex[flexBasis.property] = `${val3.value}${val3.unit}`;
+        } else if (val3.type === AST_TYPES.PERCENTAGE) {
+          flex[flexBasis.property] = `${val3.value}%`;
         } else {
           return;
         }
       } else {
         switch (val2.type) {
-          case "Calc": {
+          case AST_TYPES.CALC: {
             if (val2.isNumber) {
-              flex["flex-shrink"] = `${val2.name}(${val2.value})`;
+              flex[flexShrink.property] = `${val2.name}(${val2.value})`;
             } else {
-              flex["flex-basis"] = `${val2.name}(${val2.value})`;
+              flex[flexBasis.property] = `${val2.name}(${val2.value})`;
             }
             break;
           }
-          case "Dimension": {
-            flex["flex-basis"] = `${val2.value}${val2.unit}`;
+          case AST_TYPES.DIMENSION: {
+            flex[flexBasis.property] = `${val2.value}${val2.unit}`;
             break;
           }
-          case "Number": {
-            flex["flex-shrink"] = val2.value;
+          case AST_TYPES.NUMBER: {
+            flex[flexShrink.property] = val2.value;
             break;
           }
-          case "Percentage": {
-            flex["flex-basis"] = `${val2.value}%`;
+          case AST_TYPES.PERCENTAGE: {
+            flex[flexBasis.property] = `${val2.value}%`;
             break;
           }
-          case "Identifier": {
-            flex["flex-basis"] = val2.name;
+          case AST_TYPES.IDENTIFIER: {
+            flex[flexBasis.property] = val2.name;
             break;
           }
           default: {
@@ -133,7 +134,6 @@ module.exports.parse = function parse(v, opt = {}) {
         }
       }
       return flex;
-      // return [...Object.values(flex)].join(" ");
     }
   } else if (typeof value === "string") {
     return value;
@@ -142,7 +142,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       for (const [longhand] of module.exports.shorthandFor) {
         this._setProperty(longhand, "");
@@ -174,3 +174,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/flexBasis.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "flex-basis";
 const shorthand = "flex";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -15,22 +15,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;
   }
@@ -38,7 +25,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(shorthand, "");
       this._setProperty(property, v);
@@ -47,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._flexBoxSetter(property, val, priority, shorthand);
       }
     }
@@ -60,3 +48,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/flexGrow.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "flex-grow";
 const shorthand = "flex";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -15,21 +15,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 `${name}(${itemValue})`;
-        }
-        break;
-      }
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseNumber(value);
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -37,7 +25,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(shorthand, "");
       this._setProperty(property, v);
@@ -46,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._flexBoxSetter(property, val, priority, shorthand);
       }
     }
@@ -59,3 +48,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/flexShrink.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "flex-shrink";
 const shorthand = "flex";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -15,21 +15,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 `${name}(${itemValue})`;
-        }
-        break;
-      }
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseNumber(value);
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -37,7 +25,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(shorthand, "");
       this._setProperty(property, v);
@@ -46,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._flexBoxSetter(property, val, priority, shorthand);
       }
     }
@@ -59,3 +48,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/float.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "float";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,14 +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":
-      case "Identifier": {
-        return name;
-      }
-      default:
-    }
+    return parsers.resolveKeywordValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -29,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -48,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/floodColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "flood-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;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

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,13 +237,13 @@ module.exports.parse = function parse(v, opt = {}) {
       return;
     }
   }
-  font["font-family"] = [...fontFamilies].join(", ");
+  font[fontFamily.property] = [...fontFamilies].join(", ");
   return font;
 };
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (v === "" || parsers.hasVarFunc(v)) {
       for (const [key] of module.exports.shorthandFor) {
         this._setProperty(key, "");
@@ -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;