cssstyle 5.3.5 → 5.3.7

package/lib/properties/borderRight.js

@@ -8,19 +8,25 @@ const borderRightColor = require("./borderRightColor");
 const property = "border-right";
 const shorthand = "border";
 
+const subProps = {
+  width: borderRightWidth.property,
+  style: borderRightStyle.property,
+  color: borderRightColor.property
+};
+
 module.exports.initialValues = new Map([
-  ["border-right-width", "medium"],
-  ["border-right-style", "none"],
-  ["border-right-color", "currentcolor"]
+  [borderRightWidth.property, "medium"],
+  [borderRightStyle.property, "none"],
+  [borderRightColor.property, "currentcolor"]
 ]);
 
 module.exports.shorthandFor = new Map([
-  ["border-right-width", borderRightWidth],
-  ["border-right-style", borderRightStyle],
-  ["border-right-color", borderRightColor]
+  [borderRightWidth.property, borderRightWidth],
+  [borderRightStyle.property, borderRightStyle],
+  [borderRightColor.property, borderRightColor]
 ]);
 
-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-right-width")) {
-            return;
-          }
-          parsedValues.set("border-right-width", `${name}(${itemValue})`);
-          break;
-        }
-        case "Dimension":
-        case "Number": {
-          if (parsedValues.has("border-right-width")) {
-            return;
-          }
-          const parsedValue = parsers.parseLength(value, {
-            min: 0
-          });
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-right-width", parsedValue);
-          break;
-        }
-        case "Function": {
-          if (parsedValues.has("border-right-color")) {
-            return;
-          }
-          const parsedValue = parsers.parseColor(value);
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-right-color", parsedValue);
-          break;
-        }
-        case "GlobalKeyword": {
-          return name;
-        }
-        case "Hash": {
-          if (parsedValues.has("border-right-color")) {
-            return;
-          }
-          const parsedValue = parsers.parseColor(value);
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-right-color", parsedValue);
-          break;
-        }
-        case "Identifier": {
-          if (parsers.isValidPropertyValue("border-right-width", name)) {
-            if (parsedValues.has("border-right-width")) {
-              return;
-            }
-            parsedValues.set("border-right-width", name);
-            break;
-          } else if (parsers.isValidPropertyValue("border-right-style", name)) {
-            if (parsedValues.has("border-right-style")) {
-              return;
-            }
-            parsedValues.set("border-right-style", name);
-            break;
-          } else if (parsers.isValidPropertyValue("border-right-color", name)) {
-            if (parsedValues.has("border-right-color")) {
-              return;
-            }
-            parsedValues.set("border-right-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-right-width": "medium"
+      [borderRightWidth.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-right-width"] && obj["border-right-width"] === "medium") {
-            delete obj["border-right-width"];
+          if (obj[borderRightWidth.property] && obj[borderRightWidth.property] === "medium") {
+            delete obj[borderRightWidth.property];
           }
         }
       }
@@ -133,7 +74,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 {
@@ -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/borderRightColor.js

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

@@ -7,7 +7,7 @@ const lineShorthand = "border-style";
 const positionShorthand = "border-right";
 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/borderRightWidth.js

@@ -7,7 +7,7 @@ const lineShorthand = "border-width";
 const positionShorthand = "border-right";
 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/borderSpacing.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "border-spacing";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -16,17 +16,18 @@ module.exports.parse = function parse(v, opt = {}) {
   if (Array.isArray(value) && value.length) {
     switch (value.length) {
       case 1: {
-        const [part1] = value;
-        const val1 = parsers.parseLength([part1]);
-        if (val1) {
-          return val1;
-        }
-        break;
+        return parsers.resolveNumericValue(value, {
+          type: "length"
+        });
       }
       case 2: {
         const [part1, part2] = value;
-        const val1 = parsers.parseLength([part1]);
-        const val2 = parsers.parseLength([part2]);
+        const val1 = parsers.resolveNumericValue([part1], {
+          type: "length"
+        });
+        const val2 = parsers.resolveNumericValue([part2], {
+          type: "length"
+        });
         if (val1 && val2) {
           return `${val1} ${val2}`;
         }
@@ -41,7 +42,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 {
@@ -60,3 +61,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/borderStyle.js

@@ -10,13 +10,13 @@ const property = "border-style";
 const shorthand = "border";
 
 module.exports.shorthandFor = new Map([
-  ["border-top-style", borderTopStyle],
-  ["border-right-style", borderRightStyle],
-  ["border-bottom-style", borderBottomStyle],
-  ["border-left-style", borderLeftStyle]
+  [borderTopStyle.property, borderTopStyle],
+  [borderRightStyle.property, borderRightStyle],
+  [borderBottomStyle.property, borderBottomStyle],
+  [borderLeftStyle.property, borderLeftStyle]
 ]);
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -31,22 +31,13 @@ module.exports.parse = function parse(v, opt = {}) {
       return;
     }
     for (const value of values) {
-      const { name, type } = value;
-      switch (type) {
-        case "GlobalKeyword": {
-          if (values.length !== 1) {
-            return;
-          }
-          return name;
-        }
-        case "Identifier": {
-          parsedValues.push(name);
-          break;
-        }
-        default: {
-          return;
-        }
+      const parsedValue = parsers.resolveKeywordValue([value], {
+        length: values.length
+      });
+      if (!parsedValue) {
+        return;
       }
+      parsedValues.push(parsedValue);
     }
   } else if (typeof values === "string") {
     parsedValues.push(values);
@@ -93,7 +84,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 {
@@ -101,9 +92,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);
       }
     }
@@ -114,3 +106,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/borderTop.js

@@ -8,19 +8,25 @@ const borderTopColor = require("./borderTopColor");
 const property = "border-top";
 const shorthand = "border";
 
+const subProps = {
+  width: borderTopWidth.property,
+  style: borderTopStyle.property,
+  color: borderTopColor.property
+};
+
 module.exports.initialValues = new Map([
-  ["border-top-width", "medium"],
-  ["border-top-style", "none"],
-  ["border-top-color", "currentcolor"]
+  [borderTopWidth.property, "medium"],
+  [borderTopStyle.property, "none"],
+  [borderTopColor.property, "currentcolor"]
 ]);
 
 module.exports.shorthandFor = new Map([
-  ["border-top-width", borderTopWidth],
-  ["border-top-style", borderTopStyle],
-  ["border-top-color", borderTopColor]
+  [borderTopWidth.property, borderTopWidth],
+  [borderTopStyle.property, borderTopStyle],
+  [borderTopColor.property, borderTopColor]
 ]);
 
-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-top-width")) {
-            return;
-          }
-          parsedValues.set("border-top-width", `${name}(${itemValue})`);
-          break;
-        }
-        case "Dimension":
-        case "Number": {
-          if (parsedValues.has("border-top-width")) {
-            return;
-          }
-          const parsedValue = parsers.parseLength(value, {
-            min: 0
-          });
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-top-width", parsedValue);
-          break;
-        }
-        case "Function": {
-          if (parsedValues.has("border-top-color")) {
-            return;
-          }
-          const parsedValue = parsers.parseColor(value);
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-top-color", parsedValue);
-          break;
-        }
-        case "GlobalKeyword": {
-          return name;
-        }
-        case "Hash": {
-          if (parsedValues.has("border-top-color")) {
-            return;
-          }
-          const parsedValue = parsers.parseColor(value);
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.set("border-top-color", parsedValue);
-          break;
-        }
-        case "Identifier": {
-          if (parsers.isValidPropertyValue("border-top-width", name)) {
-            if (parsedValues.has("border-top-width")) {
-              return;
-            }
-            parsedValues.set("border-top-width", name);
-            break;
-          } else if (parsers.isValidPropertyValue("border-top-style", name)) {
-            if (parsedValues.has("border-top-style")) {
-              return;
-            }
-            parsedValues.set("border-top-style", name);
-            break;
-          } else if (parsers.isValidPropertyValue("border-top-color", name)) {
-            if (parsedValues.has("border-top-color")) {
-              return;
-            }
-            parsedValues.set("border-top-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-top-width": "medium"
+      [borderTopWidth.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-top-width"] && obj["border-top-width"] === "medium") {
-            delete obj["border-top-width"];
+          if (obj[borderTopWidth.property] && obj[borderTopWidth.property] === "medium") {
+            delete obj[borderTopWidth.property];
           }
         }
       }
@@ -133,7 +74,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 {
@@ -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;