cssstyle 5.3.5 → 5.3.7

package/lib/properties/borderTopColor.js

@@ -7,7 +7,7 @@ const lineShorthand = "border-color";
 const positionShorthand = "border-top";
 const shorthand = "border";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,15 +17,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;
   }
@@ -33,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._borderSetter(property, v, "");
     } else {
@@ -44,10 +36,10 @@ module.exports.definition = {
         const shorthandPriority = this._priorities.get(shorthand);
         const linePriority = this._priorities.get(lineShorthand);
         const positionPriority = this._priorities.get(positionShorthand);
-        let priority = this._priorities.get(property) ?? "";
-        if ((shorthandPriority || linePriority || positionPriority) && priority) {
-          priority = "";
-        }
+        const priority =
+          !(shorthandPriority || linePriority || positionPriority) && this._priorities.has(property)
+            ? this._priorities.get(property)
+            : "";
         this._borderSetter(property, val, priority);
       }
     }
@@ -58,3 +50,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/borderTopStyle.js

@@ -7,7 +7,7 @@ const lineShorthand = "border-style";
 const positionShorthand = "border-top";
 const shorthand = "border";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,14 +17,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;
   }
@@ -32,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._borderSetter(property, v, "");
     } else {
@@ -43,10 +36,10 @@ module.exports.definition = {
         const shorthandPriority = this._priorities.get(shorthand);
         const linePriority = this._priorities.get(lineShorthand);
         const positionPriority = this._priorities.get(positionShorthand);
-        let priority = this._priorities.get(property) ?? "";
-        if ((shorthandPriority || linePriority || positionPriority) && priority) {
-          priority = "";
-        }
+        const priority =
+          !(shorthandPriority || linePriority || positionPriority) && this._priorities.has(property)
+            ? this._priorities.get(property)
+            : "";
         this._borderSetter(property, val, priority);
       }
     }
@@ -57,3 +50,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/borderTopWidth.js

@@ -7,7 +7,7 @@ const lineShorthand = "border-width";
 const positionShorthand = "border-top";
 const shorthand = "border";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,24 +17,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.parseLength(value, {
-          min: 0
-        });
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0,
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -42,7 +28,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._borderSetter(property, v, "");
     } else {
@@ -53,10 +39,10 @@ module.exports.definition = {
         const shorthandPriority = this._priorities.get(shorthand);
         const linePriority = this._priorities.get(lineShorthand);
         const positionPriority = this._priorities.get(positionShorthand);
-        let priority = this._priorities.get(property) ?? "";
-        if ((shorthandPriority || linePriority || positionPriority) && priority) {
-          priority = "";
-        }
+        const priority =
+          !(shorthandPriority || linePriority || positionPriority) && this._priorities.has(property)
+            ? this._priorities.get(property)
+            : "";
         this._borderSetter(property, val, priority);
       }
     }
@@ -67,3 +53,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/borderWidth.js

@@ -10,13 +10,13 @@ const property = "border-width";
 const shorthand = "border";
 
 module.exports.shorthandFor = new Map([
-  ["border-top-width", borderTopWidth],
-  ["border-right-width", borderRightWidth],
-  ["border-bottom-width", borderBottomWidth],
-  ["border-left-width", borderLeftWidth]
+  [borderTopWidth.property, borderTopWidth],
+  [borderRightWidth.property, borderRightWidth],
+  [borderBottomWidth.property, borderBottomWidth],
+  [borderLeftWidth.property, borderLeftWidth]
 ]);
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -31,35 +31,14 @@ module.exports.parse = function parse(v, opt = {}) {
       return;
     }
     for (const value of values) {
-      const { isNumber, name, type, value: itemValue } = value;
-      switch (type) {
-        case "Calc": {
-          if (isNumber) {
-            return;
-          }
-          parsedValues.push(`${name}(${itemValue})`);
-          break;
-        }
-        case "GlobalKeyword": {
-          if (values.length !== 1) {
-            return;
-          }
-          return name;
-        }
-        case "Identifier": {
-          parsedValues.push(name);
-          break;
-        }
-        default: {
-          const parsedValue = parsers.parseLength([value], {
-            min: 0
-          });
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.push(parsedValue);
-        }
+      const parsedValue = parsers.resolveNumericValue([value], {
+        length: values.length,
+        type: "length"
+      });
+      if (!parsedValue) {
+        return;
       }
+      parsedValues.push(parsedValue);
     }
   } else if (typeof values === "string") {
     parsedValues.push(values);
@@ -106,7 +85,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._borderSetter(property, v, "");
     } else {
@@ -114,9 +93,10 @@ module.exports.definition = {
         globalObject: this._global
       });
       if (Array.isArray(val) || 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._borderSetter(property, val, priority);
       }
     }
@@ -127,3 +107,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/bottom.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "bottom";
 
-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, raw, type }] = value;
-    switch (type) {
-      case "Calc": {
-        if (!isNumber) {
-          return raw;
-        }
-        break;
-      }
-      case "GlobalKeyword":
-      case "Identifier": {
-        return name;
-      }
-      default: {
-        return parsers.parseLengthPercentage(value);
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -37,7 +24,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 {
@@ -56,3 +43,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/clear.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "clear";
 
-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/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:
@@ -47,7 +50,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 {
@@ -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;
   }
@@ -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/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 = "";
@@ -186,7 +187,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 {
@@ -205,3 +206,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;