cssstyle 5.3.5 → 5.3.6

package/lib/properties/clip.js

@@ -6,11 +6,12 @@ const parsers = require("../parsers");
 
 const property = "clip";
 
-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,14 +19,16 @@ module.exports.parse = function parse(v, opt = {}) {
   if (Array.isArray(value) && value.length === 1) {
     const [{ name, type, value: itemValue }] = value;
     switch (type) {
-      case "Function": {
+      case AST_TYPES.FUNCTION: {
         const values = parsers.splitValue(itemValue, {
           delimiter: ","
         });
         const parsedValues = [];
         for (const item of values) {
           const parsedValue = parsers.parseCSS(item, { context: "value" }, true);
-          const val = parsers.parseLength(parsedValue.children);
+          const val = parsers.resolveNumericValue(parsedValue.children, {
+            type: "length"
+          });
           if (val) {
             parsedValues.push(val);
           } else {
@@ -34,8 +37,8 @@ module.exports.parse = function parse(v, opt = {}) {
         }
         return `${name}(${parsedValues.join(", ")})`;
       }
-      case "GlobalKeyword":
-      case "Identifier": {
+      case AST_TYPES.GLOBAL_KEYWORD:
+      case AST_TYPES.IDENTIFIER: {
         return name;
       }
       default:
@@ -66,3 +69,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/color.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "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/display.js

@@ -8,11 +8,12 @@ const property = "display";
 const displayOutside = ["block", "inline", "run-in"];
 const displayFlow = ["flow", "flow-root"];
 
-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
@@ -22,10 +23,10 @@ module.exports.parse = function parse(v, opt = {}) {
       case 1: {
         const [{ name, type }] = value;
         switch (type) {
-          case "GlobalKeyword": {
+          case AST_TYPES.GLOBAL_KEYWORD: {
             return name;
           }
-          case "Identifier": {
+          case AST_TYPES.IDENTIFIER: {
             if (name === "flow") {
               return "block";
             }
@@ -37,8 +38,8 @@ module.exports.parse = function parse(v, opt = {}) {
       }
       case 2: {
         const [part1, part2] = value;
-        const val1 = part1.type === "Identifier" && part1.name;
-        const val2 = part2.type === "Identifier" && part2.name;
+        const val1 = part1.type === AST_TYPES.IDENTIFIER && part1.name;
+        const val2 = part2.type === AST_TYPES.IDENTIFIER && part2.name;
         if (val1 && val2) {
           let outerValue = "";
           let innerValue = "";
@@ -122,9 +123,9 @@ module.exports.parse = function parse(v, opt = {}) {
       }
       case 3: {
         const [part1, part2, part3] = value;
-        const val1 = part1.type === "Identifier" && part1.name;
-        const val2 = part2.type === "Identifier" && part2.name;
-        const val3 = part3.type === "Identifier" && part3.name;
+        const val1 = part1.type === AST_TYPES.IDENTIFIER && part1.name;
+        const val2 = part2.type === AST_TYPES.IDENTIFIER && part2.name;
+        const val3 = part3.type === AST_TYPES.IDENTIFIER && part3.name;
         if (val1 && val2 && part3) {
           let outerValue = "";
           let flowValue = "";
@@ -205,3 +206,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

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;
@@ -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;
   }
@@ -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;
   }
@@ -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;
   }
@@ -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;
   }
@@ -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;
   }
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;