cssstyle 1.3.0 → 1.4.0

package/.eslintignore

@@ -1,4 +1,3 @@
 node_modules
 lib/implementedProperties.js
 lib/properties.js
-jest.config.js

package/.eslintrc.js

@@ -14,14 +14,9 @@ module.exports = {
     module: true,
     require: true,
     window: true,
-    describe: true,
-    it: true,
-    test: true,
-    expect: true,
   },
   plugins: ['prettier'],
   rules: {
-    'no-prototype-builtins': 'off',
     'prettier/prettier': [
       'warn',
       {

package/.travis.yml

@@ -5,13 +5,11 @@ cache:
     - node_modules
 notifications:
   email: true
-install:
-    - npm install
-    - npm install -g codecov
 node_js:
-  - "8"
-  - "10"
-  - "12"
+  - 6
+  - 8
+  - 10
+  - 11
 
 script:
   - npm run test-ci

package/README.md

@@ -1,15 +1,27 @@
 # CSSStyleDeclaration
 
-A Node JS implementation of the CSS Object Model [CSSStyleDeclaration interface](https://www.w3.org/TR/cssom-1/#the-cssstyledeclaration-interface).
+[![NpmVersion](https://img.shields.io/npm/v/cssstyle.svg)](https://www.npmjs.com/package/cssstyle) [![Build Status](https://travis-ci.org/jsakas/CSSStyleDeclaration.svg?branch=master)](https://travis-ci.org/jsakas/CSSStyleDeclaration)
 
-[![NpmVersion](https://img.shields.io/npm/v/cssstyle.svg)](https://www.npmjs.com/package/cssstyle) [![Build Status](https://travis-ci.org/jsakas/CSSStyleDeclaration.svg?branch=master)](https://travis-ci.org/jsakas/CSSStyleDeclaration) [![codecov](https://codecov.io/gh/jsakas/CSSStyleDeclaration/branch/master/graph/badge.svg)](https://codecov.io/gh/jsakas/CSSStyleDeclaration)
+CSSStyleDeclaration is a work-a-like to the CSSStyleDeclaration class in Nikita Vasilyev's [CSSOM](https://github.com/NV/CSSOM). I made it so that when using [jQuery in node](https://github.com/tmtk75/node-jquery) setting css attributes via $.fn.css() would work. node-jquery uses [jsdom](https://github.com/tmpvar/jsdom) to create a DOM to use in node. jsdom uses CSSOM for styling, and CSSOM's implementation of the [CSSStyleDeclaration](http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSStyleDeclaration) doesn't support [CSS2Properties](http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSS2Properties), which is how jQuery's [$.fn.css()](http://api.jquery.com/css/) operates.
 
----
+### Why not just issue a pull request?
 
-#### Background
+Well, NV wants to keep CSSOM fast (which I can appreciate) and CSS2Properties aren't required by the standard (though every browser has the interface). So I figured the path of least resistance would be to just modify this one class, publish it as a node module (that requires CSSOM) and then make a pull request of jsdom to use it.
 
-This package is an extension of the CSSStyleDeclaration class in Nikita Vasilyev's [CSSOM](https://github.com/NV/CSSOM) with added support for CSS 2 & 3 properties. The primary use case is for testing browser code in a Node environment. 
+### How do I test this code?
 
-It was originally created by Chad Walker, it is now maintaind by Jon Sakas and other open source contributors.
+`npm test` should do the trick, assuming you have the dev dependencies installed:
 
-Bug reports and pull requests are welcome.
+```
+$ npm test
+
+tests
+✔ Verify Has Properties
+✔ Verify Has Functions
+✔ Verify Has Special Properties
+✔ Test From Style String
+✔ Test From Properties
+✔ Test Shorthand Properties
+✔ Test width and height Properties and null and empty strings
+✔ Test Implicit Properties
+```

package/lib/allProperties.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// autogenerated - 7/1/2019
+// autogenerated - 2/3/2019
 
 /*
  *
@@ -12,7 +12,6 @@ module.exports = allProperties;
 allProperties.add('align-content');
 allProperties.add('align-items');
 allProperties.add('align-self');
-allProperties.add('alignment-adjust');
 allProperties.add('alignment-baseline');
 allProperties.add('all');
 allProperties.add('animation');
@@ -26,7 +25,6 @@ allProperties.add('animation-play-state');
 allProperties.add('animation-timing-function');
 allProperties.add('appearance');
 allProperties.add('azimuth');
-allProperties.add('backface-visibility');
 allProperties.add('background');
 allProperties.add('background-attachment');
 allProperties.add('background-blend-mode');
@@ -58,37 +56,20 @@ allProperties.add('border-block-style');
 allProperties.add('border-block-width');
 allProperties.add('border-bottom');
 allProperties.add('border-bottom-color');
-allProperties.add('border-bottom-fit-length');
-allProperties.add('border-bottom-fit-width');
-allProperties.add('border-bottom-image');
-allProperties.add('border-bottom-left-fit-width');
-allProperties.add('border-bottom-left-image');
 allProperties.add('border-bottom-left-radius');
-allProperties.add('border-bottom-right-fit-length');
-allProperties.add('border-bottom-right-fit-width');
-allProperties.add('border-bottom-right-image');
 allProperties.add('border-bottom-right-radius');
 allProperties.add('border-bottom-style');
 allProperties.add('border-bottom-width');
-allProperties.add('border-bottoml-eft-fit-length');
 allProperties.add('border-boundary');
-allProperties.add('border-break');
 allProperties.add('border-collapse');
 allProperties.add('border-color');
-allProperties.add('border-corner-fit');
-allProperties.add('border-corner-image');
-allProperties.add('border-corner-image-transform');
 allProperties.add('border-end-end-radius');
 allProperties.add('border-end-start-radius');
-allProperties.add('border-fit');
-allProperties.add('border-fit-length');
-allProperties.add('border-fit-width');
 allProperties.add('border-image');
 allProperties.add('border-image-outset');
 allProperties.add('border-image-repeat');
 allProperties.add('border-image-slice');
 allProperties.add('border-image-source');
-allProperties.add('border-image-transform');
 allProperties.add('border-image-width');
 allProperties.add('border-inline');
 allProperties.add('border-inline-color');
@@ -104,17 +85,11 @@ allProperties.add('border-inline-style');
 allProperties.add('border-inline-width');
 allProperties.add('border-left');
 allProperties.add('border-left-color');
-allProperties.add('border-left-fit-length');
-allProperties.add('border-left-fit-width');
-allProperties.add('border-left-image');
 allProperties.add('border-left-style');
 allProperties.add('border-left-width');
 allProperties.add('border-radius');
 allProperties.add('border-right');
 allProperties.add('border-right-color');
-allProperties.add('border-right-fit-length');
-allProperties.add('border-right-fit-width');
-allProperties.add('border-right-image');
 allProperties.add('border-right-style');
 allProperties.add('border-right-width');
 allProperties.add('border-spacing');
@@ -123,16 +98,7 @@ allProperties.add('border-start-start-radius');
 allProperties.add('border-style');
 allProperties.add('border-top');
 allProperties.add('border-top-color');
-allProperties.add('border-top-fit-length');
-allProperties.add('border-top-fit-width');
-allProperties.add('border-top-image');
-allProperties.add('border-top-left-fit-length');
-allProperties.add('border-top-left-fit-width');
-allProperties.add('border-top-left-image');
 allProperties.add('border-top-left-radius');
-allProperties.add('border-top-right-fit-length');
-allProperties.add('border-top-right-fit-width');
-allProperties.add('border-top-right-image');
 allProperties.add('border-top-right-radius');
 allProperties.add('border-top-style');
 allProperties.add('border-top-width');
@@ -155,9 +121,7 @@ allProperties.add('clip');
 allProperties.add('clip-path');
 allProperties.add('clip-rule');
 allProperties.add('color');
-allProperties.add('color-adjust');
 allProperties.add('color-interpolation-filters');
-allProperties.add('color-scheme');
 allProperties.add('column-count');
 allProperties.add('column-fill');
 allProperties.add('column-gap');
@@ -181,12 +145,6 @@ allProperties.add('cursor');
 allProperties.add('direction');
 allProperties.add('display');
 allProperties.add('dominant-baseline');
-allProperties.add('drop-initial-after-adjust');
-allProperties.add('drop-initial-after-align');
-allProperties.add('drop-initial-before-adjust');
-allProperties.add('drop-initial-before-align');
-allProperties.add('drop-initial-size');
-allProperties.add('drop-initial-value');
 allProperties.add('elevation');
 allProperties.add('empty-cells');
 allProperties.add('filter');
@@ -232,7 +190,6 @@ allProperties.add('font-variation-settings');
 allProperties.add('font-weight');
 allProperties.add('footnote-display');
 allProperties.add('footnote-policy');
-allProperties.add('forced-color-adjust');
 allProperties.add('gap');
 allProperties.add('glyph-orientation-vertical');
 allProperties.add('grid');
@@ -263,7 +220,6 @@ allProperties.add('image-resolution');
 allProperties.add('initial-letters');
 allProperties.add('initial-letters-align');
 allProperties.add('initial-letters-wrap');
-allProperties.add('inline-box-align');
 allProperties.add('inline-size');
 allProperties.add('inline-sizing');
 allProperties.add('inset');
@@ -286,10 +242,6 @@ allProperties.add('line-grid');
 allProperties.add('line-height');
 allProperties.add('line-padding');
 allProperties.add('line-snap');
-allProperties.add('line-stacking');
-allProperties.add('line-stacking-ruby');
-allProperties.add('line-stacking-shift');
-allProperties.add('line-stacking-strategy');
 allProperties.add('list-style');
 allProperties.add('list-style-image');
 allProperties.add('list-style-position');
@@ -382,8 +334,6 @@ allProperties.add('page-break-inside');
 allProperties.add('pause');
 allProperties.add('pause-after');
 allProperties.add('pause-before');
-allProperties.add('perspective');
-allProperties.add('perspective-origin');
 allProperties.add('pitch');
 allProperties.add('pitch-range');
 allProperties.add('place-content');
@@ -391,9 +341,13 @@ allProperties.add('place-items');
 allProperties.add('place-self');
 allProperties.add('play-during');
 allProperties.add('position');
+allProperties.add('presentation-level');
 allProperties.add('quotes');
 allProperties.add('region-fragment');
 allProperties.add('resize');
+allProperties.add('rest');
+allProperties.add('rest-after');
+allProperties.add('rest-before');
 allProperties.add('richness');
 allProperties.add('right');
 allProperties.add('row-gap');
@@ -432,6 +386,7 @@ allProperties.add('shape-inside');
 allProperties.add('shape-margin');
 allProperties.add('shape-outside');
 allProperties.add('speak');
+allProperties.add('speak-as');
 allProperties.add('speak-header');
 allProperties.add('speak-numeral');
 allProperties.add('speak-punctuation');
@@ -453,7 +408,6 @@ allProperties.add('text-emphasis-color');
 allProperties.add('text-emphasis-position');
 allProperties.add('text-emphasis-style');
 allProperties.add('text-group-align');
-allProperties.add('text-height');
 allProperties.add('text-indent');
 allProperties.add('text-justify');
 allProperties.add('text-orientation');
@@ -469,7 +423,6 @@ allProperties.add('top');
 allProperties.add('transform');
 allProperties.add('transform-box');
 allProperties.add('transform-origin');
-allProperties.add('transform-style');
 allProperties.add('transition');
 allProperties.add('transition-delay');
 allProperties.add('transition-duration');
@@ -479,7 +432,14 @@ allProperties.add('unicode-bidi');
 allProperties.add('user-select');
 allProperties.add('vertical-align');
 allProperties.add('visibility');
+allProperties.add('voice-balance');
+allProperties.add('voice-duration');
 allProperties.add('voice-family');
+allProperties.add('voice-pitch');
+allProperties.add('voice-range');
+allProperties.add('voice-rate');
+allProperties.add('voice-stress');
+allProperties.add('voice-volume');
 allProperties.add('volume');
 allProperties.add('white-space');
 allProperties.add('widows');

package/lib/implementedProperties.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// autogenerated - 7/1/2019
+// autogenerated - 7/15/2019
 
 /*
  *

package/lib/parsers.js

@@ -21,12 +21,12 @@ exports.TYPES = {
 
 // rough regular expressions
 var integerRegEx = /^[-+]?[0-9]+$/;
-var numberRegEx = /^[-+]?[0-9]*\.?[0-9]+$/;
+var numberRegEx = /^[-+]?[0-9]*\.[0-9]+$/;
 var lengthRegEx = /^(0|[-+]?[0-9]*\.?[0-9]+(in|cm|em|mm|pt|pc|px|ex|rem|vh|vw))$/;
 var percentRegEx = /^[-+]?[0-9]*\.?[0-9]+%$/;
 var urlRegEx = /^url\(\s*([^)]*)\s*\)$/;
 var stringRegEx = /^("[^"]*"|'[^']*')$/;
-var colorRegEx1 = /^#([0-9a-fA-F]{3,4}){1,2}$/;
+var colorRegEx1 = /^#[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]([0-9a-fA-F][0-9a-fA-F][0-9a-fA-F])?$/;
 var colorRegEx2 = /^rgb\(([^)]*)\)$/;
 var colorRegEx3 = /^rgba\(([^)]*)\)$/;
 var colorRegEx4 = /^hsla?\(\s*(-?\d+|-?\d*.\d+)\s*,\s*(-?\d+|-?\d*.\d+)%\s*,\s*(-?\d+|-?\d*.\d+)%\s*(,\s*(-?\d+|-?\d*.\d+)\s*)?\)/;
@@ -287,26 +287,15 @@ exports.parseColor = function parseColor(val) {
     alpha = 1;
   var parts;
   var res = colorRegEx1.exec(val);
-  // is it #aaa, #ababab, #aaaa, #abababaa
+  // is it #aaa or #ababab
   if (res) {
-    var defaultHex = val.substr(1);
     var hex = val.substr(1);
-    if (hex.length === 3 || hex.length === 4) {
+    if (hex.length === 3) {
       hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2];
-
-      if (defaultHex.length === 4) {
-        hex = hex + defaultHex[3] + defaultHex[3];
-      }
     }
     red = parseInt(hex.substr(0, 2), 16);
     green = parseInt(hex.substr(2, 2), 16);
     blue = parseInt(hex.substr(4, 2), 16);
-    if (hex.length === 8) {
-      var hexAlpha = hex.substr(6, 2);
-      var hexAlphaToRgbaAlpha = Number((parseInt(hexAlpha, 16) / 255).toFixed(3));
-
-      return 'rgba(' + red + ', ' + green + ', ' + blue + ', ' + hexAlphaToRgbaAlpha + ')';
-    }
     return 'rgb(' + red + ', ' + green + ', ' + blue + ')';
   }
 

package/lib/properties/fontSize.js

@@ -2,7 +2,6 @@
 
 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'];
@@ -17,18 +16,9 @@ module.exports.isValid = function(v) {
   );
 };
 
-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', parse(v));
+    this._setProperty('font-size', v);
   },
   get: function() {
     return this.getPropertyValue('font-size');

package/lib/properties.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// autogenerated - 7/1/2019
+// autogenerated - 7/15/2019
 
 /*
  *
@@ -1040,16 +1040,9 @@ fontSize_export_isValid = function (v) {
   return type === external_dependency_parsers_0.TYPES.LENGTH || type === external_dependency_parsers_0.TYPES.PERCENT || type === external_dependency_parsers_0.TYPES.KEYWORD && fontSize_local_var_absoluteSizes.indexOf(v.toLowerCase()) !== -1 || type === external_dependency_parsers_0.TYPES.KEYWORD && fontSize_local_var_relativeSizes.indexOf(v.toLowerCase()) !== -1;
 };
 
-function fontSize_local_fn_parse(v) {
-  const valueAsString = String(v).toLowerCase();
-  const optionalArguments = fontSize_local_var_absoluteSizes.concat(fontSize_local_var_relativeSizes);
-  const isOptionalArgument = optionalArguments.some(stringValue => stringValue.toLowerCase() === valueAsString);
-  return isOptionalArgument ? valueAsString : external_dependency_parsers_0.parseMeasurement(v);
-}
-
 fontSize_export_definition = {
   set: function (v) {
-    this._setProperty('font-size', fontSize_local_fn_parse(v));
+    this._setProperty('font-size', v);
   },
   get: function () {
     return this.getPropertyValue('font-size');

package/package.json

@@ -6,18 +6,13 @@
     "CSSStyleDeclaration",
     "StyleSheet"
   ],
-  "version": "1.3.0",
+  "version": "1.4.0",
   "homepage": "https://github.com/jsakas/CSSStyleDeclaration",
   "maintainers": [
     {
       "name": "Jon Sakas",
       "email": "jon.sakas@gmail.com",
       "url": "https://jon.sakas.co/"
-    },
-    {
-      "name": "Rafał Ruciński",
-      "email": "fatfisz@gmail.com",
-      "url": "https://fatfisz.com"
     }
   ],
   "contributors": [
@@ -25,6 +20,21 @@
       "name": "Chad Walker",
       "email": "chad@chad-cat-lore-eddie.com",
       "url": "https://github.com/chad3814"
+    },
+    {
+      "name": "Rafał Ruciński",
+      "email": "fatfisz@gmail.com",
+      "url": "https://fatfisz.com"
+    },
+    {
+      "name": "Nikita Vasilyev",
+      "email": "me@elv1s.ru"
+    },
+    {
+      "name": "Davide P. Cervone"
+    },
+    {
+      "name": "Forbes Lindesay"
     }
   ],
   "repository": "jsakas/CSSStyleDeclaration",
@@ -34,21 +44,21 @@
   },
   "main": "./lib/CSSStyleDeclaration.js",
   "dependencies": {
-    "cssom": "~0.3.6"
+    "cssom": "0.3.x"
   },
   "devDependencies": {
     "babel-generator": "~6.26.1",
     "babel-traverse": "~6.26.0",
     "babel-types": "~6.26.0",
     "babylon": "~6.18.0",
-    "eslint": "~6.0.0",
-    "eslint-config-prettier": "~6.0.0",
-    "eslint-plugin-prettier": "~3.1.0",
-    "jest": "^24.8.0",
+    "eslint": "5.13.0",
+    "eslint-config-prettier": "4.0.0",
+    "eslint-plugin-prettier": "3.0.1",
+    "nodeunit": "~0.11.3",
     "npm-run-all": "^4.1.5",
-    "prettier": "~1.18.0",
+    "prettier": "1.16.4",
     "request": "^2.88.0",
-    "resolve": "~1.11.1"
+    "resolve": "~1.8.1"
   },
   "scripts": {
     "download": "node ./scripts/download_latest_properties.js && eslint lib/allProperties.js --fix",
@@ -57,13 +67,9 @@
     "generate:properties": "node ./scripts/generate_properties.js",
     "lint": "npm run generate && eslint . --max-warnings 0",
     "lint:fix": "eslint . --fix --max-warnings 0",
-    "prepublishOnly": "npm run lint && npm run test",
-    "test": "npm run generate && jest",
-    "test-ci": "npm run lint && npm run test && codecov",
-    "update-authors": "git log --format=\"%aN <%aE>\" | sort -f | uniq > AUTHORS"
+    "prepublishOnly": "npm run test-ci",
+    "test": "npm run generate && nodeunit tests",
+    "test-ci": "npm run lint && npm run test"
   },
-  "license": "MIT",
-  "engines": {
-    "node": ">=8"
-  }
+  "license": "MIT"
 }