cssstyle 5.2.1 → 5.3.0

package/lib/properties/background.js

@@ -10,17 +10,7 @@ const backgroundClip = require("./backgroundClip");
 const backgroundAttachment = require("./backgroundAttachment");
 const backgroundColor = require("./backgroundColor");
 
-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]
-]);
-
+const property = "background";
 const initialValues = new Map([
   ["background-image", "none"],
   ["background-position", "0% 0%"],
@@ -32,7 +22,27 @@ const initialValues = new Map([
   ["background-color", "transparent"]
 ]);
 
-module.exports.parse = function parse(v) {
+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]
+]);
+
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
+  if (v === "") {
+    return v;
+  } else if (parsers.hasCalcFunc(v)) {
+    v = parsers.resolveCalc(v);
+  }
+  if (!parsers.isValidPropertyValue(property, v)) {
+    return;
+  }
   const values = parsers.splitValue(v, {
     delimiter: ","
   });
@@ -74,13 +84,13 @@ module.exports.parse = function parse(v) {
     const parts1 = parsers.splitValue(bgPart1);
     for (const part of parts1) {
       let partValid = false;
-      for (const [property, value] of module.exports.shorthandFor) {
-        if (value.isValid(part)) {
+      for (const [longhand, value] of module.exports.shorthandFor) {
+        if (parsers.isValidPropertyValue(longhand, part)) {
           partValid = true;
-          switch (property) {
+          switch (longhand) {
             case "background-clip":
             case "background-origin": {
-              const parsedValue = value.parse(part);
+              const parsedValue = value.parse(part, { globalObject });
               if (parsedValue) {
                 bgBox.push(parsedValue);
               }
@@ -90,21 +100,21 @@ module.exports.parse = function parse(v) {
               if (i !== values.length - 1) {
                 return;
               }
-              const parsedValue = value.parse(part);
+              const parsedValue = value.parse(part, { globalObject });
               if (parsedValue) {
-                bg[property] = parsedValue;
+                bg[longhand] = parsedValue;
               }
               break;
             }
             case "background-position": {
-              const parsedValue = value.parse(part);
+              const parsedValue = value.parse(part, { globalObject });
               if (parsedValue) {
                 bgPosition.push(parsedValue);
               }
               break;
             }
             case "background-repeat": {
-              const parsedValue = value.parse(part);
+              const parsedValue = value.parse(part, { globalObject });
               if (parsedValue) {
                 bgRepeat.push(parsedValue);
               }
@@ -114,9 +124,9 @@ module.exports.parse = function parse(v) {
               break;
             }
             default: {
-              const parsedValue = value.parse(part);
+              const parsedValue = value.parse(part, { globalObject });
               if (parsedValue) {
-                bg[property] = parsedValue;
+                bg[longhand] = parsedValue;
               }
             }
           }
@@ -130,13 +140,13 @@ module.exports.parse = function parse(v) {
       const parts2 = parsers.splitValue(bgPart2);
       for (const part of parts2) {
         let partValid = false;
-        for (const [property, value] of module.exports.shorthandFor) {
-          if (value.isValid(part)) {
+        for (const [longhand, value] of module.exports.shorthandFor) {
+          if (parsers.isValidPropertyValue(longhand, part)) {
             partValid = true;
-            switch (property) {
+            switch (longhand) {
               case "background-clip":
               case "background-origin": {
-                const parsedValue = value.parse(part);
+                const parsedValue = value.parse(part, { globalObject });
                 if (parsedValue) {
                   bgBox.push(parsedValue);
                 }
@@ -146,9 +156,9 @@ module.exports.parse = function parse(v) {
                 if (i !== l - 1) {
                   return;
                 }
-                const parsedValue = value.parse(part);
+                const parsedValue = value.parse(part, { globalObject });
                 if (parsedValue) {
-                  bg[property] = parsedValue;
+                  bg[longhand] = parsedValue;
                 }
                 break;
               }
@@ -156,23 +166,23 @@ module.exports.parse = function parse(v) {
                 break;
               }
               case "background-repeat": {
-                const parsedValue = value.parse(part);
+                const parsedValue = value.parse(part, { globalObject });
                 if (parsedValue) {
                   bgRepeat.push(parsedValue);
                 }
                 break;
               }
               case "background-size": {
-                const parsedValue = value.parse(part);
+                const parsedValue = value.parse(part, { globalObject });
                 if (parsedValue) {
                   bgSize.push(parsedValue);
                 }
                 break;
               }
               default: {
-                const parsedValue = value.parse(part);
+                const parsedValue = value.parse(part, { globalObject });
                 if (parsedValue) {
-                  bg[property] = parsedValue;
+                  bg[longhand] = parsedValue;
                 }
               }
             }
@@ -185,21 +195,21 @@ module.exports.parse = function parse(v) {
     }
     if (bgPosition.length) {
       const { parse: parser } = module.exports.shorthandFor.get("background-position");
-      const value = parser(bgPosition.join(" "));
+      const value = parser(bgPosition.join(" "), { globalObject });
       if (value) {
         bg["background-position"] = value;
       }
     }
     if (bgSize.length) {
       const { parse: parser } = module.exports.shorthandFor.get("background-size");
-      const value = parser(bgSize.join(" "));
+      const value = parser(bgSize.join(" "), { globalObject });
       if (value) {
         bg["background-size"] = value;
       }
     }
     if (bgRepeat.length) {
       const { parse: parser } = module.exports.shorthandFor.get("background-repeat");
-      const value = parser(bgRepeat.join(" "));
+      const value = parser(bgRepeat.join(" "), { globalObject });
       if (value) {
         bg["background-repeat"] = value;
       }
@@ -235,9 +245,11 @@ module.exports.definition = {
       for (const [key] of module.exports.shorthandFor) {
         this._setProperty(key, "");
       }
-      this._setProperty("background", v);
+      this._setProperty(property, v);
     } else {
-      const bgValues = module.exports.parse(v);
+      const bgValues = module.exports.parse(v, {
+        globalObject: this._global
+      });
       if (!Array.isArray(bgValues)) {
         return;
       }
@@ -254,22 +266,22 @@ module.exports.definition = {
       const backgrounds = [];
       for (const bgValue of bgValues) {
         const bg = [];
-        for (const [property, value] of Object.entries(bgValue)) {
+        for (const [longhand, value] of Object.entries(bgValue)) {
           if (value) {
-            const arr = bgMap.get(property);
+            const arr = bgMap.get(longhand);
             arr.push(value);
-            bgMap.set(property, arr);
-            if (value !== initialValues.get(property)) {
-              if (property === "background-size") {
+            bgMap.set(longhand, arr);
+            if (value !== initialValues.get(longhand)) {
+              if (longhand === "background-size") {
                 bg.push(`/ ${value}`);
               } else {
                 bg.push(value);
               }
-            } else if (property === "background-image") {
+            } else if (longhand === "background-image") {
               if (v === "none") {
                 bg.push(value);
               }
-            } else if (property === "background-color") {
+            } else if (longhand === "background-color") {
               if (v === "transparent") {
                 bg.push(value);
               }
@@ -278,22 +290,23 @@ module.exports.definition = {
         }
         backgrounds.push(bg.join(" "));
       }
-      for (const [property, value] of bgMap) {
-        this._setProperty(property, value.join(", "));
+      const priority = this._priorities.get(property) ?? "";
+      for (const [longhand, value] of bgMap) {
+        this._setProperty(longhand, value.join(", "), priority);
       }
-      this._setProperty("background", backgrounds.join(", "));
+      this._setProperty(property, backgrounds.join(", "), priority);
     }
   },
   get() {
-    const v = this.getPropertyValue("background");
+    const v = this.getPropertyValue(property);
     if (parsers.hasVarFunc(v)) {
       return v;
     }
     const bgMap = new Map();
     let l = 0;
-    for (const [property] of module.exports.shorthandFor) {
-      const val = this.getPropertyValue(property);
-      if (property === "background-image") {
+    for (const [longhand] of module.exports.shorthandFor) {
+      const val = this.getPropertyValue(longhand);
+      if (longhand === "background-image") {
         if (
           val === "none" &&
           v === "none" &&
@@ -301,20 +314,20 @@ module.exports.definition = {
         ) {
           return val;
         }
-        if (val !== initialValues.get(property)) {
+        if (val !== initialValues.get(longhand)) {
           const imgValues = parsers.splitValue(val, {
             delimiter: ","
           });
           l = imgValues.length;
-          bgMap.set(property, imgValues);
+          bgMap.set(longhand, imgValues);
         }
-      } else if (property === "background-color") {
-        if (val !== initialValues.get(property) || v.includes(val)) {
-          bgMap.set(property, [val]);
+      } else if (longhand === "background-color") {
+        if (val !== initialValues.get(longhand) || v.includes(val)) {
+          bgMap.set(longhand, [val]);
         }
-      } else if (val !== initialValues.get(property)) {
+      } else if (val !== initialValues.get(longhand)) {
         bgMap.set(
-          property,
+          longhand,
           parsers.splitValue(val, {
             delimiter: ","
           })
@@ -332,16 +345,16 @@ module.exports.definition = {
     for (let i = 0; i < l; i++) {
       bgValues[i] = [];
     }
-    for (const [property, values] of bgMap) {
+    for (const [longhand, values] of bgMap) {
       for (let i = 0; i < l; i++) {
-        switch (property) {
+        switch (longhand) {
           case "background-color": {
             if (i === l - 1) {
               const value = values[0];
               if (parsers.hasVarFunc(value)) {
                 return "";
               }
-              if (value && value !== initialValues.get(property)) {
+              if (value && value !== initialValues.get(longhand)) {
                 const bgValue = bgValues[i];
                 bgValue.push(value);
               }
@@ -353,7 +366,7 @@ module.exports.definition = {
             if (parsers.hasVarFunc(value)) {
               return "";
             }
-            if (value && value !== initialValues.get(property)) {
+            if (value && value !== initialValues.get(longhand)) {
               const bgValue = bgValues[i];
               bgValue.push(`/ ${value}`);
             }
@@ -364,7 +377,7 @@ module.exports.definition = {
             if (parsers.hasVarFunc(value)) {
               return "";
             }
-            if (value && value !== initialValues.get(property)) {
+            if (value && value !== initialValues.get(longhand)) {
               const bgValue = bgValues[i];
               bgValue.push(value);
             }

package/lib/properties/backgroundAttachment.js

@@ -2,21 +2,35 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
+const property = "background-attachment";
+const shorthand = "background";
+
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
     return v;
   }
-  const values = parsers.splitValue(v, {
-    delimiter: ","
-  });
-  const keywords = ["fixed", "scroll", "local"];
+  const values = parsers.splitValue(v, { delimiter: "," });
   const parsedValues = [];
-  for (const value of values) {
-    const parsedValue = parsers.parseKeyword(value, keywords);
-    if (parsedValue) {
-      parsedValues.push(parsedValue);
-    } else {
-      return;
+  for (const val of values) {
+    const value = parsers.parsePropertyValue(property, val, {
+      globalObject,
+      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;
+        }
+      }
+    } else if (typeof value === "string") {
+      parsedValues.push(value);
     }
   }
   if (parsedValues.length) {
@@ -24,25 +38,26 @@ module.exports.parse = function parse(v) {
   }
 };
 
-module.exports.isValid = function isValid(v) {
-  if (v === "") {
-    return true;
-  }
-  return typeof module.exports.parse(v) === "string";
-};
-
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("background", "");
-      this._setProperty("background-attachment", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._setProperty("background-attachment", module.exports.parse(v));
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const shorthandPriority = this._priorities.get(shorthand);
+        const prior = this._priorities.get(property) ?? "";
+        const priority = shorthandPriority && prior ? "" : prior;
+        this._setProperty(property, val, priority);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("background-attachment");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/backgroundClip.js

@@ -2,21 +2,35 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
+const property = "background-clip";
+const shorthand = "background";
+
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
     return v;
   }
-  const values = parsers.splitValue(v, {
-    delimiter: ","
-  });
-  const keywords = ["border-box", "padding-box", "content-box"];
+  const values = parsers.splitValue(v, { delimiter: "," });
   const parsedValues = [];
-  for (const value of values) {
-    const parsedValue = parsers.parseKeyword(value, keywords);
-    if (parsedValue) {
-      parsedValues.push(parsedValue);
-    } else {
-      return;
+  for (const val of values) {
+    const value = parsers.parsePropertyValue(property, val, {
+      globalObject,
+      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;
+        }
+      }
+    } else if (typeof value === "string") {
+      parsedValues.push(value);
     }
   }
   if (parsedValues.length) {
@@ -24,25 +38,26 @@ module.exports.parse = function parse(v) {
   }
 };
 
-module.exports.isValid = function isValid(v) {
-  if (v === "") {
-    return true;
-  }
-  return typeof module.exports.parse(v) === "string";
-};
-
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("background", "");
-      this._setProperty("background-clip", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._setProperty("background-clip", module.exports.parse(v));
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const shorthandPriority = this._priorities.get(shorthand);
+        const prior = this._priorities.get(property) ?? "";
+        const priority = shorthandPriority && prior ? "" : prior;
+        this._setProperty(property, val, priority);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("background-clip");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/backgroundColor.js

@@ -2,33 +2,53 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const val = parsers.parseColor(v);
-  if (val) {
-    return val;
-  }
-  return parsers.parseKeyword(v);
-};
+const property = "background-color";
+const shorthand = "background";
 
-module.exports.isValid = function isValid(v) {
-  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
-    return true;
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
+  if (v === "") {
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    inArray: true
+  });
+  if (Array.isArray(value) && value.length === 1) {
+    const [{ name, type }] = value;
+    switch (type) {
+      case "GlobalKeyword": {
+        return name;
+      }
+      default: {
+        return parsers.parseColor(value);
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return parsers.isValidColor(v);
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("background", "");
-      this._setProperty("background-color", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._setProperty("background-color", module.exports.parse(v));
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const shorthandPriority = this._priorities.get(shorthand);
+        const prior = this._priorities.get(property) ?? "";
+        const priority = shorthandPriority && prior ? "" : prior;
+        this._setProperty(property, val, priority);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("background-color");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/backgroundImage.js

@@ -2,18 +2,47 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
+const property = "background-image";
+const shorthand = "background";
+
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
     return v;
   }
-  const values = parsers.splitValue(v, {
-    delimiter: ","
-  });
+  const values = parsers.splitValue(v, { delimiter: "," });
   const parsedValues = [];
-  for (const value of values) {
-    const parsedValue = parsers.parseImage(value);
-    if (parsedValue) {
-      parsedValues.push(parsedValue);
+  for (const val of values) {
+    const value = parsers.parsePropertyValue(property, val, {
+      globalObject,
+      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);
+        }
+      }
+    } else if (typeof value === "string") {
+      parsedValues.push(value);
     } else {
       return;
     }
@@ -23,25 +52,26 @@ module.exports.parse = function parse(v) {
   }
 };
 
-module.exports.isValid = function isValid(v) {
-  if (v === "") {
-    return true;
-  }
-  return typeof module.exports.parse(v) === "string";
-};
-
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("background", "");
-      this._setProperty("background-image", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._setProperty("background-image", module.exports.parse(v));
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const shorthandPriority = this._priorities.get(shorthand);
+        const prior = this._priorities.get(property) ?? "";
+        const priority = shorthandPriority && prior ? "" : prior;
+        this._setProperty(property, val, priority);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("background-image");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true