cssstyle 4.3.0 → 4.4.0

package/lib/properties/borderStyle.js

@@ -1,38 +1,54 @@
-'use strict';
+"use strict";
 
-var implicitSetter = require('../parsers').implicitSetter;
+const parsers = require("../parsers");
 
-// the valid border-styles:
-var styles = [
-  'none',
-  'hidden',
-  'dotted',
-  'dashed',
-  'solid',
-  'double',
-  'groove',
-  'ridge',
-  'inset',
-  'outset',
-];
-
-module.exports.isValid = function parse(v) {
-  return typeof v === 'string' && (v === '' || styles.indexOf(v) !== -1);
+module.exports.parse = function parse(v) {
+  const keywords = [
+    "none",
+    "hidden",
+    "dotted",
+    "dashed",
+    "solid",
+    "double",
+    "groove",
+    "ridge",
+    "inset",
+    "outset"
+  ];
+  return parsers.parseKeyword(v, keywords);
 };
-var isValid = module.exports.isValid;
 
-var parser = function (v) {
-  if (isValid(v)) {
-    return v.toLowerCase();
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
   }
-  return undefined;
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: implicitSetter('border', 'style', isValid, parser),
-  get: function () {
-    return this.getPropertyValue('border-style');
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (v.toLowerCase() === "none") {
+      v = "";
+    }
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-style", v);
+      return;
+    }
+    const positions = ["top", "right", "bottom", "left"];
+    this._implicitSetter(
+      "border",
+      "style",
+      v,
+      module.exports.isValid,
+      module.exports.parse,
+      positions
+    );
+  },
+  get() {
+    return this.getPropertyValue("border-style");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderTop.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-top-width': require('./borderTopWidth'),
-  'border-top-style': require('./borderTopStyle'),
-  'border-top-color': require('./borderTopColor'),
-};
+const shorthandFor = new Map([
+  ["border-top-width", borderTopWidth],
+  ["border-top-style", borderTopStyle],
+  ["border-top-color", borderTopColor]
+]);
 
 module.exports.definition = {
-  set: shorthandSetter('border-top', shorthand_for),
-  get: shorthandGetter('border-top', 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-top", v);
+    } else {
+      this._shorthandSetter("border-top", v, shorthandFor);
+    }
+  },
+  get() {
+    let val = this.getPropertyValue("border-top");
+    if (parsers.hasVarFunc(val)) {
+      return val;
+    }
+    val = this._shorthandGetter("border-top", shorthandFor);
+    if (parsers.hasVarFunc(val)) {
+      return "";
+    }
+    return val;
+  },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderTopColor.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-top-color', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-top", "");
+      this._setProperty("border-color", "");
     }
+    this._setProperty("border-top-color", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('border-top-color');
+  get() {
+    return this.getPropertyValue("border-top-color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderTopStyle.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-top-width');
-      }
-      this._setProperty('border-top-style', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    const val = module.exports.parse(v);
+    if (val === "none" || val === "hidden" || v === "") {
+      this._setProperty("border-top-style", "");
+      this._setProperty("border-top-color", "");
+      this._setProperty("border-top-width", "");
+      return;
+    }
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-top", "");
+      this._setProperty("border-style", "");
     }
+    this._setProperty("border-top-style", val);
   },
-  get: function () {
-    return this.getPropertyValue('border-top-style');
+  get() {
+    return this.getPropertyValue("border-top-style");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderTopWidth.js

@@ -1,17 +1,36 @@
-'use strict';
+"use strict";
 
-var isValid = require('./borderWidth').isValid;
-module.exports.isValid = 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-top-width', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-top", "");
+      this._setProperty("border-width", "");
     }
+    this._setProperty("border-top-width", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('border-top-width');
+  get() {
+    return this.getPropertyValue("border-top-width");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/borderWidth.js

@@ -1,46 +1,44 @@
-'use strict';
+"use strict";
 
-var parsers = require('../parsers');
-var implicitSetter = require('../parsers').implicitSetter;
+const parsers = require("../parsers");
 
-// the valid border-widths:
-var widths = ['thin', 'medium', 'thick'];
-
-module.exports.isValid = function parse(v) {
-  var length = parsers.parseLength(v);
-  if (length !== undefined) {
-    return true;
-  }
-  if (typeof v !== 'string') {
-    return false;
-  }
-  if (v === '') {
-    return true;
+module.exports.parse = function parse(v) {
+  const keywords = ["thin", "medium", "thick"];
+  const key = parsers.parseKeyword(v, keywords);
+  if (key) {
+    return key;
   }
-  v = v.toLowerCase();
-  if (widths.indexOf(v) === -1) {
-    return false;
-  }
-  return true;
+  return parsers.parseLength(v, true);
 };
-var isValid = module.exports.isValid;
 
-var parser = function (v) {
-  var length = parsers.parseLength(v);
-  if (length !== undefined) {
-    return length;
-  }
-  if (isValid(v)) {
-    return v.toLowerCase();
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
   }
-  return undefined;
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: implicitSetter('border', 'width', isValid, parser),
-  get: function () {
-    return this.getPropertyValue('border-width');
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("border", "");
+      this._setProperty("border-width", v);
+    } else {
+      const positions = ["top", "right", "bottom", "left"];
+      this._implicitSetter(
+        "border",
+        "width",
+        v,
+        module.exports.isValid,
+        module.exports.parse,
+        positions
+      );
+    }
+  },
+  get() {
+    return this.getPropertyValue("border-width");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/bottom.js

@@ -1,14 +1,30 @@
-'use strict';
+"use strict";
 
-var parseMeasurement = require('../parsers').parseInheritingMeasurement;
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const dim = parsers.parseMeasurement(v);
+  if (dim) {
+    return dim;
+  }
+  return parsers.parseKeyword(v, ["auto"]);
+};
+
+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('bottom', parseMeasurement(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("bottom", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('bottom');
+  get() {
+    return this.getPropertyValue("bottom");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/clear.js

@@ -1,16 +1,40 @@
-'use strict';
+"use strict";
 
-var parseKeyword = require('../parsers').parseKeyword;
+const parsers = require("../parsers");
 
-var clear_keywords = ['none', 'left', 'right', 'both', 'inherit'];
+module.exports.parse = function parse(v) {
+  const keywords = [
+    "inline-start",
+    "inline-end",
+    "block-start",
+    "block-end",
+    "left",
+    "right",
+    "top",
+    "bottom",
+    "both-inline",
+    "both-block",
+    "both",
+    "none"
+  ];
+  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) {
-    this._setProperty('clear', parseKeyword(v, clear_keywords));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("clear", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('clear');
+  get() {
+    return this.getPropertyValue("clear");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/clip.js

@@ -1,47 +1,53 @@
-'use strict';
+"use strict";
+// deprecated
+// @see https://drafts.fxtf.org/css-masking/#clip-property
 
-var parseMeasurement = require('../parsers').parseMeasurement;
+const parsers = require("../parsers");
 
-var shape_regex = /^rect\((.*)\)$/i;
-
-var parse = function (val) {
-  if (val === '' || val === null) {
-    return val;
-  }
-  if (typeof val !== 'string') {
-    return undefined;
+module.exports.parse = function parse(v) {
+  if (v === "") {
+    return v;
   }
-  val = val.toLowerCase();
-  if (val === 'auto' || val === 'inherit') {
+  const val = parsers.parseKeyword(v, ["auto"]);
+  if (val) {
     return val;
   }
-  var matches = val.match(shape_regex);
+  // parse legacy <shape>
+  v = v.toLowerCase();
+  const matches = v.match(/^rect\(\s*(.*)\s*\)$/);
   if (!matches) {
-    return undefined;
+    return;
   }
-  var parts = matches[1].split(/\s*,\s*/);
+  const parts = matches[1].split(/\s*,\s*/);
   if (parts.length !== 4) {
-    return undefined;
+    return;
   }
-  var valid = parts.every(function (part, index) {
-    var measurement = parseMeasurement(part);
+  const valid = parts.every(function (part, index) {
+    const measurement = parsers.parseMeasurement(part.trim());
     parts[index] = measurement;
-    return measurement !== undefined;
+    return typeof measurement === "string";
   });
   if (!valid) {
-    return undefined;
+    return;
+  }
+  return `rect(${parts.join(", ")})`;
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
   }
-  parts = parts.join(', ');
-  return val.replace(matches[1], parts);
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('clip', parse(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("clip", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('clip');
+  get() {
+    return this.getPropertyValue("clip");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/color.js

@@ -1,14 +1,30 @@
-'use strict';
+"use strict";
 
-var parseColor = require('../parsers').parseColor;
+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) {
-    this._setProperty('color', parseColor(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("color", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('color');
+  get() {
+    return this.getPropertyValue("color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };