cssstyle 2.3.0 → 4.0.0

package/lib/allWebkitProperties.js

@@ -191,4 +191,4 @@ module.exports = [
   'wrap-through',
   'writing-mode',
   'zoom',
-].map(prop => 'webkit-' + prop);
+].map((prop) => 'webkit-' + prop);

package/lib/implementedProperties.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// autogenerated - 4/29/2020
+// autogenerated - 12/28/2023
 
 /*
  *

package/lib/parsers.js

@@ -32,7 +32,8 @@ var colorRegEx1 = /^#([0-9a-fA-F]{3,4}){1,2}$/;
 var colorRegEx2 = /^rgb\(([^)]*)\)$/;
 var colorRegEx3 = /^rgba\(([^)]*)\)$/;
 var calcRegEx = /^calc\(([^)]*)\)$/;
-var colorRegEx4 = /^hsla?\(\s*(-?\d+|-?\d*.\d+)\s*,\s*(-?\d+|-?\d*.\d+)%\s*,\s*(-?\d+|-?\d*.\d+)%\s*(,\s*(-?\d+|-?\d*.\d+)\s*)?\)/;
+var colorRegEx4 =
+  /^hsla?\(\s*(-?\d+|-?\d*.\d+)\s*,\s*(-?\d+|-?\d*.\d+)%\s*,\s*(-?\d+|-?\d*.\d+)%\s*(,\s*(-?\d+|-?\d*.\d+)\s*)?\)/;
 var angleRegEx = /^([-+]?[0-9]*\.?[0-9]+)(deg|grad|rad)$/;
 
 // This will return one of the above types based on the passed in string
@@ -448,7 +449,7 @@ exports.parseKeyword = function parseKeyword(val, valid_keywords) {
 };
 
 // utility to translate from border-width to borderWidth
-var dashedToCamelCase = function(dashed) {
+var dashedToCamelCase = function (dashed) {
   var i;
   var camel = '';
   var nextCap = false;
@@ -468,7 +469,7 @@ var is_space = /\s/;
 var opening_deliminators = ['"', "'", '('];
 var closing_deliminators = ['"', "'", ')'];
 // this splits on whitespace, but keeps quoted and parened parts together
-var getParts = function(str) {
+var getParts = function (str) {
   var deliminator_stack = [];
   var length = str.length;
   var i;
@@ -521,7 +522,7 @@ exports.shorthandParser = function parse(v, shorthand_for) {
   var obj = {};
   var type = exports.valueType(v);
   if (type === exports.TYPES.NULL_OR_EMPTY_STR) {
-    Object.keys(shorthand_for).forEach(function(property) {
+    Object.keys(shorthand_for).forEach(function (property) {
       obj[property] = '';
     });
     return obj;
@@ -540,9 +541,9 @@ exports.shorthandParser = function parse(v, shorthand_for) {
   }
   var parts = getParts(v);
   var valid = true;
-  parts.forEach(function(part, i) {
+  parts.forEach(function (part, i) {
     var part_valid = false;
-    Object.keys(shorthand_for).forEach(function(property) {
+    Object.keys(shorthand_for).forEach(function (property) {
       if (shorthand_for[property].isValid(part, i)) {
         part_valid = true;
         obj[property] = part;
@@ -556,14 +557,14 @@ exports.shorthandParser = function parse(v, shorthand_for) {
   return obj;
 };
 
-exports.shorthandSetter = function(property, shorthand_for) {
-  return function(v) {
+exports.shorthandSetter = function (property, shorthand_for) {
+  return function (v) {
     var obj = exports.shorthandParser(v, shorthand_for);
     if (obj === undefined) {
       return;
     }
     //console.log('shorthandSetter for:', property, 'obj:', obj);
-    Object.keys(obj).forEach(function(subprop) {
+    Object.keys(obj).forEach(function (subprop) {
       // in case subprop is an implicit property, this will clear
       // *its* subpropertiesX
       var camel = dashedToCamelCase(subprop);
@@ -576,7 +577,7 @@ exports.shorthandSetter = function(property, shorthand_for) {
         this._values[subprop] = obj[subprop];
       }
     }, this);
-    Object.keys(shorthand_for).forEach(function(subprop) {
+    Object.keys(shorthand_for).forEach(function (subprop) {
       if (!obj.hasOwnProperty(subprop)) {
         this.removeProperty(subprop);
         delete this._values[subprop];
@@ -594,16 +595,16 @@ exports.shorthandSetter = function(property, shorthand_for) {
   };
 };
 
-exports.shorthandGetter = function(property, shorthand_for) {
-  return function() {
+exports.shorthandGetter = function (property, shorthand_for) {
+  return function () {
     if (this._values[property] !== undefined) {
       return this.getPropertyValue(property);
     }
     return Object.keys(shorthand_for)
-      .map(function(subprop) {
+      .map(function (subprop) {
         return this.getPropertyValue(subprop);
       }, this)
-      .filter(function(value) {
+      .filter(function (value) {
         return value !== '';
       })
       .join(' ');
@@ -615,14 +616,14 @@ exports.shorthandGetter = function(property, shorthand_for) {
 // if two, the first applies to the top and bottom, and the second to left and right
 // if three, the first applies to the top, the second to left and right, the third bottom
 // if four, top, right, bottom, left
-exports.implicitSetter = function(property_before, property_after, isValid, parser) {
+exports.implicitSetter = function (property_before, property_after, isValid, parser) {
   property_after = property_after || '';
   if (property_after !== '') {
     property_after = '-' + property_after;
   }
   var part_names = ['top', 'right', 'bottom', 'left'];
 
-  return function(v) {
+  return function (v) {
     if (typeof v === 'number') {
       v = v.toString();
     }
@@ -643,7 +644,7 @@ exports.implicitSetter = function(property_before, property_after, isValid, pars
       return undefined;
     }
 
-    parts = parts.map(function(part) {
+    parts = parts.map(function (part) {
       return parser(part);
     });
     this._setProperty(property_before + property_after, parts.join(' '));
@@ -674,14 +675,17 @@ exports.implicitSetter = function(property_before, property_after, isValid, pars
 //  sub-parts are set.  If so, it sets the shorthand version and removes
 //  the individual parts from the cssText.
 //
-exports.subImplicitSetter = function(prefix, part, isValid, parser) {
+exports.subImplicitSetter = function (prefix, part, isValid, parser) {
   var property = prefix + '-' + part;
   var subparts = [prefix + '-top', prefix + '-right', prefix + '-bottom', prefix + '-left'];
 
-  return function(v) {
+  return function (v) {
     if (typeof v === 'number') {
       v = v.toString();
     }
+    if (v === null) {
+      v = '';
+    }
     if (typeof v !== 'string') {
       return undefined;
     }
@@ -690,19 +694,28 @@ exports.subImplicitSetter = function(prefix, part, isValid, parser) {
     }
     v = parser(v);
     this._setProperty(property, v);
-    var parts = [];
-    for (var i = 0; i < 4; i++) {
-      if (this._values[subparts[i]] == null || this._values[subparts[i]] === '') {
-        break;
-      }
-      parts.push(this._values[subparts[i]]);
-    }
-    if (parts.length === 4) {
-      for (i = 0; i < 4; i++) {
+
+    var combinedPriority = this.getPropertyPriority(prefix);
+    var parts = subparts.map((subpart) => this._values[subpart]);
+    var priorities = subparts.map((subpart) => this.getPropertyPriority(subpart));
+    // Combine into a single property if all values are set and have the same priority
+    if (
+      parts.every((p) => p !== '' && p != null) &&
+      priorities.every((p) => p === priorities[0]) &&
+      priorities[0] === combinedPriority
+    ) {
+      for (var i = 0; i < subparts.length; i++) {
         this.removeProperty(subparts[i]);
         this._values[subparts[i]] = parts[i];
       }
-      this._setProperty(prefix, parts.join(' '));
+      this._setProperty(prefix, parts.join(' '), priorities[0]);
+    } else {
+      this.removeProperty(prefix);
+      for (var j = 0; j < subparts.length; j++) {
+        // The property we're setting won't be important, the rest will either keep their priority or inherit it from the combined property
+        var priority = subparts[j] === property ? '' : priorities[j] || combinedPriority;
+        this._setProperty(subparts[j], parts[j], priority);
+      }
     }
     return v;
   };
@@ -711,7 +724,7 @@ exports.subImplicitSetter = function(prefix, part, isValid, parser) {
 var camel_to_dashed = /[A-Z]/g;
 var first_segment = /^\([^-]\)-/;
 var vendor_prefixes = ['o', 'moz', 'ms', 'webkit'];
-exports.camelToDashed = function(camel_case) {
+exports.camelToDashed = function (camel_case) {
   var match;
   var dashed = camel_case.replace(camel_to_dashed, '-$&').toLowerCase();
   match = dashed.match(first_segment);

package/lib/parsers.test.js

@@ -107,7 +107,14 @@ describe('parseColor', () => {
 
     expect(output).toEqual('rgba(5, 5, 5, 0.5)');
   });
-
+  it.each([
+    [120, 'rgb(0, 255, 0)'],
+    [240, 'rgb(0, 0, 255)'],
+  ])('should convert not zero hsl with non zero hue %s to %s', (hue, rgbValue) => {
+    let input = 'hsl(' + hue + ', 100%, 50%)';
+    let output = parsers.parseColor(input);
+    expect(output).toEqual(rgbValue);
+  });
   it.todo('Add more tests');
 });
 describe('parseAngle', () => {

package/lib/properties/azimuth.js

@@ -3,16 +3,13 @@
 var parsers = require('../parsers');
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     var valueType = parsers.valueType(v);
     if (valueType === parsers.TYPES.ANGLE) {
       return this._setProperty('azimuth', parsers.parseAngle(v));
     }
     if (valueType === parsers.TYPES.KEYWORD) {
-      var keywords = v
-        .toLowerCase()
-        .trim()
-        .split(/\s+/);
+      var keywords = v.toLowerCase().trim().split(/\s+/);
       var hasBehind = false;
       if (keywords.length > 2) {
         return;
@@ -59,7 +56,7 @@ module.exports.definition = {
       }
     }
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('azimuth');
   },
   enumerable: true,

package/lib/properties/backgroundAttachment.js

@@ -10,13 +10,13 @@ var isValid = (module.exports.isValid = function isValid(v) {
 });
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     if (!isValid(v)) {
       return;
     }
     this._setProperty('background-attachment', v);
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('background-attachment');
   },
   enumerable: true,

package/lib/properties/backgroundColor.js

@@ -21,14 +21,14 @@ module.exports.isValid = function isValid(v) {
 };
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     var parsed = parse(v);
     if (parsed === undefined) {
       return;
     }
     this._setProperty('background-color', parsed);
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('background-color');
   },
   enumerable: true,

package/lib/properties/backgroundImage.js

@@ -21,10 +21,10 @@ module.exports.isValid = function isValid(v) {
 };
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     this._setProperty('background-image', parse(v));
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('background-image');
   },
   enumerable: true,

package/lib/properties/backgroundPosition.js

@@ -13,7 +13,7 @@ var parse = function parse(v) {
     return undefined;
   }
   var types = [];
-  parts.forEach(function(part, index) {
+  parts.forEach(function (part, index) {
     types[index] = parsers.valueType(part);
   });
   if (parts.length === 1) {
@@ -47,10 +47,10 @@ module.exports.isValid = function isValid(v) {
 };
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     this._setProperty('background-position', parse(v));
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('background-position');
   },
   enumerable: true,

package/lib/properties/backgroundRepeat.js

@@ -21,10 +21,10 @@ module.exports.isValid = function isValid(v) {
 };
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     this._setProperty('background-repeat', parse(v));
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('background-repeat');
   },
   enumerable: true,

package/lib/properties/border.js

@@ -13,7 +13,7 @@ var myShorthandSetter = shorthandSetter('border', shorthand_for);
 var myShorthandGetter = shorthandGetter('border', shorthand_for);
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     if (v.toString().toLowerCase() === 'none') {
       v = '';
     }

package/lib/properties/borderBottomColor.js

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

package/lib/properties/borderBottomStyle.js

@@ -4,7 +4,7 @@ var isValid = require('./borderStyle').isValid;
 module.exports.isValid = isValid;
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     if (isValid(v)) {
       if (v.toLowerCase() === 'none') {
         v = '';
@@ -13,7 +13,7 @@ module.exports.definition = {
       this._setProperty('border-bottom-style', v);
     }
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-bottom-style');
   },
   enumerable: true,

package/lib/properties/borderBottomWidth.js

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

package/lib/properties/borderCollapse.js

@@ -15,10 +15,10 @@ var parse = function parse(v) {
 };
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     this._setProperty('border-collapse', parse(v));
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-collapse');
   },
   enumerable: true,

package/lib/properties/borderColor.js

@@ -13,7 +13,7 @@ module.exports.isValid = function parse(v) {
 };
 var isValid = module.exports.isValid;
 
-var parser = function(v) {
+var parser = function (v) {
   if (isValid(v)) {
     return v.toLowerCase();
   }
@@ -22,7 +22,7 @@ var parser = function(v) {
 
 module.exports.definition = {
   set: implicitSetter('border', 'color', isValid, parser),
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-color');
   },
   enumerable: true,

package/lib/properties/borderLeftColor.js

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

package/lib/properties/borderLeftStyle.js

@@ -4,7 +4,7 @@ var isValid = require('./borderStyle').isValid;
 module.exports.isValid = isValid;
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     if (isValid(v)) {
       if (v.toLowerCase() === 'none') {
         v = '';
@@ -13,7 +13,7 @@ module.exports.definition = {
       this._setProperty('border-left-style', v);
     }
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-left-style');
   },
   enumerable: true,

package/lib/properties/borderLeftWidth.js

@@ -3,12 +3,12 @@
 var isValid = (module.exports.isValid = require('./borderWidth').isValid);
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     if (isValid(v)) {
       this._setProperty('border-left-width', v);
     }
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-left-width');
   },
   enumerable: true,

package/lib/properties/borderRightColor.js

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

package/lib/properties/borderRightStyle.js

@@ -4,7 +4,7 @@ var isValid = require('./borderStyle').isValid;
 module.exports.isValid = isValid;
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     if (isValid(v)) {
       if (v.toLowerCase() === 'none') {
         v = '';
@@ -13,7 +13,7 @@ module.exports.definition = {
       this._setProperty('border-right-style', v);
     }
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-right-style');
   },
   enumerable: true,

package/lib/properties/borderRightWidth.js

@@ -3,12 +3,12 @@
 var isValid = (module.exports.isValid = require('./borderWidth').isValid);
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     if (isValid(v)) {
       this._setProperty('border-right-width', v);
     }
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-right-width');
   },
   enumerable: true,

package/lib/properties/borderSpacing.js

@@ -20,7 +20,7 @@ var parse = function parse(v) {
   if (parts.length !== 1 && parts.length !== 2) {
     return undefined;
   }
-  parts.forEach(function(part) {
+  parts.forEach(function (part) {
     if (parsers.valueType(part) !== parsers.TYPES.LENGTH) {
       return undefined;
     }
@@ -30,10 +30,10 @@ var parse = function parse(v) {
 };
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     this._setProperty('border-spacing', parse(v));
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-spacing');
   },
   enumerable: true,

package/lib/properties/borderStyle.js

@@ -21,7 +21,7 @@ module.exports.isValid = function parse(v) {
 };
 var isValid = module.exports.isValid;
 
-var parser = function(v) {
+var parser = function (v) {
   if (isValid(v)) {
     return v.toLowerCase();
   }
@@ -30,7 +30,7 @@ var parser = function(v) {
 
 module.exports.definition = {
   set: implicitSetter('border', 'style', isValid, parser),
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-style');
   },
   enumerable: true,

package/lib/properties/borderTopColor.js

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

package/lib/properties/borderTopStyle.js

@@ -4,7 +4,7 @@ var isValid = require('./borderStyle').isValid;
 module.exports.isValid = isValid;
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     if (isValid(v)) {
       if (v.toLowerCase() === 'none') {
         v = '';
@@ -13,7 +13,7 @@ module.exports.definition = {
       this._setProperty('border-top-style', v);
     }
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-top-style');
   },
   enumerable: true,

package/lib/properties/borderTopWidth.js

@@ -4,12 +4,12 @@ var isValid = require('./borderWidth').isValid;
 module.exports.isValid = isValid;
 
 module.exports.definition = {
-  set: function(v) {
+  set: function (v) {
     if (isValid(v)) {
       this._setProperty('border-top-width', v);
     }
   },
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-top-width');
   },
   enumerable: true,

package/lib/properties/borderWidth.js

@@ -25,7 +25,7 @@ module.exports.isValid = function parse(v) {
 };
 var isValid = module.exports.isValid;
 
-var parser = function(v) {
+var parser = function (v) {
   var length = parsers.parseLength(v);
   if (length !== undefined) {
     return length;
@@ -38,7 +38,7 @@ var parser = function(v) {
 
 module.exports.definition = {
   set: implicitSetter('border', 'width', isValid, parser),
-  get: function() {
+  get: function () {
     return this.getPropertyValue('border-width');
   },
   enumerable: true,

package/lib/properties/bottom.js

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

package/lib/properties/clear.js

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