cssstyle 1.1.1 → 1.3.0

package/lib/properties/borderWidth.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var parsers = require('../parsers');
 var parsers = require('../parsers');
 var implicitSetter = require('../parsers').implicitSetter;
 
@@ -8,40 +7,40 @@ var implicitSetter = require('../parsers').implicitSetter;
 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;
-    }
-    v = v.toLowerCase();
-    if (widths.indexOf(v) === -1) {
-        return false;
-    }
+  var length = parsers.parseLength(v);
+  if (length !== undefined) {
+    return true;
+  }
+  if (typeof v !== 'string') {
+    return false;
+  }
+  if (v === '') {
     return true;
+  }
+  v = v.toLowerCase();
+  if (widths.indexOf(v) === -1) {
+    return false;
+  }
+  return 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();
-    }
-    return undefined;
+var parser = function(v) {
+  var length = parsers.parseLength(v);
+  if (length !== undefined) {
+    return length;
+  }
+  if (isValid(v)) {
+    return v.toLowerCase();
+  }
+  return undefined;
 };
 
 module.exports.definition = {
-    set: implicitSetter('border', 'width', isValid, parser),
-    get: function () {
-        return this.getPropertyValue('border-width');
-    },
-    enumerable: true,
-    configurable: true
+  set: implicitSetter('border', 'width', isValid, parser),
+  get: function() {
+    return this.getPropertyValue('border-width');
+  },
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/bottom.js

@@ -3,12 +3,12 @@
 var parseMeasurement = require('../parsers').parseMeasurement;
 
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('bottom', parseMeasurement(v));
-    },
-    get: function () {
-        return this.getPropertyValue('bottom');
-    },
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    this._setProperty('bottom', parseMeasurement(v));
+  },
+  get: function() {
+    return this.getPropertyValue('bottom');
+  },
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/clear.js

@@ -2,15 +2,15 @@
 
 var parseKeyword = require('../parsers').parseKeyword;
 
-var clear_keywords = [ 'none', 'left', 'right', 'both', 'inherit' ];
+var clear_keywords = ['none', 'left', 'right', 'both', 'inherit'];
 
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('clear', parseKeyword(v, clear_keywords));
-    },
-    get: function () {
-        return this.getPropertyValue('clear');
-    },
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    this._setProperty('clear', parseKeyword(v, clear_keywords));
+  },
+  get: function() {
+    return this.getPropertyValue('clear');
+  },
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/clip.js

@@ -2,48 +2,46 @@
 
 var parseMeasurement = require('../parsers').parseMeasurement;
 
-/*jslint regexp: true*/
 var shape_regex = /^rect\((.*)\)$/i;
-/*jslint regexp: false*/
 
-var parse = function (val) {
-    if (val === '' || val === null) {
-        return val;
-    }
-    if (typeof val !== 'string') {
-        return undefined;
-    }
-    val = val.toLowerCase();
-    if (val === 'auto' || val === 'inherit') {
-        return val;
-    }
-    var matches = val.match(shape_regex);
-    if (!matches) {
-        return undefined;
-    }
-    var parts = matches[1].split(/\s*,\s*/);
-    if (parts.length !== 4) {
-        return undefined;
-    }
-    var valid = parts.every(function (part, index) {
-        var measurement = parseMeasurement(part);
-        parts[index] = measurement;
-        return measurement !== undefined;
-    });
-    if (!valid) {
-        return undefined;
-    }
-    parts = parts.join(', ');
-    return val.replace(matches[1], parts);
+var parse = function(val) {
+  if (val === '' || val === null) {
+    return val;
+  }
+  if (typeof val !== 'string') {
+    return undefined;
+  }
+  val = val.toLowerCase();
+  if (val === 'auto' || val === 'inherit') {
+    return val;
+  }
+  var matches = val.match(shape_regex);
+  if (!matches) {
+    return undefined;
+  }
+  var parts = matches[1].split(/\s*,\s*/);
+  if (parts.length !== 4) {
+    return undefined;
+  }
+  var valid = parts.every(function(part, index) {
+    var measurement = parseMeasurement(part);
+    parts[index] = measurement;
+    return measurement !== undefined;
+  });
+  if (!valid) {
+    return undefined;
+  }
+  parts = parts.join(', ');
+  return val.replace(matches[1], parts);
 };
 
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('clip', parse(v));
-    },
-    get: function () {
-        return this.getPropertyValue('clip');
-    },
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    this._setProperty('clip', parse(v));
+  },
+  get: function() {
+    return this.getPropertyValue('clip');
+  },
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/color.js

@@ -3,12 +3,12 @@
 var parseColor = require('../parsers').parseColor;
 
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('color', parseColor(v));
-    },
-    get: function () {
-        return this.getPropertyValue('color');
-    },
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    this._setProperty('color', parseColor(v));
+  },
+  get: function() {
+    return this.getPropertyValue('color');
+  },
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/cssFloat.js

@@ -1,12 +1,12 @@
 'use strict';
 
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('float', v);
-    },
-    get: function () {
-        return this.getPropertyValue('float');
-    },
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    this._setProperty('float', v);
+  },
+  get: function() {
+    return this.getPropertyValue('float');
+  },
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/flex.js

@@ -0,0 +1,45 @@
+'use strict';
+
+var shorthandParser = require('../parsers').shorthandParser;
+var shorthandSetter = require('../parsers').shorthandSetter;
+var shorthandGetter = require('../parsers').shorthandGetter;
+
+var shorthand_for = {
+  'flex-grow': require('./flexGrow'),
+  'flex-shrink': require('./flexShrink'),
+  'flex-basis': require('./flexBasis'),
+};
+
+var myShorthandSetter = shorthandSetter('flex', shorthand_for);
+
+module.exports.isValid = function isValid(v) {
+  return shorthandParser(v, shorthand_for) !== undefined;
+};
+
+module.exports.definition = {
+  set: function(v) {
+    var normalizedValue = String(v)
+      .trim()
+      .toLowerCase();
+
+    if (normalizedValue === 'none') {
+      myShorthandSetter.call(this, '0 0 auto');
+      return;
+    }
+    if (normalizedValue === 'initial') {
+      myShorthandSetter.call(this, '0 1 auto');
+      return;
+    }
+    if (normalizedValue === 'auto') {
+      this.removeProperty('flex-grow');
+      this.removeProperty('flex-shrink');
+      this.setProperty('flex-basis', normalizedValue);
+      return;
+    }
+
+    myShorthandSetter.call(this, v);
+  },
+  get: shorthandGetter('flex', shorthand_for),
+  enumerable: true,
+  configurable: true,
+};

package/lib/properties/flexBasis.js

@@ -0,0 +1,28 @@
+'use strict';
+
+var parseMeasurement = require('../parsers').parseMeasurement;
+
+function parse(v) {
+  if (String(v).toLowerCase() === 'auto') {
+    return 'auto';
+  }
+  if (String(v).toLowerCase() === 'inherit') {
+    return 'inherit';
+  }
+  return parseMeasurement(v);
+}
+
+module.exports.isValid = function isValid(v) {
+  return parse(v) !== undefined;
+};
+
+module.exports.definition = {
+  set: function(v) {
+    this._setProperty('flex-basis', parse(v));
+  },
+  get: function() {
+    return this.getPropertyValue('flex-basis');
+  },
+  enumerable: true,
+  configurable: true,
+};

package/lib/properties/flexGrow.js

@@ -0,0 +1,19 @@
+'use strict';
+
+var parseNumber = require('../parsers').parseNumber;
+var POSITION_AT_SHORTHAND = require('../constants').POSITION_AT_SHORTHAND;
+
+module.exports.isValid = function isValid(v, positionAtFlexShorthand) {
+  return parseNumber(v) !== undefined && positionAtFlexShorthand === POSITION_AT_SHORTHAND.first;
+};
+
+module.exports.definition = {
+  set: function(v) {
+    this._setProperty('flex-grow', parseNumber(v));
+  },
+  get: function() {
+    return this.getPropertyValue('flex-grow');
+  },
+  enumerable: true,
+  configurable: true,
+};

package/lib/properties/flexShrink.js

@@ -0,0 +1,19 @@
+'use strict';
+
+var parseNumber = require('../parsers').parseNumber;
+var POSITION_AT_SHORTHAND = require('../constants').POSITION_AT_SHORTHAND;
+
+module.exports.isValid = function isValid(v, positionAtFlexShorthand) {
+  return parseNumber(v) !== undefined && positionAtFlexShorthand === POSITION_AT_SHORTHAND.second;
+};
+
+module.exports.definition = {
+  set: function(v) {
+    this._setProperty('flex-shrink', parseNumber(v));
+  },
+  get: function() {
+    return this.getPropertyValue('flex-shrink');
+  },
+  enumerable: true,
+  configurable: true,
+};

package/lib/properties/float.js

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports.definition = {
+  set: function(v) {
+    this._setProperty('float', v);
+  },
+  get: function() {
+    return this.getPropertyValue('float');
+  },
+  enumerable: true,
+  configurable: true,
+};

package/lib/properties/floodColor.js

@@ -3,12 +3,12 @@
 var parseColor = require('../parsers').parseColor;
 
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('flood-color', parseColor(v));
-    },
-    get: function () {
-        return this.getPropertyValue('flood-color');
-    },
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    this._setProperty('flood-color', parseColor(v));
+  },
+  get: function() {
+    return this.getPropertyValue('flood-color');
+  },
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/font.js

@@ -7,34 +7,37 @@ var shorthandSetter = require('../parsers').shorthandSetter;
 var shorthandGetter = require('../parsers').shorthandGetter;
 
 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')
+  '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'];
-
-module.exports.isValid = function isValid(v) {
-    return (shorthandParser(v, shorthand_for) !== undefined) ||
-        (valueType(v) === TYPES.KEYWORD && static_fonts.indexOf(v.toLowerCase()) !== -1);
-};
+var static_fonts = [
+  'caption',
+  'icon',
+  'menu',
+  'message-box',
+  'small-caption',
+  'status-bar',
+  'inherit',
+];
 
 var setter = shorthandSetter('font', shorthand_for);
 
 module.exports.definition = {
-    set: function (v) {
-        var short = shorthandParser(v, shorthand_for);
-        if (short !== undefined) {
-            return setter.call(this, v);
-        }
-        if (valueType(v) === TYPES.KEYWORD && static_fonts.indexOf(v.toLowerCase()) !== -1) {
-            this._setProperty('font', v);
-        }
-    },
-    get: shorthandGetter('font', shorthand_for),
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    var short = shorthandParser(v, shorthand_for);
+    if (short !== undefined) {
+      return setter.call(this, v);
+    }
+    if (valueType(v) === TYPES.KEYWORD && static_fonts.indexOf(v.toLowerCase()) !== -1) {
+      this._setProperty('font', v);
+    }
+  },
+  get: shorthandGetter('font', shorthand_for),
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/fontFamily.js

@@ -5,29 +5,29 @@ var valueType = require('../parsers').valueType;
 
 var partsRegEx = /\s*,\s*/;
 module.exports.isValid = function isValid(v) {
-    if (v === '' || v === null) {
-        return true;
+  if (v === '' || v === null) {
+    return true;
+  }
+  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;
     }
-    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;
-        }
-    }
-    return false;
+  }
+  return false;
 };
 
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('font-family', v);
-    },
-    get: function () {
-        return this.getPropertyValue('font-family');
-    },
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    this._setProperty('font-family', v);
+  },
+  get: function() {
+    return this.getPropertyValue('font-family');
+  },
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/fontSize.js

@@ -2,24 +2,37 @@
 
 var TYPES = require('../parsers').TYPES;
 var valueType = require('../parsers').valueType;
+var parseMeasurement = require('../parsers').parseMeasurement;
 
 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.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)
+  );
 };
 
+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.definition = {
-    set: function (v) {
-        this._setProperty('font-size', v);
-    },
-    get: function () {
-        return this.getPropertyValue('font-size');
-    },
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    this._setProperty('font-size', parse(v));
+  },
+  get: function() {
+    return this.getPropertyValue('font-size');
+  },
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/fontStyle.js

@@ -2,17 +2,17 @@
 
 var valid_styles = ['normal', 'italic', 'oblique', 'inherit'];
 
-module.exports.isValid = function (v) {
-    return valid_styles.indexOf(v.toLowerCase()) !== -1;
+module.exports.isValid = function(v) {
+  return valid_styles.indexOf(v.toLowerCase()) !== -1;
 };
 
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('font-style', v);
-    },
-    get: function () {
-        return this.getPropertyValue('font-style');
-    },
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    this._setProperty('font-style', v);
+  },
+  get: function() {
+    return this.getPropertyValue('font-style');
+  },
+  enumerable: true,
+  configurable: true,
 };

package/lib/properties/fontVariant.js

@@ -3,16 +3,16 @@
 var valid_variants = ['normal', 'small-caps', 'inherit'];
 
 module.exports.isValid = function isValid(v) {
-    return valid_variants.indexOf(v.toLowerCase()) !== -1;
+  return valid_variants.indexOf(v.toLowerCase()) !== -1;
 };
 
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('font-variant', v);
-    },
-    get: function () {
-        return this.getPropertyValue('font-variant');
-    },
-    enumerable: true,
-    configurable: true
+  set: function(v) {
+    this._setProperty('font-variant', v);
+  },
+  get: function() {
+    return this.getPropertyValue('font-variant');
+  },
+  enumerable: true,
+  configurable: true,
 };