cssstyle 2.2.0 → 2.3.0

package/lib/CSSStyleDeclaration.test.js

@@ -547,4 +547,10 @@ describe('CSSStyleDeclaration', () => {
     expect(style.getPropertyValue('--foo')).toEqual('');
     expect(style.getPropertyValue('--fOo')).toEqual('purple');
   });
+
+  test('supports calc', () => {
+    const style = new CSSStyleDeclaration();
+    style.setProperty('width', 'calc(100% - 100px)');
+    expect(style.getPropertyValue('width')).toEqual('calc(100% - 100px)');
+  });
 });

package/lib/allProperties.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// autogenerated - 1/20/2020
+// autogenerated - 4/29/2020
 
 /*
  *
@@ -258,7 +258,6 @@ module.exports = new Set([
   'margin-left',
   'margin-right',
   'margin-top',
-  'margin-trim',
   'marker-side',
   'mask',
   'mask-border',
@@ -345,6 +344,9 @@ module.exports = new Set([
   'quotes',
   'region-fragment',
   'resize',
+  'rest',
+  'rest-after',
+  'rest-before',
   'richness',
   'right',
   'row-gap',
@@ -386,6 +388,7 @@ module.exports = new Set([
   'spatial-navigation-contain',
   'spatial-navigation-function',
   'speak',
+  'speak-as',
   'speak-header',
   'speak-numeral',
   'speak-punctuation',
@@ -431,7 +434,14 @@ module.exports = new Set([
   'user-select',
   'vertical-align',
   'visibility',
+  'voice-balance',
+  'voice-duration',
   'voice-family',
+  'voice-pitch',
+  'voice-range',
+  'voice-rate',
+  'voice-stress',
+  'voice-volume',
   'volume',
   'white-space',
   'widows',

package/lib/implementedProperties.js

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

package/lib/parsers.js

@@ -18,6 +18,7 @@ exports.TYPES = {
   ANGLE: 8,
   KEYWORD: 9,
   NULL_OR_EMPTY_STR: 10,
+  CALC: 11,
 };
 
 // rough regular expressions
@@ -30,6 +31,7 @@ var stringRegEx = /^("[^"]*"|'[^']*')$/;
 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 angleRegEx = /^([-+]?[0-9]*\.?[0-9]+)(deg|grad|rad)$/;
 
@@ -61,6 +63,9 @@ exports.valueType = function valueType(val) {
   if (urlRegEx.test(val)) {
     return exports.TYPES.URL;
   }
+  if (calcRegEx.test(val)) {
+    return exports.TYPES.CALC;
+  }
   if (stringRegEx.test(val)) {
     return exports.TYPES.STRING;
   }
@@ -70,6 +75,7 @@ exports.valueType = function valueType(val) {
   if (colorRegEx1.test(val)) {
     return exports.TYPES.COLOR;
   }
+
   var res = colorRegEx2.exec(val);
   var parts;
   if (res !== null) {
@@ -201,6 +207,11 @@ exports.parsePercent = function parsePercent(val) {
 
 // either a length or a percent
 exports.parseMeasurement = function parseMeasurement(val) {
+  var type = exports.valueType(val);
+  if (type === exports.TYPES.CALC) {
+    return val;
+  }
+
   var length = exports.parseLength(val);
   if (length !== undefined) {
     return length;

package/lib/parsers.test.js

@@ -65,6 +65,13 @@ describe('valueType', () => {
 
     expect(output).toEqual(parsers.TYPES.LENGTH);
   });
+
+  it('returns calc from calc(100px * 2)', () => {
+    let input = 'calc(100px * 2)';
+    let output = parsers.valueType(input);
+
+    expect(output).toEqual(parsers.TYPES.CALC);
+  });
 });
 describe('parseInteger', () => {
   it.todo('test');

package/lib/properties.js

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

package/package.json

@@ -6,7 +6,7 @@
     "CSSStyleDeclaration",
     "StyleSheet"
   ],
-  "version": "2.2.0",
+  "version": "2.3.0",
   "homepage": "https://github.com/jsdom/cssstyle",
   "maintainers": [
     {