cssstyle 5.3.4 → 5.3.6

package/lib/properties/backgroundPosition.js

@@ -10,11 +10,12 @@ const keywordsX = ["center", ...keyX];
 const keywordsY = ["center", ...keyY];
 const keywords = ["center", ...keyX, ...keyY];
 
-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: ","
   });
@@ -25,12 +26,14 @@ module.exports.parse = function parse(v, opt = {}) {
       inArray: true
     });
     if (Array.isArray(value) && value.length) {
+      const [part1, part2, part3, part4] = value;
       let parsedValue = "";
       switch (value.length) {
         case 1: {
-          const [part1] = value;
           const val1 =
-            part1.type === "Identifier" ? part1.name : parsers.parseLengthPercentage([part1]);
+            part1.type === AST_TYPES.IDENTIFIER
+              ? part1.name
+              : parsers.resolveNumericValue([part1], { type: "length" });
           if (val1) {
             if (val1 === "center") {
               parsedValue = `${val1} ${val1}`;
@@ -43,11 +46,14 @@ module.exports.parse = function parse(v, opt = {}) {
           break;
         }
         case 2: {
-          const [part1, part2] = value;
           const val1 =
-            part1.type === "Identifier" ? part1.name : parsers.parseLengthPercentage([part1]);
+            part1.type === AST_TYPES.IDENTIFIER
+              ? part1.name
+              : parsers.resolveNumericValue([part1], { type: "length" });
           const val2 =
-            part2.type === "Identifier" ? part2.name : parsers.parseLengthPercentage([part2]);
+            part2.type === AST_TYPES.IDENTIFIER
+              ? part2.name
+              : parsers.resolveNumericValue([part2], { type: "length" });
           if (val1 && val2) {
             if (keywordsX.includes(val1) && keywordsY.includes(val2)) {
               parsedValue = `${val1} ${val2}`;
@@ -68,12 +74,15 @@ module.exports.parse = function parse(v, opt = {}) {
           break;
         }
         case 3: {
-          const [part1, part2, part3] = value;
-          const val1 = part1.type === "Identifier" && part1.name;
+          const val1 = part1.type === AST_TYPES.IDENTIFIER && part1.name;
           const val2 =
-            part2.type === "Identifier" ? part2.name : parsers.parseLengthPercentage([part2]);
+            part2.type === AST_TYPES.IDENTIFIER
+              ? part2.name
+              : parsers.resolveNumericValue([part2], { type: "length" });
           const val3 =
-            part3.type === "Identifier" ? part3.name : parsers.parseLengthPercentage([part3]);
+            part3.type === AST_TYPES.IDENTIFIER
+              ? part3.name
+              : parsers.resolveNumericValue([part3], { type: "length" });
           if (val1 && val2 && val3) {
             let posX = "";
             let offX = "";
@@ -119,11 +128,10 @@ module.exports.parse = function parse(v, opt = {}) {
           break;
         }
         case 4: {
-          const [part1, part2, part3, part4] = value;
-          const val1 = part1.type === "Identifier" && part1.name;
-          const val2 = parsers.parseLengthPercentage([part2]);
-          const val3 = part3.type === "Identifier" && part3.name;
-          const val4 = parsers.parseLengthPercentage([part4]);
+          const val1 = part1.type === AST_TYPES.IDENTIFIER && part1.name;
+          const val2 = parsers.resolveNumericValue([part2], { type: "length" });
+          const val3 = part3.type === AST_TYPES.IDENTIFIER && part3.name;
+          const val4 = parsers.resolveNumericValue([part4], { type: "length" });
           if (val1 && val2 && val3 && val4) {
             let posX = "";
             let offX = "";
@@ -178,9 +186,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);
       }
     }
@@ -191,3 +200,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/backgroundRepeat.js

@@ -5,11 +5,12 @@ const parsers = require("../parsers");
 const property = "background-repeat";
 const shorthand = "background";
 
-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,7 +25,7 @@ module.exports.parse = function parse(v, opt = {}) {
       switch (value.length) {
         case 1: {
           const [part1] = value;
-          const val1 = part1.type === "Identifier" && part1.name;
+          const val1 = part1.type === AST_TYPES.IDENTIFIER && part1.name;
           if (val1) {
             parsedValue = val1;
           }
@@ -32,8 +33,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) {
             if (val1 === "repeat" && val2 === "no-repeat") {
               parsedValue = "repeat-x";
@@ -74,9 +75,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);
       }
     }
@@ -87,3 +89,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/backgroundSize.js

@@ -5,11 +5,12 @@ const parsers = require("../parsers");
 const property = "background-size";
 const shorthand = "background";
 
-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: ","
   });
@@ -23,20 +24,22 @@ module.exports.parse = function parse(v, opt = {}) {
       if (value.length === 1) {
         const [{ isNumber, name, type, value: itemValue }] = value;
         switch (type) {
-          case "Calc": {
+          case AST_TYPES.CALC: {
             if (isNumber) {
               return;
             }
             parsedValues.push(`${name}(${itemValue})`);
             break;
           }
-          case "GlobalKeyword":
-          case "Identifier": {
+          case AST_TYPES.GLOBAL_KEYWORD:
+          case AST_TYPES.IDENTIFIER: {
             parsedValues.push(name);
             break;
           }
           default: {
-            const parsedValue = parsers.parseLengthPercentage(value);
+            const parsedValue = parsers.resolveNumericValue(value, {
+              type: "length"
+            });
             if (!parsedValue) {
               return;
             }
@@ -46,36 +49,36 @@ module.exports.parse = function parse(v, opt = {}) {
       } else {
         const [val1, val2] = value;
         const parts = [];
-        if (val1.type === "Calc" && !val1.isNumber) {
+        if (val1.type === AST_TYPES.CALC && !val1.isNumber) {
           parts.push(`${val1.name}(${val1.value})`);
-        } else if (val1.type === "Identifier") {
+        } else if (val1.type === AST_TYPES.IDENTIFIER) {
           parts.push(val1.name);
-        } else if (val1.type === "Dimension") {
+        } else if (val1.type === AST_TYPES.DIMENSION) {
           parts.push(`${val1.value}${val1.unit}`);
-        } else if (val1.type === "Percentage") {
+        } else if (val1.type === AST_TYPES.PERCENTAGE) {
           parts.push(`${val1.value}%`);
         } else {
           return;
         }
         switch (val2.type) {
-          case "Calc": {
+          case AST_TYPES.CALC: {
             if (val2.isNumber) {
               return;
             }
             parts.push(`${val2.name}(${val2.value})`);
             break;
           }
-          case "Dimension": {
+          case AST_TYPES.DIMENSION: {
             parts.push(`${val2.value}${val2.unit}`);
             break;
           }
-          case "Identifier": {
+          case AST_TYPES.IDENTIFIER: {
             if (val2.name !== "auto") {
               parts.push(val2.name);
             }
             break;
           }
-          case "Percentage": {
+          case AST_TYPES.PERCENTAGE: {
             parts.push(`${val2.value}%`);
             break;
           }
@@ -105,9 +108,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);
       }
     }
@@ -118,3 +122,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/border.js

@@ -11,26 +11,32 @@ const borderLeft = require("./borderLeft");
 
 const property = "border";
 
+const subProps = {
+  width: borderWidth.property,
+  style: borderStyle.property,
+  color: borderColor.property
+};
+
 module.exports.initialValues = new Map([
-  ["border-width", "medium"],
-  ["border-style", "none"],
-  ["border-color", "currentcolor"]
+  [borderWidth.property, "medium"],
+  [borderStyle.property, "none"],
+  [borderColor.property, "currentcolor"]
 ]);
 
 module.exports.shorthandFor = new Map([
-  ["border-width", borderWidth],
-  ["border-style", borderStyle],
-  ["border-color", borderColor]
+  [borderWidth.property, borderWidth],
+  [borderStyle.property, borderStyle],
+  [borderColor.property, borderColor]
 ]);
 
 module.exports.positionShorthandFor = new Map([
-  ["border-top", borderTop],
-  ["border-right", borderRight],
-  ["border-bottom", borderBottom],
-  ["border-left", borderLeft]
+  [borderTop.property, borderTop],
+  [borderRight.property, borderRight],
+  [borderBottom.property, borderBottom],
+  [borderLeft.property, borderLeft]
 ]);
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "" || parsers.hasVarFunc(v)) {
     return v;
@@ -43,79 +49,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 || parsedValues.has("border-width")) {
-            return;
-          }
-          parsedValues.set("border-width", `${name}(${itemValue})`);
-          break;
-        }
-        case "Dimension":
-        case "Number": {
-          if (parsedValues.has("border-width")) {
-            return;
-          }
-          const parsedValue = parsers.parseLength(value, {
-            min: 0
-          });
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-width", parsedValue);
-          break;
-        }
-        case "Function": {
-          if (parsedValues.has("border-color")) {
-            return;
-          }
-          const parsedValue = parsers.parseColor(value);
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-color", parsedValue);
-          break;
-        }
-        case "GlobalKeyword": {
-          return name;
-        }
-        case "Hash": {
-          if (parsedValues.has("border-color")) {
-            return;
-          }
-          const parsedValue = parsers.parseColor(value);
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-color", parsedValue);
-          break;
-        }
-        case "Identifier": {
-          if (parsers.isValidPropertyValue("border-width", name)) {
-            if (parsedValues.has("border-width")) {
-              return;
-            }
-            parsedValues.set("border-width", name);
-            break;
-          } else if (parsers.isValidPropertyValue("border-style", name)) {
-            if (parsedValues.has("border-style")) {
-              return;
-            }
-            parsedValues.set("border-style", name);
-            break;
-          } else if (parsers.isValidPropertyValue("border-color", name)) {
-            if (parsedValues.has("border-color")) {
-              return;
-            }
-            parsedValues.set("border-color", name);
-            break;
-          }
-          return;
-        }
-        default: {
-          return;
-        }
+      const parsedValue = parsers.resolveBorderShorthandValue(value, subProps, parsedValues);
+      if (typeof parsedValue === "string") {
+        return parsedValue;
+      } else if (Array.isArray(parsedValue)) {
+        const [key, resolvedVal] = parsedValue;
+        parsedValues.set(key, resolvedVal);
+      } else {
+        return;
       }
     } else {
       return;
@@ -124,15 +65,15 @@ module.exports.parse = function parse(v, opt = {}) {
   if (parsedValues.size) {
     const keys = module.exports.shorthandFor.keys();
     const obj = {
-      "border-width": "medium"
+      [borderWidth.property]: "medium"
     };
     for (const key of keys) {
       if (parsedValues.has(key)) {
         const parsedValue = parsedValues.get(key);
         if (parsedValue !== module.exports.initialValues.get(key)) {
           obj[key] = parsedValues.get(key);
-          if (obj["border-width"] && obj["border-width"] === "medium") {
-            delete obj["border-width"];
+          if (obj[borderWidth.property] && obj[borderWidth.property] === "medium") {
+            delete obj[borderWidth.property];
           }
         }
       }
@@ -162,3 +103,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/borderBottom.js

@@ -8,19 +8,25 @@ const borderBottomColor = require("./borderBottomColor");
 const property = "border-bottom";
 const shorthand = "border";
 
+const subProps = {
+  width: borderBottomWidth.property,
+  style: borderBottomStyle.property,
+  color: borderBottomColor.property
+};
+
 module.exports.initialValues = new Map([
-  ["border-bottom-width", "medium"],
-  ["border-bottom-style", "none"],
-  ["border-bottom-color", "currentcolor"]
+  [borderBottomWidth.property, "medium"],
+  [borderBottomStyle.property, "none"],
+  [borderBottomColor.property, "currentcolor"]
 ]);
 
 module.exports.shorthandFor = new Map([
-  ["border-bottom-width", borderBottomWidth],
-  ["border-bottom-style", borderBottomStyle],
-  ["border-bottom-color", borderBottomColor]
+  [borderBottomWidth.property, borderBottomWidth],
+  [borderBottomStyle.property, borderBottomStyle],
+  [borderBottomColor.property, borderBottomColor]
 ]);
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -33,79 +39,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 || parsedValues.has("border-bottom-width")) {
-            return;
-          }
-          parsedValues.set("border-bottom-width", `${name}(${itemValue})`);
-          break;
-        }
-        case "Dimension":
-        case "Number": {
-          if (parsedValues.has("border-bottom-width")) {
-            return;
-          }
-          const parsedValue = parsers.parseLength(value, {
-            min: 0
-          });
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-bottom-width", parsedValue);
-          break;
-        }
-        case "Function": {
-          if (parsedValues.has("border-bottom-color")) {
-            return;
-          }
-          const parsedValue = parsers.parseColor(value);
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-bottom-color", parsedValue);
-          break;
-        }
-        case "GlobalKeyword": {
-          return name;
-        }
-        case "Hash": {
-          if (parsedValues.has("border-bottom-color")) {
-            return;
-          }
-          const parsedValue = parsers.parseColor(value);
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-bottom-color", parsedValue);
-          break;
-        }
-        case "Identifier": {
-          if (parsers.isValidPropertyValue("border-bottom-width", name)) {
-            if (parsedValues.has("border-bottom-width")) {
-              return;
-            }
-            parsedValues.set("border-bottom-width", name);
-            break;
-          } else if (parsers.isValidPropertyValue("border-bottom-style", name)) {
-            if (parsedValues.has("border-bottom-style")) {
-              return;
-            }
-            parsedValues.set("border-bottom-style", name);
-            break;
-          } else if (parsers.isValidPropertyValue("border-bottom-color", name)) {
-            if (parsedValues.has("border-bottom-color")) {
-              return;
-            }
-            parsedValues.set("border-bottom-color", name);
-            break;
-          }
-          return;
-        }
-        default: {
-          return;
-        }
+      const parsedValue = parsers.resolveBorderShorthandValue(value, subProps, parsedValues);
+      if (typeof parsedValue === "string") {
+        return parsedValue;
+      } else if (Array.isArray(parsedValue)) {
+        const [key, resolvedVal] = parsedValue;
+        parsedValues.set(key, resolvedVal);
+      } else {
+        return;
       }
     } else {
       return;
@@ -114,15 +55,15 @@ module.exports.parse = function parse(v, opt = {}) {
   if (parsedValues.size) {
     const keys = module.exports.shorthandFor.keys();
     const obj = {
-      "border-bottom-width": "medium"
+      [borderBottomWidth.property]: "medium"
     };
     for (const key of keys) {
       if (parsedValues.has(key)) {
         const parsedValue = parsedValues.get(key);
         if (parsedValue !== module.exports.initialValues.get(key)) {
           obj[key] = parsedValues.get(key);
-          if (obj["border-bottom-width"] && obj["border-bottom-width"] === "medium") {
-            delete obj["border-bottom-width"];
+          if (obj[borderBottomWidth.property] && obj[borderBottomWidth.property] === "medium") {
+            delete obj[borderBottomWidth.property];
           }
         }
       }
@@ -141,9 +82,10 @@ module.exports.definition = {
         globalObject: this._global
       });
       if (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);
       }
     }
@@ -154,3 +96,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/borderBottomColor.js

@@ -7,7 +7,7 @@ const lineShorthand = "border-color";
 const positionShorthand = "border-bottom";
 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;
   }
@@ -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/borderBottomStyle.js

@@ -7,7 +7,7 @@ const lineShorthand = "border-style";
 const positionShorthand = "border-bottom";
 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;
   }
@@ -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;