cssstyle 4.3.0 → 4.4.0

package/lib/properties/borderCollapse.js

@@ -1,26 +1,26 @@
-'use strict';
+"use strict";
 
-var parsers = require('../parsers');
+const parsers = require("../parsers");
 
-var parse = function parse(v) {
-  if (
-    parsers.valueType(v) === parsers.TYPES.KEYWORD &&
-    (v.toLowerCase() === 'collapse' ||
-      v.toLowerCase() === 'separate' ||
-      v.toLowerCase() === 'inherit')
-  ) {
-    return v;
+module.exports.parse = function parse(v) {
+  return parsers.parseKeyword(v, ["collapse", "separate"]);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
   }
-  return undefined;
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('border-collapse', parse(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("border-collapse", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('border-collapse');
+  get() {
+    return this.getPropertyValue("border-collapse");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderColor.js

@@ -1,29 +1,43 @@
-'use strict';
+"use strict";
 
-var parsers = require('../parsers');
-var implicitSetter = require('../parsers').implicitSetter;
+const parsers = require("../parsers");
 
-var parser = function (v) {
-  var parsed = parsers.parseColor(v);
-  if (parsed !== undefined) {
-    return parsed;
+module.exports.parse = function parse(v) {
+  const val = parsers.parseColor(v);
+  if (val) {
+    return val;
   }
-  if (parsers.valueType(v) === parsers.TYPES.KEYWORD && v.toLowerCase() === 'inherit') {
-    return v;
-  }
-  return undefined;
+  return parsers.parseKeyword(v);
 };
 
-module.exports.isValid = function parse(v) {
-  return parser(v) !== undefined;
+module.exports.isValid = function isValid(v) {
+  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
+    return true;
+  }
+  return parsers.isValidColor(v);
 };
-var isValid = module.exports.isValid;
 
 module.exports.definition = {
-  set: implicitSetter('border', 'color', isValid, parser),
-  get: function () {
-    return this.getPropertyValue('border-color');
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-color", v);
+    } else {
+      const positions = ["top", "right", "bottom", "left"];
+      this._implicitSetter(
+        "border",
+        "color",
+        v,
+        module.exports.isValid,
+        module.exports.parse,
+        positions
+      );
+    }
+  },
+  get() {
+    return this.getPropertyValue("border-color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderLeft.js

@@ -1,17 +1,40 @@
-'use strict';
+"use strict";
 
-var shorthandSetter = require('../parsers').shorthandSetter;
-var shorthandGetter = require('../parsers').shorthandGetter;
+const parsers = require("../parsers");
+const borderTopWidth = require("./borderTopWidth");
+const borderTopStyle = require("./borderTopStyle");
+const borderTopColor = require("./borderTopColor");
 
-var shorthand_for = {
-  'border-left-width': require('./borderLeftWidth'),
-  'border-left-style': require('./borderLeftStyle'),
-  'border-left-color': require('./borderLeftColor'),
-};
+const shorthandFor = new Map([
+  ["border-left-width", borderTopWidth],
+  ["border-left-style", borderTopStyle],
+  ["border-left-color", borderTopColor]
+]);
 
 module.exports.definition = {
-  set: shorthandSetter('border-left', shorthand_for),
-  get: shorthandGetter('border-left', shorthand_for),
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      for (const [key] of shorthandFor) {
+        this._setProperty(key, "");
+      }
+      this._setProperty("border", "");
+      this._setProperty("border-left", v);
+    } else {
+      this._shorthandSetter("border-left", v, shorthandFor);
+    }
+  },
+  get() {
+    let val = this.getPropertyValue("border-left");
+    if (parsers.hasVarFunc(val)) {
+      return val;
+    }
+    val = this._shorthandGetter("border-left", shorthandFor);
+    if (parsers.hasVarFunc(val)) {
+      return "";
+    }
+    return val;
+  },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderLeftColor.js

@@ -1,16 +1,35 @@
-'use strict';
+"use strict";
 
-var isValid = (module.exports.isValid = require('./borderColor').isValid);
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseColor(v);
+  if (val) {
+    return val;
+  }
+  return parsers.parseKeyword(v);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
+    return true;
+  }
+  return parsers.isValidColor(v);
+};
 
 module.exports.definition = {
-  set: function (v) {
-    if (isValid(v)) {
-      this._setProperty('border-left-color', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-left", "");
+      this._setProperty("border-color", "");
     }
+    this._setProperty("border-left-color", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('border-left-color');
+  get() {
+    return this.getPropertyValue("border-left-color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderLeftStyle.js

@@ -1,21 +1,50 @@
-'use strict';
+"use strict";
 
-var isValid = require('./borderStyle').isValid;
-module.exports.isValid = isValid;
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const keywords = [
+    "none",
+    "hidden",
+    "dotted",
+    "dashed",
+    "solid",
+    "double",
+    "groove",
+    "ridge",
+    "inset",
+    "outset"
+  ];
+  return parsers.parseKeyword(v, keywords);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
+};
 
 module.exports.definition = {
-  set: function (v) {
-    if (isValid(v)) {
-      if (v.toLowerCase() === 'none') {
-        v = '';
-        this.removeProperty('border-left-width');
-      }
-      this._setProperty('border-left-style', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    const val = module.exports.parse(v);
+    if (val === "none" || val === "hidden") {
+      this._setProperty("border-left-style", "");
+      this._setProperty("border-left-color", "");
+      this._setProperty("border-left-width", "");
+      return;
+    }
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-left", "");
+      this._setProperty("border-style", "");
     }
+    this._setProperty("border-left-style", val);
   },
-  get: function () {
-    return this.getPropertyValue('border-left-style');
+  get() {
+    return this.getPropertyValue("border-left-style");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderLeftWidth.js

@@ -1,16 +1,36 @@
-'use strict';
+"use strict";
 
-var isValid = (module.exports.isValid = require('./borderWidth').isValid);
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const keywords = ["thin", "medium", "thick"];
+  const key = parsers.parseKeyword(v, keywords);
+  if (key) {
+    return key;
+  }
+  return parsers.parseLength(v, true);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
+};
 
 module.exports.definition = {
-  set: function (v) {
-    if (isValid(v)) {
-      this._setProperty('border-left-width', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-left", "");
+      this._setProperty("border-width", "");
     }
+    this._setProperty("border-left-width", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('border-left-width');
+  get() {
+    return this.getPropertyValue("border-left-width");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderRight.js

@@ -1,17 +1,40 @@
-'use strict';
+"use strict";
 
-var shorthandSetter = require('../parsers').shorthandSetter;
-var shorthandGetter = require('../parsers').shorthandGetter;
+const parsers = require("../parsers");
+const borderTopWidth = require("./borderTopWidth");
+const borderTopStyle = require("./borderTopStyle");
+const borderTopColor = require("./borderTopColor");
 
-var shorthand_for = {
-  'border-right-width': require('./borderRightWidth'),
-  'border-right-style': require('./borderRightStyle'),
-  'border-right-color': require('./borderRightColor'),
-};
+const shorthandFor = new Map([
+  ["border-right-width", borderTopWidth],
+  ["border-right-style", borderTopStyle],
+  ["border-right-color", borderTopColor]
+]);
 
 module.exports.definition = {
-  set: shorthandSetter('border-right', shorthand_for),
-  get: shorthandGetter('border-right', shorthand_for),
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      for (const [key] of shorthandFor) {
+        this._setProperty(key, "");
+      }
+      this._setProperty("border", "");
+      this._setProperty("border-right", v);
+    } else {
+      this._shorthandSetter("border-right", v, shorthandFor);
+    }
+  },
+  get() {
+    let val = this.getPropertyValue("border-right");
+    if (parsers.hasVarFunc(val)) {
+      return val;
+    }
+    val = this._shorthandGetter("border-right", shorthandFor);
+    if (parsers.hasVarFunc(val)) {
+      return "";
+    }
+    return val;
+  },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderRightColor.js

@@ -1,16 +1,35 @@
-'use strict';
+"use strict";
 
-var isValid = (module.exports.isValid = require('./borderColor').isValid);
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseColor(v);
+  if (val) {
+    return val;
+  }
+  return parsers.parseKeyword(v);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
+    return true;
+  }
+  return parsers.isValidColor(v);
+};
 
 module.exports.definition = {
-  set: function (v) {
-    if (isValid(v)) {
-      this._setProperty('border-right-color', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-right", "");
+      this._setProperty("border-color", "");
     }
+    this._setProperty("border-right-color", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('border-right-color');
+  get() {
+    return this.getPropertyValue("border-right-color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderRightStyle.js

@@ -1,21 +1,50 @@
-'use strict';
+"use strict";
 
-var isValid = require('./borderStyle').isValid;
-module.exports.isValid = isValid;
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const keywords = [
+    "none",
+    "hidden",
+    "dotted",
+    "dashed",
+    "solid",
+    "double",
+    "groove",
+    "ridge",
+    "inset",
+    "outset"
+  ];
+  return parsers.parseKeyword(v, keywords);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
+};
 
 module.exports.definition = {
-  set: function (v) {
-    if (isValid(v)) {
-      if (v.toLowerCase() === 'none') {
-        v = '';
-        this.removeProperty('border-right-width');
-      }
-      this._setProperty('border-right-style', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    const val = module.exports.parse(v);
+    if (val === "none" || val === "hidden") {
+      this._setProperty("border-right-style", "");
+      this._setProperty("border-right-color", "");
+      this._setProperty("border-right-width", "");
+      return;
+    }
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-right", "");
+      this._setProperty("border-style", "");
     }
+    this._setProperty("border-right-style", val);
   },
-  get: function () {
-    return this.getPropertyValue('border-right-style');
+  get() {
+    return this.getPropertyValue("border-right-style");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderRightWidth.js

@@ -1,16 +1,36 @@
-'use strict';
+"use strict";
 
-var isValid = (module.exports.isValid = require('./borderWidth').isValid);
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const keywords = ["thin", "medium", "thick"];
+  const key = parsers.parseKeyword(v, keywords);
+  if (key) {
+    return key;
+  }
+  return parsers.parseLength(v, true);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
+};
 
 module.exports.definition = {
-  set: function (v) {
-    if (isValid(v)) {
-      this._setProperty('border-right-width', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-right", "");
+      this._setProperty("border-width", "");
     }
+    this._setProperty("border-right-width", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('border-right-width');
+  get() {
+    return this.getPropertyValue("border-right-width");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderSpacing.js

@@ -1,41 +1,45 @@
-'use strict';
+"use strict";
 
-var parsers = require('../parsers');
+const parsers = require("../parsers");
 
-// <length> <length>? | inherit
-// if one, it applies to both horizontal and verical spacing
-// if two, the first applies to the horizontal and the second applies to vertical spacing
-
-var parse = function parse(v) {
-  if (v === '' || v === null) {
-    return undefined;
-  }
-  if (v === 0) {
-    return '0px';
-  }
-  if (v.toLowerCase() === 'inherit') {
+module.exports.parse = function parse(v) {
+  if (v === "") {
     return v;
   }
-  var parts = v.split(/\s+/);
-  if (parts.length !== 1 && parts.length !== 2) {
-    return undefined;
+  const key = parsers.parseKeyword(v);
+  if (key) {
+    return key;
+  }
+  const parts = parsers.splitValue(v);
+  if (!parts.length || parts.length > 2) {
+    return;
   }
-  parts.forEach(function (part) {
-    if (parsers.valueType(part) !== parsers.TYPES.LENGTH) {
-      return undefined;
+  const val = [];
+  for (const part of parts) {
+    const dim = parsers.parseLength(part);
+    if (!dim) {
+      return;
     }
-  });
+    val.push(dim);
+  }
+  return val.join(" ");
+};
 
-  return v;
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('border-spacing', parse(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("border-spacing", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('border-spacing');
+  get() {
+    return this.getPropertyValue("border-spacing");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };