cssstyle 1.1.0 → 1.2.2

package/lib/utils/getBasicPropertyDescriptor.js

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

package/package.json

@@ -6,13 +6,13 @@
     "CSSStyleDeclaration",
     "StyleSheet"
   ],
-  "version": "1.1.0",
+  "version": "1.2.2",
   "homepage": "https://github.com/jsakas/CSSStyleDeclaration",
   "maintainers": [
     {
       "name": "Jon Sakas",
       "email": "jon.sakas@gmail.com",
-      "url": "http://jon.sakas.co/"
+      "url": "https://jon.sakas.co/"
     }
   ],
   "contributors": [
@@ -21,6 +21,11 @@
       "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"
@@ -42,16 +47,29 @@
     "cssom": "0.3.x"
   },
   "devDependencies": {
-    "babel-generator": "~6.11.4",
-    "babel-traverse": "~6.13.0",
-    "babel-types": "~6.13.0",
-    "babylon": "~6.8.4",
-    "nodeunit": "~0.8.0",
-    "resolve": "~1.1.7"
+    "babel-generator": "~6.26.1",
+    "babel-traverse": "~6.26.0",
+    "babel-types": "~6.26.0",
+    "babylon": "~6.18.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.16.4",
+    "request": "^2.88.0",
+    "resolve": "~1.8.1"
   },
   "scripts": {
-    "test": "node ./scripts/generate_properties.js && node ./scripts/generate_valid_properties.js && nodeunit tests",
-    "prepublish": "node ./scripts/generate_properties.js && node ./scripts/generate_valid_properties.js"
+    "download": "node ./scripts/download_latest_properties.js && eslint lib/allProperties.js --fix",
+    "generate": "run-p generate:*",
+    "generate:implemented_properties": "node ./scripts/generate_implemented_properties.js",
+    "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 test-ci",
+    "test": "npm run generate && nodeunit tests",
+    "test-ci": "npm run lint && npm run test"
   },
   "license": "MIT"
 }

package/scripts/download_latest_properties.js

@@ -0,0 +1,88 @@
+'use strict';
+
+/*
+ * W3C provides JSON list of all CSS properties and their status in the standard
+ *
+ * documentation: https://www.w3.org/Style/CSS/all-properties.en.html
+ * JSON url: ( https://www.w3.org/Style/CSS/all-properties.en.json )
+ *
+ * Download that file, filter out duplicates and filter the properties based on the wanted standard level
+ *
+ * ED   - Editors' Draft (not a W3C Technical Report)
+ * FPWD - First Public Working Draft
+ * WD   - Working Draft
+ * LC   - Last Call Working Draft
+ * CR   - Candidate Recommendation
+ * PR   - Proposed Recommendation
+ * REC  - Recommendation
+ * NOTE - Working Group Note
+ */
+
+var fs = require('fs');
+var path = require('path');
+
+var request = require('request');
+
+const { camelToDashed } = require('../lib/parsers');
+
+var url = 'https://www.w3.org/Style/CSS/all-properties.en.json';
+
+console.log('Downloading CSS properties...');
+
+function toCamelCase(propName) {
+  return propName.replace(/-([a-z])/g, function(g) {
+    return g[1].toUpperCase();
+  });
+}
+
+request(url, function(error, response, body) {
+  if (!error && response.statusCode === 200) {
+    var allCSSProperties = JSON.parse(body);
+
+    // Filter out all properties newer than Working Draft
+    var workingDraftAndOlderProperties = allCSSProperties.filter(function(cssProp) {
+      // TODO: --* css Needs additional logic to this module, so filter it out for now
+      return cssProp.status !== 'ED' && cssProp.status !== 'FPWD' && cssProp.property !== '--*';
+    });
+
+    // Remove duplicates, there can be many properties in different states of standard
+    // and add only property names to the list
+    var CSSpropertyNames = [];
+    workingDraftAndOlderProperties.forEach(function(cssProp) {
+      const camelCaseName = toCamelCase(cssProp.property);
+
+      if (CSSpropertyNames.indexOf(camelCaseName) === -1) {
+        CSSpropertyNames.push(camelCaseName);
+      }
+    });
+
+    var out_file = fs.createWriteStream(path.resolve(__dirname, './../lib/allProperties.js'), {
+      encoding: 'utf-8',
+    });
+
+    var date_today = new Date();
+    out_file.write(
+      "'use strict';\n\n// autogenerated - " +
+        (date_today.getMonth() + 1 + '/' + date_today.getDate() + '/' + date_today.getFullYear()) +
+        '\n\n'
+    );
+    out_file.write('/*\n *\n * https://www.w3.org/Style/CSS/all-properties.en.html\n */\n\n');
+
+    out_file.write('var allProperties = new Set();\n');
+    out_file.write('module.exports = allProperties;\n');
+
+    CSSpropertyNames.forEach(function(property) {
+      out_file.write('allProperties.add(' + JSON.stringify(camelToDashed(property)) + ');\n');
+    });
+
+    out_file.end(function(err) {
+      if (err) {
+        throw err;
+      }
+
+      console.log('Generated ' + Object.keys(CSSpropertyNames).length + ' properties.');
+    });
+  } else {
+    throw error;
+  }
+});

package/scripts/generate_implemented_properties.js

@@ -0,0 +1,61 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const t = require('babel-types');
+const generate = require('babel-generator').default;
+const camelToDashed = require('../lib/parsers').camelToDashed;
+
+const dashedProperties = fs
+  .readdirSync(path.resolve(__dirname, '../lib/properties'))
+  .filter(propertyFile => propertyFile.substr(-3) === '.js')
+  .map(propertyFile => camelToDashed(propertyFile.replace('.js', '')));
+
+const out_file = fs.createWriteStream(path.resolve(__dirname, '../lib/implementedProperties.js'), {
+  encoding: 'utf-8',
+});
+var date_today = new Date();
+out_file.write(
+  "'use strict';\n\n// autogenerated - " +
+    (date_today.getMonth() + 1 + '/' + date_today.getDate() + '/' + date_today.getFullYear()) +
+    '\n\n'
+);
+out_file.write('/*\n *\n * https://www.w3.org/Style/CSS/all-properties.en.html\n */\n\n');
+
+const statements = [];
+statements.push(
+  t.variableDeclaration('var', [
+    t.variableDeclarator(
+      t.identifier('implementedProperties'),
+      t.newExpression(t.identifier('Set'), [])
+    ),
+  ])
+);
+
+dashedProperties.forEach(property => {
+  statements.push(
+    t.expressionStatement(
+      t.callExpression(
+        t.memberExpression(t.identifier('implementedProperties'), t.identifier('add')),
+        [t.stringLiteral(property)]
+      )
+    )
+  );
+});
+
+statements.push(
+  t.expressionStatement(
+    t.assignmentExpression(
+      '=',
+      t.memberExpression(t.identifier('module'), t.identifier('exports')),
+      t.identifier('implementedProperties')
+    )
+  )
+);
+
+out_file.write(generate(t.program(statements)).code + '\n');
+out_file.end(function(err) {
+  if (err) {
+    throw err;
+  }
+});

package/scripts/generate_properties.js

@@ -18,31 +18,39 @@ function getUniqueIndex() {
   return uniqueIndex++;
 }
 
-var property_files = fs.readdirSync(path.resolve(__dirname, '../lib/properties')).filter(function (property) {
+var property_files = fs
+  .readdirSync(path.resolve(__dirname, '../lib/properties'))
+  .filter(function(property) {
     return property.substr(-3) === '.js';
+  });
+var out_file = fs.createWriteStream(path.resolve(__dirname, '../lib/properties.js'), {
+  encoding: 'utf-8',
 });
-var out_file = fs.createWriteStream(path.resolve(__dirname, '../lib/properties.js'), {encoding: 'utf-8'});
-
-out_file.write('\'use strict\';\n\n// autogenerated\n\n');
-out_file.write('/*\n *\n * http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSS2Properties\n */\n\n');
+var date_today = new Date();
+out_file.write(
+  "'use strict';\n\n// autogenerated - " +
+    (date_today.getMonth() + 1 + '/' + date_today.getDate() + '/' + date_today.getFullYear()) +
+    '\n\n'
+);
+out_file.write('/*\n *\n * https://www.w3.org/Style/CSS/all-properties.en.html\n */\n\n');
 
 function isModuleDotExports(node) {
   return (
-    t.isMemberExpression(node, {computed: false}) &&
-    t.isIdentifier(node.object, {name: 'module'}) &&
-    t.isIdentifier(node.property, {name: 'exports'})
+    t.isMemberExpression(node, { computed: false }) &&
+    t.isIdentifier(node.object, { name: 'module' }) &&
+    t.isIdentifier(node.property, { name: 'exports' })
   );
 }
 function isRequire(node, filename) {
   if (
     t.isCallExpression(node) &&
-    t.isIdentifier(node.callee, {name: 'require'}) &&
+    t.isIdentifier(node.callee, { name: 'require' }) &&
     node.arguments.length === 1 &&
     t.isStringLiteral(node.arguments[0])
   ) {
     var relative = node.arguments[0].value;
-    var fullPath = resolve.sync(relative, {basedir: dirname(filename)});
-    return {relative: relative, fullPath: fullPath};
+    var fullPath = resolve.sync(relative, { basedir: dirname(filename) });
+    return { relative: relative, fullPath: fullPath };
   } else {
     return false;
   }
@@ -50,26 +58,26 @@ function isRequire(node, filename) {
 
 // step 1: parse all files and figure out their dependencies
 var parsedFilesByPath = {};
-property_files.map(function (property) {
-    var filename = path.resolve(__dirname, '../lib/properties/' + property);
-    var src = fs.readFileSync(filename, 'utf8');
-    property = basename(property, '.js');
-    var ast = babylon.parse(src);
-    var dependencies = [];
-    traverse(ast, {
-      enter(path) {
-        var r;
-        if (r = isRequire(path.node, filename)) {
-          dependencies.push(r.fullPath);
-        }
+property_files.map(function(property) {
+  var filename = path.resolve(__dirname, '../lib/properties/' + property);
+  var src = fs.readFileSync(filename, 'utf8');
+  property = basename(property, '.js');
+  var ast = babylon.parse(src);
+  var dependencies = [];
+  traverse(ast, {
+    enter(path) {
+      var r;
+      if ((r = isRequire(path.node, filename))) {
+        dependencies.push(r.fullPath);
       }
-    });
-    parsedFilesByPath[filename] = {
-      filename: filename,
-      property: property,
-      ast: ast,
-      dependencies: dependencies,
-    };
+    },
+  });
+  parsedFilesByPath[filename] = {
+    filename: filename,
+    property: property,
+    ast: ast,
+    dependencies: dependencies,
+  };
 });
 
 // step 2: serialize the files in an order where dependencies are always above
@@ -81,7 +89,10 @@ function addFile(filename, dependencyPath) {
   if (dependencyPath.indexOf(filename) !== -1) {
     throw new Error(
       'Circular dependency: ' +
-      dependencyPath.slice(dependencyPath.indexOf(filename)).concat([filename]).join(' -> ')
+        dependencyPath
+          .slice(dependencyPath.indexOf(filename))
+          .concat([filename])
+          .join(' -> ')
     );
   }
   var file = parsedFilesByPath[filename];
@@ -91,14 +102,14 @@ function addFile(filename, dependencyPath) {
   if (!file) {
     externalDependencies.push(filename);
   } else {
-    file.dependencies.forEach(function (dependency) {
+    file.dependencies.forEach(function(dependency) {
       addFile(dependency, dependencyPath.concat([filename]));
     });
     parsedFiles.push(parsedFilesByPath[filename]);
   }
   addedFiles[filename] = true;
 }
-Object.keys(parsedFilesByPath).forEach(function (filename) {
+Object.keys(parsedFilesByPath).forEach(function(filename) {
   addFile(filename, []);
 });
 // Step 3: add files to output
@@ -106,50 +117,37 @@ Object.keys(parsedFilesByPath).forEach(function (filename) {
 // and updating require calls as appropriate
 var moduleExportsByPath = {};
 var statements = [];
-externalDependencies.forEach(function (filename, i) {
+externalDependencies.forEach(function(filename, i) {
   var id = t.identifier(
-    'external_dependency_' +
-    basename(filename, '.js').replace(/[^A-Za-z]/g, '') +
-    '_' + i
+    'external_dependency_' + basename(filename, '.js').replace(/[^A-Za-z]/g, '') + '_' + i
   );
-  moduleExportsByPath[filename] = {defaultExports: id};
+  moduleExportsByPath[filename] = { defaultExports: id };
   var relativePath = path.relative(path.resolve(__dirname + '/../lib'), filename);
   if (relativePath[0] !== '.') {
     relativePath = './' + relativePath;
   }
-  statements.push(t.variableDeclaration(
-    'var',
-    [
+  statements.push(
+    t.variableDeclaration('var', [
       t.variableDeclarator(
         id,
-        t.callExpression(
-          t.identifier('require'),
-          [
-            t.stringLiteral(
-              relativePath
-            )
-          ]
-        )
-      )
-    ]
-  ));
+        t.callExpression(t.identifier('require'), [t.stringLiteral(relativePath)])
+      ),
+    ])
+  );
 });
 function getRequireValue(node, file) {
-  var r;
+  var r, e;
   // replace require("./foo").bar with the named export from foo
   if (
-    t.isMemberExpression(node, {computed: false}) &&
+    t.isMemberExpression(node, { computed: false }) &&
     (r = isRequire(node.object, file.filename))
   ) {
-    var e = moduleExportsByPath[r.fullPath];
+    e = moduleExportsByPath[r.fullPath];
     if (!e) {
       return;
     }
     if (!e.namedExports) {
-      return t.memberExpression(
-        e.defaultExports,
-        node.property
-      );
+      return t.memberExpression(e.defaultExports, node.property);
     }
     if (!e.namedExports[node.property.name]) {
       throw new Error(r.relative + ' does not export ' + node.property.name);
@@ -157,8 +155,8 @@ function getRequireValue(node, file) {
     return e.namedExports[node.property.name];
 
     // replace require("./foo") with the default export of foo
-  } else if (r = isRequire(node, file.filename)) {
-    var e = moduleExportsByPath[r.fullPath];
+  } else if ((r = isRequire(node, file.filename))) {
+    e = moduleExportsByPath[r.fullPath];
     if (!e) {
       if (/^\.\.\//.test(r.relative)) {
         node.arguments[0].value = r.relative.substr(1);
@@ -168,7 +166,7 @@ function getRequireValue(node, file) {
     return e.defaultExports;
   }
 }
-parsedFiles.forEach(function (file) {
+parsedFiles.forEach(function(file) {
   var namedExports = {};
   var localVariableMap = {};
 
@@ -176,7 +174,7 @@ parsedFiles.forEach(function (file) {
     enter(path) {
       // replace require calls with the corresponding value
       var r;
-      if (r = getRequireValue(path.node, file)) {
+      if ((r = getRequireValue(path.node, file))) {
         path.replaceWith(r);
         return;
       }
@@ -190,21 +188,21 @@ parsedFiles.forEach(function (file) {
         (r = getRequireValue(path.node.declarations[0].init, file))
       ) {
         var newName = 'compiled_local_variable_reference_' + getUniqueIndex();
-        path.scope.rename(
-          path.node.declarations[0].id.name,
-          newName
-        );
+        path.scope.rename(path.node.declarations[0].id.name, newName);
         localVariableMap[newName] = r;
         path.remove();
         return;
       }
 
+      // rename all top level functions to keep them local to the module
+      if (t.isFunctionDeclaration(path.node) && t.isProgram(path.parent)) {
+        path.scope.rename(path.node.id.name, file.property + '_local_fn_' + path.node.id.name);
+        return;
+      }
+
       // rename all top level variables to keep them local to the module
-      if (
-        t.isVariableDeclaration(path.node) &&
-        t.isProgram(path.parent)
-      ) {
-        path.node.declarations.forEach(function (declaration) {
+      if (t.isVariableDeclaration(path.node) && t.isProgram(path.parent)) {
+        path.node.declarations.forEach(function(declaration) {
           path.scope.rename(
             declaration.id.name,
             file.property + '_local_var_' + declaration.id.name
@@ -215,7 +213,7 @@ parsedFiles.forEach(function (file) {
 
       // replace module.exports.bar with a variable for the named export
       if (
-        t.isMemberExpression(path.node, {computed: false}) &&
+        t.isMemberExpression(path.node, { computed: false }) &&
         isModuleDotExports(path.node.object)
       ) {
         var name = path.node.property.name;
@@ -223,7 +221,7 @@ parsedFiles.forEach(function (file) {
         path.replaceWith(identifier);
         namedExports[name] = identifier;
       }
-    }
+    },
   });
   traverse(file.ast, {
     enter(path) {
@@ -233,25 +231,29 @@ parsedFiles.forEach(function (file) {
       ) {
         path.replaceWith(localVariableMap[path.node.name]);
       }
-    }
+    },
   });
-  var defaultExports = t.objectExpression(Object.keys(namedExports).map(function (name) {
-    return t.objectProperty(t.identifier(name), namedExports[name]);
-  }));
+  var defaultExports = t.objectExpression(
+    Object.keys(namedExports).map(function(name) {
+      return t.objectProperty(t.identifier(name), namedExports[name]);
+    })
+  );
   moduleExportsByPath[file.filename] = {
     namedExports: namedExports,
-    defaultExports: defaultExports
+    defaultExports: defaultExports,
   };
-  statements.push(t.variableDeclaration(
-    'var',
-    Object.keys(namedExports).map(function (name) {
-      return t.variableDeclarator(namedExports[name]);
-    })
-  ))
+  statements.push(
+    t.variableDeclaration(
+      'var',
+      Object.keys(namedExports).map(function(name) {
+        return t.variableDeclarator(namedExports[name]);
+      })
+    )
+  );
   statements.push.apply(statements, file.ast.program.body);
 });
 var propertyDefinitions = [];
-parsedFiles.forEach(function (file) {
+parsedFiles.forEach(function(file) {
   var dashed = camelToDashed(file.property);
   propertyDefinitions.push(
     t.objectProperty(
@@ -261,42 +263,30 @@ parsedFiles.forEach(function (file) {
   );
   if (file.property !== dashed) {
     propertyDefinitions.push(
-      t.objectProperty(
-        t.stringLiteral(dashed),
-        t.identifier(file.property + '_export_definition')
-      )
+      t.objectProperty(t.stringLiteral(dashed), t.identifier(file.property + '_export_definition'))
     );
   }
 });
 var definePropertiesCall = t.callExpression(
-  t.memberExpression(
-    t.identifier('Object'),
-    t.identifier('defineProperties')
-  ),
-  [
-    t.identifier('prototype'),
-    t.objectExpression(
-      propertyDefinitions
-    )
-  ]
+  t.memberExpression(t.identifier('Object'), t.identifier('defineProperties')),
+  [t.identifier('prototype'), t.objectExpression(propertyDefinitions)]
 );
-statements.push(t.expressionStatement(
-  t.assignmentExpression(
-    '=',
-    t.memberExpression(
-      t.identifier('module'),
-      t.identifier('exports')
-    ),
-    t.functionExpression(
-      null,
-      [t.identifier('prototype')],
-      t.blockStatement([t.expressionStatement(definePropertiesCall)])
+statements.push(
+  t.expressionStatement(
+    t.assignmentExpression(
+      '=',
+      t.memberExpression(t.identifier('module'), t.identifier('exports')),
+      t.functionExpression(
+        null,
+        [t.identifier('prototype')],
+        t.blockStatement([t.expressionStatement(definePropertiesCall)])
+      )
     )
   )
-));
-out_file.write(generate(t.program(statements)).code + '\n')
-out_file.end(function (err) {
-    if (err) {
-        throw err;
-    }
+);
+out_file.write(generate(t.program(statements)).code + '\n');
+out_file.end(function(err) {
+  if (err) {
+    throw err;
+  }
 });