cssstyle 5.3.4 → 5.3.6

package/lib/properties/background.js

@@ -11,29 +11,30 @@ const backgroundAttachment = require("./backgroundAttachment");
 const backgroundColor = require("./backgroundColor");
 
 const property = "background";
-const initialValues = new Map([
-  ["background-image", "none"],
-  ["background-position", "0% 0%"],
-  ["background-size", "auto"],
-  ["background-repeat", "repeat"],
-  ["background-origin", "padding-box"],
-  ["background-clip", "border-box"],
-  ["background-attachment", "scroll"],
-  ["background-color", "transparent"]
+
+module.exports.initialValues = new Map([
+  [backgroundImage.property, "none"],
+  [backgroundPosition.property, "0% 0%"],
+  [backgroundSize.property, "auto"],
+  [backgroundRepeat.property, "repeat"],
+  [backgroundOrigin.property, "padding-box"],
+  [backgroundClip.property, "border-box"],
+  [backgroundAttachment.property, "scroll"],
+  [backgroundColor.property, "transparent"]
 ]);
 
 module.exports.shorthandFor = new Map([
-  ["background-image", backgroundImage],
-  ["background-position", backgroundPosition],
-  ["background-size", backgroundSize],
-  ["background-repeat", backgroundRepeat],
-  ["background-origin", backgroundOrigin],
-  ["background-clip", backgroundClip],
-  ["background-attachment", backgroundAttachment],
-  ["background-color", backgroundColor]
+  [backgroundImage.property, backgroundImage],
+  [backgroundPosition.property, backgroundPosition],
+  [backgroundSize.property, backgroundSize],
+  [backgroundRepeat.property, backgroundRepeat],
+  [backgroundOrigin.property, backgroundOrigin],
+  [backgroundClip.property, backgroundClip],
+  [backgroundAttachment.property, backgroundAttachment],
+  [backgroundColor.property, backgroundColor]
 ]);
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -50,24 +51,30 @@ module.exports.parse = function parse(v, opt = {}) {
   const l = values.length;
   for (let i = 0; i < l; i++) {
     let bg = {
-      "background-image": initialValues.get("background-image"),
-      "background-position": initialValues.get("background-position"),
-      "background-size": initialValues.get("background-size"),
-      "background-repeat": initialValues.get("background-repeat"),
-      "background-origin": initialValues.get("background-origin"),
-      "background-clip": initialValues.get("background-clip"),
-      "background-attachment": initialValues.get("background-attachment"),
-      "background-color": initialValues.get("background-color")
+      [backgroundImage.property]: module.exports.initialValues.get(backgroundImage.property),
+      [backgroundPosition.property]: module.exports.initialValues.get(backgroundPosition.property),
+      [backgroundSize.property]: module.exports.initialValues.get(backgroundSize.property),
+      [backgroundRepeat.property]: module.exports.initialValues.get(backgroundRepeat.property),
+      [backgroundOrigin.property]: module.exports.initialValues.get(backgroundOrigin.property),
+      [backgroundClip.property]: module.exports.initialValues.get(backgroundClip.property),
+      [backgroundAttachment.property]: module.exports.initialValues.get(
+        backgroundAttachment.property
+      ),
+      [backgroundColor.property]: module.exports.initialValues.get(backgroundColor.property)
     };
     if (l > 1 && i !== l - 1) {
       bg = {
-        "background-image": initialValues.get("background-image"),
-        "background-position": initialValues.get("background-position"),
-        "background-size": initialValues.get("background-size"),
-        "background-repeat": initialValues.get("background-repeat"),
-        "background-origin": initialValues.get("background-origin"),
-        "background-clip": initialValues.get("background-clip"),
-        "background-attachment": initialValues.get("background-attachment")
+        [backgroundImage.property]: module.exports.initialValues.get(backgroundImage.property),
+        [backgroundPosition.property]: module.exports.initialValues.get(
+          backgroundPosition.property
+        ),
+        [backgroundSize.property]: module.exports.initialValues.get(backgroundSize.property),
+        [backgroundRepeat.property]: module.exports.initialValues.get(backgroundRepeat.property),
+        [backgroundOrigin.property]: module.exports.initialValues.get(backgroundOrigin.property),
+        [backgroundClip.property]: module.exports.initialValues.get(backgroundClip.property),
+        [backgroundAttachment.property]: module.exports.initialValues.get(
+          backgroundAttachment.property
+        )
       };
     }
     const bgPosition = [];
@@ -88,15 +95,15 @@ module.exports.parse = function parse(v, opt = {}) {
         if (parsers.isValidPropertyValue(longhand, part)) {
           partValid = true;
           switch (longhand) {
-            case "background-clip":
-            case "background-origin": {
+            case backgroundClip.property:
+            case backgroundOrigin.property: {
               const parsedValue = value.parse(part, { globalObject });
               if (parsedValue) {
                 bgBox.push(parsedValue);
               }
               break;
             }
-            case "background-color": {
+            case backgroundColor.property: {
               if (i !== values.length - 1) {
                 return;
               }
@@ -106,21 +113,21 @@ module.exports.parse = function parse(v, opt = {}) {
               }
               break;
             }
-            case "background-position": {
+            case backgroundPosition.property: {
               const parsedValue = value.parse(part, { globalObject });
               if (parsedValue) {
                 bgPosition.push(parsedValue);
               }
               break;
             }
-            case "background-repeat": {
+            case backgroundRepeat.property: {
               const parsedValue = value.parse(part, { globalObject });
               if (parsedValue) {
                 bgRepeat.push(parsedValue);
               }
               break;
             }
-            case "background-size": {
+            case backgroundSize.property: {
               break;
             }
             default: {
@@ -144,15 +151,15 @@ module.exports.parse = function parse(v, opt = {}) {
           if (parsers.isValidPropertyValue(longhand, part)) {
             partValid = true;
             switch (longhand) {
-              case "background-clip":
-              case "background-origin": {
+              case backgroundClip.property:
+              case backgroundOrigin.property: {
                 const parsedValue = value.parse(part, { globalObject });
                 if (parsedValue) {
                   bgBox.push(parsedValue);
                 }
                 break;
               }
-              case "background-color": {
+              case backgroundColor.property: {
                 if (i !== l - 1) {
                   return;
                 }
@@ -162,17 +169,17 @@ module.exports.parse = function parse(v, opt = {}) {
                 }
                 break;
               }
-              case "background-position": {
+              case backgroundPosition.property: {
                 break;
               }
-              case "background-repeat": {
+              case backgroundRepeat.property: {
                 const parsedValue = value.parse(part, { globalObject });
                 if (parsedValue) {
                   bgRepeat.push(parsedValue);
                 }
                 break;
               }
-              case "background-size": {
+              case backgroundSize.property: {
                 const parsedValue = value.parse(part, { globalObject });
                 if (parsedValue) {
                   bgSize.push(parsedValue);
@@ -194,38 +201,38 @@ module.exports.parse = function parse(v, opt = {}) {
       }
     }
     if (bgPosition.length) {
-      const { parse: parser } = module.exports.shorthandFor.get("background-position");
+      const { parse: parser } = module.exports.shorthandFor.get(backgroundPosition.property);
       const value = parser(bgPosition.join(" "), { globalObject });
       if (value) {
-        bg["background-position"] = value;
+        bg[backgroundPosition.property] = value;
       }
     }
     if (bgSize.length) {
-      const { parse: parser } = module.exports.shorthandFor.get("background-size");
+      const { parse: parser } = module.exports.shorthandFor.get(backgroundSize.property);
       const value = parser(bgSize.join(" "), { globalObject });
       if (value) {
-        bg["background-size"] = value;
+        bg[backgroundSize.property] = value;
       }
     }
     if (bgRepeat.length) {
-      const { parse: parser } = module.exports.shorthandFor.get("background-repeat");
+      const { parse: parser } = module.exports.shorthandFor.get(backgroundRepeat.property);
       const value = parser(bgRepeat.join(" "), { globalObject });
       if (value) {
-        bg["background-repeat"] = value;
+        bg[backgroundRepeat.property] = value;
       }
     }
     if (bgBox.length) {
       switch (bgBox.length) {
         case 1: {
           const [value] = bgBox;
-          bg["background-origin"] = value;
-          bg["background-clip"] = value;
+          bg[backgroundOrigin.property] = value;
+          bg[backgroundClip.property] = value;
           break;
         }
         case 2: {
           const [value1, value2] = bgBox;
-          bg["background-origin"] = value1;
-          bg["background-clip"] = value2;
+          bg[backgroundOrigin.property] = value1;
+          bg[backgroundClip.property] = value2;
           break;
         }
         default: {
@@ -254,14 +261,14 @@ module.exports.definition = {
         return;
       }
       const bgMap = new Map([
-        ["background-image", []],
-        ["background-position", []],
-        ["background-size", []],
-        ["background-repeat", []],
-        ["background-origin", []],
-        ["background-clip", []],
-        ["background-attachment", []],
-        ["background-color", []]
+        [backgroundImage.property, []],
+        [backgroundPosition.property, []],
+        [backgroundSize.property, []],
+        [backgroundRepeat.property, []],
+        [backgroundOrigin.property, []],
+        [backgroundClip.property, []],
+        [backgroundAttachment.property, []],
+        [backgroundColor.property, []]
       ]);
       const backgrounds = [];
       for (const bgValue of bgValues) {
@@ -271,17 +278,17 @@ module.exports.definition = {
             const arr = bgMap.get(longhand);
             arr.push(value);
             bgMap.set(longhand, arr);
-            if (value !== initialValues.get(longhand)) {
-              if (longhand === "background-size") {
+            if (value !== module.exports.initialValues.get(longhand)) {
+              if (longhand === backgroundSize.property) {
                 bg.push(`/ ${value}`);
               } else {
                 bg.push(value);
               }
-            } else if (longhand === "background-image") {
+            } else if (longhand === backgroundImage.property) {
               if (v === "none") {
                 bg.push(value);
               }
-            } else if (longhand === "background-color") {
+            } else if (longhand === backgroundColor.property) {
               if (v === "transparent") {
                 bg.push(value);
               }
@@ -306,26 +313,26 @@ module.exports.definition = {
     let l = 0;
     for (const [longhand] of module.exports.shorthandFor) {
       const val = this.getPropertyValue(longhand);
-      if (longhand === "background-image") {
+      if (longhand === backgroundImage.property) {
         if (
           val === "none" &&
           v === "none" &&
-          this.getPropertyValue("background-color") === "transparent"
+          this.getPropertyValue(backgroundColor.property) === "transparent"
         ) {
           return val;
         }
-        if (val !== initialValues.get(longhand)) {
+        if (val !== module.exports.initialValues.get(longhand)) {
           const imgValues = parsers.splitValue(val, {
             delimiter: ","
           });
           l = imgValues.length;
           bgMap.set(longhand, imgValues);
         }
-      } else if (longhand === "background-color") {
-        if (val !== initialValues.get(longhand) || v.includes(val)) {
+      } else if (longhand === backgroundColor.property) {
+        if (val !== module.exports.initialValues.get(longhand) || v.includes(val)) {
           bgMap.set(longhand, [val]);
         }
-      } else if (val !== initialValues.get(longhand)) {
+      } else if (val !== module.exports.initialValues.get(longhand)) {
         bgMap.set(
           longhand,
           parsers.splitValue(val, {
@@ -335,7 +342,8 @@ module.exports.definition = {
       }
     }
     if (l === 0) {
-      const [background] = bgMap.get("background-color");
+      const bgColArr = bgMap.get(backgroundColor.property);
+      const background = bgColArr ? bgColArr[0] : null;
       if (background) {
         return background;
       }
@@ -348,25 +356,25 @@ module.exports.definition = {
     for (const [longhand, values] of bgMap) {
       for (let i = 0; i < l; i++) {
         switch (longhand) {
-          case "background-color": {
+          case backgroundColor.property: {
             if (i === l - 1) {
               const value = values[0];
               if (parsers.hasVarFunc(value)) {
                 return "";
               }
-              if (value && value !== initialValues.get(longhand)) {
+              if (value && value !== module.exports.initialValues.get(longhand)) {
                 const bgValue = bgValues[i];
                 bgValue.push(value);
               }
             }
             break;
           }
-          case "background-size": {
+          case backgroundSize.property: {
             const value = values[i];
             if (parsers.hasVarFunc(value)) {
               return "";
             }
-            if (value && value !== initialValues.get(longhand)) {
+            if (value && value !== module.exports.initialValues.get(longhand)) {
               const bgValue = bgValues[i];
               bgValue.push(`/ ${value}`);
             }
@@ -377,7 +385,7 @@ module.exports.definition = {
             if (parsers.hasVarFunc(value)) {
               return "";
             }
-            if (value && value !== initialValues.get(longhand)) {
+            if (value && value !== module.exports.initialValues.get(longhand)) {
               const bgValue = bgValues[i];
               bgValue.push(value);
             }
@@ -394,3 +402,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/backgroundAttachment.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "background-attachment";
 const shorthand = "background";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -18,17 +18,11 @@ 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": {
-          parsedValues.push(name);
-          break;
-        }
-        default: {
-          return;
-        }
+      const parsedValue = parsers.resolveKeywordValue(value);
+      if (!parsedValue) {
+        return;
       }
+      parsedValues.push(parsedValue);
     } else if (typeof value === "string") {
       parsedValues.push(value);
     }
@@ -49,9 +43,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 +57,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/backgroundClip.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "background-clip";
 const shorthand = "background";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -18,17 +18,11 @@ 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": {
-          parsedValues.push(name);
-          break;
-        }
-        default: {
-          return;
-        }
+      const parsedValue = parsers.resolveKeywordValue(value);
+      if (!parsedValue) {
+        return;
       }
+      parsedValues.push(parsedValue);
     } else if (typeof value === "string") {
       parsedValues.push(value);
     }
@@ -49,9 +43,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 +57,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/backgroundColor.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "background-color";
 const shorthand = "background";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -15,15 +15,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;
   }
@@ -40,9 +32,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);
       }
     }
@@ -53,3 +46,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/backgroundImage.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "background-image";
 const shorthand = "background";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -18,29 +18,11 @@ 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": {
-          parsedValues.push(name);
-          break;
-        }
-        case "Url": {
-          const parsedValue = parsers.parseUrl(value);
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.push(parsedValue);
-          break;
-        }
-        default: {
-          const parsedValue = parsers.parseGradient(value);
-          if (!parsedValue) {
-            return;
-          }
-          parsedValues.push(parsedValue);
-        }
+      const parsedValue = parsers.resolveGradientUrlValue(value);
+      if (!parsedValue) {
+        return;
       }
+      parsedValues.push(parsedValue);
     } else if (typeof value === "string") {
       parsedValues.push(value);
     } else {
@@ -63,9 +45,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);
       }
     }
@@ -76,3 +59,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/backgroundOrigin.js

@@ -5,7 +5,7 @@ const parsers = require("../parsers");
 const property = "background-origin";
 const shorthand = "background";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -18,17 +18,11 @@ 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": {
-          parsedValues.push(name);
-          break;
-        }
-        default: {
-          return;
-        }
+      const parsedValue = parsers.resolveKeywordValue(value);
+      if (!parsedValue) {
+        return;
       }
+      parsedValues.push(parsedValue);
     } else if (typeof value === "string") {
       parsedValues.push(value);
     }
@@ -49,9 +43,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 +57,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;