cssstyle 5.3.5 → 5.3.7

package/lib/properties/fontFamily.js

@@ -5,11 +5,12 @@ const parsers = require("../parsers");
 const property = "font-family";
 const shorthand = "font";
 
-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,15 +25,16 @@ module.exports.parse = function parse(v, opt = {}) {
       if (value.length === 1) {
         const [{ name, type, value: itemValue }] = value;
         switch (type) {
-          case "Function": {
+          case AST_TYPES.FUNCTION: {
             parsedValues.push(`${name}(${itemValue})`);
             break;
           }
-          case "GlobalKeyword":
-          case "Identifier": {
-            if (name !== "undefined") {
-              parsedValues.push(name);
+          case AST_TYPES.GLOBAL_KEYWORD:
+          case AST_TYPES.IDENTIFIER: {
+            if (name === "undefined") {
+              return;
             }
+            parsedValues.push(name);
             break;
           }
           case "String": {
@@ -48,11 +50,10 @@ module.exports.parse = function parse(v, opt = {}) {
         const parts = [];
         for (const item of value) {
           const { name, type } = item;
-          if (type === "Identifier") {
-            parts.push(name);
-          } else {
+          if (type !== AST_TYPES.IDENTIFIER) {
             return;
           }
+          parts.push(name);
         }
         const parsedValue = parts.join(" ").replaceAll("\\", "").replaceAll('"', '\\"');
         parsedValues.push(`"${parsedValue}"`);
@@ -70,7 +71,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(shorthand, "");
       this._setProperty(property, v);
@@ -79,9 +80,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);
       }
     }
@@ -92,3 +94,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/fontSize.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "font-size";
 const shorthand = "font";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -15,24 +15,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.parseLengthPercentage(value, {
-          min: 0
-        });
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0,
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -40,7 +26,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(shorthand, "");
       this._setProperty(property, v);
@@ -49,9 +35,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);
       }
     }
@@ -62,3 +49,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/fontStyle.js

@@ -5,11 +5,12 @@ const parsers = require("../parsers");
 const property = "font-style";
 const shorthand = "font";
 
-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,16 +19,18 @@ module.exports.parse = function parse(v, opt = {}) {
     if (value.length === 1) {
       const [{ name, type }] = value;
       switch (type) {
-        case "GlobalKeyword":
-        case "Identifier": {
+        case AST_TYPES.GLOBAL_KEYWORD:
+        case AST_TYPES.IDENTIFIER: {
           return name;
         }
         default:
       }
     } else if (value.length === 2) {
       const [part1, part2] = value;
-      const val1 = part1.type === "Identifier" && part1.name;
-      const val2 = parsers.parseAngle([part2]);
+      const val1 = part1.type === AST_TYPES.IDENTIFIER && part1.name;
+      const val2 = parsers.resolveNumericValue([part2], {
+        type: "angle"
+      });
       if (val1 && val1 === "oblique" && val2) {
         return `${val1} ${val2}`;
       }
@@ -39,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(shorthand, "");
       this._setProperty(property, v);
@@ -48,9 +51,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);
       }
     }
@@ -61,3 +65,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/fontVariant.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "font-variant";
 const shorthand = "font";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -18,21 +18,11 @@ 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 "Function": {
-          parsedValues.push(`${name}(${itemValue})`);
-          break;
-        }
-        case "GlobalKeyword":
-        case "Identifier": {
-          parsedValues.push(name);
-          break;
-        }
-        default: {
-          return;
-        }
+      const parsedValue = parsers.resolveFunctionValue(value);
+      if (!parsedValue) {
+        return;
       }
+      parsedValues.push(parsedValue);
     } else if (typeof value === "string") {
       parsedValues.push(value);
     }
@@ -49,7 +39,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(shorthand, "");
       this._setProperty(property, v);
@@ -58,9 +48,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);
       }
     }
@@ -71,3 +62,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/fontWeight.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "font-weight";
 const shorthand = "font";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -15,28 +15,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) {
-          return `${name}(${itemValue})`;
-        }
-        break;
-      }
-      case "GlobalKeyword":
-      case "Identifier": {
-        return name;
-      }
-      default: {
-        const parsedValue = parsers.parseNumber(value, {
-          min: 1,
-          max: 1000
-        });
-        if (parsedValue) {
-          return parsedValue;
-        }
-      }
+    const parsedValue = parsers.resolveNumericValue(value, {
+      min: 1,
+      max: 1000
+    });
+    if (!parsedValue) {
+      return;
     }
+    return parsedValue;
   } else if (typeof value === "string") {
     return value;
   }
@@ -44,7 +30,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(shorthand, "");
       this._setProperty(property, v);
@@ -53,9 +39,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);
       }
     }
@@ -66,3 +53,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/height.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "height";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,22 +14,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.parseLengthPercentage(value);
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0,
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -37,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._setProperty(property, v);
     } else {
@@ -56,3 +44,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/left.js

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

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

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "line-height";
 const shorthand = "font";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -15,26 +15,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, {
-          min: 0
-        });
-      }
-      default: {
-        return parsers.parseLengthPercentage(value, {
-          min: 0
-        });
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -42,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._setProperty(shorthand, "");
       this._setProperty(property, v);
@@ -51,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._setProperty(property, val, priority);
       }
     }
@@ -64,3 +48,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

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);
@@ -71,7 +51,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)) {
       for (const [longhand] of module.exports.shorthandFor) {
         this._setProperty(longhand, "");
@@ -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;
   }
@@ -40,7 +27,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(shorthand, "");
       this._setProperty(property, v);
@@ -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;