cssstyle 4.3.0 → 4.4.0

package/lib/properties/background.js

@@ -1,19 +1,46 @@
-'use strict';
+"use strict";
+// FIXME:
+// * support multiple backgrounds
+// * also fix longhands
 
-var shorthandSetter = require('../parsers').shorthandSetter;
-var shorthandGetter = require('../parsers').shorthandGetter;
+const parsers = require("../parsers");
+const backgroundImage = require("./backgroundImage");
+const backgroundPosition = require("./backgroundPosition");
+const backgroundRepeat = require("./backgroundRepeat");
+const backgroundAttachment = require("./backgroundAttachment");
+const backgroundColor = require("./backgroundColor");
 
-var shorthand_for = {
-  'background-color': require('./backgroundColor'),
-  'background-image': require('./backgroundImage'),
-  'background-repeat': require('./backgroundRepeat'),
-  'background-attachment': require('./backgroundAttachment'),
-  'background-position': require('./backgroundPosition'),
-};
+const shorthandFor = new Map([
+  ["background-image", backgroundImage],
+  ["background-position", backgroundPosition],
+  ["background-repeat", backgroundRepeat],
+  ["background-attachment", backgroundAttachment],
+  ["background-color", backgroundColor]
+]);
 
 module.exports.definition = {
-  set: shorthandSetter('background', shorthand_for),
-  get: shorthandGetter('background', shorthand_for),
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (v.toLowerCase() === "none" || parsers.hasVarFunc(v)) {
+      for (const [key] of shorthandFor) {
+        this._setProperty(key, "");
+      }
+      this._setProperty("background", v);
+    } else {
+      this._shorthandSetter("background", v, shorthandFor);
+    }
+  },
+  get() {
+    let val = this.getPropertyValue("background");
+    if (parsers.hasVarFunc(val)) {
+      return val;
+    }
+    val = this._shorthandGetter("background", shorthandFor);
+    if (parsers.hasVarFunc(val)) {
+      return "";
+    }
+    return val;
+  },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/backgroundAttachment.js

@@ -1,24 +1,32 @@
-'use strict';
+"use strict";
 
-var parsers = require('../parsers');
+const parsers = require("../parsers");
 
-var isValid = (module.exports.isValid = function isValid(v) {
-  return (
-    parsers.valueType(v) === parsers.TYPES.KEYWORD &&
-    (v.toLowerCase() === 'scroll' || v.toLowerCase() === 'fixed' || v.toLowerCase() === 'inherit')
-  );
-});
+module.exports.parse = function parse(v) {
+  const keywords = ["fixed", "scroll", "local"];
+  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)) {
-      return;
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("background", "");
+      this._setProperty("backgound-attachemnt", v);
+    } else {
+      this._setProperty("background-attachment", module.exports.parse(v));
     }
-    this._setProperty('background-attachment', v);
   },
-  get: function () {
-    return this.getPropertyValue('background-attachment');
+  get() {
+    return this.getPropertyValue("background-attachment");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/backgroundColor.js

@@ -1,33 +1,35 @@
-'use strict';
+"use strict";
 
-var parsers = require('../parsers');
+const parsers = require("../parsers");
 
-var parse = function parse(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 isValid(v) {
-  return parse(v) !== undefined;
+  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
+    return true;
+  }
+  return parsers.isValidColor(v);
 };
 
 module.exports.definition = {
-  set: function (v) {
-    var parsed = parse(v);
-    if (parsed === undefined) {
-      return;
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("background", "");
+      this._setProperty("backgound-color", v);
+    } else {
+      this._setProperty("background-color", module.exports.parse(v));
     }
-    this._setProperty('background-color', parsed);
   },
-  get: function () {
-    return this.getPropertyValue('background-color');
+  get() {
+    return this.getPropertyValue("background-color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/backgroundImage.js

@@ -1,26 +1,31 @@
-'use strict';
+"use strict";
 
-var parsers = require('../parsers');
+const parsers = require("../parsers");
 
-var parse = function parse(v) {
-  var parsed = parsers.parseImage(v);
-  if (parsed !== undefined) {
-    return parsed;
-  }
-  return undefined;
+module.exports.parse = function parse(v) {
+  return parsers.parseImage(v);
 };
 
 module.exports.isValid = function isValid(v) {
-  return parse(v) !== undefined;
+  if (v === "" || typeof parsers.parseKeyword(v, ["none"]) === "string") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('background-image', parse(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("background", "");
+      this._setProperty("backgound-image", v);
+    } else {
+      this._setProperty("background-image", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('background-image');
+  get() {
+    return this.getPropertyValue("background-image");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/backgroundPosition.js

@@ -1,58 +1,52 @@
-'use strict';
+"use strict";
 
-var parsers = require('../parsers');
+const parsers = require("../parsers");
 
-var valid_keywords = ['top', 'center', 'bottom', 'left', 'right'];
-
-var parse = function parse(v) {
-  if (v === '' || v === null) {
-    return undefined;
-  }
-  var parts = v.split(/\s+/);
-  if (parts.length > 2 || parts.length < 1) {
-    return undefined;
+module.exports.parse = function parse(v) {
+  const parts = parsers.splitValue(v);
+  if (!parts.length || parts.length > 2) {
+    return;
   }
-  var types = [];
-  parts.forEach(function (part, index) {
-    types[index] = parsers.valueType(part);
-  });
+  const validKeywordsX = ["left", "center", "right"];
+  const validKeywordsY = ["top", "center", "bottom"];
   if (parts.length === 1) {
-    if (types[0] === parsers.TYPES.LENGTH || types[0] === parsers.TYPES.PERCENT) {
-      return v;
+    const dim = parsers.parseMeasurement(parts[0]);
+    if (dim) {
+      return dim;
     }
-    if (types[0] === parsers.TYPES.KEYWORD) {
-      if (valid_keywords.indexOf(v.toLowerCase()) !== -1 || v.toLowerCase() === 'inherit') {
-        return v;
-      }
-    }
-    return undefined;
-  }
-  if (
-    (types[0] === parsers.TYPES.LENGTH || types[0] === parsers.TYPES.PERCENT) &&
-    (types[1] === parsers.TYPES.LENGTH || types[1] === parsers.TYPES.PERCENT)
-  ) {
-    return v;
+    const validKeywords = new Set([...validKeywordsX, ...validKeywordsY]);
+    return parsers.parseKeyword(v, [...validKeywords]);
   }
-  if (types[0] !== parsers.TYPES.KEYWORD || types[1] !== parsers.TYPES.KEYWORD) {
-    return undefined;
-  }
-  if (valid_keywords.indexOf(parts[0]) !== -1 && valid_keywords.indexOf(parts[1]) !== -1) {
-    return v;
+  const [partX, partY] = parts;
+  const posX = parsers.parseMeasurement(partX) || parsers.parseKeyword(partX, validKeywordsX);
+  if (posX) {
+    const posY = parsers.parseMeasurement(partY) || parsers.parseKeyword(partY, validKeywordsY);
+    if (posY) {
+      return `${posX} ${posY}`;
+    }
   }
-  return undefined;
 };
 
 module.exports.isValid = function isValid(v) {
-  return parse(v) !== undefined;
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('background-position', parse(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("background", "");
+      this._setProperty("backgound-position", v);
+    } else {
+      this._setProperty("background-position", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('background-position');
+  get() {
+    return this.getPropertyValue("background-position");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/backgroundRepeat.js

@@ -1,32 +1,32 @@
-'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() === 'repeat' ||
-      v.toLowerCase() === 'repeat-x' ||
-      v.toLowerCase() === 'repeat-y' ||
-      v.toLowerCase() === 'no-repeat' ||
-      v.toLowerCase() === 'inherit')
-  ) {
-    return v;
-  }
-  return undefined;
+module.exports.parse = function parse(v) {
+  const keywords = ["repeat", "repeat-x", "repeat-y", "no-repeat", "space", "round"];
+  return parsers.parseKeyword(v, keywords);
 };
 
 module.exports.isValid = function isValid(v) {
-  return parse(v) !== undefined;
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('background-repeat', parse(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("background", "");
+      this._setProperty("backgound-repeat", v);
+    } else {
+      this._setProperty("background-repeat", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('background-repeat');
+  get() {
+    return this.getPropertyValue("background-repeat");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/border.js

@@ -1,33 +1,42 @@
-'use strict';
+"use strict";
 
-var shorthandSetter = require('../parsers').shorthandSetter;
-var shorthandGetter = require('../parsers').shorthandGetter;
+const parsers = require("../parsers");
+const borderWidth = require("./borderWidth");
+const borderStyle = require("./borderStyle");
+const borderColor = require("./borderColor");
 
-var shorthand_for = {
-  'border-width': require('./borderWidth'),
-  'border-style': require('./borderStyle'),
-  'border-color': require('./borderColor'),
-};
-
-var myShorthandSetter = shorthandSetter('border', shorthand_for);
-var myShorthandGetter = shorthandGetter('border', shorthand_for);
+const shorthandFor = new Map([
+  ["border-width", borderWidth],
+  ["border-style", borderStyle],
+  ["border-color", borderColor]
+]);
 
 module.exports.definition = {
-  set: function (v) {
-    if (v.toString().toLowerCase() === 'none') {
-      v = '';
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (v.toLowerCase() === "none") {
+      v = "";
+    }
+    if (parsers.hasVarFunc(v)) {
+      for (const [key] of shorthandFor) {
+        this._setProperty(key, "");
+      }
+      this._setProperty("border", v);
+    } else {
+      this._midShorthandSetter("border", v, shorthandFor, ["top", "right", "bottom", "left"]);
+    }
+  },
+  get() {
+    let val = this.getPropertyValue("border");
+    if (parsers.hasVarFunc(val)) {
+      return val;
+    }
+    val = this._shorthandGetter("border", shorthandFor);
+    if (parsers.hasVarFunc(val)) {
+      return "";
     }
-    myShorthandSetter.call(this, v);
-    this.removeProperty('border-top');
-    this.removeProperty('border-left');
-    this.removeProperty('border-right');
-    this.removeProperty('border-bottom');
-    this._values['border-top'] = this._values.border;
-    this._values['border-left'] = this._values.border;
-    this._values['border-right'] = this._values.border;
-    this._values['border-bottom'] = this._values.border;
+    return val;
   },
-  get: myShorthandGetter,
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

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

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

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

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