cssstyle 4.3.0 → 4.4.0

package/lib/properties/flex.js

@@ -1,43 +1,73 @@
-'use strict';
+"use strict";
 
-var shorthandParser = require('../parsers').shorthandParser;
-var shorthandSetter = require('../parsers').shorthandSetter;
-var shorthandGetter = require('../parsers').shorthandGetter;
+const parsers = require("../parsers");
+const flexGrow = require("./flexGrow");
+const flexShrink = require("./flexShrink");
+const flexBasis = require("./flexBasis");
 
-var shorthand_for = {
-  'flex-grow': require('./flexGrow'),
-  'flex-shrink': require('./flexShrink'),
-  'flex-basis': require('./flexBasis'),
-};
+const shorthandFor = new Map([
+  ["flex-grow", flexGrow],
+  ["flex-shrink", flexShrink],
+  ["flex-basis", flexBasis]
+]);
 
-var myShorthandSetter = shorthandSetter('flex', shorthand_for);
+module.exports.parse = function parse(v) {
+  const key = parsers.parseKeyword(v, ["auto", "none"]);
+  if (key) {
+    if (key === "auto") {
+      return "1 1 auto";
+    }
+    if (key === "none") {
+      return "0 0 auto";
+    }
+    if (key === "initial") {
+      return "0 1 auto";
+    }
+    return;
+  }
+  const obj = parsers.parseShorthand(v, shorthandFor);
+  if (obj) {
+    const flex = {
+      "flex-grow": "1",
+      "flex-shrink": "1",
+      "flex-basis": "0%"
+    };
+    const items = Object.entries(obj);
+    for (const [property, value] of items) {
+      flex[property] = value;
+    }
+    return [...Object.values(flex)].join(" ");
+  }
+};
 
 module.exports.isValid = function isValid(v) {
-  return shorthandParser(v, shorthand_for) !== undefined;
+  if (v === "") {
+    return true;
+  }
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    var normalizedValue = String(v).trim().toLowerCase();
-
-    if (normalizedValue === 'none') {
-      myShorthandSetter.call(this, '0 0 auto');
-      return;
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._shorthandSetter("flex", "", shorthandFor);
+      this._setProperty("flex", v);
+    } else {
+      this._shorthandSetter("flex", module.exports.parse(v), shorthandFor);
     }
-    if (normalizedValue === 'initial') {
-      myShorthandSetter.call(this, '0 1 auto');
-      return;
+  },
+  get() {
+    let val = this.getPropertyValue("flex");
+    if (parsers.hasVarFunc(val)) {
+      return val;
     }
-    if (normalizedValue === 'auto') {
-      this.removeProperty('flex-grow');
-      this.removeProperty('flex-shrink');
-      this.setProperty('flex-basis', normalizedValue);
-      return;
+    val = this._shorthandGetter("flex", shorthandFor);
+    if (parsers.hasVarFunc(val)) {
+      return "";
     }
-
-    myShorthandSetter.call(this, v);
+    return val;
   },
-  get: shorthandGetter('flex', shorthand_for),
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/flexBasis.js

@@ -1,28 +1,33 @@
-'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 val = parsers.parseMeasurement(v);
+  if (val) {
+    return val;
   }
-  if (String(v).toLowerCase() === 'inherit') {
-    return 'inherit';
-  }
-  return parseMeasurement(v);
-}
+  const keywords = ["content", "auto", "min-content", "max-content"];
+  return parsers.parseKeyword(v, keywords);
+};
 
 module.exports.isValid = function isValid(v) {
-  return parse(v) !== undefined;
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('flex-basis', parse(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("flex", "");
+      this._setProperty("flex-basis", v);
+    } else {
+      this._setProperty("flex-basis", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('flex-basis');
+  get() {
+    return this.getPropertyValue("flex-basis");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/flexGrow.js

@@ -1,19 +1,28 @@
-'use strict';
+"use strict";
 
-var parseNumber = require('../parsers').parseNumber;
-var POSITION_AT_SHORTHAND = require('../constants').POSITION_AT_SHORTHAND;
+const parsers = require("../parsers");
 
-module.exports.isValid = function isValid(v, positionAtFlexShorthand) {
-  return parseNumber(v) !== undefined && positionAtFlexShorthand === POSITION_AT_SHORTHAND.first;
+module.exports.parse = function parse(v) {
+  return parsers.parseNumber(v, true);
+};
+
+module.exports.isValid = function isValid(v) {
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('flex-grow', parseNumber(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("flex", "");
+      this._setProperty("flex-grow", v);
+    } else {
+      this._setProperty("flex-grow", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('flex-grow');
+  get() {
+    return this.getPropertyValue("flex-grow");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/flexShrink.js

@@ -1,19 +1,28 @@
-'use strict';
+"use strict";
 
-var parseNumber = require('../parsers').parseNumber;
-var POSITION_AT_SHORTHAND = require('../constants').POSITION_AT_SHORTHAND;
+const parsers = require("../parsers");
 
-module.exports.isValid = function isValid(v, positionAtFlexShorthand) {
-  return parseNumber(v) !== undefined && positionAtFlexShorthand === POSITION_AT_SHORTHAND.second;
+module.exports.parse = function parse(v) {
+  return parsers.parseNumber(v, true);
+};
+
+module.exports.isValid = function isValid(v) {
+  return typeof module.exports.parse(v) === "string";
 };
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('flex-shrink', parseNumber(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("flex", "");
+      this._setProperty("flex-shrink", v);
+    } else {
+      this._setProperty("flex-shrink", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('flex-shrink');
+  get() {
+    return this.getPropertyValue("flex-shrink");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/float.js

@@ -1,12 +1,27 @@
-'use strict';
+"use strict";
+
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const keywords = ["left", "right", "none", "inline-start", "inline-end"];
+  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('float', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("float", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('float');
+  get() {
+    return this.getPropertyValue("float");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

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

package/lib/properties/font.js

@@ -1,43 +1,130 @@
-'use strict';
+"use strict";
 
-var TYPES = require('../parsers').TYPES;
-var valueType = require('../parsers').valueType;
-var shorthandParser = require('../parsers').shorthandParser;
-var shorthandSetter = require('../parsers').shorthandSetter;
-var shorthandGetter = require('../parsers').shorthandGetter;
+const parsers = require("../parsers");
+const fontStyle = require("./fontStyle");
+const fontVariant = require("./fontVariant");
+const fontWeight = require("./fontWeight");
+const fontSize = require("./fontSize");
+const lineHeight = require("./lineHeight");
+const fontFamily = require("./fontFamily");
 
-var shorthand_for = {
-  'font-family': require('./fontFamily'),
-  'font-size': require('./fontSize'),
-  'font-style': require('./fontStyle'),
-  'font-variant': require('./fontVariant'),
-  'font-weight': require('./fontWeight'),
-  'line-height': require('./lineHeight'),
-};
-
-var static_fonts = [
-  'caption',
-  'icon',
-  'menu',
-  'message-box',
-  'small-caption',
-  'status-bar',
-  'inherit',
-];
+const shorthandFor = new Map([
+  ["font-style", fontStyle],
+  ["font-variant", fontVariant],
+  ["font-weight", fontWeight],
+  ["font-size", fontSize],
+  ["line-height", lineHeight],
+  ["font-family", fontFamily]
+]);
 
-var setter = shorthandSetter('font', shorthand_for);
+module.exports.parse = function parse(v) {
+  const keywords = ["caption", "icon", "menu", "message-box", "small-caption", "status-bar"];
+  const key = parsers.parseKeyword(v, keywords);
+  if (key) {
+    return key;
+  }
+  const [fontBlock, ...families] = parsers.splitValue(v, {
+    delimiter: ","
+  });
+  let blockA, blockB;
+  if (fontBlock.includes("/")) {
+    [blockA, blockB] = parsers.splitValue(fontBlock, {
+      delimiter: "/"
+    });
+  } else {
+    blockA = fontBlock.trim();
+  }
+  const obj = parsers.parseShorthand(blockA, shorthandFor, true);
+  if (!obj) {
+    return;
+  }
+  const font = {};
+  const fontFamilies = new Set();
+  for (const [property, value] of Object.entries(obj)) {
+    if (property === "font-family") {
+      if (!blockB) {
+        fontFamilies.add(value);
+      }
+    } else {
+      font[property] = value;
+    }
+  }
+  // blockB, if matched, includes line-height and first font-family
+  if (blockB) {
+    const [lineheight, family] = parsers.splitValue(blockB);
+    if (lineHeight.isValid(lineheight)) {
+      font["line-height"] = lineHeight.parse(lineheight);
+    } else {
+      return;
+    }
+    if (fontFamily.isValid(family)) {
+      fontFamilies.add(fontFamily.parse(family));
+    } else {
+      return;
+    }
+  }
+  for (const family of families) {
+    if (fontFamily.isValid(family)) {
+      fontFamilies.add(fontFamily.parse(family));
+    } else {
+      return;
+    }
+  }
+  font["font-family"] = [...fontFamilies].join(", ");
+  return font;
+};
 
 module.exports.definition = {
-  set: function (v) {
-    var short = shorthandParser(v, shorthand_for);
-    if (short !== undefined) {
-      return setter.call(this, v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      for (const [key] of shorthandFor) {
+        this._setProperty(key, "");
+      }
+      this._setProperty("font", v);
+    } else {
+      const obj = module.exports.parse(v);
+      if (!obj) {
+        return;
+      }
+      const str = new Set();
+      for (const [key] of shorthandFor) {
+        const val = obj[key];
+        if (typeof val === "string") {
+          this._setProperty(key, val);
+          if (val && !str.has(val)) {
+            if (key === "line-height") {
+              str.add(`/ ${val}`);
+            } else {
+              str.add(val);
+            }
+          }
+        }
+      }
+      this._setProperty("font", [...str].join(" "));
+    }
+  },
+  get() {
+    const val = this.getPropertyValue("font");
+    if (parsers.hasVarFunc(val)) {
+      return val;
     }
-    if (valueType(v) === TYPES.KEYWORD && static_fonts.indexOf(v.toLowerCase()) !== -1) {
-      this._setProperty('font', v);
+    const str = new Set();
+    for (const [key] of shorthandFor) {
+      const v = this.getPropertyValue(key);
+      if (parsers.hasVarFunc(v)) {
+        return "";
+      }
+      if (v && !str.has(v)) {
+        if (key === "line-height") {
+          str.add(`/ ${v}`);
+        } else {
+          str.add(`${v}`);
+        }
+      }
     }
+    return [...str].join(" ");
   },
-  get: shorthandGetter('font', shorthand_for),
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/fontFamily.js

@@ -1,33 +1,71 @@
-'use strict';
+"use strict";
 
-var TYPES = require('../parsers').TYPES;
-var valueType = require('../parsers').valueType;
+const parsers = require("../parsers");
 
-var partsRegEx = /\s*,\s*/;
-module.exports.isValid = function isValid(v) {
-  if (v === '' || v === null) {
-    return true;
+module.exports.parse = function parse(v) {
+  if (v === "") {
+    return v;
   }
-  var parts = v.split(partsRegEx);
-  var len = parts.length;
-  var i;
-  var type;
-  for (i = 0; i < len; i++) {
-    type = valueType(parts[i]);
-    if (type === TYPES.STRING || type === TYPES.KEYWORD) {
-      return true;
+  const keywords = ["serif", "sans-serif", "system-ui", "cursive", "fantasy", "monospace"];
+  const val = parsers.splitValue(v, {
+    delimiter: ","
+  });
+  const font = [];
+  let valid = false;
+  for (const i of val) {
+    const str = parsers.parseString(i);
+    if (str) {
+      font.push(str);
+      valid = true;
+      continue;
+    }
+    const key = parsers.parseKeyword(i, keywords);
+    if (key) {
+      font.push(key);
+      valid = true;
+      continue;
+    }
+    // This implementation does not strictly follow the specification. The spec
+    // does not require the first letter of the font-family to be capitalized.
+    // Also, unquoted font-family names are not restricted to ASCII only.
+    // However, in the real world, the first letter of the ASCII font-family
+    // names are always capitalized, and unquoted font-family names do not
+    // contain spaces, e.g. `Times`, and AFAIK, non-ASCII font-family names are
+    // always quoted even without spaces, e.g. `"メイリオ"`.
+    // Therefore, it is unlikely that this implementation will cause problems.
+    // @see https://drafts.csswg.org/css-fonts/#font-family-prop
+    if (/^\s*(?:[A-Z][A-Za-z\d\s-]+)\s*$/.test(i)) {
+      font.push(i.trim());
+      valid = true;
+      continue;
+    }
+    if (!valid) {
+      return;
     }
   }
-  return false;
+  return font.join(", ");
+};
+
+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-family', v);
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("font", "");
+      this._setProperty("font-family", v);
+    } else {
+      this._setProperty("font-family", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('font-family');
+  get() {
+    return this.getPropertyValue("font-family");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/fontSize.js

@@ -1,38 +1,47 @@
-'use strict';
+"use strict";
 
-var TYPES = require('../parsers').TYPES;
-var valueType = require('../parsers').valueType;
-var parseMeasurement = require('../parsers').parseMeasurement;
+const parsers = require("../parsers");
 
-var absoluteSizes = ['xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large'];
-var relativeSizes = ['larger', 'smaller'];
-
-module.exports.isValid = function (v) {
-  var type = valueType(v.toLowerCase());
-  return (
-    type === TYPES.LENGTH ||
-    type === TYPES.PERCENT ||
-    (type === TYPES.KEYWORD && absoluteSizes.indexOf(v.toLowerCase()) !== -1) ||
-    (type === TYPES.KEYWORD && relativeSizes.indexOf(v.toLowerCase()) !== -1)
-  );
+module.exports.parse = function parse(v) {
+  const val = parsers.parseMeasurement(v, true);
+  if (val) {
+    return val;
+  }
+  const keywords = [
+    "xx-small",
+    "x-small",
+    "small",
+    "medium",
+    "large",
+    "x-large",
+    "xx-large",
+    "xxx-large",
+    "smaller",
+    "larger"
+  ];
+  return parsers.parseKeyword(v, keywords);
 };
 
-function parse(v) {
-  const valueAsString = String(v).toLowerCase();
-  const optionalArguments = absoluteSizes.concat(relativeSizes);
-  const isOptionalArgument = optionalArguments.some(
-    (stringValue) => stringValue.toLowerCase() === valueAsString
-  );
-  return isOptionalArgument ? valueAsString : parseMeasurement(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('font-size', parse(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    if (parsers.hasVarFunc(v)) {
+      this._setProperty("font", "");
+      this._setProperty("font-size", v);
+    } else {
+      this._setProperty("font-size", module.exports.parse(v));
+    }
   },
-  get: function () {
-    return this.getPropertyValue('font-size');
+  get() {
+    return this.getPropertyValue("font-size");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };