cssstyle 4.3.0 → 4.4.0

package/lib/properties/fontStyle.js

@@ -1,18 +1,32 @@
-'use strict';
+"use strict";
 
-var valid_styles = ['normal', 'italic', 'oblique', 'inherit'];
+const parsers = require("../parsers");
 
-module.exports.isValid = function (v) {
-  return valid_styles.indexOf(v.toLowerCase()) !== -1;
+module.exports.parse = function parse(v) {
+  const keywords = ["normal", "italic", "oblique"];
+  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('font-style', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("font", "");
+      this._setProperty("font-style", v);
+    } else {
+      this._setProperty("font-style", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('font-style');
+  get() {
+    return this.getPropertyValue("font-style");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/fontVariant.js

@@ -1,18 +1,36 @@
-'use strict';
+"use strict";
 
-var valid_variants = ['normal', 'small-caps', 'inherit'];
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const num = parsers.parseNumber(v, true);
+  if (num && parseFloat(num) <= 1000) {
+    return num;
+  }
+  const keywords = ["normal", "none", "small-caps"];
+  return parsers.parseKeyword(v, keywords);
+};
 
 module.exports.isValid = function isValid(v) {
-  return valid_variants.indexOf(v.toLowerCase()) !== -1;
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('font-variant', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("font", "");
+      this._setProperty("font-valiant", v);
+    } else {
+      this._setProperty("font-variant", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('font-variant');
+  get() {
+    return this.getPropertyValue("font-variant");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/fontWeight.js

@@ -1,33 +1,36 @@
-'use strict';
+"use strict";
 
-var valid_weights = [
-  'normal',
-  'bold',
-  'bolder',
-  'lighter',
-  '100',
-  '200',
-  '300',
-  '400',
-  '500',
-  '600',
-  '700',
-  '800',
-  '900',
-  'inherit',
-];
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const num = parsers.parseNumber(v, true);
+  if (num && parseFloat(num) <= 1000) {
+    return num;
+  }
+  const keywords = ["normal", "bold", "lighter", "bolder"];
+  return parsers.parseKeyword(v, keywords);
+};
 
 module.exports.isValid = function isValid(v) {
-  return valid_weights.indexOf(v.toLowerCase()) !== -1;
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('font-weight', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("font", "");
+      this._setProperty("font-weight", v);
+    } else {
+      this._setProperty("font-weight", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('font-weight');
+  get() {
+    return this.getPropertyValue("font-weight");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/height.js

@@ -1,24 +1,31 @@
-'use strict';
+"use strict";
 
-var parseMeasurement = require('../parsers').parseMeasurement;
+const parsers = require("../parsers");
 
-function parse(v) {
-  if (String(v).toLowerCase() === 'auto') {
-    return 'auto';
+module.exports.parse = function parse(v) {
+  const dim = parsers.parseMeasurement(v, true);
+  if (dim) {
+    return dim;
   }
-  if (String(v).toLowerCase() === 'inherit') {
-    return 'inherit';
+  const keywords = ["auto", "min-content", "max-content", "fit-content"];
+  return parsers.parseKeyword(v, keywords);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
   }
-  return parseMeasurement(v);
-}
+  return typeof module.exports.parse(v) === "string";
+};
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('height', parse(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("height", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('height');
+  get() {
+    return this.getPropertyValue("height");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

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

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

package/lib/properties/lineHeight.js

@@ -1,26 +1,39 @@
-'use strict';
+"use strict";
 
-var TYPES = require('../parsers').TYPES;
-var valueType = require('../parsers').valueType;
+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);
+};
 
 module.exports.isValid = function isValid(v) {
-  var type = valueType(v);
-  return (
-    (type === TYPES.KEYWORD && v.toLowerCase() === 'normal') ||
-    v.toLowerCase() === 'inherit' ||
-    type === TYPES.NUMBER ||
-    type === TYPES.LENGTH ||
-    type === TYPES.PERCENT
-  );
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('line-height', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("font", "");
+      this._setProperty("line-height", v);
+    } else {
+      this._setProperty("line-height", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('line-height');
+  get() {
+    return this.getPropertyValue("line-height");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/margin.js

@@ -1,73 +1,58 @@
-'use strict';
+"use strict";
 
-var parsers = require('../parsers.js');
-var TYPES = parsers.TYPES;
+const parsers = require("../parsers");
 
-var isValid = function (v) {
-  if (v.toLowerCase() === 'auto') {
-    return true;
-  }
-  var type = parsers.valueType(v);
-  return (
-    type === TYPES.NULL_OR_EMPTY_STR ||
-    type === TYPES.LENGTH ||
-    type === TYPES.PERCENT ||
-    type === TYPES.CALC ||
-    (type === TYPES.INTEGER && (v === '0' || v === 0))
-  );
-};
+const positions = ["top", "right", "bottom", "left"];
 
-var parser = function (v) {
-  var V = v.toLowerCase();
-  if (V === 'auto') {
-    return V;
+module.exports.parse = function parse(v) {
+  const val = parsers.parseMeasurement(v, true);
+  if (val) {
+    return val;
   }
-  return parsers.parseMeasurement(v);
+  return parsers.parseKeyword(v, ["auto"]);
 };
 
-var mySetter = parsers.implicitSetter('margin', '', isValid, parser);
-var myGlobal = parsers.implicitSetter(
-  'margin',
-  '',
-  function () {
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
     return true;
-  },
-  function (v) {
-    return v;
   }
-);
+  return typeof module.exports.parse(v) === "string";
+};
 
 module.exports.definition = {
-  set: function (v) {
-    if (typeof v === 'number') {
-      v = String(v);
+  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);
+    } else {
+      this._implicitSetter(
+        "margin",
+        "",
+        v,
+        module.exports.isValid,
+        module.exports.parse,
+        positions
+      );
     }
-    if (v === null) {
-      v = '';
-    }
-    if (typeof v !== 'string') {
-      return;
+  },
+  get() {
+    const val = this._implicitGetter("margin", positions);
+    if (val === "") {
+      return this.getPropertyValue("margin");
     }
-    var V = v.toLowerCase();
-    switch (V) {
-      case 'inherit':
-      case 'initial':
-      case 'unset':
-      case '':
-        myGlobal.call(this, V);
-        break;
-
-      default:
-        mySetter.call(this, v);
-        break;
+    if (parsers.hasVarFunc(val)) {
+      return "";
     }
-  },
-  get: function () {
-    return this.getPropertyValue('margin');
+    return val;
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };
-
-module.exports.isValid = isValid;
-module.exports.parser = parser;

package/lib/properties/marginBottom.js

@@ -1,13 +1,40 @@
-'use strict';
+"use strict";
 
-var margin = require('./margin.js');
-var parsers = require('../parsers.js');
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseMeasurement(v, true);
+  if (val) {
+    return val;
+  }
+  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: parsers.subImplicitSetter('margin', 'bottom', margin.isValid, margin.parser),
-  get: function () {
-    return this.getPropertyValue('margin-bottom');
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("margin", "");
+      this._setProperty("margin-bottom", v);
+    } else {
+      this._subImplicitSetter("margin", "bottom", v, module.exports.isValid, module.exports.parse, [
+        "top",
+        "right",
+        "bottom",
+        "left"
+      ]);
+    }
+  },
+  get() {
+    return this.getPropertyValue("margin-bottom");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/marginLeft.js

@@ -1,13 +1,40 @@
-'use strict';
+"use strict";
 
-var margin = require('./margin.js');
-var parsers = require('../parsers.js');
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseMeasurement(v, true);
+  if (val) {
+    return val;
+  }
+  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: parsers.subImplicitSetter('margin', 'left', margin.isValid, margin.parser),
-  get: function () {
-    return this.getPropertyValue('margin-left');
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("margin", "");
+      this._setProperty("margin-left", v);
+    } else {
+      this._subImplicitSetter("margin", "left", v, module.exports.isValid, module.exports.parse, [
+        "top",
+        "right",
+        "bottom",
+        "left"
+      ]);
+    }
+  },
+  get() {
+    return this.getPropertyValue("margin-left");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/marginRight.js

@@ -1,13 +1,40 @@
-'use strict';
+"use strict";
 
-var margin = require('./margin.js');
-var parsers = require('../parsers.js');
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseMeasurement(v, true);
+  if (val) {
+    return val;
+  }
+  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: parsers.subImplicitSetter('margin', 'right', margin.isValid, margin.parser),
-  get: function () {
-    return this.getPropertyValue('margin-right');
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("margin", "");
+      this._setProperty("margin-right", v);
+    } else {
+      this._subImplicitSetter("margin", "right", v, module.exports.isValid, module.exports.parse, [
+        "top",
+        "right",
+        "bottom",
+        "left"
+      ]);
+    }
+  },
+  get() {
+    return this.getPropertyValue("margin-right");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/marginTop.js

@@ -1,13 +1,40 @@
-'use strict';
+"use strict";
 
-var margin = require('./margin.js');
-var parsers = require('../parsers.js');
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseMeasurement(v, true);
+  if (val) {
+    return val;
+  }
+  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: parsers.subImplicitSetter('margin', 'top', margin.isValid, margin.parser),
-  get: function () {
-    return this.getPropertyValue('margin-top');
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("margin", "");
+      this._setProperty("margin-top", v);
+    } else {
+      this._subImplicitSetter("margin", "top", v, module.exports.isValid, module.exports.parse, [
+        "top",
+        "right",
+        "bottom",
+        "left"
+      ]);
+    }
+  },
+  get() {
+    return this.getPropertyValue("margin-top");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };