v1.11.4

Update logo on README

.travis.yml

@@ -10,7 +10,10 @@ branches:
 before_script: "npm install -g codeclimate-test-reporter"
 script: "make test-travis"
 
-addons:
-  code_climate:
-    repo_token:
-      secure: "PfP9sDUJzSznDb+ZEPO2cignXabSTXJxEVm5ESRPgEcFr+/4b0pt3hI8R9b+9mLtBEwtw3DLUq48MOeqEKnq29csQmpjPVcN6gT4uR2DdNa1JpVgDuwxT05NB3fBea9U2reM73iV8ylCgPHExr2uGR9/87JzR2beY/56EUL5NjY="
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/acf1870e9d223c65e8d5
+    on_success: always
+    on_failure: always
+    on_start: false

README.md

@@ -1,22 +1,22 @@
 <p align="center">
-  <img alt="6to5" src="http://i.imgur.com/hVl9KRw.png">
+  <img alt="6to5" src="https://raw.githubusercontent.com/6to5/logo/master/logo.png" width="546">
 </p>
 
 <p align="center">
-  <a href="https://travis-ci.org/sebmck/6to5">
-    <img alt="Travis Status" src="http://img.shields.io/travis/sebmck/6to5.svg?branch=master&amp;style=flat&amp;label=travis">
+  <a href="https://travis-ci.org/6to5/6to5">
+    <img alt="Travis Status" src="http://img.shields.io/travis/6to5/6to5.svg?branch=master&amp;style=flat&amp;label=travis">
   </a>
 
-  <a href="https://codeclimate.com/github/sebmck/6to5">
-    <img alt="Code Climate Score" src="http://img.shields.io/codeclimate/github/sebmck/6to5.svg?style=flat">
+  <a href="https://codeclimate.com/github/6to5/6to5">
+    <img alt="Code Climate Score" src="http://img.shields.io/codeclimate/github/6to5/6to5.svg?style=flat">
   </a>
 
-  <a href="https://codeclimate.com/github/sebmck/6to5">
-    <img alt="Coverage" src="http://img.shields.io/codeclimate/coverage/github/sebmck/6to5.svg?style=flat">
+  <a href="https://codeclimate.com/github/6to5/6to5">
+    <img alt="Coverage" src="http://img.shields.io/codeclimate/coverage/github/6to5/6to5.svg?style=flat">
   </a>
 
-  <a href="https://david-dm.org/sebmck/6to5">
-    <img alt="Dependency Status" src="http://img.shields.io/david/sebmck/6to5.svg?style=flat">
+  <a href="https://david-dm.org/6to5/6to5">
+    <img alt="Dependency Status" src="http://img.shields.io/david/6to5/6to5.svg?style=flat">
   </a>
 </p>
 
@@ -73,10 +73,10 @@ It's as easy as:
 ### Plugins
 
  - [Broccoli](https://github.com/very-geek/broccoli-6to5-transpiler)
- - [Browserify](https://github.com/sebmck/6to5-browserify)
+ - [Browserify](https://github.com/6to5/6to5-browserify)
  - [Brunch](https://github.com/es128/6to5-brunch)
  - [Duo](https://github.com/bdo-labs/duo6to5)
- - [Connect](https://github.com/sebmck/6to5-connect)
+ - [Connect](https://github.com/6to5/6to5-connect)
  - [Gulp](https://github.com/sindresorhus/gulp-6to5)
  - [Grunt](https://github.com/sindresorhus/grunt-6to5)
  - [Jade](https://github.com/Apoxx/jade-6to5)

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

@@ -62,15 +62,6 @@ exports.MethodDefinition = function (node, print) {
   this._method(node, print);
 };
 
-exports.ReturnStatement = function (node, print) {
-  this.push("return");
-  if (node.argument) {
-    this.space();
-    print(node.argument);
-  }
-  this.semicolon();
-};
-
 exports.FunctionDeclaration =
 exports.FunctionExpression = function (node, print) {
   this.push("function");

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

@@ -52,25 +52,20 @@ exports.WhileStatement = function (node, print) {
   print.block(node.body);
 };
 
-exports.ForInStatement = function (node, print) {
-  this.keyword("for");
-  this.push("(");
-  print(node.left);
-  this.push(" in ");
-  print(node.right);
-  this.push(")");
-  print.block(node.body);
+var buildForXStatement = function (op) {
+  return function (node, print) {
+    this.keyword("for");
+    this.push("(");
+    print(node.left);
+    this.push(" " + op + " ");
+    print(node.right);
+    this.push(")");
+    print.block(node.body);
+  };
 };
 
-exports.ForOfStatement = function (node, print) {
-  this.keyword("for");
-  this.push("(");
-  print(node.left);
-  this.push(" of ");
-  print(node.right);
-  this.push(")");
-  print.block(node.body);
-};
+exports.ForInStatement = buildForXStatement("in");
+exports.ForOfStatement = buildForXStatement("of");
 
 exports.DoWhileStatement = function (node, print) {
   this.keyword("do");
@@ -82,23 +77,23 @@ exports.DoWhileStatement = function (node, print) {
   this.push(");");
 };
 
-exports.BreakStatement = function (node, print) {
-  this.push("break");
-  if (node.label) {
-    this.space();
-    print(node.label);
-  }
-  this.semicolon();
+var buildLabelStatement = function (prefix, key) {
+  return function (node, print) {
+    this.push(prefix);
+
+    var label = node[key || "label"];
+    if (label) {
+      this.space();
+      print(label);
+    }
+
+    this.semicolon();
+  };
 };
 
-exports.ContinueStatement = function (node, print) {
-  this.push("continue");
-  if (node.label) {
-    this.space();
-    print(node.label);
-  }
-  this.semicolon();
-};
+exports.ContinueStatement = buildLabelStatement("continue");
+exports.ReturnStatement   = buildLabelStatement("return", "argument");
+exports.BreakStatement    = buildLabelStatement("break");
 
 exports.LabeledStatement = function (node, print) {
   print(node.label);

lib/6to5/index.js

@@ -1,4 +1,5 @@
 var transform = require("./transformation/transform");
+var util      = require("./util");
 var fs        = require("fs");
 var _         = require("lodash");
 
@@ -14,6 +15,8 @@ exports.polyfill = function () {
   require("./polyfill");
 };
 
+exports.canCompile = util.canCompile;
+
 exports.transform = transform;
 
 exports.transformFile = function (filename, opts, callback) {

lib/6to5/runtime.js

@@ -11,16 +11,7 @@ module.exports = function (namespace) {
   var container = t.functionExpression(null, [], t.blockStatement(body));
   var tree      = t.program([t.expressionStatement(t.callExpression(container, []))]);
 
-  body.push(t.variableDeclaration("var", [
-    t.variableDeclarator(t.identifier("self"), t.conditionalExpression(
-      t.binaryExpression("===",
-        t.unaryExpression("typeof", t.identifier("global"), true),
-        t.literal("undefined")
-      ),
-      t.identifier("window"),
-      t.identifier("global"))
-    )
-  ]));
+  body.push(util.template("self-global", true));
 
   body.push(t.variableDeclaration("var", [
     t.variableDeclarator(

lib/6to5/templates/let-scoping-return.js

@@ -0,0 +1 @@
+if (typeof RETURN === "object") return RETURN.v;

lib/6to5/templates/self-global.js

@@ -0,0 +1 @@
+var self = typeof global === "undefined" ? window : global;

lib/6to5/transformation/transform.js

@@ -20,7 +20,16 @@ transform._ensureTransformerNames = function (type, keys) {
   });
 };
 
-transform.transformers = {
+transform.transformers = {};
+
+transform.moduleFormatters = {
+  common: require("./modules/common"),
+  ignore: require("./modules/ignore"),
+  amd:    require("./modules/amd"),
+  umd:    require("./modules/umd")
+};
+
+_.each({
   modules:                  require("./transformers/modules"),
   propertyNameShorthand:    require("./transformers/property-name-shorthand"),
   constants:                require("./transformers/constants"),
@@ -53,15 +62,6 @@ transform.transformers = {
   useStrict:                require("./transformers/use-strict"),
 
   _moduleFormatter:         require("./transformers/_module-formatter")
-};
-
-transform.moduleFormatters = {
-  common: require("./modules/common"),
-  ignore: require("./modules/ignore"),
-  amd:    require("./modules/amd"),
-  umd:    require("./modules/umd")
-};
-
-_.each(transform.transformers, function (transformer, key) {
+}, function (transformer, key) {
   transform.transformers[key] = new Transformer(key, transformer);
 });

lib/6to5/transformation/transformer.js

@@ -37,7 +37,7 @@ Transformer.prototype.transform = function (file) {
   astRun("enter");
 
   var build = function (exit) {
-    return function (node, parent, opts) {
+    return function (node, parent, scope) {
       // add any node type aliases that exist
       var types = [node.type].concat(t.ALIAS_KEYS[node.type] || []);
 
@@ -54,7 +54,7 @@ Transformer.prototype.transform = function (file) {
       if (exit) fn = fns.exit;
       if (!fn) return;
 
-      return fn(node, parent, file, opts.scope);
+      return fn(node, parent, file, scope);
     };
   };
 

lib/6to5/transformation/transformers/_property-literals.js

@@ -0,0 +1,14 @@
+var esutils = require("esutils");
+var t       = require("../../types");
+
+exports.Property = function (node) {
+  // ignore key literals that are valid identifiers
+  var key = node.key;
+  if (t.isLiteral(key) && esutils.keyword.isIdentifierName(key.value)) {
+    key.type = "Identifier";
+    key.name = key.value;
+    delete key.value;
+
+    node.computed = false;
+  }
+};

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

@@ -1,4 +1,5 @@
 var traverse = require("../../traverse");
+var util     = require("../../util");
 var t        = require("../../types");
 var _        = require("lodash");
 
@@ -143,6 +144,87 @@ var checkFor = function (forParent, block) {
   return has;
 };
 
+var hoistVarDeclarations = function (block, pushDeclar) {
+  traverse(block, function (node) {
+    if (t.isForStatement(node)) {
+      if (isVar(node.init)) {
+        node.init = t.sequenceExpression(pushDeclar(node.init));
+      }
+    } else if (t.isFor(node)) {
+      if (isVar(node.left)) {
+        node.left = node.left.declarations[0].id;
+      }
+    } else if (isVar(node)) {
+      return pushDeclar(node).map(t.expressionStatement);
+    } else if (t.isFunction(node)) {
+      return false;
+    }
+  });
+};
+
+var getParams = function (info, letReferences) {
+  var params = _.cloneDeep(letReferences);
+  _.each(params, function (param) {
+    param.name = info.duplicates[param.name] || param.name;
+  });
+  return params;
+};
+
+var getLetReferences = function (block, info, letReferences) {
+  var closurify = false;
+
+  // traverse through this block, stopping on functions and checking if they
+  // contain any outside let references
+  traverse(block, function (node, parent, scope) {
+    if (t.isFunction(node)) {
+      traverse(node, function (node, parent) {
+        // not an identifier so we have no use
+        if (!t.isIdentifier(node)) return;
+
+        // not a direct reference
+        if (!t.isReferenced(node, parent)) return;
+
+        // this scope has a variable with the same name so it couldn't belong
+        // to our let scope
+        if (scope.hasOwn(node.name)) return;
+
+        closurify = true;
+
+        // this key doesn't appear just outside our scope
+        if (!_.contains(info.outsideKeys, node.name)) return;
+
+        // push this badboy
+        letReferences[node.name] = node;
+      });
+
+      return false;
+    } else if (t.isFor(node)) {
+      return false;
+    }
+  });
+
+  return closurify;
+};
+
+var buildPushDeclar = function (body) {
+  return function (node) {
+    body.push(t.variableDeclaration(node.kind, node.declarations.map(function (declar) {
+      return t.variableDeclarator(declar.id);
+    })));
+
+    var replace = [];
+
+    _.each(node.declarations, function (declar) {
+      if (!declar.init) return;
+
+      var expr = t.assignmentExpression("=", declar.id, declar.init);
+      replace.push(t.inherits(expr, declar));
+    });
+
+    return replace;
+  };
+};
+
 var run = function (forParent, block, parent, file, scope) {
   if (block._letDone) return;
   block._letDone = true;
@@ -160,38 +242,9 @@ var run = function (forParent, block, parent, file, scope) {
   // outside let references that we need to wrap
   var letReferences = {};
 
-  // are there any outside let references within any functions?
-  var closurify = false;
-
-  // traverse through this block, stopping on functions and checking if they
-  // contain any outside let references
-  traverse(block, function (node, parent, opts) {
-    if (t.isFunction(node)) {
-      traverse(node, function (node, parent) {
-        // not an identifier so we have no use
-        if (!t.isIdentifier(node)) return;
-
-        // not a direct reference
-        if (!t.isReferenced(node, parent)) return;
-
-        // this scope has a variable with the same name so it couldn't belong
-        // to our let scope
-        if (opts.scope.hasOwn(node.name)) return;
-
-        closurify = true;
-
-        // this key doesn't appear just outside our scope
-        if (!_.contains(info.outsideKeys, node.name)) return;
-
-        // push this badboy
-        letReferences[node.name] = node;
-      });
-
-      return false;
-    } else if (t.isFor(node)) {
-      return false;
-    }
-  });
+  // returns whether or not there are any outside let references within any
+  // functions
+  var closurify = getLetReferences(block, info, letReferences);
 
   letReferences = _.values(letReferences);
 
@@ -205,39 +258,10 @@ var run = function (forParent, block, parent, file, scope) {
   var body = [];
 
   // hoist a `VariableDeclaration` and add `AssignmentExpression`s in it's place
-  var pushDeclar = function (node) {
-    body.push(t.variableDeclaration(node.kind, node.declarations.map(function (declar) {
-      return t.variableDeclarator(declar.id);
-    })));
-
-    var replace = [];
-
-    _.each(node.declarations, function (declar) {
-      if (!declar.init) return;
-
-      var expr = t.assignmentExpression("=", declar.id, declar.init);
-      replace.push(t.inherits(expr, declar));
-    });
-
-    return replace;
-  };
+  var pushDeclar = buildPushDeclar(body);
 
   // hoist var references to retain scope
-  traverse(block, function (node) {
-    if (t.isForStatement(node)) {
-      if (isVar(node.init)) {
-        node.init = t.sequenceExpression(pushDeclar(node.init));
-      }
-    } else if (t.isFor(node)) {
-      if (isVar(node.left)) {
-        node.left = node.left.declarations[0].id;
-      }
-    } else if (isVar(node)) {
-      return pushDeclar(node).map(t.expressionStatement);
-    } else if (t.isFunction(node)) {
-      return false;
-    }
-  });
+  hoistVarDeclarations(block, pushDeclar);
 
   // set let references to plain var references
   standardiseLets(declarators);
@@ -249,11 +273,8 @@ var run = function (forParent, block, parent, file, scope) {
   // replace the current block body with the one we've built
   block.body = body;
 
-  // cahnge duplicate let references to their uid if they have one
-  var params = _.cloneDeep(letReferences);
-  _.each(params, function (param) {
-    param.name = info.duplicates[param.name] || param.name;
-  });
+  // change duplicate let references to their uid if they have one
+  var params = getParams(info, letReferences);
 
   var call = t.callExpression(fn, params);
   var ret  = t.identifier(file.generateUid("ret", scope));
@@ -267,10 +288,9 @@ var run = function (forParent, block, parent, file, scope) {
 
     if (has.hasReturn) {
       // typeof ret === "object"
-      retCheck = t.ifStatement(
-        t.binaryExpression("===", t.unaryExpression("typeof", ret, true), t.literal("object")),
-        t.returnStatement(t.memberExpression(ret, t.identifier("v")))
-      );
+      retCheck = util.template("let-scoping-return", {
+        RETURN: ret,
+      });
 
       // there's no `break` or `continue` so we can just push in the `if`
       if (!has.hasBreak && !has.hasContinue) {
@@ -299,7 +319,6 @@ var run = function (forParent, block, parent, file, scope) {
 
       body.push(t.switchStatement(ret, cases));
     }
-
   } else {
     body.push(t.expressionStatement(call));
   }

lib/6to5/traverse/index.js

@@ -54,7 +54,7 @@ function traverse(parent, callbacks, opts) {
 
       // enter
       if (callbacks.enter) {
-        result = callbacks.enter(node, parent, opts2);
+        result = callbacks.enter(node, parent, opts2.scope);
 
         // stop iteration
         if (result === false) return;
@@ -67,7 +67,7 @@ function traverse(parent, callbacks, opts) {
 
       // exit
       if (callbacks.exit) {
-        maybeReplace(callbacks.exit(node, parent, opts2));
+        maybeReplace(callbacks.exit(node, parent, opts2.scope));
       }
     };
 

lib/6to5/types/index.js

@@ -162,29 +162,17 @@ t.getIds = function (node, map) {
 
   while (search.length) {
     var id = search.shift();
+    if (!id) continue;
+
+    var nodeKey = t.getIds.nodes[id.type];
+    var arrKey  = t.getIds.arrays[id.type];
 
     if (t.isIdentifier(id)) {
       ids[id.name] = id;
-    } else if (t.isArrayPattern(id)) {
-      _.each(id.elements, function (elem) {
-        search.push(elem);
-      });
-    } else if (t.isAssignmentExpression(id)) {
-      search.push(id.left);
-    } else if (t.isObjectPattern(id)) {
-      _.each(id.properties, function (prop) {
-        search.push(prop.value);
-      });
-    } else if (t.isVariableDeclaration(id)) {
-      search = search.concat(id.declarations);
-    } else if (t.isImportSpecifier(id) || t.isExportSpecifier(id) || t.isVariableDeclarator(id) || t.isFunctionDeclaration(id) || t.isClassDeclaration(id)) {
-      search.push(id.id);
-    } else if (t.isSpreadElement(id)) {
-      search.push(id.argument);
-    } else if (t.isExportDeclaration(id) || t.isImportDeclaration(id)) {
-      search = search.concat(id.specifiers);
-    } else if (t.isMemberExpression(id)) {
-      search.push(id.object);
+    } else if (nodeKey) {
+      if (id[nodeKey]) search.push(id[nodeKey]);
+    } else if (arrKey) {
+      search = search.concat(id[arrKey] || []);
     }
   }
 
@@ -192,6 +180,27 @@ t.getIds = function (node, map) {
   return ids;
 };
 
+t.getIds.nodes = {
+  AssignmentExpression: "left",
+  ImportSpecifier: "id",
+  ExportSpecifier: "id",
+  VariableDeclarator: "id",
+  FunctionDeclaration: "id",
+  ClassDeclaration: "id",
+  ParenthesizedExpression: "expression",
+  MemeberExpression: "object",
+  SpreadElement: "argument",
+  Property: "value"
+};
+
+t.getIds.arrays = {
+  ExportDeclaration: "specifiers",
+  ImportDeclaration: "specifiers",
+  VariableDeclaration: "declarations",
+  ArrayPattern: "elements",
+  ObjectPattern: "properties"
+};
+
 t.inherits = function (child, parent) {
   child.loc   = parent.loc;
   child.end   = parent.end;

lib/6to5/util.js

@@ -11,6 +11,12 @@ var _          = require("lodash");
 
 exports.inherits = util.inherits;
 
+exports.canCompile = function (filename, altExts) {
+  var exts = altExts || [".js", ".jsx", ".es6"];
+  var ext = path.extname(filename);
+  return _.contains(exts, ext);
+};
+
 exports.resolve = function (loc) {
   try {
     return require.resolve(loc);
@@ -111,6 +117,11 @@ exports.template = function (name, nodes, keepExpression) {
   var template = exports.templates[name];
   if (!template) throw new ReferenceError("unknown template " + name);
 
+  if (nodes === true) {
+    keepExpression = true;
+    nodes = null;
+  }
+
   template = _.cloneDeep(template);
 
   var inherits = false;
@@ -192,13 +203,14 @@ exports.parse = function (opts, code, callback) {
     var tokens   = [];
 
     var ast = acorn.parse(code, {
-      preserveParens: true,
-      ecmaVersion:    Infinity,
-      strictMode:     true,
-      onComment:      comments,
-      locations:      true,
-      onToken:        tokens,
-      ranges:         true
+      allowReturnOutsideFunction: true,
+      preserveParens:             true,
+      ecmaVersion:                Infinity,
+      strictMode:                 true,
+      onComment:                  comments,
+      locations:                  true,
+      onToken:                    tokens,
+      ranges:                     true
     });
 
     estraverse.attachComments(ast, comments, tokens);
@@ -245,7 +257,7 @@ var loadTemplates = function () {
   if (!fs.existsSync(templatesLoc)) {
     throw new Error("no templates directory - this is most likely the " +
                     "result of a broken `npm publish`. Please report to " +
-                    "https://githut.com/sebmck/6to5/issues");
+                    "https://githut.com/6to5/6to5/issues");
   }
 
   _.each(fs.readdirSync(templatesLoc), function (name) {

package.json

@@ -1,15 +1,15 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "1.11.0",
+  "version": "1.11.4",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
-  "homepage": "https://github.com/sebmck/6to5",
+  "homepage": "https://github.com/6to5/6to5",
   "repository": {
     "type": "git",
-    "url": "https://github.com/sebmck/6to5.git"
+    "url": "https://github.com/6to5/6to5.git"
   },
   "bugs": {
-    "url": "https://github.com/sebmck/6to5/issues"
+    "url": "https://github.com/6to5/6to5/issues"
   },
   "preferGlobal": true,
   "main": "lib/6to5/index.js",
@@ -36,29 +36,29 @@
   },
   "dependencies": {
     "ast-types": "~0.6.0",
-    "commander": "2.4.0",
+    "commander": "2.5.0",
     "fs-readdir-recursive": "0.0.2",
     "lodash": "2.4.1",
     "mkdirp": "0.5.0",
-    "es6-shim": "0.18.0",
+    "es6-shim": "0.20.2",
     "es6-symbol": "0.1.1",
     "regexpu": "0.3.0",
     "source-map": "0.1.40",
-    "regenerator-6to5": "https://github.com/sebmck/regenerator-6to5/archive/b7bc53e1a655879974aad53a8ceb93a70efaa08d.tar.gz",
-    "chokidar": "0.10.0",
-    "source-map-support": "0.2.7",
+    "regenerator-6to5": "https://github.com/6to5/regenerator-6to5/archive/b7bc53e1a655879974aad53a8ceb93a70efaa08d.tar.gz",
+    "chokidar": "0.10.5",
+    "source-map-support": "0.2.8",
     "esutils": "1.1.4",
-    "acorn-6to5": "https://github.com/sebmck/acorn-6to5/archive/f5110383517eef0bea78c2da2a1fb01fbed74e4e.tar.gz",
+    "acorn-6to5": "https://github.com/6to5/acorn-6to5/archive/49e421660af161af0e75c2fa066ea356d6650e69.tar.gz",
     "estraverse": "^1.7.0"
   },
   "devDependencies": {
     "istanbul": "0.3.2",
     "matcha": "0.5.0",
-    "mocha": "1.21.5",
+    "mocha": "2.0.1",
     "uglify-js": "2.4.15",
-    "browserify": "6.1.0",
+    "browserify": "6.2.0",
     "rimraf": "2.2.8",
-    "jshint": "2.5.6",
+    "jshint": "2.5.10",
     "chai": "^1.9.2"
   }
 }

test/fixtures/generation/harmony-edgecase/one-assignment-property/actual.js

@@ -1,5 +0,0 @@
-({ t: t }) = obj;
-({
-  t: { C: C }
-}) = obj;
-({ a, b, c }) = obj;

test/fixtures/generation/harmony-edgecase/one-assignment-property/expected.js

@@ -1,5 +0,0 @@
-({ t: t }) = obj;
-({
-  t: { C: C }
-}) = obj;
-({ a, b, c }) = obj;