cssstyle 1.3.0 → 2.2.0

package/lib/allWebkitProperties.js

@@ -0,0 +1,194 @@
+'use strict';
+
+/**
+ * This file contains all implemented properties that are not a part of any
+ * current specifications or drafts, but are handled by browsers nevertheless.
+ */
+
+module.exports = [
+  'animation',
+  'animation-delay',
+  'animation-direction',
+  'animation-duration',
+  'animation-fill-mode',
+  'animation-iteration-count',
+  'animation-name',
+  'animation-play-state',
+  'animation-timing-function',
+  'appearance',
+  'aspect-ratio',
+  'backface-visibility',
+  'background-clip',
+  'background-composite',
+  'background-origin',
+  'background-size',
+  'border-after',
+  'border-after-color',
+  'border-after-style',
+  'border-after-width',
+  'border-before',
+  'border-before-color',
+  'border-before-style',
+  'border-before-width',
+  'border-end',
+  'border-end-color',
+  'border-end-style',
+  'border-end-width',
+  'border-fit',
+  'border-horizontal-spacing',
+  'border-image',
+  'border-radius',
+  'border-start',
+  'border-start-color',
+  'border-start-style',
+  'border-start-width',
+  'border-vertical-spacing',
+  'box-align',
+  'box-direction',
+  'box-flex',
+  'box-flex-group',
+  'box-lines',
+  'box-ordinal-group',
+  'box-orient',
+  'box-pack',
+  'box-reflect',
+  'box-shadow',
+  'color-correction',
+  'column-axis',
+  'column-break-after',
+  'column-break-before',
+  'column-break-inside',
+  'column-count',
+  'column-gap',
+  'column-rule',
+  'column-rule-color',
+  'column-rule-style',
+  'column-rule-width',
+  'columns',
+  'column-span',
+  'column-width',
+  'filter',
+  'flex-align',
+  'flex-direction',
+  'flex-flow',
+  'flex-item-align',
+  'flex-line-pack',
+  'flex-order',
+  'flex-pack',
+  'flex-wrap',
+  'flow-from',
+  'flow-into',
+  'font-feature-settings',
+  'font-kerning',
+  'font-size-delta',
+  'font-smoothing',
+  'font-variant-ligatures',
+  'highlight',
+  'hyphenate-character',
+  'hyphenate-limit-after',
+  'hyphenate-limit-before',
+  'hyphenate-limit-lines',
+  'hyphens',
+  'line-align',
+  'line-box-contain',
+  'line-break',
+  'line-clamp',
+  'line-grid',
+  'line-snap',
+  'locale',
+  'logical-height',
+  'logical-width',
+  'margin-after',
+  'margin-after-collapse',
+  'margin-before',
+  'margin-before-collapse',
+  'margin-bottom-collapse',
+  'margin-collapse',
+  'margin-end',
+  'margin-start',
+  'margin-top-collapse',
+  'marquee',
+  'marquee-direction',
+  'marquee-increment',
+  'marquee-repetition',
+  'marquee-speed',
+  'marquee-style',
+  'mask',
+  'mask-attachment',
+  'mask-box-image',
+  'mask-box-image-outset',
+  'mask-box-image-repeat',
+  'mask-box-image-slice',
+  'mask-box-image-source',
+  'mask-box-image-width',
+  'mask-clip',
+  'mask-composite',
+  'mask-image',
+  'mask-origin',
+  'mask-position',
+  'mask-position-x',
+  'mask-position-y',
+  'mask-repeat',
+  'mask-repeat-x',
+  'mask-repeat-y',
+  'mask-size',
+  'match-nearest-mail-blockquote-color',
+  'max-logical-height',
+  'max-logical-width',
+  'min-logical-height',
+  'min-logical-width',
+  'nbsp-mode',
+  'overflow-scrolling',
+  'padding-after',
+  'padding-before',
+  'padding-end',
+  'padding-start',
+  'perspective',
+  'perspective-origin',
+  'perspective-origin-x',
+  'perspective-origin-y',
+  'print-color-adjust',
+  'region-break-after',
+  'region-break-before',
+  'region-break-inside',
+  'region-overflow',
+  'rtl-ordering',
+  'svg-shadow',
+  'tap-highlight-color',
+  'text-combine',
+  'text-decorations-in-effect',
+  'text-emphasis',
+  'text-emphasis-color',
+  'text-emphasis-position',
+  'text-emphasis-style',
+  'text-fill-color',
+  'text-orientation',
+  'text-security',
+  'text-size-adjust',
+  'text-stroke',
+  'text-stroke-color',
+  'text-stroke-width',
+  'transform',
+  'transform-origin',
+  'transform-origin-x',
+  'transform-origin-y',
+  'transform-origin-z',
+  'transform-style',
+  'transition',
+  'transition-delay',
+  'transition-duration',
+  'transition-property',
+  'transition-timing-function',
+  'user-drag',
+  'user-modify',
+  'user-select',
+  'wrap',
+  'wrap-flow',
+  'wrap-margin',
+  'wrap-padding',
+  'wrap-shape-inside',
+  'wrap-shape-outside',
+  'wrap-through',
+  'writing-mode',
+  'zoom',
+].map(prop => 'webkit-' + prop);

package/lib/implementedProperties.js

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

package/lib/parsers.js

@@ -5,6 +5,7 @@
 'use strict';
 
 const namedColors = require('./named_colors.json');
+const { hslToRgb } = require('./utils/colorSpace');
 
 exports.TYPES = {
   INTEGER: 1,
@@ -22,7 +23,7 @@ exports.TYPES = {
 // rough regular expressions
 var integerRegEx = /^[-+]?[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 lengthRegEx = /^(0|[-+]?[0-9]*\.?[0-9]+(in|cm|em|mm|pt|pc|px|ex|rem|vh|vw|ch))$/;
 var percentRegEx = /^[-+]?[0-9]*\.?[0-9]+%$/;
 var urlRegEx = /^url\(\s*([^)]*)\s*\)$/;
 var stringRegEx = /^("[^"]*"|'[^']*')$/;
@@ -92,7 +93,7 @@ exports.valueType = function valueType(val) {
     }
     if (
       parts.slice(0, 3).every(percentRegEx.test.bind(percentRegEx)) ||
-      parts.every(integerRegEx.test.bind(integerRegEx))
+      parts.slice(0, 3).every(integerRegEx.test.bind(integerRegEx))
     ) {
       if (numberRegEx.test(parts[3])) {
         return exports.TYPES.COLOR;
@@ -378,10 +379,12 @@ exports.parseColor = function parseColor(val) {
     if (_alpha && numberRegEx.test(_alpha)) {
       alpha = parseFloat(_alpha);
     }
+
+    const [r, g, b] = hslToRgb(hue, saturation / 100, lightness / 100);
     if (!_alphaString || alpha === 1) {
-      return 'hsl(' + hue + ', ' + saturation + '%, ' + lightness + '%)';
+      return 'rgb(' + r + ', ' + g + ', ' + b + ')';
     }
-    return 'hsla(' + hue + ', ' + saturation + '%, ' + lightness + '%, ' + alpha + ')';
+    return 'rgba(' + r + ', ' + g + ', ' + b + ', ' + alpha + ')';
   }
 
   if (type === exports.TYPES.COLOR) {

package/lib/parsers.test.js

@@ -38,12 +38,33 @@ describe('valueType', () => {
     expect(output).toEqual(parsers.TYPES.COLOR);
   });
 
+  it('returns color for rgba(n, n, n, n) with decimal alpha', () => {
+    let input = 'rgba(10, 10, 10, 0.5)';
+    let output = parsers.valueType(input);
+
+    expect(output).toEqual(parsers.TYPES.COLOR);
+  });
+
   it('returns color for rgba(p, p, p, n)', () => {
     let input = 'rgba(10%, 10%, 10%, 1)';
     let output = parsers.valueType(input);
 
     expect(output).toEqual(parsers.TYPES.COLOR);
   });
+
+  it('returns color for rgba(p, p, p, n) with decimal alpha', () => {
+    let input = 'rgba(10%, 10%, 10%, 0.5)';
+    let output = parsers.valueType(input);
+
+    expect(output).toEqual(parsers.TYPES.COLOR);
+  });
+
+  it('returns length for 100ch', () => {
+    let input = '100ch';
+    let output = parsers.valueType(input);
+
+    expect(output).toEqual(parsers.TYPES.LENGTH);
+  });
 });
 describe('parseInteger', () => {
   it.todo('test');
@@ -67,7 +88,20 @@ describe('parseString', () => {
   it.todo('test');
 });
 describe('parseColor', () => {
-  it.todo('test');
+  it('should convert hsl to rgb values', () => {
+    let input = 'hsla(0, 1%, 2%)';
+    let output = parsers.parseColor(input);
+
+    expect(output).toEqual('rgb(5, 5, 5)');
+  });
+  it('should convert hsla to rgba values', () => {
+    let input = 'hsla(0, 1%, 2%, 0.5)';
+    let output = parsers.parseColor(input);
+
+    expect(output).toEqual('rgba(5, 5, 5, 0.5)');
+  });
+
+  it.todo('Add more tests');
 });
 describe('parseAngle', () => {
   it.todo('test');

package/lib/properties.js

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

package/lib/utils/colorSpace.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const hueToRgb = (t1, t2, hue) => {
+  if (hue < 0) hue += 6;
+  if (hue >= 6) hue -= 6;
+
+  if (hue < 1) return (t2 - t1) * hue + t1;
+  else if (hue < 3) return t2;
+  else if (hue < 4) return (t2 - t1) * (4 - hue) + t1;
+  else return t1;
+};
+
+// https://www.w3.org/TR/css-color-4/#hsl-to-rgb
+exports.hslToRgb = (hue, sat, light) => {
+  const t2 = light <= 0.5 ? light * (sat + 1) : light + sat - light * sat;
+  const t1 = light * 2 - t2;
+  const r = hueToRgb(t1, t2, hue + 2);
+  const g = hueToRgb(t1, t2, hue);
+  const b = hueToRgb(t1, t2, hue - 2);
+  return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)];
+};

package/package.json

@@ -6,8 +6,8 @@
     "CSSStyleDeclaration",
     "StyleSheet"
   ],
-  "version": "1.3.0",
-  "homepage": "https://github.com/jsakas/CSSStyleDeclaration",
+  "version": "2.2.0",
+  "homepage": "https://github.com/jsdom/cssstyle",
   "maintainers": [
     {
       "name": "Jon Sakas",
@@ -27,11 +27,14 @@
       "url": "https://github.com/chad3814"
     }
   ],
-  "repository": "jsakas/CSSStyleDeclaration",
-  "bugs": "https://github.com/jsakas/CSSStyleDeclaration/issues",
+  "repository": "jsdom/cssstyle",
+  "bugs": "https://github.com/jsdom/cssstyle/issues",
   "directories": {
     "lib": "./lib"
   },
+  "files": [
+    "lib/"
+  ],
   "main": "./lib/CSSStyleDeclaration.js",
   "dependencies": {
     "cssom": "~0.3.6"

package/.eslintignore

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

package/.eslintrc.js

@@ -1,55 +0,0 @@
-'use strict';
-
-module.exports = {
-  root: true,
-  extends: ['eslint:recommended', 'prettier'],
-  parserOptions: {
-    ecmaVersion: 2018,
-  },
-  env: {
-    es6: true,
-  },
-  globals: {
-    exports: true,
-    module: true,
-    require: true,
-    window: true,
-    describe: true,
-    it: true,
-    test: true,
-    expect: true,
-  },
-  plugins: ['prettier'],
-  rules: {
-    'no-prototype-builtins': 'off',
-    'prettier/prettier': [
-      'warn',
-      {
-        printWidth: 100,
-        singleQuote: true,
-        trailingComma: 'es5',
-      },
-    ],
-    strict: ['warn', 'global'],
-  },
-  overrides: [
-    {
-      files: ['lib/implementedProperties.js', 'lib/properties.js'],
-      rules: {
-        'prettier/prettier': 'off',
-      },
-    },
-    {
-      files: 'scripts/**/*',
-      rules: {
-        'no-console': 'off',
-      },
-    },
-    {
-      files: ['scripts/**/*', 'tests/**/*'],
-      env: {
-        node: true,
-      },
-    },
-  ],
-};

package/.travis.yml

@@ -1,17 +0,0 @@
-sudo: false
-language: node_js
-cache:
-  directories:
-    - node_modules
-notifications:
-  email: true
-install:
-    - npm install
-    - npm install -g codecov
-node_js:
-  - "8"
-  - "10"
-  - "12"
-
-script:
-  - npm run test-ci

package/AUTHORS

@@ -1,31 +0,0 @@
-Benny Powers <web@bennypowers.com>
-Brenton Partridge <bapartridge@gmail.com>
-Chad Walker <chad@chad-cat-lore-eddie.com>
-chad3814 <chad@chad-cat-lore-eddie.com>
-Dallas Hall <dallas.hall@procore.com>
-Davide P. Cervone <dpvc@union.edu>
-Edward Betts <edward@4angle.com>
-Evan Jacobs <evan.jacobs@enigma.io>
-fatfisz <fatfisz@gmail.com>
-ForbesLindesay <forbes@lindesay.co.uk>
-Gabriel Bibiano <gabriel.bibiano.a@gmail.com>
-Ignacio Rodriguez <inz@fastmicroservices.com>
-Isaac Devine <isaac@devinesystems.co.nz>
-Jacob Feldman <jacob.h.feldman@gmail.com>
-jakeFeldman <jacob.h.feldman@gmail.com>
-Jon Sakas <jon.sakas@beatport.com>
-Jon Sakas <jon.sakas@gmail.com>
-Jonathan Cousins - External <jonathan.cousins.external@ynap.com>
-João Gabriel Bibiano de Araújo <joao.araujo-ext@viavarejo.com.br>
-Kwun-Lok Ng <k@samplify.io>
-lsiu <leonard.siu@gmail.com>
-Marc Prud'hommeaux <mwp1@cornell.edu>
-Marcel Klehr <mklehr@gmx.net>
-Matthew Crinklaw-Vogt <mlaw@fb.com>
-omri lugasi <omriDroid@gmail.com>
-Pierre Carru <pierre.carru@gmail.com>
-Rafał Ruciński <fatfisz@gmail.com>
-Ronald Rey <reyronald@gmail.com>
-Sampo Kivistö <sampo.kivisto@live.fi>
-step-off <stepanoff@skbkontur.ru>
-stepanoff <stepanoff@skbkontur.ru>