v1.12.1

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.12.0
+
+ * Combine `jsx` and `react` transformers to `react`.
+ * Update `react` syntax output to React v0.12.
+
+# 1.11.15
+
+ * Fix JSX literal whitespace generation.
+
 # 1.11.14
 
  * Avoid using a switch for let-scoping continue and break statements and use an if statement instead.

Makefile

@@ -6,7 +6,7 @@ MOCHA_CMD = node_modules/mocha/bin/_mocha
 
 export NODE_ENV = test
 
-.PHONY: clean test test-cov tlint est-travis test-appveyor test-browser publish bench build
+.PHONY: clean test test-cov test-clean lint test-travis test-spec test-browser publish bench build
 
 clean:
 	rm -rf coverage templates.json test/tmp dist
@@ -18,19 +18,23 @@ bench:
 lint:
 	$(JSHINT_CMD) lib bin benchmark/index.js
 
+test-clean:
+	rm -rf test/tmp
+
 test:
 	make lint
 	$(MOCHA_CMD)
+	make test-clean
 
 test-cov:
 	rm -rf coverage
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
 
-test-appveyor:
+test-spec:
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) -- --reporter spec
 
 test-travis:
-	make test-appveyor
+	make test-spec
 	if test -n "$$CODECLIMATE_REPO_TOKEN"; then codeclimate < coverage/lcov.info; fi
 
 test-browser:

README.md

@@ -49,6 +49,7 @@ It's as easy as:
 - [Caveats](#caveats)
 - [Polyfill](#polyfill)
 - [Optional runtime](#optional-runtime)
+- [React/JSX](#reactjsx)
 - [Differences](#differences)
 
 ## [Features](FEATURES.md)
@@ -84,7 +85,10 @@ It's as easy as:
  - [Gulp](https://github.com/sindresorhus/gulp-6to5)
  - [Grunt](https://github.com/sindresorhus/grunt-6to5)
  - [Jade](https://github.com/Apoxx/jade-6to5)
+ - [Jest](https://github.com/6to5/6to5-jest)
  - [Karma](https://github.com/shuhei/karma-6to5-preprocessor)
+ - [Mocha](https://github.com/6to5/6to5-mocha)
+ - [Rails](https://github.com/6to5/6to5-rails)
  - [webpack](https://github.com/Couto/6to5-loader)
 
 ### CLI
@@ -401,6 +405,14 @@ require("6to5").runtime("myCustomNamespace");
 See [Options - runtime](#options) for documentation on changing the reference in
 generated code.
 
+## React/JSX
+
+6to5 has built-in support for React v0.12. Tags are automatically transformed to
+their equivalent `React.createElement(...)` and `displayName` is automatically
+inferred and added to all `React.createClass` calls.
+
+To disable this behaviour add `react` to your blacklist.
+
 ## Differences
 
 ### Philosophy

appveyor.yml

@@ -10,7 +10,7 @@ install:
 test_script:
  - "node --version"
  - "npm --version"
- - "make test-appveyor"
+ - "make test-spec"
 
 build: "off"
 

lib/6to5/generation/buffer.js

@@ -0,0 +1,123 @@
+module.exports = Buffer;
+
+var util = require("../util");
+var _    = require("lodash");
+
+function Buffer(position, format) {
+  this.position = position;
+  this._indent  = format.indent.base;
+  this.format   = format;
+  this.buf      = "";
+}
+
+Buffer.prototype.get = function () {
+  return this.buf.trimRight();
+};
+
+Buffer.prototype.getIndent = function () {
+  if (this.format.compact) {
+    return "";
+  } else {
+    return util.repeat(this._indent, this.format.indent.style);
+  }
+};
+
+Buffer.prototype.indentSize = function () {
+  return this.getIndent().length;
+};
+
+Buffer.prototype.indent = function () {
+  this._indent++;
+};
+
+Buffer.prototype.dedent = function () {
+  this._indent--;
+};
+
+Buffer.prototype.semicolon = function () {
+  if (this.format.semicolons) this.push(";");
+};
+
+Buffer.prototype.ensureSemicolon = function () {
+  if (!this.isLast(";")) this.semicolon();
+};
+
+Buffer.prototype.rightBrace = function () {
+  this.newline(true);
+  this.push("}");
+};
+
+Buffer.prototype.keyword = function (name) {
+  this.push(name);
+  this.push(" ");
+};
+
+Buffer.prototype.space = function () {
+  if (this.buf && !this.isLast([" ", "\n"])) {
+    this.push(" ");
+  }
+};
+
+Buffer.prototype.removeLast = function (cha) {
+  if (!this.isLast(cha)) return;
+
+  this.buf = this.buf.slice(0, -1);
+  this.position.unshift(cha);
+};
+
+Buffer.prototype.newline = function (i, removeLast) {
+  if (!this.buf) return;
+  if (this.format.compact) return;
+  if (this.endsWith("{\n")) return;
+
+  if (_.isBoolean(i)) {
+    removeLast = i;
+    i = null;
+  }
+
+  if (_.isNumber(i)) {
+    var self = this;
+    _.times(i, function () {
+      self.newline(null, removeLast);
+    });
+    return;
+  }
+
+  if (removeLast && this.isLast("\n")) this.removeLast("\n");
+
+  this.removeLast(" ");
+  this.buf = this.buf.replace(/\n(\s+)$/, "\n");
+  this._push("\n");
+};
+
+Buffer.prototype.push = function (str, noIndent) {
+  if (this._indent && !noIndent && str !== "\n") {
+    // we have an indent level and we aren't pushing a newline
+    var indent = this.getIndent();
+
+    // replace all newlines with newlines with the indentation
+    str = str.replace(/\n/g, "\n" + indent);
+
+    // we've got a newline before us so prepend on the indentation
+    if (this.isLast("\n")) str = indent + str;
+  }
+
+  this._push(str);
+};
+
+Buffer.prototype._push = function (str) {
+  this.position.push(str);
+  this.buf += str;
+};
+
+Buffer.prototype.endsWith = function (str) {
+  return this.buf.slice(-str.length) === str;
+};
+
+Buffer.prototype.isLast = function (cha, trimRight) {
+  var buf = this.buf;
+  if (trimRight) buf = buf.trimRight();
+
+  var chars = [].concat(cha);
+  return _.contains(chars, _.last(buf));
+};

lib/6to5/generation/generator.js

@@ -8,6 +8,7 @@ module.exports.CodeGenerator = CodeGenerator;
 var Whitespace = require("./whitespace");
 var SourceMap  = require("./source-map");
 var Position   = require("./position");
+var Buffer     = require("./buffer");
 var util       = require("../util");
 var n          = require("./node");
 var t          = require("../types");
@@ -18,18 +19,21 @@ function CodeGenerator(ast, opts, code) {
 
   this.comments = ast.comments || [];
   this.tokens   = ast.tokens || [];
-  this.opts     = opts;
+  this.format   = CodeGenerator.normaliseOptions(opts);
   this.ast      = ast;
-  this.buf      = "";
-
-  this.format  = CodeGenerator.normaliseOptions(opts);
-  this._indent = this.format.indent.base;
 
   this.whitespace = new Whitespace(this.tokens, this.comments);
   this.position   = new Position;
   this.map        = new SourceMap(this.position, opts, code);
+  this.buffer     = new Buffer(this.position, this.format);
 }
 
+_.each(Buffer.prototype, function (fn, key) {
+  CodeGenerator.prototype[key] = function () {
+    return fn.apply(this.buffer, arguments);
+  };
+});
+
 CodeGenerator.normaliseOptions = function (opts) {
   opts = opts.format || {};
 
@@ -65,125 +69,15 @@ _.each(CodeGenerator.generators, function (generator) {
   _.extend(CodeGenerator.prototype, generator);
 });
 
-CodeGenerator.prototype.newline = function (i, removeLast) {
-  if (!this.buf) return;
-  if (this.format.compact) return;
-  if (this.endsWith("{\n")) return;
-
-  if (_.isBoolean(i)) {
-    removeLast = i;
-    i = null;
-  }
-
-  if (_.isNumber(i)) {
-    var self = this;
-    _.times(i, function () {
-      self.newline(null, removeLast);
-    });
-    return;
-  }
-
-  if (removeLast && this.isLast("\n")) this.removeLast("\n");
-
-  this.removeLast(" ");
-  this.buf = this.buf.replace(/\n(\s+)$/, "\n");
-  this._push("\n");
-};
-
-CodeGenerator.prototype.removeLast = function (cha) {
-  if (!this.isLast(cha)) return;
-
-  this.buf = this.buf.slice(0, -1);
-  this.position.unshift(cha);
-};
-
-CodeGenerator.prototype.semicolon = function () {
-  if (this.format.semicolons) this.push(";");
-};
-
-CodeGenerator.prototype.ensureSemicolon = function () {
-  if (!this.isLast(";")) this.semicolon();
-};
-
-CodeGenerator.prototype.rightBrace = function () {
-  this.newline(true);
-  this.push("}");
-};
-
-CodeGenerator.prototype.keyword = function (name) {
-  this.push(name);
-  this.push(" ");
-};
-
-CodeGenerator.prototype.space = function () {
-  if (this.buf && !this.isLast([" ", "\n"])) {
-    this.push(" ");
-  }
-};
-
-CodeGenerator.prototype.push = function (str, noIndent) {
-  if (this._indent && !noIndent && str !== "\n") {
-    // we have an indent level and we aren't pushing a newline
-    var indent = this.getIndent();
-
-    // replace all newlines with newlines with the indentation
-    str = str.replace(/\n/g, "\n" + indent);
-
-    // we've got a newline before us so prepend on the indentation
-    if (this.isLast("\n")) str = indent + str;
-  }
-
-  this._push(str);
-};
-
-CodeGenerator.prototype._push = function (str) {
-  this.position.push(str);
-  this.buf += str;
-};
-
-CodeGenerator.prototype.endsWith = function (str) {
-  return this.buf.slice(-str.length) === str;
-};
-
-CodeGenerator.prototype.isLast = function (cha, trimRight) {
-  var buf = this.buf;
-  if (trimRight) buf = buf.trimRight();
-
-  var chars = [].concat(cha);
-  return _.contains(chars, _.last(buf));
-};
-
-CodeGenerator.prototype.getIndent = function () {
-  if (this.format.compact) {
-    return "";
-  } else {
-    return util.repeat(this._indent, this.format.indent.style);
-  }
-};
-
-CodeGenerator.prototype.indentSize = function () {
-  return this.getIndent().length;
-};
-
-CodeGenerator.prototype.indent = function () {
-  this._indent++;
-};
-
-CodeGenerator.prototype.dedent = function () {
-  this._indent--;
-};
-
 CodeGenerator.prototype.generate = function () {
   var ast = this.ast;
 
   this.print(ast);
 
-  this.buf = this.buf.trimRight();
-
   return {
     map:  this.map.get(),
     ast:  ast,
-    code: this.buf
+    code: this.buffer.get()
   };
 };
 

lib/6to5/generation/generators/jsx.js

@@ -46,15 +46,11 @@ exports.XJSElement = function (node, print) {
 
   this.indent();
   _.each(node.children, function (child) {
-    if (t.isLiteral(child) && typeof child.value === "string") {
-      if (/\S/.test(child.value)) {
-        return self.push(child.value.replace(/^\s+|\s+$/g, ""));
-      } else if (/\n/.test(child.value)) {
-        return self.newline();
-      }
+    if (t.isLiteral(child)) {
+      self.push(child.value);
+    } else {
+      print(child);
     }
-
-    print(child);
   });
   this.dedent();
 

lib/6to5/generation/node.js

@@ -1,294 +0,0 @@
-module.exports = Node;
-
-var t = require("../types");
-var _ = require("lodash");
-
-function Node(node, parent) {
-  this.parent = parent;
-  this.node   = node;
-}
-
-//
-
-Node.whitespace = {
-  FunctionExpression: 1,
-  FunctionStatement: 1,
-  ClassExpression: 1,
-  ClassStatement: 1,
-  ForOfStatement: 1,
-  ForInStatement: 1,
-  ForStatement: 1,
-  SwitchStatement: 1,
-  IfStatement: { before: 1 },
-  //Property: { before: 1 },
-  Literal: { after: 1 }
-};
-
-_.each(Node.whitespace, function (amounts, type) {
-  if (_.isNumber(amounts)) amounts = { after: amounts, before: amounts };
-  Node.whitespace[type] = amounts;
-});
-
-//
-
-Node.PRECEDENCE = {};
-
-_.each([
-  ["||"],
-  ["&&"],
-  ["|"],
-  ["^"],
-  ["&"],
-  ["==", "===", "!=", "!=="],
-  ["<", ">", "<=", ">=", "in", "instanceof"],
-  [">>", "<<", ">>>"],
-  ["+", "-"],
-  ["*", "/", "%"]
-], function (tier, i) {
-  _.each(tier, function (op) {
-    Node.PRECEDENCE[op] = i;
-  });
-});
-
-//
-
-Node.prototype.isUserWhitespacable = function () {
-  //var parent = this.parent;
-  var node = this.node;
-
-  if (t.isUserWhitespacable(node)) {
-    return true;
-  }
-
-  //if (t.isArrayExpression(parent)) {
-  //  return true;
-  //}
-
-  return false;
-};
-
-Node.prototype.needsWhitespace = function (type) {
-  var parent = this.parent;
-  var node   = this.node;
-  if (!node) return 0;
-
-  if (t.isExpressionStatement(node)) {
-    node = node.expression;
-  }
-
-  if (type === "before") {
-    if (t.isProperty(node) && parent.properties[0] === node) {
-      return 1;
-    }
-
-    if (t.isSwitchCase(node) && parent.cases[0] === node) {
-      return 1;
-    }
-  }
-
-  if (type === "after") {
-    if (t.isCallExpression(node)) {
-      return 1;
-    }
-
-    var exprs = [];
-
-    if (t.isVariableDeclaration(node)) {
-      exprs = _.map(node.declarations, "init");
-    }
-
-    if (t.isArrayExpression(node)) {
-      exprs = node.elements;
-    }
-
-    if (t.isObjectExpression(node)) {
-      exprs = node.properties;
-    }
-
-    var lines = 0;
-
-    _.each(exprs, function (expr) {
-      lines = Node.needsWhitespace(expr, node, type);
-      if (lines) return false;
-    });
-
-    if (lines) return lines;
-  }
-
-  if (t.isCallExpression(node) && t.isFunction(node.callee)) {
-    return 1;
-  }
-
-  var opts = Node.whitespace[node.type];
-  return (opts && opts[type]) || 0;
-};
-
-Node.prototype.needsWhitespaceBefore = function () {
-  return this.needsWhitespace("before");
-};
-
-Node.prototype.needsWhitespaceAfter = function () {
-  return this.needsWhitespace("after");
-};
-
-Node.prototype.needsParens = function () {
-  var parent = this.parent;
-  var node = this.node;
-
-  if (!parent) return false;
-
-  //
-  if (t.isUnaryLike(node)) {
-    return t.isMemberExpression(parent) && parent.object === node;
-  }
-
-  if (t.isBinary(node)) {
-    //
-    if (t.isCallExpression(parent) && parent.callee === node) {
-      return true;
-    }
-
-    //
-    if (t.isUnaryLike(parent)) {
-      return true;
-    }
-
-    //
-    if (t.isMemberExpression(parent) && parent.object === node) {
-      return true;
-    }
-
-    if (t.isBinary(parent)) {
-      var parentOp  = parent.operator;
-      var parentPos = Node.PRECEDENCE[parentOp];
-
-      var nodeOp = node.operator;
-      var nodePos = Node.PRECEDENCE[nodeOp];
-
-      if (parentPos > nodePos) {
-        return true;
-      }
-
-      if (parentPos === nodePos && parent.right === node) {
-        return true;
-      }
-    }
-  }
-
-  if (t.isBinaryExpression(node) && node.operator === "in") {
-    // var i = (1 in []);
-    if (t.isVariableDeclarator(parent)) {
-      return true;
-    }
-
-    // for ((1 in []);;);
-    if (t.isFor(parent)) {
-      return true;
-    }
-  }
-
-  // (class {});
-  if (t.isClassExpression(node) && t.isExpressionStatement(parent)) {
-    return true;
-  }
-
-  if (t.isSequenceExpression(node)) {
-    if (t.isForStatement(parent)) {
-      // Although parentheses wouldn't hurt around sequence
-      // expressions in the head of for loops, traditional style
-      // dictates that e.g. i++, j++ should not be wrapped with
-      // parentheses.
-      return false;
-    }
-
-    if (t.isExpressionStatement(parent) && parent.expression === node) {
-      return false;
-    }
-
-    // Otherwise err on the side of overparenthesization, adding
-    // explicit exceptions above if this proves overzealous.
-    return true;
-  }
-
-  //
-  if (t.isYieldExpression(node)) {
-    return t.isBinary(parent) ||
-           t.isUnaryLike(parent) ||
-           t.isCallExpression(parent) ||
-           t.isMemberExpression(parent) ||
-           t.isNewExpression(parent) ||
-           t.isConditionalExpression(parent) ||
-           t.isYieldExpression(parent);
-  }
-
-  if (t.isNewExpression(parent) && parent.callee === node) {
-    return t.isCallExpression(node) || _.some(node, function (val) {
-      return t.isCallExpression(val);
-    });
-  }
-
-  // (1).valueOf()
-  if (t.isLiteral(node) && _.isNumber(node.value) && t.isMemberExpression(parent) && parent.object === node) {
-    return true;
-  }
-
-  if (t.isAssignmentExpression(node) || t.isConditionalExpression(node)) {
-    //
-    if (t.isUnaryLike(parent)) {
-      return true;
-    }
-
-    //
-    if (t.isBinary(parent)) {
-      return true;
-    }
-
-    //
-    if (t.isCallExpression(parent) && parent.callee === node) {
-      return true;
-    }
-
-    //
-    if (t.isConditionalExpression(parent) && parent.test === node) {
-      return true;
-    }
-
-    //
-    if (t.isMemberExpression(parent) && parent.object === node) {
-      return true;
-    }
-  }
-
-  if (t.isFunctionExpression(node)) {
-    // function () {};
-    if (t.isExpressionStatement(parent)) {
-      return true;
-    }
-
-    // (function test() {}).name;
-    if (t.isMemberExpression(parent) && parent.object === node) {
-      return true;
-    }
-
-    // (function () {})();
-    if (t.isCallExpression(parent) && parent.callee === node) {
-      return true;
-    }
-  }
-
-  // ({ x, y }) = { x: 5, y: 6 };
-  if (t.isObjectPattern(node) && t.isAssignmentExpression(parent) && parent.left == node) {
-    return true;
-  }
-
-  return false;
-};
-
-_.each(Node.prototype, function (fn, key) {
-  Node[key] = function (node, parent) {
-    var n = new Node(node, parent);
-
-    var args = _.toArray(arguments).slice(2);
-    return n[key].apply(n, args);
-  };
-});

lib/6to5/generation/node/index.js

@@ -0,0 +1,90 @@
+module.exports = Node;
+
+var whitespace = require("./whitespace");
+var parens     = require("./parentheses");
+var t           = require("../../types");
+var _           = require("lodash");
+
+var find = function (obj, node, parent) {
+  var result;
+
+  _.each(obj, function (fn, type) {
+    if (t["is" + type](node)) {
+      result = fn(node, parent);
+      if (result != null) return false;
+    }
+  });
+
+  return result;
+};
+
+function Node(node, parent) {
+  this.parent = parent;
+  this.node   = node;
+}
+
+Node.prototype.isUserWhitespacable = function () {
+  //var parent = this.parent;
+  var node = this.node;
+
+  if (t.isUserWhitespacable(node)) {
+    return true;
+  }
+
+  //if (t.isArrayExpression(parent)) {
+  //  return true;
+  //}
+
+  return false;
+};
+
+Node.prototype.needsWhitespace = function (type) {
+  var parent = this.parent;
+  var node   = this.node;
+  if (!node) return 0;
+
+  if (t.isExpressionStatement(node)) {
+    node = node.expression;
+  }
+
+  var lines = find(whitespace[type].nodes, node, parent);
+  if (lines) return lines;
+
+  _.each(find(whitespace[type].list, node, parent), function (expr) {
+    lines = Node.needsWhitespace(expr, node, type);
+    if (lines) return false;
+  });
+  return lines || 0;
+};
+
+Node.prototype.needsWhitespaceBefore = function () {
+  return this.needsWhitespace("before");
+};
+
+Node.prototype.needsWhitespaceAfter = function () {
+  return this.needsWhitespace("after");
+};
+
+Node.prototype.needsParens = function () {
+  var parent = this.parent;
+  var node   = this.node;
+
+  if (!parent) return false;
+
+  if (t.isNewExpression(parent) && parent.callee === node) {
+    return t.isCallExpression(node) || _.some(node, function (val) {
+      return t.isCallExpression(val);
+    });
+  }
+
+  return find(parens, node, parent);
+};
+
+_.each(Node.prototype, function (fn, key) {
+  Node[key] = function (node, parent) {
+    var n = new Node(node, parent);
+
+    var args = _.toArray(arguments).slice(2);
+    return n[key].apply(n, args);
+  };
+});

lib/6to5/generation/node/parentheses.js

@@ -0,0 +1,150 @@
+var t = require("../../types");
+var _ = require("lodash");
+
+var PRECEDENCE = {};
+
+_.each([
+  ["||"],
+  ["&&"],
+  ["|"],
+  ["^"],
+  ["&"],
+  ["==", "===", "!=", "!=="],
+  ["<", ">", "<=", ">=", "in", "instanceof"],
+  [">>", "<<", ">>>"],
+  ["+", "-"],
+  ["*", "/", "%"]
+], function (tier, i) {
+  _.each(tier, function (op) {
+    PRECEDENCE[op] = i;
+  });
+});
+
+exports.Binary = function (node, parent) {
+  if (t.isCallExpression(parent) && parent.callee === node) {
+    return true;
+  }
+
+  if (t.isUnaryLike(parent)) {
+    return true;
+  }
+
+  if (t.isMemberExpression(parent) && parent.object === node) {
+    return true;
+  }
+
+  if (t.isBinary(parent)) {
+    var parentOp  = parent.operator;
+    var parentPos = PRECEDENCE[parentOp];
+
+    var nodeOp = node.operator;
+    var nodePos = PRECEDENCE[nodeOp];
+
+    if (parentPos > nodePos) {
+      return true;
+    }
+
+    if (parentPos === nodePos && parent.right === node) {
+      return true;
+    }
+  }
+};
+
+exports.BinaryExpression = function (node, parent) {
+  if (node.operator === "in") {
+    // var i = (1 in []);
+    if (t.isVariableDeclarator(parent)) {
+      return true;
+    }
+
+    // for ((1 in []);;);
+    if (t.isFor(parent)) {
+      return true;
+    }
+  }
+};
+
+exports.SequenceExpression = function (node, parent) {
+  if (t.isForStatement(parent)) {
+    // Although parentheses wouldn't hurt around sequence
+    // expressions in the head of for loops, traditional style
+    // dictates that e.g. i++, j++ should not be wrapped with
+    // parentheses.
+    return false;
+  }
+
+  if (t.isExpressionStatement(parent) && parent.expression === node) {
+    return false;
+  }
+
+  // Otherwise err on the side of overparenthesization, adding
+  // explicit exceptions above if this proves overzealous.
+  return true;
+};
+
+exports.YieldExpression = function (node, parent) {
+  return t.isBinary(parent) ||
+         t.isUnaryLike(parent) ||
+         t.isCallExpression(parent) ||
+         t.isMemberExpression(parent) ||
+         t.isNewExpression(parent) ||
+         t.isConditionalExpression(parent) ||
+         t.isYieldExpression(parent);
+};
+
+exports.Literal = function (node, parent) {
+  // (1).valueOf()
+  if (_.isNumber(node.value) && t.isMemberExpression(parent) && parent.object === node) {
+    return true;
+  }
+};
+
+exports.ClassExpression = function (node, parent) {
+  return t.isExpressionStatement(parent);
+};
+
+exports.UnaryLike = function (node, parent) {
+  return t.isMemberExpression(parent) && parent.object === node;
+};
+
+exports.FunctionExpression = function (node, parent) {
+  // function () {};
+  if (t.isExpressionStatement(parent)) {
+    return true;
+  }
+
+  // (function test() {}).name;
+  if (t.isMemberExpression(parent) && parent.object === node) {
+    return true;
+  }
+
+  // (function () {})();
+  if (t.isCallExpression(parent) && parent.callee === node) {
+    return true;
+  }
+};
+
+exports.AssignmentExpression =
+exports.ConditionalExpression = function (node, parent) {
+  if (t.isUnaryLike(parent)) {
+    return true;
+  }
+
+  if (t.isBinary(parent)) {
+    return true;
+  }
+
+  if (t.isCallExpression(parent) && parent.callee === node) {
+    return true;
+  }
+
+  if (t.isConditionalExpression(parent) && parent.test === node) {
+    return true;
+  }
+
+  if (t.isMemberExpression(parent) && parent.object === node) {
+    return true;
+  }
+
+  return false;
+};

lib/6to5/generation/node/whitespace.js

@@ -0,0 +1,60 @@
+var _ = require("lodash");
+var t = require("../../types");
+
+exports.before = {
+  nodes: {
+    Property: function (node, parent) {
+      if (parent.properties[0] === node) {
+        return 1;
+      }
+    },
+
+    SwitchCase: function (node, parent) {
+      if (parent.cases[0] === node) {
+        return 1;
+      }
+    },
+
+    CallExpression: function (node) {
+      if (t.isFunction(node.callee)) {
+        return 1;
+      }
+    }
+  }
+};
+
+exports.after = {
+  nodes: {},
+
+  list: {
+    VariableDeclaration: function (node) {
+      return _.map(node.declarations, "init");
+    },
+
+    ArrayExpression: function (node) {
+      return node.elements;
+    },
+
+    ObjectExpression: function (node) {
+      return node.properties;
+    }
+  }
+};
+
+_.each({
+  Function: 1,
+  Class: 1,
+  For: 1,
+  SwitchStatement: 1,
+  IfStatement: { before: 1 },
+  CallExpression: { after: 1 },
+  Literal: { after: 1 }
+}, function (amounts, type) {
+  if (_.isNumber(amounts)) amounts = { after: amounts, before: amounts };
+
+  _.each(amounts, function (amount, key) {
+    exports[key].nodes[type] = function () {
+      return amount;
+    };
+  });
+});

lib/6to5/transformation/transform.js

@@ -49,7 +49,6 @@ _.each({
   numericLiterals:          require("./transformers/numeric-literals"),
 
   react:                    require("./transformers/react"),
-  jsx:                      require("./transformers/jsx"),
 
   _aliasFunctions:          require("./transformers/_alias-functions"),
   _blockHoist:              require("./transformers/_block-hoist"),

lib/6to5/transformation/transformers/_alias-functions.js

@@ -14,10 +14,9 @@ var go = function (getBody, node, file, scope) {
   };
 
   // traverse the function and find all alias functions so we can alias
-  // arguments and this if necessary
+  // `arguments` and `this` if necessary
   traverse(node, function (node) {
-    var _aliasFunction = node._aliasFunction;
-    if (!_aliasFunction) {
+    if (!node._aliasFunction) {
       if (t.isFunction(node)) {
         // stop traversal of this node as it'll be hit again by this transformer
         return false;
@@ -26,12 +25,10 @@ var go = function (getBody, node, file, scope) {
       }
     }
 
-    // traverse all child nodes of this function and find arguments and this
+    // traverse all child nodes of this function and find `arguments` and `this`
     traverse(node, function (node, parent) {
-      if (_aliasFunction === "arrows") {
-        if (t.isFunction(node) && node._aliasFunction !== "arrows") {
-          return false;
-        }
+      if (t.isFunction(node) && !node._aliasFunction) {
+        return false;
       }
 
       if (node._ignoreAliasFunctions) return;

lib/6to5/transformation/transformers/array-comprehension.js

@@ -1,5 +1,6 @@
 var util = require("../../util");
 var t    = require("../../types");
+var _    = require("lodash");
 
 var singleArrayExpression = function (node) {
   var block = node.blocks[0];
@@ -13,7 +14,13 @@ var singleArrayExpression = function (node) {
     ARRAY:     block.right,
     KEY:       block.left
   });
-  result._aliasFunction = true;
+
+  _.each([result.callee.object, result], function (call) {
+    if (t.isCallExpression(call)) {
+      call.arguments[0]._aliasFunction = true;
+    }
+  });
+
   return result;
 };
 
@@ -23,7 +30,7 @@ var multiple = function (node, file) {
   var container = util.template("array-comprehension-container", {
     KEY: uid
   });
-  container._aliasFunction = true;
+  container.callee.expression._aliasFunction = true;
 
   var block = container.callee.expression.body;
   var body  = block.body;

lib/6to5/transformation/transformers/arrow-functions.js

@@ -3,7 +3,7 @@ var t = require("../../types");
 exports.ArrowFunctionExpression = function (node) {
   t.ensureBlock(node);
 
-  node._aliasFunction = "arrows";
+  node._aliasFunction = true;
   node.expression = false;
   node.type = "FunctionExpression";
 

lib/6to5/transformation/transformers/computed-property-names.js

@@ -29,7 +29,7 @@ exports.ObjectExpression = function (node, parent, file) {
   var containerCallee = container.callee.expression;
   var containerBody = containerCallee.body.body;
 
-  containerCallee._aliasFunction = "arrows";
+  containerCallee._aliasFunction = true;
 
   _.each(computed, function (prop) {
     containerBody.unshift(

lib/6to5/transformation/transformers/jsx.js

@@ -1,101 +0,0 @@
-// Based upon the excellent jsx-transpiler by Ingvar Stepanyan (RReverser)
-// https://github.com/RReverser/jsx-transpiler
-
-var esutils = require("esutils");
-var t       = require("../../types");
-var _       = require("lodash");
-
-var JSX_ANNOTATION_REGEX = /^\*\s*@jsx\s+([^\s]+)/;
-
-exports.Program = function (node, parent, file) {
-  var jsx = "React.DOM";
-
-  // looking for namespace annotation
-  _.each(node.leadingComments, function (comment) {
-    var matches = JSX_ANNOTATION_REGEX.exec(comment.value);
-    if (matches) jsx = matches[1];
-  });
-
-  // prebuilding AST node
-  file.jsx = jsx.split(".").map(t.identifier).reduce(function (object, property) {
-    return t.memberExpression(object, property);
-  });
-};
-
-exports.XJSIdentifier = function (node) {
-  if (esutils.keyword.isIdentifierName(node.name)) {
-    node.type = "Identifier";
-  } else {
-    return t.literal(node.name);
-  }
-};
-
-exports.XJSNamespacedName = function () {
-  throw new Error("Namespace tags are not supported. ReactJSX is not XML.");
-};
-
-exports.XJSMemberExpression = {
-  exit: function (node) {
-    node.computed = t.isLiteral(node.property);
-    node.type = "MemberExpression";
-  }
-};
-
-exports.XJSExpressionContainer = function (node) {
-  return node.expression;
-};
-
-exports.XJSAttribute = {
-  exit: function (node) {
-    var value = node.value || t.literal(true);
-    return t.property("init", node.name, value);
-  }
-};
-
-exports.XJSOpeningElement = {
-  exit: function (node, parent, file) {
-    var tagExpr = node.name;
-
-    if (t.isIdentifier(tagExpr)) {
-      var tagName = tagExpr.name;
-
-      if (/[a-z]/.exec(tagName[0]) || _.contains(tagName, "-")) {
-        tagExpr = t.memberExpression(file.jsx, tagExpr);
-      }
-    }
-
-    var props = node.attributes;
-    if (props.length) {
-      props = t.objectExpression(props);
-    } else {
-      props = t.literal(null);
-    }
-
-    return t.callExpression(tagExpr, [props]);
-  }
-};
-
-exports.XJSElement = {
-  exit: function (node) {
-    var callExpr = node.openingElement;
-    var children = node.children;
-
-    _.each(children, function (child, i) {
-      var val = child.value;
-      if (t.isLiteral(child) && _.isString(val)) {
-        val = val.replace(/\n(\s+)/g, " ");
-
-        i = +i;
-        if (i === 0) val = val.trimLeft();
-        if (i === children.length - 1) val = val.trimRight();
-
-        if (!val) return;
-        child.value = val;
-      }
-
-      callExpr.arguments.push(child);
-    });
-
-    return t.inherits(callExpr, node);
-  }
-};

lib/6to5/transformation/transformers/react.js

@@ -1,5 +1,100 @@
-var t = require("../../types");
-var _ = require("lodash");
+// Based upon the excellent jsx-transpiler by Ingvar Stepanyan (RReverser)
+// https://github.com/RReverser/jsx-transpiler
+
+// jsx
+
+var esutils = require("esutils");
+var t       = require("../../types");
+var _       = require("lodash");
+
+exports.XJSIdentifier = function (node) {
+  if (esutils.keyword.isIdentifierName(node.name)) {
+    node.type = "Identifier";
+  } else {
+    return t.literal(node.name);
+  }
+};
+
+exports.XJSNamespacedName = function (node, parent, file) {
+  throw file.errorWithNode(node, "Namespace tags are not supported. ReactJSX is not XML.");
+};
+
+exports.XJSMemberExpression = {
+  exit: function (node) {
+    node.computed = t.isLiteral(node.property);
+    node.type = "MemberExpression";
+  }
+};
+
+exports.XJSExpressionContainer = function (node) {
+  return node.expression;
+};
+
+exports.XJSAttribute = {
+  exit: function (node) {
+    var value = node.value || t.literal(true);
+    return t.property("init", node.name, value);
+  }
+};
+
+exports.XJSOpeningElement = {
+  exit: function (node) {
+    var tagExpr = node.name;
+    var args = [];
+
+    var tagName;
+    if (t.isIdentifier(tagExpr)) {
+      tagName = tagExpr.name;
+    } else if (t.isLiteral(tagExpr)) {
+      tagName = tagExpr.value;
+    }
+
+    if (tagName && (/[a-z]/.exec(tagName[0]) || _.contains(tagName, "-"))) {
+      args.push(t.literal(tagName));
+    } else {
+      args.push(tagExpr);
+    }
+
+    var props = node.attributes;
+    if (props.length) {
+      var first = props[0];
+      if (t.isXJSSpreadAttribute(first)) {
+        props.shift();
+        props = t.callExpression(
+          t.memberExpression(t.identifier("React"), t.identifier("__spread")),
+          [t.objectExpression([]), first.argument, t.objectExpression(props)]
+        );
+      } else {
+        props = t.objectExpression(props);
+      }
+    } else {
+      props = t.literal(null);
+    }
+
+    args.push(props);
+
+    tagExpr = t.memberExpression(t.identifier("React"), t.identifier("createElement"));
+    return t.callExpression(tagExpr, args);
+  }
+};
+
+exports.XJSElement = {
+  exit: function (node) {
+    var callExpr = node.openingElement;
+
+    var childrenToRender = node.children.filter(function(child) {
+      return !(t.isLiteral(child) && _.isString(child.value) && child.value.match(/^[ \t]*[\r\n][ \t\r\n]*$/));
+    });
+
+    _.each(childrenToRender, function (child) {
+      callExpr.arguments.push(child);
+    });
+
+    return t.inherits(callExpr, node);
+  }
+};
+
+// display names
 
 var addDisplayName = function (id, call) {
   if (!call || !t.isCallExpression(call)) return;

lib/6to5/types/index.js

@@ -205,10 +205,12 @@ t.getIds.arrays = {
 };
 
 t.inherits = function (child, parent) {
-  child.loc   = parent.loc;
-  child.end   = parent.end;
-  child.range = parent.range;
-  child.start = parent.start;
+  child.loc              = parent.loc;
+  child.end              = parent.end;
+  child.range            = parent.range;
+  child.start            = parent.start;
+  child.leadingComments  = parent.leadingComments;
+  child.trailingComments = parent.trailingComments;
   return child;
 };
 

lib/6to5/types/visitor-keys.json

@@ -71,6 +71,6 @@
   "XJSMemberExpression":      ["object", "property"],
   "XJSNamespacedName":        ["namespace", "name"],
   "XJSOpeningElement":        ["name", "attributes"],
-  "XJSSpreadAttribute":       [],
+  "XJSSpreadAttribute":       ["argument"],
   "YieldExpression":          ["argument"]
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "1.11.14",
+  "version": "1.12.1",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {

test/bin.js

@@ -149,7 +149,3 @@ _.each(fs.readdirSync(fixtureLoc), function (binName) {
     });
   });
 });
-
-after(function () {
-  rimraf.sync(tmpLoc);
-});

test/fixtures/transformation/jsx/annotation/actual.js

@@ -1,3 +0,0 @@
-/** @jsx CUSTOM_DOM */
-
-<a></a>

test/fixtures/transformation/jsx/annotation/expected.js

@@ -1,5 +0,0 @@
-/** @jsx CUSTOM_DOM */
-
-"use strict";
-
-CUSTOM_DOM.a(null);

test/fixtures/transformation/jsx/empty/actual.js

@@ -1 +0,0 @@
-<X>{}</X>

test/fixtures/transformation/jsx/empty/expected.js

@@ -1,3 +0,0 @@
-"use strict";
-
-X(null, null);

test/fixtures/transformation/jsx/everything/actual.js

@@ -1,2 +0,0 @@
-<X data-prop={x ? <Y prop={2} /> : <Z>
-</Z>}></X>

test/fixtures/transformation/jsx/everything/expected.js

@@ -1,7 +0,0 @@
-"use strict";
-
-X({
-  "data-prop": x ? Y({
-    prop: 2
-  }) : Z(null)
-});

test/fixtures/transformation/jsx/expressions/actual.js

@@ -1,5 +0,0 @@
-(<X>{a}</X>);
-
-(<X>{a} {b}</X>);
-
-(<X prop={a} yes></X>);

test/fixtures/transformation/jsx/expressions/expected.js

@@ -1,10 +0,0 @@
-"use strict";
-
-(X(null, a));
-
-(X(null, a, " ", b));
-
-(X({
-  prop: a,
-  yes: true
-}));

test/fixtures/transformation/jsx/known-tags/actual.js

@@ -1 +0,0 @@
-<a></a>

test/fixtures/transformation/jsx/known-tags/expected.js

@@ -1,3 +0,0 @@
-"use strict";
-
-React.DOM.a(null);

test/fixtures/transformation/jsx/member-expression/actual.js

@@ -1 +0,0 @@
-<Test.X></Test.X>

test/fixtures/transformation/jsx/member-expression/expected.js

@@ -1,3 +0,0 @@
-"use strict";
-
-Test.X(null);

test/fixtures/transformation/jsx/no-xml-namespaces/actual.js

@@ -1 +0,0 @@
-<Test:X></Test:X>

test/fixtures/transformation/jsx/self-closing-tags/actual.js

@@ -1,3 +0,0 @@
-(<X />);
-
-(<X prop="1" />);

test/fixtures/transformation/jsx/self-closing-tags/expected.js

@@ -1,7 +0,0 @@
-"use strict";
-
-(X(null));
-
-(X({
-  prop: "1"
-}));

test/fixtures/transformation/jsx/simple-tags/actual.js

@@ -1 +0,0 @@
-<X></X>

test/fixtures/transformation/jsx/simple-tags/expected.js

@@ -1,3 +0,0 @@
-"use strict";
-
-X(null);

test/fixtures/transformation/jsx/tags-with-children/actual.js

@@ -1,3 +0,0 @@
-(<X prop="2"><Y /></X>);
-
-(<X prop="2"><Y /><Z /></X>);

test/fixtures/transformation/jsx/tags-with-children/expected.js

@@ -1,9 +0,0 @@
-"use strict";
-
-(X({
-  prop: "2"
-}, Y(null)));
-
-(X({
-  prop: "2"
-}, Y(null), Z(null)));

test/fixtures/transformation/jsx/tags-with-literals/actual.js

@@ -1,13 +0,0 @@
-(<X>   </X>);
-
-(<X>
-</X>);
-
-(<X>
-  string
-</X>);
-
-(<X>
-  string
-  string
-  </X>);

test/fixtures/transformation/jsx/tags-with-literals/expected.js

@@ -1,9 +0,0 @@
-"use strict";
-
-(X(null));
-
-(X(null));
-
-(X(null, "string"));
-
-(X(null, "string string"));

test/fixtures/transformation/react/.should-not-strip-nbsp-even-coupled-with-other-whitespace/actual.js

@@ -0,0 +1 @@
+<div>&nbsp; </div>;

test/fixtures/transformation/react/.should-not-strip-nbsp-even-coupled-with-other-whitespace/expected.js

@@ -0,0 +1 @@
+React.createElement("div", null, "\u00A0 ");

test/fixtures/transformation/react/.should-not-strip-tags-with-a-single-child-of-nbsp/actual.js

@@ -0,0 +1 @@
+<div>&nbsp;</div>;

test/fixtures/transformation/react/.should-not-strip-tags-with-a-single-child-of-nbsp/expected.js

@@ -0,0 +1 @@
+React.createElement("div", null, "\u00A0");

test/fixtures/transformation/react/.should-properly-handle-comments-adjacent-to-children/actual.js

@@ -0,0 +1,13 @@
+var x = (
+  <div>
+    {/* A comment at the beginning */}
+    {/* A second comment at the beginning */}
+    <span>
+      {/* A nested comment */}
+    </span>
+    {/* A sandwiched comment */}
+    <br />
+    {/* A comment at the end */}
+    {/* A second comment at the end */}
+  </div>
+);

test/fixtures/transformation/react/.should-properly-handle-comments-adjacent-to-children/expected.js

@@ -0,0 +1,11 @@
+var x = (React.createElement("div", null,
+  /* A comment at the beginning */
+  /* A second comment at the beginning */
+  React.createElement("span", null
+    /* A nested comment */
+  ),
+  /* A sandwiched comment */
+  React.createElement("br", null)
+  /* A comment at the end */
+  /* A second comment at the end */
+));

test/fixtures/transformation/react/.should-properly-handle-comments-between-props/actual.js

@@ -0,0 +1,10 @@
+var x = (
+  <div
+    /* a multi-line
+       comment */
+    attr1="foo">
+    <span // a double-slash comment
+      attr2="bar"
+    />
+  </div>
+);

test/fixtures/transformation/react/.should-properly-handle-comments-between-props/expected.js

@@ -0,0 +1,8 @@
+var x = (React.createElement("div", {
+  /* a multi-line
+     comment */
+  attr1: "foo"},
+  React.createElement("span", {// a double-slash comment
+    attr2: "bar"}
+  )
+));

test/fixtures/transformation/react/adds-appropriate-newlines-when-using-spread-attribute/actual.js

@@ -0,0 +1,3 @@
+<Component
+  {...this.props}
+  sound="moo" />

test/fixtures/transformation/react/adds-appropriate-newlines-when-using-spread-attribute/expected.js

@@ -0,0 +1,3 @@
+React.createElement(Component, React.__spread({}, this.props, {
+  sound: "moo"
+}));

test/fixtures/transformation/react/display-name-assignment-expression/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 var Component;
 Component = React.createClass({
   displayName: "Component",

test/fixtures/transformation/react/display-name-if-missing/expected.js

@@ -1,8 +1,6 @@
-"use strict";
-
 var Whateva = React.createClass({
   displayName: "Whatever",
   render: function () {
     return null;
   }
-});
+});

test/fixtures/transformation/react/display-name-object-declaration/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 exports = {
   Component: React.createClass({
     displayName: "Component",

test/fixtures/transformation/react/display-name-property-assignment/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 exports.Component = React.createClass({
   displayName: "Component",
 

test/fixtures/transformation/react/display-name-variable-declaration/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 var Component = React.createClass({
   displayName: "Component",
 

test/fixtures/transformation/react/options.json

@@ -0,0 +1,3 @@
+{
+  "blacklist": ["useStrict"]
+}

test/fixtures/transformation/react/should-allow-constructor-as-prop/actual.js

@@ -0,0 +1 @@
+<Component constructor="foo" />;

test/fixtures/transformation/react/should-allow-constructor-as-prop/expected.js

@@ -0,0 +1,3 @@
+React.createElement(Component, {
+  constructor: "foo"
+});

test/fixtures/transformation/react/should-allow-deeper-js-namespacing/actual.js

@@ -0,0 +1 @@
+<Namespace.DeepNamespace.Component />;

test/fixtures/transformation/react/should-allow-deeper-js-namespacing/expected.js

@@ -0,0 +1 @@
+React.createElement(Namespace.DeepNamespace.Component, null);

test/fixtures/transformation/react/should-allow-js-namespacing/actual.js

@@ -0,0 +1 @@
+<Namespace.Component />;

test/fixtures/transformation/react/should-allow-js-namespacing/blacklist.js

@@ -0,0 +1 @@
+React.createElement(Namespace.Component, null);

test/fixtures/transformation/react/should-allow-js-namespacing/expected.js

@@ -0,0 +1 @@
+React.createElement(Namespace.Component, null);

test/fixtures/transformation/react/should-avoid-wrapping-in-extra-parens-if-not-needed/actual.js

@@ -0,0 +1,15 @@
+var x = <div>
+  <Component />
+</div>;
+
+var x = <div>
+  {this.props.children}
+</div>;
+
+var x = <Composite>
+  {this.props.children}
+</Composite>;
+
+var x = <Composite>
+  <Composite2 />
+</Composite>;

test/fixtures/transformation/react/should-avoid-wrapping-in-extra-parens-if-not-needed/expected.js

@@ -0,0 +1,7 @@
+var x = React.createElement("div", null, React.createElement(Component, null));
+
+var x = React.createElement("div", null, this.props.children);
+
+var x = React.createElement(Composite, null, this.props.children);
+
+var x = React.createElement(Composite, null, React.createElement(Composite2, null));

test/fixtures/transformation/react/should-convert-simple-tags/actual.js

@@ -0,0 +1 @@
+var x = <div></div>;

test/fixtures/transformation/react/should-convert-simple-tags/expected.js

@@ -0,0 +1 @@
+var x = React.createElement("div", null);

test/fixtures/transformation/react/should-convert-simple-text/actual.js

@@ -0,0 +1 @@
+var x = <div>text</div>;

test/fixtures/transformation/react/should-convert-simple-text/expected.js

@@ -0,0 +1 @@
+var x = React.createElement("div", null, "text");

test/fixtures/transformation/react/should-disallow-xml-namespacing/actual.js

@@ -0,0 +1 @@
+<Namespace:Component />;

test/fixtures/transformation/react/should-handle-has-own-property-correctly/actual.js

@@ -0,0 +1 @@
+<hasOwnProperty>testing</hasOwnProperty>;

test/fixtures/transformation/react/should-handle-has-own-property-correctly/expected.js

@@ -0,0 +1 @@
+React.createElement("hasOwnProperty", null, "testing");

test/fixtures/transformation/react/should-have-correct-comma-in-nested-children/actual.js

@@ -0,0 +1,5 @@
+var x = <div>
+  <div><br /></div>
+  <Component>{foo}<br />{bar}</Component>
+  <br />
+</div>;

test/fixtures/transformation/react/should-have-correct-comma-in-nested-children/expected.js

@@ -0,0 +1 @@
+var x = React.createElement("div", null, React.createElement("div", null, React.createElement("br", null)), React.createElement(Component, null, foo, React.createElement("br", null), bar), React.createElement("br", null));

test/fixtures/transformation/react/should-insert-commas-after-expressions-before-whitespace/actual.js

@@ -0,0 +1,16 @@
+var x =
+  <div
+    attr1={
+      "foo" + "bar"
+    }
+    attr2={
+      "foo" + "bar" +
+
+      "baz" + "bug"
+    }
+    attr3={
+      "foo" + "bar" +
+      "baz" + "bug"
+    }
+    attr4="baz">
+  </div>

test/fixtures/transformation/react/should-insert-commas-after-expressions-before-whitespace/expected.js

@@ -0,0 +1,6 @@
+var x = React.createElement("div", {
+  attr1: "foo" + "bar",
+  attr2: "foo" + "bar" + "baz" + "bug",
+  attr3: "foo" + "bar" + "baz" + "bug",
+  attr4: "baz"
+});

test/fixtures/transformation/react/should-transform-known-hyphenated-tags/actual.js

@@ -0,0 +1 @@
+<font-face />;

test/fixtures/transformation/react/should-transform-known-hyphenated-tags/expected.js

@@ -0,0 +1 @@
+React.createElement("font-face", null);

test/fixtures/transformation/react/wraps-props-in-react-spread-for-spread-attributes/actual.js

@@ -0,0 +1,2 @@
+<Component { ... x } y
+={2 } z />

test/fixtures/transformation/react/wraps-props-in-react-spread-for-spread-attributes/expected.js

@@ -0,0 +1,4 @@
+React.createElement(Component, React.__spread({}, x, {
+  y: 2,
+  z: true
+}));