cssstyle 0.2.31 → 0.2.37

package/package.json

@@ -1,35 +1,52 @@
 {
-    "name": "cssstyle",
-    "description": "CSSStyleDeclaration Object Model implementation",
-    "keywords": ["CSS", "CSSStyleDeclaration", "StyleSheet"],
-    "version": "0.2.31",
-    "homepage": "https://github.com/chad3814/CSSStyleDeclaration",
-    "maintainers": [{
-        "name": "Chad Walker",
-        "email": "chad@chad-cat-lore-eddie.com",
-        "url": "https://github.com/chad3814"
-    }],
-    "contributors": [{
-        "name": "Nikita Vasilyev",
-        "email": "me@elv1s.ru"
-    }, {
-        "name": "Davide P. Cervone"
-    }],
-    "repository": "chad3814/CSSStyleDeclaration",
-    "bugs": "https://github.com/chad3814/CSSStyleDeclaration/issues",
-    "directories": {
-        "lib": "./lib"
+  "name": "cssstyle",
+  "description": "CSSStyleDeclaration Object Model implementation",
+  "keywords": [
+    "CSS",
+    "CSSStyleDeclaration",
+    "StyleSheet"
+  ],
+  "version": "0.2.37",
+  "homepage": "https://github.com/chad3814/CSSStyleDeclaration",
+  "maintainers": [
+    {
+      "name": "Chad Walker",
+      "email": "chad@chad-cat-lore-eddie.com",
+      "url": "https://github.com/chad3814"
+    }
+  ],
+  "contributors": [
+    {
+      "name": "Nikita Vasilyev",
+      "email": "me@elv1s.ru"
     },
-    "main": "./lib/CSSStyleDeclaration.js",
-    "dependencies": {
-        "cssom": "0.3.x"
+    {
+      "name": "Davide P. Cervone"
     },
-    "devDependencies" : {
-      "nodeunit": "~0.8.0"
-    },
-    "scripts": {
-        "test": "./scripts/run_tests.sh",
-        "prepublish": "node ./scripts/generate_properties.js"
-    },
-    "license": "MIT"
+    {
+      "name": "Forbes Lindesay"
+    }
+  ],
+  "repository": "chad3814/CSSStyleDeclaration",
+  "bugs": "https://github.com/chad3814/CSSStyleDeclaration/issues",
+  "directories": {
+    "lib": "./lib"
+  },
+  "main": "./lib/CSSStyleDeclaration.js",
+  "dependencies": {
+    "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"
+  },
+  "scripts": {
+    "test": "./scripts/run_tests.sh",
+    "prepublish": "node ./scripts/generate_properties.js"
+  },
+  "license": "MIT"
 }

package/scripts/generate_properties.js

@@ -2,30 +2,299 @@
 
 var fs = require('fs');
 var path = require('path');
+var babylon = require('babylon');
+var t = require('babel-types');
+var generate = require('babel-generator').default;
+var traverse = require('babel-traverse').default;
+var resolve = require('resolve');
 
 var camelToDashed = require('../lib/parsers').camelToDashed;
 
-var property_files = fs.readdirSync(path.resolve(__dirname, '../lib/properties'));
+var basename = path.basename;
+var dirname = path.dirname;
+
+var uniqueIndex = 0;
+function getUniqueIndex() {
+  return uniqueIndex++;
+}
+
+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'});
 
 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');
-out_file.write('module.exports = function (prototype) {\n');
-
-property_files.forEach(function (property) {
-    var dashed;
-    if (property.substr(-3) === '.js') {
-        property = path.basename(property, '.js');
-        dashed = camelToDashed(property);
-        out_file.write('    var '+property+' = require(\'./properties/' + property + '\').definition;\n');
-        out_file.write('    Object.defineProperty(prototype, \'' + property + '\', '+property+')\n');
-        if (property !== dashed) {
-            out_file.write('    Object.defineProperty(prototype, \'' + dashed + '\', '+property+')\n');
+
+function isModuleDotExports(node) {
+  return (
+    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'}) &&
+    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};
+  } else {
+    return false;
+  }
+}
+
+// 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);
         }
-    }
+      }
+    });
+    parsedFilesByPath[filename] = {
+      filename: filename,
+      property: property,
+      ast: ast,
+      dependencies: dependencies,
+    };
 });
 
-out_file.write('};\n');
+// step 2: serialize the files in an order where dependencies are always above
+//         the files they depend on
+var externalDependencies = [];
+var parsedFiles = [];
+var addedFiles = {};
+function addFile(filename, dependencyPath) {
+  if (dependencyPath.indexOf(filename) !== -1) {
+    throw new Error(
+      'Circular dependency: ' +
+      dependencyPath.slice(dependencyPath.indexOf(filename)).concat([filename]).join(' -> ')
+    );
+  }
+  var file = parsedFilesByPath[filename];
+  if (addedFiles[filename]) {
+    return;
+  }
+  if (!file) {
+    externalDependencies.push(filename);
+  } else {
+    file.dependencies.forEach(function (dependency) {
+      addFile(dependency, dependencyPath.concat([filename]));
+    });
+    parsedFiles.push(parsedFilesByPath[filename]);
+  }
+  addedFiles[filename] = true;
+}
+Object.keys(parsedFilesByPath).forEach(function (filename) {
+  addFile(filename, []);
+});
+// Step 3: add files to output
+// renaming exports to local variables `moduleName_export_exportName`
+// and updating require calls as appropriate
+var moduleExportsByPath = {};
+var statements = [];
+externalDependencies.forEach(function (filename, i) {
+  var id = t.identifier(
+    'external_dependency_' +
+    basename(filename, '.js').replace(/[^A-Za-z]/g, '') +
+    '_' + i
+  );
+  moduleExportsByPath[filename] = {defaultExports: id};
+  var relativePath = path.relative(path.resolve(__dirname + '/../lib'), filename);
+  if (relativePath[0] !== '.') {
+    relativePath = './' + relativePath;
+  }
+  statements.push(t.variableDeclaration(
+    'var',
+    [
+      t.variableDeclarator(
+        id,
+        t.callExpression(
+          t.identifier('require'),
+          [
+            t.stringLiteral(
+              relativePath
+            )
+          ]
+        )
+      )
+    ]
+  ));
+});
+function getRequireValue(node, file) {
+  var r;
+  // replace require("./foo").bar with the named export from foo
+  if (
+    t.isMemberExpression(node, {computed: false}) &&
+    (r = isRequire(node.object, file.filename))
+  ) {
+    var e = moduleExportsByPath[r.fullPath];
+    if (!e) {
+      return;
+    }
+    if (!e.namedExports) {
+      return t.memberExpression(
+        e.defaultExports,
+        node.property
+      );
+    }
+    if (!e.namedExports[node.property.name]) {
+      throw new Error(r.relative + ' does not export ' + node.property.name);
+    }
+    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];
+    if (!e) {
+      if (/^\.\.\//.test(r.relative)) {
+        node.arguments[0].value = r.relative.substr(1);
+      }
+      return;
+    }
+    return e.defaultExports;
+  }
+}
+parsedFiles.forEach(function (file) {
+  var namedExports = {};
+  var localVariableMap = {};
+
+  traverse(file.ast, {
+    enter(path) {
+      // replace require calls with the corresponding value
+      var r;
+      if (r = getRequireValue(path.node, file)) {
+        path.replaceWith(r);
+        return;
+      }
+
+      // if we see `var foo = require('bar')` we can just inline the variable
+      // representing `require('bar')` wherever `foo` was used.
+      if (
+        t.isVariableDeclaration(path.node) &&
+        path.node.declarations.length === 1 &&
+        t.isIdentifier(path.node.declarations[0].id) &&
+        (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
+        );
+        localVariableMap[newName] = r;
+        path.remove();
+        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) {
+          path.scope.rename(
+            declaration.id.name,
+            file.property + '_local_var_' + declaration.id.name
+          );
+        });
+        return;
+      }
+
+      // replace module.exports.bar with a variable for the named export
+      if (
+        t.isMemberExpression(path.node, {computed: false}) &&
+        isModuleDotExports(path.node.object)
+      ) {
+        var name = path.node.property.name;
+        var identifier = t.identifier(file.property + '_export_' + name);
+        path.replaceWith(identifier);
+        namedExports[name] = identifier;
+      }
+    }
+  });
+  traverse(file.ast, {
+    enter(path) {
+      if (
+        t.isIdentifier(path.node) &&
+        Object.prototype.hasOwnProperty.call(localVariableMap, path.node.name)
+      ) {
+        path.replaceWith(localVariableMap[path.node.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
+  };
+  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) {
+  var dashed = camelToDashed(file.property);
+  propertyDefinitions.push(
+    t.objectProperty(
+      t.identifier(file.property),
+      t.identifier(file.property + '_export_definition')
+    )
+  );
+  if (file.property !== dashed) {
+    propertyDefinitions.push(
+      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
+    )
+  ]
+);
+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;

package/tests/tests.js

@@ -281,6 +281,18 @@ module.exports = {
         test.ok('opacity: 1;' === style.cssText, 'cssText is not "opacity: 1;": ' + style.cssText);
         test.done();
     },
+    'Width and height of auto should work': function (test) {
+        var style = new cssstyle.CSSStyleDeclaration();
+        test.expect(4);
+        style.width = "auto";
+        test.equal(style.cssText,'width: auto;', 'cssText is not "width: auto;": ' + style.cssText);
+        test.equal(style.width,'auto', 'width is not "auto": ' + style.width);
+        style = new cssstyle.CSSStyleDeclaration();
+        style.height = "auto";
+        test.equal(style.cssText,'height: auto;', 'cssText is not "height: auto;": ' + style.cssText);
+        test.equal(style.height,'auto', 'height is not "auto": ' + style.height);
+        test.done();
+    },
     'Padding and margin should set/clear shorthand properties': function (test) {
         var style = new cssstyle.CSSStyleDeclaration();
         var parts = ["Top","Right","Bottom","Left"];
@@ -288,9 +300,9 @@ module.exports = {
             style[name] = v;
             for (var i = 0; i < 4; i++) {
                 var part = name + parts[i];
-                test.ok(V[i] === style[part], part + ' is not "' + V[i] + '": ' + style[part]);
+                test.equal(V[i],style[part], part + ' is not "' + V[i] + '": "' + style[part] + '"');
             }
-            test.ok(v === style[name], name + ' is not "' + v + '": ' + style[name]);
+            test.equal(v,style[name], name + ' is not "' + v + '": "' + style[name] + '"');
             style[name] = "";
         };
         test.expect(50);
@@ -308,6 +320,26 @@ module.exports = {
         testParts("margin","",["","","",""]);
         test.done();
     },
+    'Padding and margin shorthands should set main properties': function (test) {
+        var style = new cssstyle.CSSStyleDeclaration();
+        var parts = ["Top","Right","Bottom","Left"];
+	    var testParts = function (name,v,V) {
+            var expect;
+	        for (var i = 0; i < 4; i++) {
+		        style[name] = v;
+		        style[name+parts[i]] = V;
+		        expect = v.split(/ /);
+                expect[i] = V;
+                expect = expect.join(" ");
+		        test.equal(expect,style[name], name + ' is not "' + expect + '": "' + style[name] + '"');
+	        }
+	    };
+	    test.expect(12);
+	    testParts("padding","1px 2px 3px 4px","10px");
+	    testParts("margin","1px 2px 3px 4px","10px");
+	    testParts("margin","1px 2px 3px 4px","auto");
+	    test.done();
+    },
     'Setting a value to 0 should return the string value': function (test) {
         var style = new cssstyle.CSSStyleDeclaration();
         test.expect(1);
@@ -350,5 +382,24 @@ module.exports = {
         style.backgroundImage = 'url("http://some/url/here3.png")';
         test.ok('url(http://some/url/here3.png)' === style.backgroundImage, 'background-image wasn\'t url(http://some/url/here3.png): ' + style.backgroundImage);
         test.done();
+    },
+    'Make sure setting 0 to a padding or margin works': function (test) {
+        var style = new cssstyle.CSSStyleDeclaration();
+        test.expect(2);
+        style.padding = 0;
+        test.equal(style.cssText, 'padding: 0px;', 'padding is not 0px');
+        style.margin = '1em';
+        style.marginTop = '0'
+        test.equal(style.marginTop, '0px', 'margin-top is not 0px');
+        test.done();
+    },
+    'Make sure setting null to background works': function (test) {
+        var style = new cssstyle.CSSStyleDeclaration();
+        test.expect(2);
+        style.background = 'red';
+        test.equal(style.cssText, 'background: red;', 'background is not red');
+        style.background = null;
+        test.equal(style.cssText, '', 'cssText is not empty');
+        test.done();
     }
 };