cssstyle 5.3.5 → 5.3.6

package/lib/properties/margin.js

@@ -11,13 +11,13 @@ const property = "margin";
 module.exports.position = "edges";
 
 module.exports.shorthandFor = new Map([
-  ["margin-top", marginTop],
-  ["margin-right", marginRight],
-  ["margin-bottom", marginBottom],
-  ["margin-left", marginLeft]
+  [marginTop.property, marginTop],
+  [marginRight.property, marginRight],
+  [marginBottom.property, marginBottom],
+  [marginLeft.property, marginLeft]
 ]);
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -32,34 +32,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;
-          }
-          parsedValues.push(name);
-          break;
-        }
-        case "Identifier": {
-          parsedValues.push(name);
-          break;
-        }
-        default: {
-          const parsedValue = parsers.parseLengthPercentage([value]);
-          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);
@@ -93,3 +73,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/marginBottom.js

@@ -7,7 +7,7 @@ const shorthand = "margin";
 
 module.exports.position = "bottom";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,22 +17,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;
   }
@@ -49,9 +36,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._positionLonghandSetter(property, val, priority, shorthand);
       }
     }
@@ -62,3 +50,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/marginLeft.js

@@ -7,7 +7,7 @@ const shorthand = "margin";
 
 module.exports.position = "left";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,22 +17,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;
   }
@@ -49,9 +36,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._positionLonghandSetter(property, val, priority, shorthand);
       }
     }
@@ -62,3 +50,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/marginRight.js

@@ -7,7 +7,7 @@ const shorthand = "margin";
 
 module.exports.position = "right";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,22 +17,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;
   }
@@ -49,9 +36,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._positionLonghandSetter(property, val, priority, shorthand);
       }
     }
@@ -62,3 +50,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/marginTop.js

@@ -7,7 +7,7 @@ const shorthand = "margin";
 
 module.exports.position = "top";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,22 +17,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;
   }
@@ -49,9 +36,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._positionLonghandSetter(property, val, priority, shorthand);
       }
     }
@@ -62,3 +50,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/opacity.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "opacity";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,23 +14,9 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type, value: itemValue }] = value;
-    switch (type) {
-      case "Calc": {
-        return `${name}(${itemValue})`;
-      }
-      case "GlobalKeyword":
-      case "Identifier": {
-        return name;
-      }
-      case "Number": {
-        return parsers.parseNumber(value);
-      }
-      case "Percentage": {
-        return parsers.parsePercentage(value);
-      }
-      default:
-    }
+    return parsers.resolveNumericValue(value, {
+      clamp: true
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -57,3 +43,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/outlineColor.js

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

@@ -11,13 +11,13 @@ const property = "padding";
 module.exports.position = "edges";
 
 module.exports.shorthandFor = new Map([
-  ["padding-top", paddingTop],
-  ["padding-right", paddingRight],
-  ["padding-bottom", paddingBottom],
-  ["padding-left", paddingLeft]
+  [paddingTop.property, paddingTop],
+  [paddingRight.property, paddingRight],
+  [paddingBottom.property, paddingBottom],
+  [paddingLeft.property, paddingLeft]
 ]);
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -32,32 +32,15 @@ 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;
-          }
-          parsedValues.push(name);
-          break;
-        }
-        default: {
-          const parsedValue = parsers.parseLengthPercentage([value], {
-            min: 0
-          });
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.push(parsedValue);
-        }
+      const parsedValue = parsers.resolveNumericValue([value], {
+        length: values.length,
+        min: 0,
+        type: "length"
+      });
+      if (!parsedValue) {
+        return;
       }
+      parsedValues.push(parsedValue);
     }
   } else if (typeof values === "string") {
     parsedValues.push(values);
@@ -91,3 +74,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/paddingBottom.js

@@ -7,7 +7,7 @@ const shorthand = "padding";
 
 module.exports.position = "bottom";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,23 +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": {
-        return name;
-      }
-      default: {
-        return parsers.parseLengthPercentage(value, {
-          min: 0
-        });
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0,
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -50,9 +37,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._positionLonghandSetter(property, val, priority, shorthand);
       }
     }
@@ -63,3 +51,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/paddingLeft.js

@@ -7,7 +7,7 @@ const shorthand = "padding";
 
 module.exports.position = "left";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,23 +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": {
-        return name;
-      }
-      default: {
-        return parsers.parseLengthPercentage(value, {
-          min: 0
-        });
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0,
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -50,9 +37,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._positionLonghandSetter(property, val, priority, shorthand);
       }
     }
@@ -63,3 +51,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/paddingRight.js

@@ -7,7 +7,7 @@ const shorthand = "padding";
 
 module.exports.position = "right";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,23 +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": {
-        return name;
-      }
-      default: {
-        return parsers.parseLengthPercentage(value, {
-          min: 0
-        });
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0,
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -50,9 +37,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._positionLonghandSetter(property, val, priority, shorthand);
       }
     }
@@ -63,3 +51,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/paddingTop.js

@@ -7,7 +7,7 @@ const shorthand = "padding";
 
 module.exports.position = "top";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -17,23 +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": {
-        return name;
-      }
-      default: {
-        return parsers.parseLengthPercentage(value, {
-          min: 0
-        });
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0,
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -50,9 +37,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._positionLonghandSetter(property, val, priority, shorthand);
       }
     }
@@ -63,3 +51,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;