v1.9.7

lib/6to5/transform.js

@@ -94,7 +94,11 @@ transform.transformers = {
   unicodeRegex:             require("./transformers/unicode-regex"),
   generators:               require("./transformers/generators"),
 
-  _aliasFunctions:          require("./transformers/_alias-functions")
+  react:                    require("./transformers/react"),
+  jsx:                      require("./transformers/jsx"),
+
+  _aliasFunctions:          require("./transformers/_alias-functions"),
+  _blockHoist:              require("./transformers/_block-hoist")
 };
 
 _.each(transform.transformers, function (transformer, key) {

lib/6to5/transformers/_block-hoist.js

@@ -0,0 +1,17 @@
+exports.BlockStatement =
+exports.Program = {
+  exit: function (node) {
+    var unshift = [];
+
+    node.body = node.body.filter(function (bodyNode) {
+      if (bodyNode._blockHoist) {
+        unshift.push(bodyNode);
+        return false;
+      } else {
+        return true;
+      }
+    });
+
+    node.body = unshift.concat(node.body);
+  }
+};

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

@@ -0,0 +1,99 @@
+// Based upon the excellent jsx-transpiler by Ingvar Stepanyan (RReverser)
+// https://github.com/RReverser/jsx-transpiler
+
+var esutils = require("esutils");
+var b       = require("recast").types.builders;
+var _       = require("lodash");
+
+var JSX_ANNOTATION_REGEX = /^\*\s*@jsx\s+([^\s]+)/;
+var KNOWN_TAGS           = require("./known-tags");
+
+exports.Program = function (node, parent, file) {
+  var jsx = "React.DOM";
+
+  // looking for namespace annotation
+  _.each(node.comments, function (comment) {
+    if (!comment.possiblyLeading) return;
+
+    var matches = JSX_ANNOTATION_REGEX.exec(comment.value);
+    if (matches) jsx = matches[1];
+  });
+
+  // prebuilding AST node
+  file.jsx = jsx.split(".").map(b.identifier).reduce(function (object, property) {
+    return b.memberExpression(object, property, false);
+  });
+};
+
+exports.XJSIdentifier = function (node) {
+  if (esutils.keyword.isIdentifierName(node.name)) {
+    node.type = "Identifier";
+  } else {
+    return b.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 = node.property.type === "Literal";
+    node.type = "MemberExpression";
+  }
+};
+
+exports.XJSEmptyExpression = function (node) {
+  node.value = null;
+  node.type = "Literal";
+};
+
+exports.XJSExpressionContainer = function (node) {
+  return node.expression;
+};
+
+exports.XJSAttribute = {
+  exit: function (node) {
+    var value = node.value || b.literal(true);
+    var propNode = b.property("init", node.name, value);
+    propNode.loc = node.loc;
+    return propNode;
+  }
+};
+
+exports.XJSOpeningElement = {
+  exit: function (node, parent, file) {
+    var tagExpr = node.name;
+
+    if (_.contains(KNOWN_TAGS, tagExpr.name)) {
+      tagExpr = b.memberExpression(file.jsx, tagExpr, false);
+    }
+
+    var props = node.attributes;
+    if (props.length) {
+      props = b.objectExpression(props);
+    } else {
+      props = b.literal(null);
+    }
+
+    return b.callExpression(tagExpr, [props]);
+  }
+};
+
+exports.XJSElement = {
+  exit: function (node) {
+    var callExpr = node.openingElement;
+    var children = node.children;
+    var args     = callExpr.arguments;
+
+    switch (children.length) {
+      case 0: break;
+      case 1: args.push(children[0]); break;
+      default: args.push(b.arrayExpression(children));
+    }
+
+    callExpr.loc = node.loc;
+    return callExpr;
+  }
+};

lib/6to5/transformers/jsx/known-tags.json

@@ -0,0 +1,132 @@
+[
+  "a",
+  "abbr",
+  "address",
+  "applet",
+  "area",
+  "article",
+  "aside",
+  "audio",
+  "b",
+  "base",
+  "bdi",
+  "bdo",
+  "big",
+  "blockquote",
+  "body",
+  "br",
+  "button",
+  "canvas",
+  "caption",
+  "circle",
+  "cite",
+  "code",
+  "col",
+  "colgroup",
+  "command",
+  "data",
+  "datalist",
+  "dd",
+  "defs",
+  "del",
+  "details",
+  "dfn",
+  "dialog",
+  "div",
+  "dl",
+  "dt",
+  "ellipse",
+  "em",
+  "embed",
+  "fieldset",
+  "figcaption",
+  "figure",
+  "footer",
+  "form",
+  "g",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "head",
+  "header",
+  "hgroup",
+  "hr",
+  "html",
+  "i",
+  "iframe",
+  "img",
+  "input",
+  "ins",
+  "kbd",
+  "keygen",
+  "label",
+  "legend",
+  "li",
+  "line",
+  "linearGradient",
+  "link",
+  "main",
+  "map",
+  "mark",
+  "marquee",
+  "menu",
+  "menuitem",
+  "meta",
+  "meter",
+  "nav",
+  "noscript",
+  "object",
+  "ol",
+  "optgroup",
+  "option",
+  "output",
+  "p",
+  "param",
+  "path",
+  "polygon",
+  "polyline",
+  "pre",
+  "progress",
+  "q",
+  "radialGradient",
+  "rect",
+  "rp",
+  "rt",
+  "ruby",
+  "s",
+  "samp",
+  "script",
+  "section",
+  "select",
+  "small",
+  "source",
+  "span",
+  "stop",
+  "strong",
+  "style",
+  "sub",
+  "summary",
+  "sup",
+  "svg",
+  "table",
+  "tbody",
+  "td",
+  "text",
+  "textarea",
+  "tfoot",
+  "th",
+  "thead",
+  "time",
+  "title",
+  "tr",
+  "track",
+  "tspan",
+  "u",
+  "ul",
+  "var",
+  "video",
+  "wbr"
+]

lib/6to5/transformers/let-scoping.js

@@ -26,8 +26,10 @@ exports.VariableDeclaration = function (node, parent, file) {
     if (util.isReferenced(node, parent)) return id;
   };
 
+  var isProgram = parent.type === "Program";
+
   var replace = function (node, parent) {
-    if (_.contains(traverse.FUNCTION_TYPES, node.type)) {
+    if (!isProgram && _.contains(traverse.FUNCTION_TYPES, node.type)) {
       var letReferences = [];
 
       traverse(node, function (node, parent) {
@@ -37,9 +39,13 @@ exports.VariableDeclaration = function (node, parent, file) {
       });
 
       if (letReferences.length) {
-        return b.callExpression(b.functionExpression(null, letReferences, b.blockStatement([
-          b.returnStatement(node)
-        ])), letReferences);
+        if (node.type === "FunctionDeclaration") {
+          throw new Error("`FunctionDeclaration`s that use `let` and `constant` references aren't allowed outside of the root scope");
+        } else {
+          return b.callExpression(b.functionExpression(null, letReferences, b.blockStatement([
+            b.returnStatement(node)
+          ])), letReferences);
+        }
       } else {
         return false;
       }

lib/6to5/transformers/modules.js

@@ -72,11 +72,7 @@ var pushExportDeclaration = function (node, parent, nodes) {
   var declar = node.declaration;
 
   if (node.default) {
-    if (declar.type === "FunctionDeclaration") {
-      declar.type = "FunctionExpression";
-    } else if (declar.type === "ClassDeclaration") {
-      declar.type = "ClassExpression";
-    }
+    util.ensureExpressionType(declar);
 
     nodes.push(util.template("exports-default", {
       VALUE: declar
@@ -95,30 +91,13 @@ var pushExportDeclaration = function (node, parent, nodes) {
     nodes.push(declar);
 
     if (declar.type === "FunctionDeclaration") {
-      assign._modulesHoist = true;
+      assign._blockHoist = true;
     }
 
     nodes.push(assign);
   }
 };
 
-exports.Program = {
-  exit: function (node) {
-    var unshift = [];
-
-    node.body = node.body.filter(function (bodyNode) {
-      if (bodyNode._modulesHoist) {
-        unshift.push(bodyNode);
-        return false;
-      } else {
-        return true;
-      }
-    });
-
-    node.body = unshift.concat(node.body);
-  }
-};
-
 exports.ExportDeclaration = function (node, parent) {
   var nodes = [];
 

lib/6to5/traverse/index.js

@@ -34,20 +34,30 @@ var traverse = module.exports = function (parent, callbacks, blacklistTypes) {
       // type is blacklisted
       if (_.contains(blacklistTypes, node.type)) return;
 
-      // enter
-      var result = callbacks.enter(node, parent, obj, key);
-
-      // stop iteration
-      if (result === false) return;
+      var result;
 
       // replace node
-      if (result != null) node = obj[key] = result;
+      var maybeReplace = function (result) {
+        if (result != null) obj[key] = result;
+      };
+
+      // enter
+      if (callbacks.enter) {
+        result = callbacks.enter(node, parent, obj, key);
+
+        // stop iteration
+        if (result === false) return;
+
+        maybeReplace(result);
+      }
 
       // traverse node
       traverse(node, callbacks, blacklistTypes);
 
       // exit
-      if (callbacks.exit) callbacks.exit(node, parent, obj, key);
+      if (callbacks.exit) {
+        maybeReplace(callbacks.exit(node, parent, obj, key));
+      }
     };
 
     if (_.isArray(nodes)) {

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

@@ -72,5 +72,15 @@
   "VoidTypeAnnotation":            [],
   "WhileStatement":                ["test", "body"],
   "WithStatement":                 ["object", "body"],
+  "XJSIdentifier":                 [],
+  "XJSNamespacedName":             ["namespace", "name"],
+  "XJSMemberExpression":           ["object", "property"],
+  "XJSEmptyExpression":            [],
+  "XJSExpressionContainer":        ["expression"],
+  "XJSElement":                    ["openingElement", "closingElement", "children"],
+  "XJSClosingElement":             ["name"],
+  "XJSOpeningElement":             ["name", "attributes"],
+  "XJSAttribute":                  ["name", "value"],
+  "XJSText":                       [],
   "YieldExpression":               ["argument"]
 }

lib/6to5/util.js

@@ -24,6 +24,14 @@ exports.list = function (val) {
   return val ? val.split(",") : [];
 };
 
+exports.ensureExpressionType = function (node) {
+  node.type = {
+    FunctionDeclaration: "FunctionExpression",
+    ClassDeclaration: "ClassExpression"
+  }[node.type] || node.type;
+  return node;
+};
+
 exports.getUid = function (parent, file) {
   var node;
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/sebmck/6to5",
   "repository": {
@@ -45,7 +45,8 @@
     "source-map": "0.1.40",
     "regenerator": "0.6.7",
     "chokidar": "^0.9.0",
-    "source-map-support": "^0.2.7"
+    "source-map-support": "^0.2.7",
+    "esutils": "^1.1.4"
   },
   "devDependencies": {
     "es6-transpiler": "0.7.17",

test/fixtures/bin/6to5-node/--extensions/in-files/foo.bar

@@ -0,0 +1 @@
+console.log([1, 2, 3].map(x => x * x));

test/fixtures/bin/6to5-node/--extensions/options.json

@@ -0,0 +1,4 @@
+{
+  "args": ["foo", "--extensions", ".bar"],
+  "stdout": "[ 1, 4, 9 ]"
+}

test/fixtures/syntax/destructuring/empty/actual.js

@@ -0,0 +1 @@
+var [, a, [b], [c], d] = ["foo", "hello", [", ", "junk"], ["world"]];

test/fixtures/syntax/destructuring/empty/expected.js

@@ -0,0 +1,5 @@
+var _ref = ["foo", "hello", [", ", "junk"], ["world"]];
+var a = _ref[1];
+var b = _ref[2][0];
+var c = _ref[3][0];
+var d = _ref[4];

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

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

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

@@ -0,0 +1,3 @@
+/** @jsx CUSTOM_DOM */
+
+CUSTOM_DOM.a(null);

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

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

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

@@ -0,0 +1 @@
+x(null, null);

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

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

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

@@ -0,0 +1,3 @@
+X({
+  "data-prop": x ? Y({ prop: 2 }) : Z(null, "\n")
+});

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

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

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

@@ -0,0 +1,3 @@
+X(null, a);
+X(null, [a, ' ', b]);
+X({ prop: a, yes: true });

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

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

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

@@ -0,0 +1 @@
+React.DOM.a(null);

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

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

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

@@ -0,0 +1 @@
+Test.X(null);

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

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

test/fixtures/syntax/jsx/no-xml-namespaces/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Namespace tags are not supported. ReactJSX is not XML."
+}

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

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

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

@@ -0,0 +1,2 @@
+X(null);
+X({ prop: '1' });

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

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

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

@@ -0,0 +1 @@
+X(null);

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

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

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

@@ -0,0 +1,2 @@
+X({ prop: '2' }, Y(null));
+X({ prop: '2' }, [Y(null), Z(null)]);

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

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

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

@@ -0,0 +1,4 @@
+X(null, '   ');
+X(null, '\n');
+X(null, '\n  string\n');
+X(null, '\n  string\n  string\n  ');

test/fixtures/syntax/let-scoping/no-nested-function-declarations/actual.js

@@ -0,0 +1,7 @@
+var numbers = [1, 2, 3];
+
+for (let i in numbers) {
+  function foo() {
+    return i;
+  }
+}

test/fixtures/syntax/let-scoping/no-nested-function-declarations/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "`FunctionDeclaration`s that use `let` and `constant` references aren't allowed outside of the root scope"
+}

test/traverse.js

@@ -1,5 +1,6 @@
 var traverse = require("../lib/6to5/traverse");
 var assert   = require("assert");
+var b        = require("recast").types.builders;
 var _        = require("lodash");
 
 suite("traverse", function () {
@@ -137,9 +138,21 @@ suite("traverse", function () {
     }, /trying to delete property object from MemberExpression but can't because it's required/);
   });
 
-  test("hasType");
+  test("hasType", function () {
+    assert.ok(traverse.hasType(ast, "ThisExpression"));
+    assert.ok(traverse.hasType(ast, "Program"));
+
+    assert.ok(!traverse.hasType(ast, "ThisExpression", ["MemberExpression"]));
+    assert.ok(!traverse.hasType(ast, "ThisExpression", ["Program"]));
+
+    assert.ok(!traverse.hasType(ast, "ArrowFunctionExpression"));
+  });
 
   test("isPattern");
 
-  test("isFunction");
+  test("isFunction", function () {
+    //assert.ok(traverse.isFunction(b.arrowFunctionExpression());
+    //assert.ok(traverse.isFunction(b.functionExpression()));
+    //assert.ok(traverse.isFunction(b.functionDeclaration()));
+  });
 });

test/util.js

@@ -45,6 +45,15 @@ suite("util", function () {
     assert.ok(!util.isAbsolute("test/test.js"));
   });
 
+  test("list", function () {
+    assert.deepEqual(util.list(undefined), []);
+    assert.deepEqual(util.list(false), []);
+    assert.deepEqual(util.list(null), []);
+    assert.deepEqual(util.list(""), []);
+    assert.deepEqual(util.list("foo"), ["foo"]);
+    assert.deepEqual(util.list("foo,bar"), ["foo", "bar"]);
+  });
+
   test("getIds");
 
   test("isReferenced");