cssstyle 5.2.0 → 5.3.0

package/lib/properties/lineHeight.js

@@ -2,37 +2,64 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const val = parsers.parseKeyword(v, ["normal"]);
-  if (val) {
-    return val;
-  }
-  const num = parsers.parseNumber(v, true);
-  if (num) {
-    return num;
-  }
-  return parsers.parseMeasurement(v, true);
-};
+const property = "line-height";
+const shorthand = "font";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    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
+        });
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("font", "");
-      this._setProperty("line-height", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._setProperty("line-height", 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("line-height");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/margin.js

@@ -1,57 +1,94 @@
 "use strict";
 
 const parsers = require("../parsers");
+const marginTop = require("./marginTop");
+const marginRight = require("./marginRight");
+const marginBottom = require("./marginBottom");
+const marginLeft = require("./marginLeft");
 
-const positions = ["top", "right", "bottom", "left"];
+const property = "margin";
 
-module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v);
-  if (val) {
-    return val;
-  }
-  return parsers.parseKeyword(v, ["auto"]);
-};
+module.exports.position = "edges";
+
+module.exports.shorthandFor = new Map([
+  ["margin-top", marginTop],
+  ["margin-right", marginRight],
+  ["margin-bottom", marginBottom],
+  ["margin-left", marginLeft]
+]);
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const values = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    inArray: true
+  });
+  const parsedValues = [];
+  if (Array.isArray(values) && values.length) {
+    if (values.length > 4) {
+      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);
+        }
+      }
+    }
+  } else if (typeof values === "string") {
+    parsedValues.push(values);
+  }
+  if (parsedValues.length) {
+    return parsedValues;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._implicitSetter(
-        "margin",
-        "",
-        "",
-        module.exports.isValid,
-        module.exports.parse,
-        positions
-      );
-      this._setProperty("margin", v);
+      for (const [longhand] of module.exports.shorthandFor) {
+        this._setProperty(longhand, "");
+      }
+      this._setProperty(property, v);
     } else {
-      this._implicitSetter(
-        "margin",
-        "",
-        v,
-        module.exports.isValid,
-        module.exports.parse,
-        positions
-      );
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (Array.isArray(val) || typeof val === "string") {
+        const priority = this._priorities.get(property) ?? "";
+        this._positionShorthandSetter(property, val, priority);
+      }
     }
   },
   get() {
-    const val = this._implicitGetter("margin", positions);
-    if (val === "") {
-      return this.getPropertyValue("margin");
-    }
-    if (parsers.hasVarFunc(val)) {
-      return "";
-    }
-    return val;
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/marginBottom.js

@@ -2,38 +2,62 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v);
-  if (val) {
-    return val;
-  }
-  return parsers.parseKeyword(v, ["auto"]);
-};
+const property = "margin-bottom";
+const shorthand = "margin";
+
+module.exports.position = "bottom";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    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);
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("margin", "");
-      this._setProperty("margin-bottom", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._subImplicitSetter("margin", "bottom", v, module.exports.isValid, module.exports.parse, [
-        "top",
-        "right",
-        "bottom",
-        "left"
-      ]);
+      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._positionLonghandSetter(property, val, priority, shorthand);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("margin-bottom");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/marginLeft.js

@@ -2,38 +2,62 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v);
-  if (val) {
-    return val;
-  }
-  return parsers.parseKeyword(v, ["auto"]);
-};
+const property = "margin-left";
+const shorthand = "margin";
+
+module.exports.position = "left";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    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);
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("margin", "");
-      this._setProperty("margin-left", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._subImplicitSetter("margin", "left", v, module.exports.isValid, module.exports.parse, [
-        "top",
-        "right",
-        "bottom",
-        "left"
-      ]);
+      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._positionLonghandSetter(property, val, priority, shorthand);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("margin-left");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/marginRight.js

@@ -2,38 +2,62 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v);
-  if (val) {
-    return val;
-  }
-  return parsers.parseKeyword(v, ["auto"]);
-};
+const property = "margin-right";
+const shorthand = "margin";
+
+module.exports.position = "right";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    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);
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("margin", "");
-      this._setProperty("margin-right", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._subImplicitSetter("margin", "right", v, module.exports.isValid, module.exports.parse, [
-        "top",
-        "right",
-        "bottom",
-        "left"
-      ]);
+      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._positionLonghandSetter(property, val, priority, shorthand);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("margin-right");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/marginTop.js

@@ -2,38 +2,62 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  const val = parsers.parseMeasurement(v);
-  if (val) {
-    return val;
-  }
-  return parsers.parseKeyword(v, ["auto"]);
-};
+const property = "margin-top";
+const shorthand = "margin";
+
+module.exports.position = "top";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    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);
+      }
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
     if (parsers.hasVarFunc(v)) {
-      this._setProperty("margin", "");
-      this._setProperty("margin-top", v);
+      this._setProperty(shorthand, "");
+      this._setProperty(property, v);
     } else {
-      this._subImplicitSetter("margin", "top", v, module.exports.isValid, module.exports.parse, [
-        "top",
-        "right",
-        "bottom",
-        "left"
-      ]);
+      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._positionLonghandSetter(property, val, priority, shorthand);
+      }
     }
   },
   get() {
-    return this.getPropertyValue("margin-top");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/opacity.js

@@ -2,44 +2,57 @@
 
 const parsers = require("../parsers");
 
-module.exports.parse = function parse(v) {
-  let num = parsers.parseNumber(v);
-  if (num) {
-    num = parseFloat(num);
-    if (num < 0) {
-      return "0";
-    } else if (num > 1) {
-      return "1";
-    }
-    return `${num}`;
-  }
-  let pct = parsers.parsePercent(v);
-  if (pct) {
-    pct = parseFloat(pct);
-    if (pct < 0) {
-      return "0%";
-    } else if (pct > 100) {
-      return "100%";
-    }
-    return `${pct}%`;
-  }
-  return parsers.parseKeyword(v);
-};
+const property = "opacity";
 
-module.exports.isValid = function isValid(v) {
+module.exports.parse = function parse(v, opt = {}) {
+  const { globalObject } = opt;
   if (v === "") {
-    return true;
+    return v;
+  }
+  const value = parsers.parsePropertyValue(property, v, {
+    globalObject,
+    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:
+    }
+  } else if (typeof value === "string") {
+    return value;
   }
-  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
   set(v) {
     v = parsers.prepareValue(v, this._global);
-    this._setProperty("opacity", module.exports.parse(v));
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty(property, v);
+    } else {
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const priority = this._priorities.get(property) ?? "";
+        this._setProperty(property, val, priority);
+      }
+    }
   },
   get() {
-    return this.getPropertyValue("opacity");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true

package/lib/properties/outlineColor.js

@@ -2,28 +2,49 @@
 
 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 = "outline-color";
 
-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);
-    this._setProperty("outline-color", module.exports.parse(v));
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty(property, v);
+    } else {
+      const val = module.exports.parse(v, {
+        globalObject: this._global
+      });
+      if (typeof val === "string") {
+        const priority = this._priorities.get(property) ?? "";
+        this._setProperty(property, val, priority);
+      }
+    }
   },
   get() {
-    return this.getPropertyValue("outline-color");
+    return this.getPropertyValue(property);
   },
   enumerable: true,
   configurable: true