v2.12.2

Add loose transform for tagged template literals

.gitignore

@@ -10,3 +10,4 @@ test/tmp
 /runtime.js
 coverage
 dist
+.package.json

.jshintrc

@@ -5,7 +5,6 @@
   "camelcase": true,
   "unused": true,
   "eqnull": true,
-  "proto": true,
   "newcap": true,
   "supernew": true,
   "noyield": true,
@@ -14,8 +13,6 @@
   "boss": true,
   "expr": true,
   "undef": true,
-  "loopfunc": true,
-  "white": true,
   "maxparams": 5,
   "maxdepth": 4,
 

.npmignore

@@ -9,3 +9,4 @@ Makefile
 dist
 tests.json
 CHANGELOG.md
+.package.json

CHANGELOG.md

@@ -11,12 +11,146 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
+## 2.12.2
+
+ * **Internal**
+  * Exclude nodes in function parameters and catch clauses from `isReferenced` check.
+
+## 2.12.1
+
+ * **Internal**
+  * Add `.jsx` to list of allowed extensions.
+
+## 2.12.0
+
+ * **Bug Fix**
+  * Support non-string JSX literals.
+ * **New Feature**
+  * Loose mode for some transformers that enables non-spec behaviour.
+ * **Internal**
+  * Uglify `--mangle sort` has been added to the build script, cutting minified scripts in half.
+
+## 2.11.4
+
+ * **Internal**
+  * Make all dependency versions fixed.
+
+## 2.11.3
+
+ * **Bug Fix**
+  * Allow a string to be passed as the `optional` option.
+
+## 2.11.2
+
+ * **Bug Fix**
+  * Support esprima-style catch clause handlers.
+ * **Polish**
+  * Don't print a stacktrace for syntax errors in the CLI.
+
+## 2.11.1
+
+ * **Bug Fix**
+  * Remove stray `console.log` outputting debug code.
+  * Remove `Dict` from `coreAliasing`.
+
+## 2.11.0
+
+ * **Bug Fix**
+  * Fix unnecessary IIFE in default parameters on method calls.
+  * Add support for supers inside of closures.
+ * **New Feature**
+  * Add `--keep-module-id-extensions`/`keepModuleIdExtensions` option to keep extensions in module ids.
+ * **Polish**
+  * Special case single argument spread properties in `super` inside classes.
+  * Don't use a variable declaration for class declaration IFFE.
+  * Rename `inherits` helper parameters.
+  * `coreAliasing` transformer now aliases `Promise`, `Set`, `Map` and more. Thanks [@AluisioASG](https://github.com/AluisioASG).
+
+## 2.10.1
+
+ * **Internal**
+  * Upgrade `core-js` to `0.4.4`.
+ * **New Feature**
+  * Added `--include-regenerator` option to CLI and `includeRegenerator` option to API that includes the regenerator runtime if necessary.
+
+## 2.10.0
+
+ * **New Feature**
+  * Add `classesFastSuper` optional transformer that doesn't support parent getters and prototype changing.
+  * Add `forOfFast` transformer that speeds up `for...of` on arrays but produces more code.
+  * Add `--react-compat` to `bin/6to5`.
+ * **Spec Compliancy**
+  * Disallow setters without a single parameter.
+  * Add `configurable` and `writable` to defined properties.
+  * Use define instead of assignment for class methods.
+ * **Polish**
+  * Fix bin name in `6to5-node --help`.
+  * Fix shorthand `--whitelist` name in `bin/6to5`.
+ * **Internal**
+  * Hot code optimisation of traversal etc thanks to [gaearon](https://github.com/gaearon).
+
+## 2.9.4
+
+ * **Bug Fix**
+  * Support `UpdateExpression`s as `MemberExpression` objects.
+
+## 2.9.3
+
+ * **Bug Fix**
+  * Remove `exportsWildcard` helper in favor of `defaults`.
+
+## 2.9.2
+
+ * **Bug Fix**
+  * Pass `exports` to `exportWildcard` helper to allow for use inside the optional runtime.
+
+## 2.9.1
+
+ * **Bug Fix**
+  * Fix runtime generator breaking the helper inclusion loop.
+
+## 2.9.0
+
+ * **Internal**
+  * Upgrade `acorn-6to5`.
+    * Now supports destructuring shorthand properties.
+
+## 2.8.1
+
+ * **Bug Fix**
+  * Fix computed accessors on object literals.
+
+## 2.8.0
+
+ * **New Feature**
+  * Add `commonStrict`, `amdStrict` and `umdStrict` module formatters that remove `module.exports` interop assignment.
+  * Add `--indent` option to the 6to5 CLI.
+
+## 2.7.4
+
+ * **Polish**
+  * Inherit assignments from their declaration in destructuring.
+  * Properly align multi-declarator variable declarations.
+
+## 2.7.3
+
+ * **Polish**
+  * Indent and add newlines to `React.createElement` calls in `react` transformer.
+  * Remove `Object.assign` calls and replace it with an `extends` helper.
+
+## 2.7.1
+
+ * **New Feature**
+  * Expose `version` on browser and node API.
+ * **Internal**
+  * Upgrade `core-js` to 0.4.1
+
 ## 2.7.0
 
  * **Spec Compliancy**
   * Disallow reassignments of imports.
  * **New Feature**
-  * `reactCompat` to enable pre-v0.12 react components.
+  * `reactCompat` option to enable pre-v0.12 react components.
 
 ## 2.6.3
 

Makefile

@@ -1,12 +1,12 @@
 BROWSERIFY_CMD = node_modules/browserify/bin/cmd.js
 ISTANBUL_CMD = node_modules/istanbul/lib/cli.js cover
-UGLIFY_CMD = node_modules/uglify-js/bin/uglifyjs
+UGLIFY_CMD = node_modules/uglify-js/bin/uglifyjs --mangle sort
 JSHINT_CMD = node_modules/jshint/bin/jshint
 MOCHA_CMD = node_modules/mocha/bin/_mocha
 
 export NODE_ENV = test
 
-.PHONY: clean test test-cov test-clean lint test-travis test-simple test-all test-browser publish build bootstrap
+.PHONY: clean test test-cov test-clean lint test-travis test-simple test-all test-browser publish build bootstrap publish-core
 
 build:
 	mkdir -p dist
@@ -53,7 +53,7 @@ test-cov:
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
 
 test-travis: bootstrap
-	$(MOCHA_CMD)
+	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
 	if test -n "$$CODECLIMATE_REPO_TOKEN"; then codeclimate < coverage/lcov.info; fi
 
 test-browser:
@@ -71,6 +71,9 @@ publish:
 
 	make test
 
+	read -p "Version: " version; \
+	npm version $$version --message "v%s"
+
 	make build
 	cp dist/6to5.min.js browser.js
 	cp dist/polyfill.min.js browser-polyfill.js
@@ -79,12 +82,21 @@ publish:
 	node bin/cache-templates
 	test -f templates.json
 
-	read -p "Version: "  version; \
-  npm version $$version --message "v%s"
 	npm publish
 
 	git push --follow-tags
 
+	# generate
+	bin/generate-core-package-json >package2.json
+	mv package.json .package.json
+	mv package2.json package.json
+
+	npm publish
+
+	# restore
+	rm -rf package.json
+	mv .package.json package.json
+
 	rm -rf templates.json browser.js runtime.js browser-polyfill.js
 
 bootstrap:

NOTES.md

@@ -1,8 +1,13 @@
 # Notes
 
- * Wildcard exports/imports wont normalise if `export default` is a non-object.
+ * Wildcard exports/imports wont normalise if `export default` is a non-object. See [#224](https://github.com/6to5/6to5/issues/224).
 
 ## 3.0.0 breaking changes
 
  * Remove `allowImportExportEverywhere` option from acorn.
  * Remove this shorthand from playground.
+ * Remove `super()` inside non-constructors - add descriptive error message.
+ * Split up ES5 getter/setter transforming and ES6 property methods into separate transformers.
+ * Add autoindentation.
+ * Move `super` transformation from classes into a separate transformer that also supports object expressions.
+ * Remove fast transformer backwards compatibility.

bin/6to5/index.js

@@ -15,14 +15,19 @@ commander.option("-e, --experimental", "Enable experimental support for proposed
 commander.option("-p, --playground", "Enable playground support");
 
 commander.option("-m, --modules [modules]", "Module formatter type to use [common]", "common");
-commander.option("-w, --whitelist [whitelist]", "Whitelist of transformers to ONLY use", util.list);
+commander.option("-l, --whitelist [whitelist]", "Whitelist of transformers to ONLY use", util.list);
 commander.option("-b, --blacklist [blacklist]", "Blacklist of transformers to NOT use", util.list);
 commander.option("-i, --optional [list]", "List of optional transformers to enable", util.list);
+commander.option("--loose [list]", "List of transformers to enable their loose mode", util.list);
 commander.option("-o, --out-file [out]", "Compile all input files into a single file");
 commander.option("-d, --out-dir [out]", "Compile an input directory of modules into an output directory");
 commander.option("-c, --remove-comments", "Remove comments from the compiled code", false);
+commander.option("-I, --indent [width]", "Indent width [2]", 2);
 commander.option("-a, --amd-module-ids", "Insert module id in AMD modules", false); // todo: remove in 3.0.0
 commander.option("-m, --module-ids", "Insert module id in modules", false);
+commander.option("-R, --react-compat", "Makes the react transformer produce pre-v0.12 code");
+commander.option("-E, --include-regenerator", "Include the regenerator runtime if necessary", false);
+commander.option("--keep-module-id-extensions", "Keep extensions when generating module ids", false);
 
 commander.on("--help", function(){
   var outKeys = function (title, obj) {
@@ -98,17 +103,26 @@ if (errors.length) {
 //
 
 exports.opts = {
-  sourceMapName: commander.outFile,
-  experimental:  commander.experimental,
-  playground:    commander.playground,
-  moduleIds:     commander.amdModuleIds || commander.moduleIds,
-  blacklist:     commander.blacklist,
-  whitelist:     commander.whitelist,
-  sourceMap:     commander.sourceMaps || commander.sourceMapsInline,
-  optional:      commander.optional,
-  comments:      !commander.removeComments,
-  runtime:       commander.runtime,
-  modules:       commander.modules
+  keepModuleIdExtensions: commander.keepModuleIdExtensions,
+  includeRegenerator:     commander.includeRegenerator,
+  sourceMapName:          commander.outFile,
+  experimental:           commander.experimental,
+  reactCompat:            commander.reactCompat,
+  playground:             commander.playground,
+  moduleIds:              commander.amdModuleIds || commander.moduleIds,
+  blacklist:              commander.blacklist,
+  whitelist:              commander.whitelist,
+  sourceMap:              commander.sourceMaps || commander.sourceMapsInline,
+  optional:               commander.optional,
+  comments:               !commander.removeComments,
+  runtime:                commander.runtime,
+  modules:                commander.modules,
+  loose:                  commander.loose,
+  format: {
+    indent: {
+      style:     util.repeat(parseInt(commander.indent))
+    }
+  }
 };
 
 var fn;

bin/6to5/util.js

@@ -20,7 +20,17 @@ exports.transform = function (filename, code, opts) {
   opts = _.extend(opts || {}, index.opts);
   opts.filename = filename;
 
-  var result = to5.transform(code, opts);
+  var result;
+  try {
+    result = to5.transform(code, opts);
+  } catch (e) {
+    if (e instanceof SyntaxError) {
+      console.error("SyntaxError:", e.message);
+      process.exit(1);
+    } else {
+      throw e;
+    }
+  }
   result.filename = filename;
   result.actual = code;
   return result;

bin/_6to5-node

@@ -10,29 +10,31 @@ var util       = require("../lib/6to5/util");
 var vm         = require("vm");
 var _          = require("lodash");
 
-commander.option("-e, --eval [script]", "Evaluate script");
-commander.option("-p, --print", "Evaluate script and print result");
-commander.option("-i, --ignore [regex]", "Ignore all files that match this regex when using the require hook");
-commander.option("-x, --extensions [extensions]", "List of extensions to hook into [.es6,.js]");
-commander.option("-r, --experimental", "Enable experimental support for proposed ES7 features");
-commander.option("-g, --playground", "Enable playground support");
-commander.option("-c, --cache", "Cache compiled files and require paths");
+var program = new commander.Command("6to5-node");
+
+program.option("-e, --eval [script]", "Evaluate script");
+program.option("-p, --print", "Evaluate script and print result");
+program.option("-i, --ignore [regex]", "Ignore all files that match this regex when using the require hook");
+program.option("-x, --extensions [extensions]", "List of extensions to hook into [.es6,.js]");
+program.option("-r, --experimental", "Enable experimental support for proposed ES7 features");
+program.option("-g, --playground", "Enable playground support");
+program.option("-c, --cache", "Cache compiled files and require paths");
 
 var pkg = require("../package.json");
-commander.version(pkg.version);
-commander.usage("[options] [ -e script | script.js ] [arguments]");
-commander.parse(process.argv);
+program.version(pkg.version);
+program.usage("[options] [ -e script | script.js ] [arguments]");
+program.parse(process.argv);
 
-if (commander.cache) roadrunner.load();
+if (program.cache) roadrunner.load();
 
 //
 
 to5.register({
-  experimental: commander.experimental,
-  extensions:   commander.extensions,
-  playground:   commander.playground,
-  ignore:       commander.ignore,
-  cache:        commander.cache && roadrunner.get("6to5")
+  experimental: program.experimental,
+  extensions:   program.extensions,
+  playground:   program.playground,
+  ignore:       program.ignore,
+  cache:        program.cache && roadrunner.get("6to5")
 });
 
 //
@@ -41,17 +43,17 @@ var _eval = function (code, filename) {
   code = to5.transform(code, {
     filename: filename,
     blacklist: ["useStrict"],
-    experimental: commander.experimental,
-    playground: commander.playground
+    experimental: program.experimental,
+    playground: program.playground
   }).code;
   return vm.runInThisContext(code, filename);
 };
 
-if (commander.eval) {
-  var result = _eval(commander.eval, "eval");
-  if (commander.print) console.log(result);
+if (program.eval) {
+  var result = _eval(program.eval, "eval");
+  if (program.print) console.log(result);
 } else {
-  if (commander.args.length) {
+  if (program.args.length) {
     // slice all arguments up to the first filename since they're 6to5 args that we handle
     var args = process.argv.slice(2);
 
@@ -77,7 +79,7 @@ if (commander.eval) {
   }
 }
 
-if (commander.cache) roadrunner.save();
+if (program.cache) roadrunner.save();
 
 function replStart() {
   repl.start({

bin/generate-core-package-json

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+var pkg = require("../package.json");
+pkg.name += "-core";
+delete pkg.dependencies.chokidar;
+delete pkg.optionalDependencies;
+delete pkg.devDependencies;
+delete pkg.preferGlobal;
+delete pkg.scripts;
+delete pkg.bin;
+console.log(JSON.stringify(pkg, null, "  "));

lib/6to5/browser.js

@@ -1,5 +1,7 @@
 var transform = module.exports = require("./transformation/transform");
 
+transform.version = require("../../package").version;
+
 transform.transform = transform;
 
 transform.run = function (code, opts) {

lib/6to5/file.js

@@ -24,6 +24,7 @@ File.helpers = [
   "prototype-properties",
   "apply-constructor",
   "tagged-template-literal",
+  "tagged-template-literal-loose",
   "interop-require",
   "to-array",
   "sliced-to-array",
@@ -35,32 +36,38 @@ File.helpers = [
   "async-to-generator",
   "interop-require-wildcard",
   "typeof",
-  "exports-wildcard"
+  "extends",
+  "get"
 ];
 
 File.excludeHelpersFromRuntime = [
   "async-to-generator",
-  "typeof"
+  "typeof",
+  "tagged-template-literal-loose"
 ];
 
 File.normaliseOptions = function (opts) {
   opts = _.cloneDeep(opts || {});
 
   _.defaults(opts, {
-    experimental: false,
-    playground:   false,
-    whitespace:   true,
-    moduleIds:    opts.amdModuleIds || false,
-    blacklist:    [],
-    whitelist:    [],
-    sourceMap:    false,
-    optional:     [],
-    comments:     true,
-    filename:     "unknown",
-    modules:      "common",
-    runtime:      false,
-    code:         true,
-    ast:          true
+    keepModuleIdExtensions: false,
+    includeRegenerator:     false,
+    experimental:           false,
+    reactCompat:            false,
+    playground:             false,
+    whitespace:             true,
+    moduleIds:              opts.amdModuleIds || false,
+    blacklist:              [],
+    whitelist:              [],
+    sourceMap:              false,
+    optional:               [],
+    comments:               true,
+    filename:               "unknown",
+    modules:                "common",
+    runtime:                false,
+    loose:                  [],
+    code:                   true,
+    ast:                    true
   });
 
   // normalise windows path separators to unix
@@ -68,6 +75,19 @@ File.normaliseOptions = function (opts) {
 
   opts.blacklist = util.arrayify(opts.blacklist);
   opts.whitelist = util.arrayify(opts.whitelist);
+  opts.optional  = util.arrayify(opts.optional);
+  opts.loose     = util.arrayify(opts.loose);
+
+  // todo: remove in 3.0.0
+  _.each({
+    fastForOf: "forOf",
+    classesFastSuper: "classes"
+  }, function (newTransformer, oldTransformer) {
+    if (_.contains(opts.optional, oldTransformer)) {
+      _.pull(opts.optional, oldTransformer);
+      opts.loose.push(newTransformer);
+    }
+  });
 
   _.defaults(opts, {
     moduleRoot: opts.sourceRoot
@@ -97,10 +117,15 @@ File.normaliseOptions = function (opts) {
   transform._ensureTransformerNames("blacklist", opts.blacklist);
   transform._ensureTransformerNames("whitelist", opts.whitelist);
   transform._ensureTransformerNames("optional", opts.optional);
+  transform._ensureTransformerNames("loose", opts.loose);
 
   return opts;
 };
 
+File.prototype.isLoose = function (key) {
+  return _.contains(this.opts.loose, key);
+};
+
 File.prototype.getTransformers = function () {
   var file = this;
   var transformers = [];

lib/6to5/generation/buffer.js

@@ -61,7 +61,7 @@ Buffer.prototype.space = function () {
 Buffer.prototype.removeLast = function (cha) {
   if (!this.isLast(cha)) return;
 
-  this.buf = this.buf.slice(0, -1);
+  this.buf = this.buf.substr(0, this.buf.length - 1);
   this.position.unshift(cha);
 };
 
@@ -77,10 +77,9 @@ Buffer.prototype.newline = function (i, removeLast) {
     if (this.endsWith("{\n")) i--;
     if (this.endsWith(util.repeat(i, "\n"))) return;
 
-    var self = this;
-    _.times(i, function () {
-      self.newline(null, removeLast);
-    });
+    for (var j = 0; j < i; j++) {
+      this.newline(null, removeLast);
+    }
     return;
   }
 
@@ -115,13 +114,18 @@ Buffer.prototype._push = function (str) {
 };
 
 Buffer.prototype.endsWith = function (str) {
-  return this.buf.slice(-str.length) === str;
+  var d = this.buf.length - str.length;
+  return d >= 0 && this.buf.lastIndexOf(str) === d;
 };
 
 Buffer.prototype.isLast = function (cha, trimRight) {
   var buf = this.buf;
   if (trimRight) buf = util.trimRight(buf);
+  var last = buf[buf.length - 1];
 
-  var chars = [].concat(cha);
-  return _.contains(chars, _.last(buf));
+  if (Array.isArray(cha)) {
+    return _.contains(cha, last);
+  } else {
+    return cha === last;
+  }
 };

lib/6to5/generation/generator.js

@@ -125,7 +125,7 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
 
     var lines = 0;
 
-    if (node.start != null) {
+    if (node.start != null && !node._ignoreUserWhitespace) {
       // user node
       if (leading) {
         lines = self.whitespace.getNewlinesBefore(node);

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

@@ -57,8 +57,28 @@ exports.ThisExpression = function () {
 
 exports.CallExpression = function (node, print) {
   print(node.callee);
+
   this.push("(");
-  print.join(node.arguments, { separator: ", " });
+
+  var separator = ",";
+
+  if (node._prettyCall) {
+    separator += "\n";
+    this.newline();
+    this.indent();
+  } else {
+    separator += " ";
+  }
+
+  print.join(node.arguments, {
+    separator: separator
+  });
+
+  if (node._prettyCall) {
+    this.newline();
+    this.dedent();
+  }
+
   this.push(")");
 };
 

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

@@ -1,4 +1,5 @@
-var t = require("../../types");
+var util = require("../../util");
+var t    = require("../../types");
 
 exports.WithStatement = function (node, print) {
   this.keyword("with");
@@ -106,7 +107,16 @@ exports.TryStatement = function (node, print) {
   this.keyword("try");
   print(node.block);
   this.space();
-  print(node.handler);
+
+  // Esprima bug puts the catch clause in a `handlers` array.
+  // see https://code.google.com/p/esprima/issues/detail?id=433
+  // We run into this from regenerator generated ast.
+  if (node.handlers) {
+    print(node.handlers[0]);
+  } else {
+    print(node.handler);
+  }
+
   if (node.finalizer) {
     this.space();
     this.push("finally ");
@@ -157,7 +167,24 @@ exports.DebuggerStatement = function () {
 exports.VariableDeclaration = function (node, print, parent) {
   this.push(node.kind + " ");
 
-  print.join(node.declarations, { separator: ", " });
+  var inits = 0;
+  var noInits = 0;
+  for (var i in node.declarations) {
+    if (node.declarations[i].init) {
+      inits++;
+    } else {
+      noInits++;
+    }
+  }
+
+  var sep = ",";
+  if (inits > noInits) { // more inits than noinits
+    sep += "\n" + util.repeat(node.kind.length + 1);
+  } else {
+    sep += " ";
+  }
+
+  print.join(node.declarations, { separator: sep });
 
   if (!t.isFor(parent)) {
     this.semicolon();

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

@@ -6,14 +6,19 @@ var t          = require("../../types");
 var _          = require("lodash");
 
 var find = function (obj, node, parent) {
+  if (!obj) return;
   var result;
 
-  _.each(obj, function (fn, type) {
+  var types = Object.keys(obj);
+  for (var i = 0; i < types.length; i++) {
+    var type = types[i];
+
     if (t["is" + type](node)) {
+      var fn = obj[type];
       result = fn(node, parent);
-      if (result != null) return false;
+      if (result != null) break;
     }
-  });
+  }
 
   return result;
 };
@@ -99,7 +104,13 @@ _.each(Node.prototype, function (fn, key) {
   Node[key] = function (node, parent) {
     var n = new Node(node, parent);
 
-    var args = _.toArray(arguments).slice(2);
+    // Avoid leaking arguments to prevent deoptimization
+    var skipCount = 2;
+    var args = new Array(arguments.length - skipCount);
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i + 2];
+    }
+
     return n[key].apply(n, args);
   };
 });

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

@@ -21,6 +21,13 @@ _.each([
   });
 });
 
+exports.UpdateExpression = function (node, parent) {
+  if (t.isMemberExpression(parent) && parent.object === node) {
+    // (foo++).test()
+    return true;
+  }
+};
+
 exports.ObjectExpression = function (node, parent) {
   if (t.isExpressionStatement(parent)) {
     // ({ foo: "bar" });

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

@@ -62,11 +62,15 @@ _.each({
   CallExpression: { after: 1 },
   Literal: { after: 1 }
 }, function (amounts, type) {
-  if (_.isNumber(amounts)) amounts = { after: amounts, before: amounts };
+  if (_.isNumber(amounts)) {
+    amounts = { after: amounts, before: amounts };
+  }
 
-  _.each(amounts, function (amount, key) {
-    exports[key].nodes[type] = function () {
-      return amount;
-    };
+  _.each([type].concat(t.FLIPPED_ALIAS_KEYS[type] || []), function (type) {
+    _.each(amounts, function (amount, key) {
+      exports[key].nodes[type] = function () {
+        return amount;
+      };
+    });
   });
 });

lib/6to5/generation/position.js

@@ -1,33 +1,27 @@
 module.exports = Position;
 
-var _ = require("lodash");
-
 function Position() {
   this.line = 1;
   this.column = 0;
 }
 
 Position.prototype.push = function (str) {
-  var self = this;
-
-  _.each(str, function (cha) {
-    if (cha === "\n") {
-      self.line++;
-      self.column = 0;
+  for (var i = 0; i < str.length; i++) {
+    if (str[i] === "\n") {
+      this.line++;
+      this.column = 0;
     } else {
-      self.column++;
+      this.column++;
     }
-  });
+  }
 };
 
 Position.prototype.unshift = function (str) {
-  var self = this;
-
-  _.each(str, function (cha) {
-    if (cha === "\n") {
-      self.line--;
+  for (var i = 0; i < str.length; i++) {
+    if (str[i] === "\n") {
+      this.line--;
     } else {
-      self.column--;
+      this.column--;
     }
-  });
+  }
 };

lib/6to5/generation/whitespace.js

@@ -11,15 +11,18 @@ Whitespace.prototype.getNewlinesBefore = function (node) {
   var startToken;
   var endToken;
   var tokens = this.tokens;
+  var token;
+
+  for (var i = 0; i < tokens.length; i++) {
+    token = tokens[i];
 
-  _.each(tokens, function (token, i) {
     // this is the token this node starts with
     if (node.start === token.start) {
       startToken = tokens[i - 1];
       endToken = token;
-      return false;
+      break;
     }
-  });
+  }
 
   return this.getNewlinesBetween(startToken, endToken);
 };
@@ -28,20 +31,29 @@ Whitespace.prototype.getNewlinesAfter = function (node) {
   var startToken;
   var endToken;
   var tokens = this.tokens;
+  var token;
+
+  for (var i = 0; i < tokens.length; i++) {
+    token = tokens[i];
 
-  _.each(tokens, function (token, i) {
     // this is the token this node ends with
     if (node.end === token.end) {
       startToken = token;
       endToken = tokens[i + 1];
-      return false;
+      break;
     }
-  });
+  }
 
   if (endToken.type.type === "eof") {
     return 1;
   } else {
-    return this.getNewlinesBetween(startToken, endToken);
+    var lines = this.getNewlinesBetween(startToken, endToken);
+    if (node.type === "Line" && !lines) {
+      // line comment
+      return 1;
+    } else {
+      return lines;
+    }
   }
 };
 

lib/6to5/index.js

@@ -3,6 +3,8 @@ var util      = require("./util");
 var fs        = require("fs");
 var _         = require("lodash");
 
+exports.version = require("../../package").version;
+
 exports.types = require("./types");
 
 exports.runtime = require("./runtime-generator");

lib/6to5/register-browser.js

@@ -1,4 +1,5 @@
-// Required to safely use 6to5/register within a browserify codebase.
+// required to safely use 6to5/register within a browserify codebase
+
 module.exports = function () {};
 
 require("./polyfill");

lib/6to5/register.js

@@ -123,7 +123,7 @@ var hookExtensions = function (_exts) {
   });
 };
 
-hookExtensions([".es6", ".es", ".js"]);
+hookExtensions(util.canCompile.EXTENSIONS);
 
 module.exports = function (opts) {
   // normalise options

lib/6to5/runtime-generator.js

@@ -20,7 +20,7 @@ module.exports = function (namespace) {
 
   _.each(File.helpers, function (name) {
     if (_.contains(File.excludeHelpersFromRuntime, name)) {
-      return false;
+      return;
     }
 
     var key = t.identifier(t.toIdentifier(name));

lib/6to5/transformation/modules/_default.js

@@ -13,7 +13,7 @@ function DefaultFormatter(file) {
 
   this.remapAssignments();
 
-  this.checkCollisions();
+  //this.checkCollisions();
 }
 
 DefaultFormatter.prototype.getLocalExports = function () {
@@ -156,11 +156,16 @@ DefaultFormatter.prototype.getModuleName = function () {
     filenameRelative = filenameRelative.replace(sourceRootRegEx, "");
   }
 
-  // remove extension
-  filenameRelative = filenameRelative.replace(/\.(.*?)$/, "");
+  if (!opts.keepModuleIdExtensions) {
+    // remove extension
+    filenameRelative = filenameRelative.replace(/\.(.*?)$/, "");
+  }
 
   moduleName += filenameRelative;
 
+  // normalise path separators
+  moduleName = moduleName.replace(/\\/g, "/");
+
   return moduleName;
 };
 
@@ -214,7 +219,8 @@ DefaultFormatter.prototype._exportSpecifier = function (getRef, specifier, node,
 };
 
 DefaultFormatter.prototype._exportsWildcard = function (objectIdentifier) {
-  return t.expressionStatement(t.callExpression(this.file.addHelper("exports-wildcard"), [
+  return t.expressionStatement(t.callExpression(this.file.addHelper("defaults"), [
+    t.identifier("exports"),
     t.callExpression(this.file.addHelper("interop-require-wildcard"), [objectIdentifier])
   ]));
 };

lib/6to5/transformation/modules/_strict.js

@@ -0,0 +1,12 @@
+var util = require("../../util");
+
+module.exports = function (Parent) {
+  var Constructor = function () {
+    this.noInteropExport = true;
+    Parent.apply(this, arguments);
+  };
+
+  util.inherits(Constructor, Parent);
+
+  return Constructor;
+};

lib/6to5/transformation/modules/amd-strict.js

@@ -0,0 +1 @@
+module.exports = require("./_strict")(require("./amd"));

lib/6to5/transformation/modules/amd.js

@@ -7,8 +7,8 @@ var t                = require("../../types");
 var _                = require("lodash");
 
 function AMDFormatter() {
-  DefaultFormatter.apply(this, arguments);
-  this.ids  = {};
+  CommonFormatter.apply(this, arguments);
+  this.ids = {};
 }
 
 util.inherits(AMDFormatter, DefaultFormatter);
@@ -101,7 +101,7 @@ AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
 };
 
 AMDFormatter.prototype.exportDeclaration = function (node) {
-  if (node.default) {
+  if (node.default && !this.noInteropExport) {
     this.passModuleArg = true;
   }
 

lib/6to5/transformation/modules/common-strict.js

@@ -0,0 +1 @@
+module.exports = require("./_strict")(require("./common"));

lib/6to5/transformation/modules/common.js

@@ -61,7 +61,7 @@ CommonJSFormatter.prototype.importDeclaration = function (node, nodes) {
 };
 
 CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
-  if (node.default && !this.exportIdentifier) {
+  if (node.default && !this.noInteropRequire && !this.noInteropExport) {
     var declar = node.declaration;
     var assign;
 
@@ -83,10 +83,12 @@ CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
       // this export isn't a function so we can't hoist it to the top so we need to set it
       // at the very end of the file with something like:
       //
-      //   module.exports = Object.assign(exports["default"], exports)
+      //   module.exports = _extends(exports["default"], exports)
       //
 
-      assign = util.template("common-export-default-assign", true);
+      assign = util.template("common-export-default-assign", {
+        EXTENDS_HELPER: this.file.addHelper("extends")
+      }, true);
       assign._blockHoist = 0;
 
       nodes.push(assign);

lib/6to5/transformation/modules/umd-strict.js

@@ -0,0 +1 @@
+module.exports = require("./_strict")(require("./umd"));

lib/6to5/transformation/modules/umd.js

@@ -31,17 +31,18 @@ UMDFormatter.prototype.transform = function (ast) {
 
   var factory = t.functionExpression(null, args, t.blockStatement(body));
 
-  // runner
+  // amd
 
   var defineArgs = [t.literal("exports")];
   if (this.passModuleArg) defineArgs.push(t.literal("module"));
   defineArgs = defineArgs.concat(names);
   defineArgs = [t.arrayExpression(defineArgs)];
 
-  // typeof exports !== "undefined" && typeof module !== "undefined"
-  var testExports = t.binaryExpression("!==", t.unaryExpression("typeof", t.identifier("exports"), true), t.literal("undefined")),
-      testModule = t.binaryExpression("!==", t.unaryExpression("typeof", t.identifier("module"), true), t.literal("undefined")),
-      commonTests = this.passModuleArg ? t.logicalExpression("&&", testExports, testModule) : testExports;
+  // common
+
+  var testExports = util.template("test-exports");
+  var testModule  = util.template("test-module");
+  var commonTests = this.passModuleArg ? t.logicalExpression("&&", testExports, testModule) : testExports;
 
   var commonArgs = [t.identifier("exports")];
   if (this.passModuleArg) commonArgs.push(t.identifier("module"));
@@ -49,6 +50,12 @@ UMDFormatter.prototype.transform = function (ast) {
     return t.callExpression(t.identifier("require"), [name]);
   }));
 
+  // globals
+
+  //var umdArgs = [];
+
+  //
+
   var moduleName = this.getModuleName();
   if (moduleName) defineArgs.unshift(t.literal(moduleName));
 

lib/6to5/transformation/templates/class-super-constructor-call-loose.js

@@ -0,0 +1,3 @@
+if (SUPER_NAME != null) {
+  SUPER_NAME.apply(this, arguments);
+}

lib/6to5/transformation/templates/class-super-constructor-call.js

@@ -1,3 +1,3 @@
-if (SUPER_NAME !== null) {
-  SUPER_NAME.apply(this, arguments);
+if (Object.getPrototypeOf(CLASS_NAME) !== null) {
+  Object.getPrototypeOf(CLASS_NAME).apply(this, arguments);
 }

lib/6to5/transformation/templates/common-export-default-assign.js

@@ -1 +1 @@
-module.exports = Object.assign(exports["default"], exports);
+module.exports = EXTENDS_HELPER(exports["default"], exports);

lib/6to5/transformation/templates/exports-wildcard.js

@@ -1,7 +0,0 @@
-(function (obj) {
-  for (var i in obj) {
-    if (exports[i] !== undefined) {
-      exports[i] = obj[i];
-    }
-  }
-})

lib/6to5/transformation/templates/extends.js

@@ -0,0 +1,9 @@
+(function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+    for (var key in source) {
+      target[key] = source[key];
+    }
+  }
+  return target;
+})

lib/6to5/transformation/templates/for-of-loose.js

@@ -0,0 +1,13 @@
+for (var LOOP_OBJECT = OBJECT,
+         IS_ARRAY = Array.isArray(LOOP_OBJECT),
+         INDEX = 0,
+         LOOP_OBJECT = IS_ARRAY ? LOOP_OBJECT : LOOP_OBJECT[Symbol.iterator]();;) {
+  if (IS_ARRAY) {
+    if (INDEX >= LOOP_OBJECT.length) break;
+    ID = LOOP_OBJECT[INDEX++];
+  } else {
+    INDEX = LOOP_OBJECT.next();
+    if (INDEX.done) break;
+    ID = INDEX.value;
+  }
+}

lib/6to5/transformation/templates/get.js

@@ -0,0 +1,23 @@
+(function get(object, property, receiver) {
+  var desc = Object.getOwnPropertyDescriptor(object, property);
+
+  if (desc === undefined) {
+    var parent = Object.getPrototypeOf(object);
+
+    if (parent === null) {
+      return undefined;
+    } else {
+      return get(parent, property, receiver);
+    }
+  } else if ("value" in desc && desc.writable) {
+    return desc.value;
+  } else {
+    var getter = desc.get;
+
+    if (getter === undefined) {
+      return undefined;
+    }
+
+    return getter.call(receiver);
+  }
+});

lib/6to5/transformation/templates/inherits.js

@@ -1,14 +1,14 @@
-(function (child, parent) {
-  if (typeof parent !== "function" && parent !== null) {
-    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+(function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
   }
-  child.prototype = Object.create(parent && parent.prototype, {
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
     constructor: {
-      value: child,
+      value: subClass,
       enumerable: false,
       writable: true,
       configurable: true
     }
   });
-  if (parent) child.__proto__ = parent;
+  if (superClass) subClass.__proto__ = superClass;
 })

lib/6to5/transformation/templates/object-define-properties-closure.js

@@ -1,5 +0,0 @@
-
-(function (KEY) {
-  CONTENT;
-  return KEY;
-})(OBJECT);

lib/6to5/transformation/templates/object-define-properties.js

@@ -1 +0,0 @@
-Object.defineProperties(OBJECT, PROPS);

lib/6to5/transformation/templates/tagged-template-literal-loose.js

@@ -0,0 +1,4 @@
+(function (strings, raw) {
+  strings.raw = raw;
+  return strings;
+});

lib/6to5/transformation/templates/test-exports.js

@@ -0,0 +1 @@
+typeof exports !== "undefined"

lib/6to5/transformation/templates/test-module.js

@@ -0,0 +1 @@
+typeof module !== "undefined"

lib/6to5/transformation/transform.js

@@ -31,14 +31,20 @@ transform._ensureTransformerNames = function (type, keys) {
 transform.transformers = {};
 
 transform.moduleFormatters = {
-  common: require("./modules/common"),
-  system: require("./modules/system"),
-  ignore: require("./modules/ignore"),
-  amd:    require("./modules/amd"),
-  umd:    require("./modules/umd")
+  commonStrict: require("./modules/common-strict"),
+  umdStrict:    require("./modules/umd-strict"),
+  amdStrict:    require("./modules/amd-strict"),
+  common:       require("./modules/common"),
+  system:       require("./modules/system"),
+  ignore:       require("./modules/ignore"),
+  amd:          require("./modules/amd"),
+  umd:          require("./modules/umd")
 };
 
 _.each({
+  specNoForInOfAssignment:   require("./transformers/spec-no-for-in-of-assignment"),
+  specSetters:               require("./transformers/spec-setters"),
+
   // playground
   methodBinding:             require("./transformers/playground-method-binding"),
   memoizationOperator:       require("./transformers/playground-memoization-operator"),
@@ -55,13 +61,12 @@ _.each({
   arrowFunctions:            require("./transformers/es6-arrow-functions"),
   classes:                   require("./transformers/es6-classes"),
 
-  computedPropertyNames:     require("./transformers/es6-computed-property-names"),
-
   objectSpread:              require("./transformers/es7-object-spread"),
   exponentiationOperator:    require("./transformers/es7-exponentiation-operator"),
   spread:                    require("./transformers/es6-spread"),
   templateLiterals:          require("./transformers/es6-template-literals"),
   propertyMethodAssignment:  require("./transformers/es6-property-method-assignment"),
+  computedPropertyNames:     require("./transformers/es6-computed-property-names"),
   destructuring:             require("./transformers/es6-destructuring"),
   defaultParameters:         require("./transformers/es6-default-parameters"),
   forOf:                     require("./transformers/es6-for-of"),

lib/6to5/transformation/transformers/es6-classes.js

@@ -3,36 +3,11 @@ var util     = require("../../util");
 var t        = require("../../types");
 
 exports.ClassDeclaration = function (node, parent, file, scope) {
-  var closure = true;
-  if (t.isProgram(parent) || t.isBlockStatement(parent)) {
-    closure = false;
-  }
-
-  var factory = new Class(node, file, scope, closure);
-  var newNode = factory.run();
-  if (factory.closure) {
-    if (closure) {
-      // declaration in an expression context...
-      // export default class Foo {}
-      scope.push({
-        kind: "var",
-        key: node.id.key,
-        id: node.id
-      });
-      return t.assignmentExpression("=", node.id, newNode);
-    } else {
-      // has a super class or PrivateDeclaration etc
-      return t.variableDeclaration("let", [
-        t.variableDeclarator(node.id, newNode)
-      ]);
-    }
-  } else {
-    return newNode;
-  }
+  return new Class(node, file, scope, true).run();
 };
 
 exports.ClassExpression = function (node, parent, file, scope) {
-  return new Class(node, file, scope, true).run();
+  return new Class(node, file, scope, false).run();
 };
 
 /**
@@ -44,11 +19,11 @@ exports.ClassExpression = function (node, parent, file, scope) {
  * @param {Boolean} closure
  */
 
-function Class(node, file, scope, closure) {
-  this.closure = closure;
-  this.scope   = scope;
-  this.node    = node;
-  this.file    = file;
+function Class(node, file, scope, isStatement) {
+  this.isStatement = isStatement;
+  this.scope       = scope;
+  this.node        = node;
+  this.file        = file;
 
   this.hasInstanceMutators = false;
   this.hasStaticMutators   = false;
@@ -58,6 +33,7 @@ function Class(node, file, scope, closure) {
   this.hasConstructor     = false;
   this.className          = node.id || file.generateUidIdentifier("class", scope);
   this.superName          = node.superClass;
+  this.isLoose            = file.isLoose("classes");
 }
 
 /**
@@ -75,25 +51,32 @@ Class.prototype.run = function () {
 
   var body = this.body = [];
 
-  var constructor = t.functionExpression(null, [], t.blockStatement([]));
-  if (this.node.id) constructor.id = className;
+  var constructor;
+  if (this.node.id) {
+    constructor = t.functionDeclaration(className, [], t.blockStatement([]));
+    body.push(constructor);
+  } else {
+    constructor = t.functionExpression(null, [], t.blockStatement([]));
+    body.push(t.variableDeclaration("var", [
+      t.variableDeclarator(className, constructor)
+    ]));
+  }
   this.constructor = constructor;
 
-  body.push(t.variableDeclaration("let", [
-    t.variableDeclarator(className, constructor)
-  ]));
+  var closureParams = [];
+  var closureArgs = [];
 
   //
 
   if (superName) {
-    this.closure = true;
+    closureArgs.push(superName);
 
-    // so we're only evaluating it once
-    var superRef = this.scope.generateUidBasedOnNode(superName, this.file);
-    body.unshift(t.variableDeclaration("var", [
-      t.variableDeclarator(superRef, superName)
-    ]));
-    superName = superRef;
+    if (!t.isIdentifier(superName)) {
+      var superRef = this.scope.generateUidBasedOnNode(superName, this.file);
+      superName = superRef;
+    }
+
+    closureParams.push(superName);
 
     this.superName = superName;
     body.push(t.expressionStatement(t.callExpression(file.addHelper("inherits"), [className, superName])));
@@ -103,19 +86,25 @@ Class.prototype.run = function () {
 
   t.inheritsComments(body[0], this.node);
 
-  if (this.closure) {
-    if (body.length === 1) {
-      // only a constructor so no need for a closure container
-      return constructor;
-    } else {
-      body.push(t.returnStatement(className));
-      return t.callExpression(
-        t.functionExpression(null, [], t.blockStatement(body)),
-        []
-      );
-    }
+  var init;
+
+  if (body.length === 1) {
+    // only a constructor so no need for a closure container
+    init = t.toExpression(constructor);
   } else {
-    return body;
+    body.push(t.returnStatement(className));
+    init = t.callExpression(
+      t.functionExpression(null, closureParams, t.blockStatement(body)),
+      closureArgs
+    );
+  }
+
+  if (this.isStatement) {
+    return t.variableDeclaration("let", [
+      t.variableDeclarator(className, init)
+    ]);
+  } else {
+    return init;
   }
 };
 
@@ -129,27 +118,31 @@ Class.prototype.buildBody = function () {
   var superName   = this.superName;
   var classBody   = this.node.body.body;
   var body        = this.body;
-  var self        = this;
 
   for (var i in classBody) {
     var node = classBody[i];
     if (t.isMethodDefinition(node)) {
-      self.replaceInstanceSuperReferences(node);
+      this.replaceInstanceSuperReferences(node);
 
       if (node.key.name === "constructor") {
-        self.pushConstructor(node);
+        this.pushConstructor(node);
       } else {
-        self.pushMethod(node);
+        this.pushMethod(node);
       }
     } else if (t.isPrivateDeclaration(node)) {
-      self.closure = true;
+      this.closure = true;
       body.unshift(node);
     }
   }
 
+  // we have no constructor, we have a super, and the super doesn't appear to be falsy
   if (!this.hasConstructor && superName && !t.isFalsyExpression(superName)) {
-    constructor.body.body.push(util.template("class-super-constructor-call", {
-      SUPER_NAME: superName
+    var defaultConstructorTemplate = "class-super-constructor-call";
+    if (this.isLoose) defaultConstructorTemplate += "-loose";
+
+    constructor.body.body.push(util.template(defaultConstructorTemplate, {
+      CLASS_NAME: className,
+      SUPER_NAME: this.superName
     }, true));
   }
 
@@ -157,15 +150,11 @@ Class.prototype.buildBody = function () {
   var staticProps;
 
   if (this.hasInstanceMutators) {
-    var protoId = util.template("prototype-identifier", {
-      CLASS_NAME: className
-    });
-
-    instanceProps = util.buildDefineProperties(this.instanceMutatorMap, protoId);
+    instanceProps = util.buildDefineProperties(this.instanceMutatorMap);
   }
 
   if (this.hasStaticMutators) {
-    staticProps = util.buildDefineProperties(this.staticMutatorMap, className);
+    staticProps = util.buildDefineProperties(this.staticMutatorMap);
   }
 
   if (instanceProps || staticProps) {
@@ -190,41 +179,74 @@ Class.prototype.pushMethod = function (node) {
   var methodName = node.key;
 
   var kind = node.kind;
+  var mutatorMap = this.instanceMutatorMap;
+  if (node.static) {
+    this.hasStaticMutators = true;
+    mutatorMap = this.staticMutatorMap;
+  } else {
+    this.hasInstanceMutators = true;
+  }
 
   if (kind === "") {
-    // method
+    if (this.isLoose) {
+      // use assignments instead of define properties for loose classes
 
-    var className = this.className;
-    if (!node.static) className = t.memberExpression(className, t.identifier("prototype"));
-    methodName = t.memberExpression(className, methodName, node.computed);
+      var className = this.className;
+      if (!node.static) className = t.memberExpression(className, t.identifier("prototype"));
+      methodName = t.memberExpression(className, methodName, node.computed);
 
-    var expr = t.expressionStatement(t.assignmentExpression("=", methodName, node.value));
-    t.inheritsComments(expr, node);
-    this.body.push(expr);
-  } else {
-    // mutator
-    var mutatorMap = this.instanceMutatorMap;
-    if (node.static) {
-      this.hasStaticMutators = true;
-      mutatorMap = this.staticMutatorMap;
-    } else {
-      this.hasInstanceMutators = true;
+      var expr = t.expressionStatement(t.assignmentExpression("=", methodName, node.value));
+      t.inheritsComments(expr, node);
+      this.body.push(expr);
+      return;
     }
-    util.pushMutatorMap(mutatorMap, methodName, kind, node);
+
+    kind = "value";
   }
+
+  util.pushMutatorMap(mutatorMap, methodName, kind, node.computed, node);
 };
 
 /**
- * Given a `methodNode`, produce a `MemberExpression` super class reference.
+ * Gets a node representing the super class value of the named property.
  *
- * @param {Node} methodNode MethodDefinition
- * @param {Node} node Identifier
- * @param {Node} parent
+ * @example
+ *
+ *   _get(Object.getPrototypeOf(CLASS.prototype), "METHOD", this)
+ *
+ * @param {Node} property
+ * @param {boolean} isStatic
+ * @param {boolean} isComputed
  *
  * @returns {Node}
  */
 
-Class.prototype.superIdentifier = function (methodNode, id, parent) {
+Class.prototype.superProperty = function (property, isStatic, isComputed, thisExpression) {
+  return t.callExpression(
+    this.file.addHelper("get"),
+    [
+      t.callExpression(
+        t.memberExpression(t.identifier("Object"), t.identifier("getPrototypeOf")),
+        [
+          isStatic ? this.className : t.memberExpression(this.className, t.identifier("prototype"))
+        ]
+      ),
+      isComputed ? property : t.literal(property.name),
+      thisExpression
+    ]
+  );
+};
+
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {Object} id
+ * @param {Object} parent
+ * @returns {Object}
+ */
+
+Class.prototype.looseSuperProperty = function (methodNode, id, parent) {
   var methodName = methodNode.key;
   var superName  = this.superName || t.identifier("Function");
 
@@ -264,23 +286,112 @@ Class.prototype.superIdentifier = function (methodNode, id, parent) {
 
 Class.prototype.replaceInstanceSuperReferences = function (methodNode) {
   var method = methodNode.value;
-  var self = this;
+  var self   = this;
 
-  traverse(method, {
-    enter: function (node, parent) {
-      if (t.isIdentifier(node, { name: "super" })) {
-        return self.superIdentifier(methodNode, node, parent);
-      } else if (t.isCallExpression(node)) {
-        var callee = node.callee;
+  var topLevelThisReference;
+
+  traverseLevel(method, true);
+
+  if (topLevelThisReference) {
+    method.body.body.unshift(t.variableDeclaration("var", [
+      t.variableDeclarator(topLevelThisReference, t.thisExpression())
+    ]));
+  }
+
+  function traverseLevel(node, topLevel) {
+    traverse(node, {
+      enter: function (node, parent) {
+        if (t.isFunction(node) && !t.isArrowFunctionExpression(node)) {
+          // we need to call traverseLevel again so we're context aware
+          traverseLevel(node, false);
+          return this.skip();
+        }
+
+        var getThisReference = function () {
+          if (topLevel) {
+            // top level so `this` is the instance
+            return t.thisExpression();
+          } else {
+            // not in the top level so we need to create a reference
+            return topLevelThisReference = topLevelThisReference || self.file.generateUidIdentifier("this");
+          }
+        };
+
+        var callback = specHandle;
+        if (self.isLoose) callback = looseHandle;
+        return callback(getThisReference, node, parent);
+      }
+    });
+  }
+
+  function looseHandle(getThisReference, node, parent) {
+    if (t.isIdentifier(node, { name: "super" })) {
+      return self.looseSuperProperty(methodNode, node, parent);
+    } else if (t.isCallExpression(node)) {
+      var callee = node.callee;
+      if (!t.isMemberExpression(callee)) return;
+      if (callee.object.name !== "super") return;
+
+      // super.test(); -> ClassName.prototype.MethodName.call(this);
+      t.appendToMemberExpression(callee, t.identifier("call"));
+      node.arguments.unshift(getThisReference());
+    }
+  }
+
+  function specHandle(getThisReference, node, parent) {
+    var property;
+    var computed;
+    var args;
+
+    if (t.isIdentifier(node, { name: "super" })) {
+      if (!(t.isMemberExpression(parent) && !parent.computed && parent.property === node)) {
+        throw self.file.errorWithNode(node, "illegal use of bare super");
+      }
+    } else if (t.isCallExpression(node)) {
+      var callee = node.callee;
+      if (t.isIdentifier(callee, { name: "super" })) {
+        // super(); -> _get(Object.getPrototypeOf(ClassName), "MethodName", this).call(this);
+        property = methodNode.key;
+        computed = methodNode.computed;
+        args = node.arguments;
+      } else {
         if (!t.isMemberExpression(callee)) return;
         if (callee.object.name !== "super") return;
 
-        // super.test(); -> ClassName.prototype.MethodName.call(this);
-        t.appendToMemberExpression(callee, t.identifier("call"));
-        node.arguments.unshift(t.thisExpression());
+        // super.test(); -> _get(Object.getPrototypeOf(ClassName.prototype), "test", this).call(this);
+        property = callee.property;
+        computed = callee.computed;
+        args = node.arguments;
       }
+    } else if (t.isMemberExpression(node)) {
+      if (!t.isIdentifier(node.object, { name: "super" })) return;
+
+      // super.name; -> _get(Object.getPrototypeOf(ClassName.prototype), "name", this);
+      property = node.property;
+      computed = node.computed;
     }
-  });
+
+    if (!property) return;
+
+    var thisReference = getThisReference();
+    var superProperty = self.superProperty(property, methodNode.static, computed, thisReference);
+    if (args) {
+      if (args.length === 1 && t.isSpreadElement(args[0])) {
+        // super(...arguments);
+        return t.callExpression(
+          t.memberExpression(superProperty, t.identifier("apply")),
+          [thisReference, args[0].argument]
+        );
+      } else {
+        return t.callExpression(
+          t.memberExpression(superProperty, t.identifier("call")),
+          [thisReference].concat(args)
+        );
+      }
+    } else {
+      return superProperty;
+    }
+  }
 };
 
 /**
@@ -290,7 +401,7 @@ Class.prototype.replaceInstanceSuperReferences = function (methodNode) {
  */
 
 Class.prototype.pushConstructor = function (method) {
-  if (method.kind !== "") {
+  if (method.kind) {
     throw this.file.errorWithNode(method, "illegal kind for constructor method");
   }
 
@@ -302,8 +413,9 @@ Class.prototype.pushConstructor = function (method) {
   t.inherits(construct, fn);
   t.inheritsComments(construct, method);
 
-  construct.defaults = fn.defaults;
-  construct.params   = fn.params;
-  construct.body     = fn.body;
-  construct.rest     = fn.rest;
+  construct._ignoreUserWhitespace = true;
+  construct.defaults              = fn.defaults;
+  construct.params                = fn.params;
+  construct.body                  = fn.body;
+  construct.rest                  = fn.rest;
 };

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

@@ -2,29 +2,66 @@ var t = require("../../types");
 
 exports.ObjectExpression = function (node, parent, file, scope) {
   var hasComputed = false;
-  var prop;
-  var key;
-  var i;
 
-  for (i in node.properties) {
-    hasComputed = t.isProperty(node.properties[i], { computed: true });
+  for (var i in node.properties) {
+    hasComputed = t.isProperty(node.properties[i], { computed: true, kind: "init" });
     if (hasComputed) break;
   }
 
   if (!hasComputed) return;
 
+  var initProps = [];
   var objId = scope.generateUidBasedOnNode(parent, file);
 
+  //
+
   var body = [];
   var container = t.functionExpression(null, [], t.blockStatement(body));
   container._aliasFunction = true;
 
+  //
+
+  var callback = spec;
+  if (file.isLoose("computedPropertyNames")) callback = loose;
+
+  var result = callback(node, body, objId, initProps, file);
+  if (result) return result;
+
+  //
+
+  body.unshift(t.variableDeclaration("var", [
+    t.variableDeclarator(objId, t.objectExpression(initProps))
+  ]));
+
+  body.push(t.returnStatement(objId));
+
+  return t.callExpression(container, []);
+};
+
+var loose = function (node, body, objId) {
+  for (var i in node.properties) {
+    var prop = node.properties[i];
+
+    body.push(t.expressionStatement(
+      t.assignmentExpression(
+        "=",
+        t.memberExpression(objId, prop.key, prop.computed),
+        prop.value
+      )
+    ));
+  }
+};
+
+var spec = function (node, body, objId, initProps, file) {
   var props = node.properties;
+  var prop, key;
 
   // normalise key
 
-  for (i in props) {
+  for (var i in props) {
     prop = props[i];
+    if (prop.kind !== "init") continue;
+
     key = prop.key;
 
     if (!prop.computed && t.isIdentifier(key)) {
@@ -34,7 +71,6 @@ exports.ObjectExpression = function (node, parent, file, scope) {
 
   // add all non-computed properties and `__proto__` properties to the initializer
 
-  var initProps = [];
   var broken = false;
 
   for (i in props) {
@@ -44,7 +80,7 @@ exports.ObjectExpression = function (node, parent, file, scope) {
       broken = true;
     }
 
-    if (!broken || t.isLiteral(t.toComputedKey(prop, prop.key), { value: "__proto__" })) {
+    if (prop.kind !== "init" || !broken || t.isLiteral(t.toComputedKey(prop, prop.key), { value: "__proto__" })) {
       initProps.push(prop);
       props[i] = null;
     }
@@ -84,14 +120,4 @@ exports.ObjectExpression = function (node, parent, file, scope) {
       return first;
     }
   }
-
-  //
-
-  body.unshift(t.variableDeclaration("var", [
-    t.variableDeclarator(objId, t.objectExpression(initProps))
-  ]));
-
-  body.push(t.returnStatement(objId));
-
-  return t.callExpression(container, []);
 };

lib/6to5/transformation/transformers/es6-default-parameters.js

@@ -1,7 +1,6 @@
 var traverse = require("../../traverse");
 var util     = require("../../util");
 var t        = require("../../types");
-var _        = require("lodash");
 
 exports.Function = function (node, parent, file, scope) {
   if (!node.defaults || !node.defaults.length) return;
@@ -15,6 +14,23 @@ exports.Function = function (node, parent, file, scope) {
   var i;
   var def;
 
+  var checkTDZ = function (ids) {
+    var check = function (node, parent) {
+      if (!t.isIdentifier(node) || !t.isReferenced(node, parent)) return;
+
+      if (ids.indexOf(node.name) >= 0) {
+        throw file.errorWithNode(node, "Temporal dead zone - accessing a variable before it's initialized");
+      }
+
+      if (scope.has(node.name, true)) {
+        iife = true;
+      }
+    };
+
+    check(def, node);
+    traverse(def, { enter: check });
+  };
+
   for (i in node.defaults) {
     def = node.defaults[i];
     if (!def) continue;
@@ -23,25 +39,13 @@ exports.Function = function (node, parent, file, scope) {
 
     // temporal dead zone check - here we prevent accessing of params that
     // are to the right - ie. uninitialized parameters
-    _.each(ids.slice(i), function (ids) {
-      var check = function (node, parent) {
-        if (!t.isIdentifier(node) || !t.isReferenced(node, parent)) return;
-
-        if (ids.indexOf(node.name) >= 0) {
-          throw file.errorWithNode(node, "Temporal dead zone - accessing a variable before it's initialized");
-        }
-
-        if (scope.has(node.name)) {
-          iife = true;
-        }
-      };
-
-      check(def, node);
-      traverse(def, { enter: check });
-    });
+    var rightIds = ids.slice(i);
+    for (i in rightIds) {
+      checkTDZ(rightIds[i]);
+    }
 
     // we're accessing a variable that's already defined within this function
-    var has = scope.get(param.name);
+    var has = scope.get(param.name, true);
     if (has && node.params.indexOf(has) < 0) {
       iife = true;
     }

lib/6to5/transformation/transformers/es6-destructuring.js

@@ -134,7 +134,7 @@ var pushPattern = function (opts) {
   var file = opts.file;
   var scope = opts.scope;
 
-  if (!t.isMemberExpression(parentId) && !t.isIdentifier(parentId)) {
+  if (!t.isArrayExpression(parentId) && !t.isMemberExpression(parentId) && !t.isIdentifier(parentId)) {
     var key = scope.generateUidBasedOnNode(parentId, file);
 
     nodes.push(t.variableDeclaration("var", [
@@ -300,10 +300,17 @@ exports.VariableDeclaration = function (node, parent, file, scope) {
       file:    file,
       scope:   scope
     };
+
     if (t.isPattern(pattern) && patternId) {
       pushPattern(opts);
+
+      if (+i !== node.declarations.length - 1) {
+        // we aren't the last declarator so let's just make the
+        // last transformed node inherit from us
+        t.inherits(nodes[nodes.length - 1], declar);
+      }
     } else {
-      nodes.push(buildVariableAssign(opts, declar.id, declar.init));
+      nodes.push(t.inherits(buildVariableAssign(opts, declar.id, declar.init), declar));
     }
   }
 

lib/6to5/transformation/transformers/es6-for-of.js

@@ -2,15 +2,79 @@ var util = require("../../util");
 var t    = require("../../types");
 
 exports.ForOfStatement = function (node, parent, file, scope) {
+  var callback = spec;
+  if (file.isLoose("forOf")) callback = loose;
+
+  var build  = callback(node, parent, file, scope);
+  var declar = build.declar;
+  var loop   = build.loop;
+  var block  = loop.body;
+
+  // inherit comments from the original loop
+  t.inheritsComments(loop, node);
+
+  // ensure that it's a block so we can take all it's statemetns
+  t.ensureBlock(node);
+
+  // add the value declaration to the new loop body
+  if (declar){
+    if (build.shouldUnshift) {
+      block.body.unshift(declar);
+    } else {
+      block.body.push(declar);
+    }
+  }
+
+  // push the rest of the original loop body onto our new body
+  block.body = block.body.concat(node.body.body);
+
+  return loop;
+};
+
+var loose = function (node, parent, file, scope) {
+  var left = node.left;
+  var declar, id;
+
+  if (t.isIdentifier(left) || t.isPattern(left)) {
+    // for (i of test), for ({ i } of test)
+    id = left;
+  } else if (t.isVariableDeclaration(left)) {
+    // for (var i of test)
+    id = left.declarations[0].id;
+    declar = t.variableDeclaration(left.kind, [
+      t.variableDeclarator(id)
+    ]);
+  } else {
+    throw file.errorWithNode(left, "Unknown node type " + left.type + " in ForOfStatement");
+  }
+
+  var loop = util.template("for-of-loose", {
+    LOOP_OBJECT:  file.generateUidIdentifier("iterator", scope),
+    IS_ARRAY:     file.generateUidIdentifier("isArray", scope),
+    OBJECT:       node.right,
+    INDEX:        file.generateUidIdentifier("i", scope),
+    ID:           id
+  });
+
+  return {
+    shouldUnshift: true,
+    declar:        declar,
+    loop:          loop
+  };
+};
+
+var spec = function (node, parent, file, scope) {
   var left = node.left;
   var declar;
 
   var stepKey   = file.generateUidIdentifier("step", scope);
   var stepValue = t.memberExpression(stepKey, t.identifier("value"));
 
-  if (t.isIdentifier(left)) {
+  if (t.isIdentifier(left) || t.isPattern(left)) {
+    // for (i of test), for ({ i } of test)
     declar = t.expressionStatement(t.assignmentExpression("=", left, stepValue));
   } else if (t.isVariableDeclaration(left)) {
+    // for (var i of test)
     declar = t.variableDeclaration(left.kind, [
       t.variableDeclarator(left.declarations[0].id, stepValue)
     ]);
@@ -18,18 +82,14 @@ exports.ForOfStatement = function (node, parent, file, scope) {
     throw file.errorWithNode(left, "Unknown node type " + left.type + " in ForOfStatement");
   }
 
-  var node2 = util.template("for-of", {
+  var loop = util.template("for-of", {
     ITERATOR_KEY: file.generateUidIdentifier("iterator", scope),
     STEP_KEY:     stepKey,
     OBJECT:       node.right
   });
 
-  t.inheritsComments(node2, node);
-  t.ensureBlock(node);
-
-  var block = node2.body;
-  block.body.push(declar);
-  block.body = block.body.concat(node.body.body);
-
-  return node2;
+  return {
+    declar: declar,
+    loop:   loop
+  };
 };

lib/6to5/transformation/transformers/es6-generators.js

@@ -1,3 +1,9 @@
+var regenerator = require("regenerator");
+
 exports.ast = {
-  before: require("regenerator").transform
+  before: function (ast, file) {
+    regenerator.transform(ast, {
+      includeRuntime: file.opts.includeRegenerator && "if used"
+    });
+  }
 };

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

@@ -250,10 +250,11 @@ LetScoping.prototype.getInfo = function () {
     declar = block.body[i];
     if (!isLet(declar, block)) continue;
 
-    _.each(t.getIds(declar, true), function (id, key) {
-      duplicates(id, key);
+    var declars = t.getIds(declar, true);
+    for (var key in declars) {
+      duplicates(declars[key], key);
       opts.keys.push(key);
-    });
+    }
   }
 
   return opts;

lib/6to5/transformation/transformers/es6-property-method-assignment.js

@@ -46,14 +46,14 @@ exports.Property = function (node, parent, file, scope) {
   }
 };
 
-exports.ObjectExpression = function (node, parent, file, scope) {
+exports.ObjectExpression = function (node) {
   var mutatorMap = {};
   var hasAny = false;
 
   node.properties = node.properties.filter(function (prop) {
     if (prop.kind === "get" || prop.kind === "set") {
       hasAny = true;
-      util.pushMutatorMap(mutatorMap, prop.key, prop.kind, prop.value);
+      util.pushMutatorMap(mutatorMap, prop.key, prop.kind, prop.computed, prop.value);
       return false;
     } else {
       return true;
@@ -62,21 +62,8 @@ exports.ObjectExpression = function (node, parent, file, scope) {
 
   if (!hasAny) return;
 
-  if (node.properties.length) {
-    var objId = scope.generateUidBasedOnNode(parent, file);
-
-    return util.template("object-define-properties-closure", {
-      KEY: objId,
-      OBJECT: node,
-      CONTENT: util.template("object-define-properties", {
-        OBJECT: objId,
-        PROPS:  util.buildDefineProperties(mutatorMap)
-      })
-    });
-  } else {
-    return util.template("object-define-properties", {
-      OBJECT: node,
-      PROPS:  util.buildDefineProperties(mutatorMap)
-    });
-  }
+  return t.callExpression(
+    t.memberExpression(t.identifier("Object"), t.identifier("defineProperties")),
+    [node, util.buildDefineProperties(mutatorMap)]
+  );
 };

lib/6to5/transformation/transformers/es6-template-literals.js

@@ -17,10 +17,12 @@ exports.TaggedTemplateExpression = function (node, parent, file) {
     raw.push(t.literal(elem.value.raw));
   }
 
-  args.push(t.callExpression(file.addHelper("tagged-template-literal"), [
-    t.arrayExpression(strings),
-    t.arrayExpression(raw)
-  ]));
+  strings = t.arrayExpression(strings);
+  raw = t.arrayExpression(raw);
+
+  var templateName = "tagged-template-literal";
+  if (file.isLoose("templateLiterals")) templateName += "-loose";
+  args.push(t.callExpression(file.addHelper(templateName), [strings, raw]));
 
   args = args.concat(quasi.expressions);
 

lib/6to5/transformation/transformers/es7-object-spread.js

@@ -4,7 +4,7 @@ var t = require("../../types");
 
 exports.experimental = true;
 
-exports.ObjectExpression = function (node) {
+exports.ObjectExpression = function (node, parent, file) {
   var hasSpread = false;
   var i;
   var prop;
@@ -42,5 +42,5 @@ exports.ObjectExpression = function (node) {
     args.unshift(t.objectExpression([]));
   }
 
-  return t.callExpression(t.memberExpression(t.identifier("Object"), t.identifier("assign")), args);
+  return t.callExpression(file.addHelper("extends"), args);
 };

lib/6to5/transformation/transformers/optional-core-aliasing.js

@@ -8,6 +8,15 @@ var coreHas = function (node) {
   return node.name !== "_" && _.has(core, node.name);
 };
 
+var ALIASABLE_CONSTRUCTORS = [
+  "Symbol",
+  "Promise",
+  "Map",
+  "WeakMap",
+  "Set",
+  "WeakSet"
+];
+
 exports.optional = true;
 
 exports.ast = {
@@ -31,8 +40,8 @@ exports.ast = {
             this.skip();
             return t.prependToMemberExpression(node, file._coreId);
           }
-        } else if (t.isIdentifier(node) && !t.isMemberExpression(parent) && t.isReferenced(node, parent) && coreHas(node)) {
-          // new Promise -> new _core.Promise
+        } else if (t.isIdentifier(node) && !t.isMemberExpression(parent) && t.isReferenced(node, parent) && _.contains(ALIASABLE_CONSTRUCTORS, node.name)) {
+          // Symbol() -> _core.Symbol(); new Promise -> new _core.Promise
           return t.memberExpression(file._coreId, node);
         } else if (t.isCallExpression(node)) {
           // arr[Symbol.iterator]() -> _core.$for.getIterator(arr)

lib/6to5/transformation/transformers/optional-proto-to-assign.js

@@ -1,8 +1,6 @@
 var t = require("../../types");
 var _ = require("lodash");
 
-var OBJECT_ASSIGN_MEMBER = t.memberExpression(t.identifier("Object"), t.identifier("assign"));
-
 var isProtoKey = function (node) {
   return t.isLiteral(t.toComputedKey(node, node.key), { value: "__proto__" });
 };
@@ -43,7 +41,7 @@ exports.ExpressionStatement = function (node, parent, file) {
   }
 };
 
-exports.ObjectExpression = function (node) {
+exports.ObjectExpression = function (node, parent, file) {
   var proto;
 
   for (var i in node.properties) {
@@ -58,6 +56,6 @@ exports.ObjectExpression = function (node) {
   if (proto) {
     var args = [t.objectExpression([]), proto];
     if (node.properties.length) args.push(node);
-    return t.callExpression(OBJECT_ASSIGN_MEMBER, args);
+    return t.callExpression(file.addHelper("extends"), args);
   }
 };

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

@@ -5,6 +5,7 @@
 
 var esutils = require("esutils");
 var t       = require("../../types");
+var _       = require("lodash");
 
 exports.XJSIdentifier = function (node) {
   if (esutils.keyword.isIdentifierName(node.name)) {
@@ -32,7 +33,7 @@ exports.XJSExpressionContainer = function (node) {
 exports.XJSAttribute = {
   exit: function (node) {
     var value = node.value || t.literal(true);
-    return t.property("init", node.name, value);
+    return t.inherits(t.property("init", node.name, value), node);
   }
 };
 
@@ -42,7 +43,7 @@ var isTag = function(tagName) {
 
 exports.XJSOpeningElement = {
   exit: function (node, parent, file) {
-    var reactCompat = file.opts && file.opts.reactCompat;
+    var reactCompat = file.opts.reactCompat;
     var tagExpr = node.name;
     var args = [];
 
@@ -61,11 +62,16 @@ exports.XJSOpeningElement = {
       }
     }
 
-    var props = node.attributes;
-    if (props.length) {
+    var attribs = node.attributes;
+    if (attribs.length) {
       var _props = [];
       var objs = [];
 
+      // so basically in order to support spread elements we
+      // loop over all the attributes, breaking on spreads
+      // we then push a new object containing all prior attributes
+      // to an array for later processing
+
       var pushProps = function () {
         if (!_props.length) return;
 
@@ -73,8 +79,8 @@ exports.XJSOpeningElement = {
         _props = [];
       };
 
-      while (props.length) {
-        var prop = props.shift();
+      while (attribs.length) {
+        var prop = attribs.shift();
         if (t.isXJSSpreadAttribute(prop)) {
           pushProps();
           objs.push(prop.argument);
@@ -86,46 +92,41 @@ exports.XJSOpeningElement = {
       pushProps();
 
       if (objs.length === 1) {
-        props = objs[0];
+        // only one object
+        attribs = objs[0];
       } else {
+        // looks like we have multiple objects
         if (!t.isObjectExpression(objs[0])) {
           objs.unshift(t.objectExpression([]));
         }
 
-        props = t.callExpression(
+        // spread it
+        attribs = t.callExpression(
           t.memberExpression(t.identifier("React"), t.identifier("__spread")),
           objs
         );
       }
     } else {
-      props = t.literal(null);
+      attribs = t.literal(null);
     }
 
-    args.push(props);
+    args.push(attribs);
 
     if (reactCompat) {
       if (tagName && isTag(tagName)) {
         return t.callExpression(
           t.memberExpression(
-            t.memberExpression(
-              t.identifier('React'),
-              t.identifier('DOM'),
-              false
-            ),
+            t.memberExpression(t.identifier("React"), t.identifier("DOM")),
             tagExpr,
             t.isLiteral(tagExpr)
           ),
           args
         );
-      } else {
-        return t.callExpression(
-          tagExpr,
-          args
-        );
       }
+    } else {
+      tagExpr = t.memberExpression(t.identifier("React"), t.identifier("createElement"));
     }
 
-    tagExpr = t.memberExpression(t.identifier("React"), t.identifier("createElement"));
     return t.callExpression(tagExpr, args);
   }
 };
@@ -138,7 +139,7 @@ exports.XJSElement = {
     for (i in node.children) {
       var child = node.children[i];
 
-      if (t.isLiteral(child)) {
+      if (t.isLiteral(child) && _.isString(child.value)) {
         var lines = child.value.split(/\r\n|\n|\r/);
 
         for (i in lines) {
@@ -148,16 +149,16 @@ exports.XJSElement = {
           var isLastLine = +i === lines.length - 1;
 
           // replace rendered whitespace tabs with spaces
-          var trimmedLine = line.replace(/\t/g, ' ');
+          var trimmedLine = line.replace(/\t/g, " ");
 
           // trim whitespace touching a newline
           if (!isFirstLine) {
-            trimmedLine = trimmedLine.replace(/^[ ]+/, '');
+            trimmedLine = trimmedLine.replace(/^[ ]+/, "");
           }
 
           // trim whitespace touching an endline
           if (!isLastLine) {
-            trimmedLine = trimmedLine.replace(/[ ]+$/, '');
+            trimmedLine = trimmedLine.replace(/[ ]+$/, "");
           }
 
           if (trimmedLine) {
@@ -173,6 +174,10 @@ exports.XJSElement = {
       callExpr.arguments.push(child);
     }
 
+    if (callExpr.arguments.length >= 3) {
+      callExpr._prettyCall = true;
+    }
+
     return t.inherits(callExpr, node);
   }
 };

lib/6to5/transformation/transformers/spec-no-for-in-of-assignment.js

@@ -0,0 +1,10 @@
+var t = require("../../types");
+
+exports.ForInStatement =
+exports.ForOfStatement = function (node, parent, file) {
+  var left = node.left;
+  if (t.isVariableDeclaration(left)) {
+    var declar = left.declarations[0];
+    if (declar.init) throw file.errorWithNode(declar, "No assignments allowed in for-in/of head");
+  }
+};

lib/6to5/transformation/transformers/spec-setters.js

@@ -0,0 +1,6 @@
+exports.MethodDefinition =
+exports.Property = function (node, parent, file) {
+  if (node.kind === "set" && node.value.params.length !== 1) {
+    throw file.errorWithNode(node.value, "Setters must have only one parameter");
+  }
+};

lib/6to5/traverse/index.js

@@ -4,15 +4,101 @@ var Scope = require("./scope");
 var t     = require("../types");
 var _     = require("lodash");
 
+function TraversalContext(previousContext) {
+  this.didSkip = false;
+  this.didRemove = false;
+  this.didStop = false;
+  this.didFlatten = previousContext ? previousContext.didFlatten : false;
+}
+
+TraversalContext.prototype.flatten = function () {
+  this.didFlatten = true;
+};
+
+TraversalContext.prototype.remove = function () {
+  this.didRemove = true;
+  this.skip();
+};
+
+TraversalContext.prototype.skip = function () {
+  this.didSkip = true;
+};
+
+TraversalContext.prototype.stop = function () {
+  this.didStop = true;
+  this.skip();
+};
+
+TraversalContext.prototype.maybeReplace = function (result, obj, key, node) {
+  if (result === false) return node;
+  if (result == null) return node;
+
+  var isArray = Array.isArray(result);
+
+  // inherit comments from original node to the first replacement node
+  var inheritTo = result;
+  if (isArray) inheritTo = result[0];
+  if (inheritTo) t.inheritsComments(inheritTo, node);
+
+  // replace the node
+  node = obj[key] = result;
+
+  // we're replacing a statement or block node with an array of statements so we better
+  // ensure that it's a block
+  if (isArray && _.contains(t.STATEMENT_OR_BLOCK_KEYS, key) && !t.isBlockStatement(obj)) {
+    t.ensureBlock(obj, key);
+  }
+
+  if (isArray) {
+    this.flatten();
+  }
+
+  return node;
+};
+
+TraversalContext.prototype.visit = function (obj, key, opts, scope, parent) {
+  var node = obj[key];
+  if (!node) return;
+
+  // type is blacklisted
+  if (opts.blacklist && opts.blacklist.indexOf(node.type) > -1) return;
+
+  var result;
+  var ourScope = scope;
+  if (t.isScope(node)) ourScope = new Scope(node, scope);
+
+  // enter
+  if (opts.enter) {
+    result = opts.enter.call(this, node, parent, ourScope);
+    node = this.maybeReplace(result, obj, key, node);
+
+    if (this.didRemove) {
+      obj[key] = null;
+      this.flatten();
+    }
+
+    // stop traversal
+    if (this.didSkip) return;
+  }
+
+  // traverse node
+  traverse(node, opts, ourScope);
+
+  // exit
+  if (opts.exit) {
+    result = opts.exit.call(this, node, parent, ourScope);
+    node = this.maybeReplace(result, obj, key, node);
+  }
+};
+
 function traverse(parent, opts, scope) {
   // falsy node
   if (!parent) return;
 
   // array of nodes
-  if (_.isArray(parent)) {
-    _.each(parent, function (node) {
-      traverse(node, opts, scope);
-    });
+  if (Array.isArray(parent)) {
+    for (var i = 0; i < parent.length; i++)
+      traverse(parent[i], opts, scope);
     return;
   }
 
@@ -21,99 +107,21 @@ function traverse(parent, opts, scope) {
   if (!keys) return;
 
   opts = opts || {};
+  var context = null;
 
-  var stopped = false;
-
-  for (var i in keys) {
-    var key = keys[i];
+  for (var j = 0; j < keys.length; j++) {
+    var key = keys[j];
     var nodes = parent[key];
     if (!nodes) continue;
 
-    var flatten = false;
-
-    var handle = function (obj, key) {
-      var node = obj[key];
-      if (!node) return;
-
-      // type is blacklisted
-      if (opts.blacklist && opts.blacklist.indexOf(node.type) > -1) return;
-
-      // replace node
-      var maybeReplace = function (result) {
-        if (result === false) return;
-        if (result == null) return;
-
-        var isArray = _.isArray(result);
-
-        // inherit comments from original node to the first replacement node
-        var inheritTo = result;
-        if (isArray) inheritTo = result[0];
-        if (inheritTo) t.inheritsComments(inheritTo, node);
-
-        // replace the node
-        node = obj[key] = result;
-
-        if (isArray) flatten = true;
-
-        // we're replacing a statement or block node with an array of statements so we better
-        // ensure that it's a block
-        if (isArray && _.contains(t.STATEMENT_OR_BLOCK_KEYS, key) && !t.isBlockStatement(obj)) {
-          t.ensureBlock(obj, key);
-        }
-      };
-
-      var skipped = false;
-      var removed = false;
-
-      var context = {
-        stop: function () {
-          skipped = stopped = true;
-        },
-
-        skip: function () {
-          skipped = true;
-        },
-
-        remove: function () {
-          this.skip();
-          removed = true;
-        }
-      };
-
-      //
-      var ourScope = scope;
-      if (t.isScope(node)) ourScope = new Scope(node, scope);
-
-      // enter
-      if (opts.enter) {
-        var result = opts.enter.call(context, node, parent, ourScope);
-        maybeReplace(result);
-
-        if (removed) {
-          obj[key] = null;
-          flatten = true;
-        }
-
-        // stop iteration
-        if (skipped) return;
+    if (Array.isArray(nodes)) {
+      for (var k = 0; k < nodes.length; k++) {
+        context = new TraversalContext(context);
+        context.visit(nodes, k, opts, scope, parent);
+        if (context.didStop) return;
       }
 
-      // traverse node
-      traverse(node, opts, ourScope);
-
-      // exit
-      if (opts.exit) {
-        maybeReplace(opts.exit.call(context, node, parent, ourScope));
-      }
-    };
-
-    if (_.isArray(nodes)) {
-      for (i in nodes) {
-        handle(nodes, i);
-        if (stopped) return;
-      }
-
-      if (flatten) {
+      if (context && context.didFlatten) {
         parent[key] = _.flatten(parent[key]);
 
         if (key === "body") {
@@ -122,8 +130,9 @@ function traverse(parent, opts, scope) {
         }
       }
     } else {
-      handle(parent, key);
-      if (stopped) return;
+      context = new TraversalContext(context);
+      context.visit(parent, key, opts, scope, parent);
+      if (context.didStop) return;
     }
   }
 }

lib/6to5/traverse/scope.js

@@ -24,7 +24,13 @@ function Scope(block, parent) {
 }
 
 var vars = require("jshint/src/vars");
-Scope.defaultDeclarations = _.flatten([vars.newEcmaIdentifiers, vars.node, vars.ecmaIdentifiers, vars.reservedVars].map(_.keys));
+
+Scope.defaultDeclarations = _.flatten([
+  vars.newEcmaIdentifiers,
+  vars.node,
+  vars.ecmaIdentifiers,
+  vars.reservedVars
+].map(_.keys));
 
 Scope.add = function (node, references) {
   if (!node) return;

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

@@ -9,6 +9,7 @@
   "ExpressionStatement":     ["expression"],
   "File":                    ["program", "comments", "tokens"],
   "FunctionExpression":      ["id", "params", "body", "generator"],
+  "FunctionDeclaration":     ["id", "params", "body", "generator"],
   "Identifier":              ["name"],
   "IfStatement":             ["test", "consequent", "alternate"],
   "ImportDeclaration":       ["specifiers", "source"],
@@ -16,6 +17,7 @@
   "Literal":                 ["value"],
   "LogicalExpression":       ["operator", "left", "right"],
   "MemberExpression":        ["object", "property", "computed"],
+  "MethodDefinition":        ["key", "value", "computed", "kind"],
   "NewExpression":           ["callee", "arguments"],
   "ObjectExpression":        ["properties"],
   "Program":                 ["body"],

lib/6to5/types/index.js

@@ -193,6 +193,17 @@ t.isReferenced = function (node, parent) {
   // we're a property key and we aren't computed so we aren't referenced
   if (t.isProperty(parent) && parent.key === node && !parent.computed) return false;
 
+  if (t.isFunction(parent)) {
+    // we're a function param
+    if (_.contains(parent.params, node)) return false;
+
+    // we're a rest parameter
+    if (_.contains(parent.params, node)) return false;
+  }
+
+  // we're a catch clause param
+  if (t.isCatchClause(parent) && parent.param === node) return false;
+
   // we're a variable declarator id so we aren't referenced
   if (t.isVariableDeclarator(parent) && parent.id === node) return false;
 
@@ -307,6 +318,31 @@ t.toStatement = function (node, ignore) {
   return node;
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @returns {Object}
+ */
+
+exports.toExpression = function (node) {
+  if (t.isExpressionStatement(node)) {
+    node = node.expression;
+  }
+
+  if (t.isClass(node)) {
+    node.type = "ClassExpression";
+  } else if (t.isFunction(node)) {
+    node.type = "FunctionExpression";
+  }
+
+  if (t.isExpression(node)) {
+    return node;
+  } else {
+    throw new Error("cannot turn " + node.type + " to an expression");
+  }
+};
+
 /**
  * Description
  *
@@ -320,7 +356,11 @@ t.toBlock = function (node, parent) {
     return node;
   }
 
-  if (!_.isArray(node)) {
+  if (t.isEmptyStatement(node)) {
+    node = [];
+  }
+
+  if (!Array.isArray(node)) {
     if (!t.isStatement(node)) {
       if (t.isFunction(parent)) {
         node = t.returnStatement(node);

lib/6to5/util.js

@@ -12,11 +12,13 @@ var _          = require("lodash");
 exports.inherits = util.inherits;
 
 exports.canCompile = function (filename, altExts) {
-  var exts = altExts || [".js", ".jsx", ".es6", ".es"];
+  var exts = altExts || exports.canCompile.EXTENSIONS;
   var ext = path.extname(filename);
   return _.contains(exts, ext);
 };
 
+exports.canCompile.EXTENSIONS = [".js", ".jsx", ".es6", ".es"];
+
 exports.isInteger = function (i) {
   return _.isNumber(i) && i % 1 === 0;
 };
@@ -39,7 +41,7 @@ exports.list = function (val) {
 
 exports.regexify = function (val) {
   if (!val) return new RegExp(/.^/);
-  if (_.isArray(val)) val = val.join("|");
+  if (Array.isArray(val)) val = val.join("|");
   if (_.isString(val)) return new RegExp(val);
   if (_.isRegExp(val)) return val;
   throw new TypeError("illegal type for regexify");
@@ -48,7 +50,7 @@ exports.regexify = function (val) {
 exports.arrayify = function (val) {
   if (!val) return [];
   if (_.isString(val)) return exports.list(val);
-  if (_.isArray(val)) return val;
+  if (Array.isArray(val)) return val;
   throw new TypeError("illegal type for arrayify");
 };
 
@@ -65,12 +67,12 @@ exports.sourceMapToComment = function (map) {
   return "//# sourceMappingURL=data:application/json;base64," + base64;
 };
 
-exports.pushMutatorMap = function (mutatorMap, key, kind, method) {
+exports.pushMutatorMap = function (mutatorMap, key, kind, computed, method) {
   var alias;
 
   if (t.isIdentifier(key)) {
     alias = key.name;
-    if (method.computed) alias = "computed:" + alias;
+    if (computed) alias = "computed:" + alias;
   } else if (t.isLiteral(key)) {
     alias = String(key.value);
   } else {
@@ -86,7 +88,7 @@ exports.pushMutatorMap = function (mutatorMap, key, kind, method) {
   mutatorMap[alias] = map;
 
   map._key = key;
-  if (method.computed) {
+  if (computed) {
     map._computed = true;
   }
 
@@ -101,7 +103,12 @@ exports.buildDefineProperties = function (mutatorMap) {
 
     var propNode = t.property("init", map._key, mapNode, map._computed);
 
+    if (!map.get && !map.set) {
+      map.writable = t.literal(true);
+    }
+
     map.enumerable = t.literal(true);
+    map.configurable = t.literal(true);
 
     _.each(map, function (node, key) {
       if (key[0] === "_") return;
@@ -146,10 +153,10 @@ exports.template = function (name, nodes, keepExpression) {
   var node = template.body[0];
 
   if (!keepExpression && t.isExpressionStatement(node)) {
-    node = node.expression;
+    return node.expression;
+  } else {
+    return node;
   }
-
-  return node;
 };
 
 exports.codeFrame = function (lines, lineNumber, colNumber) {
@@ -188,7 +195,13 @@ exports.codeFrame = function (lines, lineNumber, colNumber) {
 
 exports.repeat = function (width, cha) {
   cha = cha || " ";
-  return new Array(width + 1).join(cha);
+
+  var result = "";
+  for (var i = 0; i < width; i++) {
+    result += cha;
+  }
+
+  return result;
 };
 
 exports.normaliseAst = function (ast, comments, tokens) {
@@ -256,7 +269,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/6to5/6to5/issues");
+                    "https://github.com/6to5/6to5/issues");
   }
 
   _.each(fs.readdirSync(templatesLoc), function (name) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "2.7.0",
+  "version": "2.12.2",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -39,36 +39,36 @@
     "test": "make test"
   },
   "dependencies": {
-    "acorn-6to5": "0.11.1-11",
+    "acorn-6to5": "0.11.1-14",
     "ast-types": "~0.6.1",
     "chokidar": "0.11.1",
     "commander": "2.5.0",
-    "core-js": "^0.4.0",
+    "core-js": "0.4.4",
     "estraverse": "1.8.0",
     "esutils": "1.1.6",
-    "esvalid": "^1.1.0",
+    "esvalid": "1.1.0",
     "fs-readdir-recursive": "0.1.0",
-    "jshint": "^2.5.10",
+    "jshint": "2.5.10",
     "lodash": "2.4.1",
     "mkdirp": "0.5.0",
     "private": "0.1.6",
-    "regenerator": "^0.8.3",
+    "regenerator": "0.8.3",
     "regexpu": "0.3.0",
-    "roadrunner": "^1.0.4",
+    "roadrunner": "1.0.4",
     "source-map": "0.1.40",
     "source-map-support": "0.2.8"
   },
   "devDependencies": {
     "browserify": "6.3.2",
-    "chai": "^1.9.2",
+    "chai": "1.9.2",
     "istanbul": "0.3.2",
-    "jshint-stylish": "^1.0.0",
+    "jshint-stylish": "1.0.0",
     "matcha": "0.6.0",
     "mocha": "1.21.4",
     "rimraf": "2.2.8",
     "uglify-js": "2.4.15"
   },
   "optionalDependencies": {
-    "kexec": "^0.2.0"
+    "kexec": "0.2.0"
   }
 }

test/bin.js

@@ -1,5 +1,4 @@
-// skip these tests under instanbul since they're useless
-if (process.env.running_under_istanbul === '1') return;
+if (process.env.running_under_istanbul) return;
 
 var readdir = require("fs-readdir-recursive");
 var helper  = require("./_helper");

test/browserify.js

@@ -12,7 +12,7 @@ suite("browserify", function() {
       assert.ok(bundle.length, "bundle output code");
 
       // ensure that the code runs without throwing an exception
-      vm.runInNewContext(bundle, {});
+      vm.runInNewContext("var global = this;\n" + bundle, {});
       done();
     })
   })

test/esnext.js

@@ -1,5 +1,3 @@
-if (!process.env.ALL_6TO5_TESTS) return;
-
 require("./_transformation-helper")({
   name: "esnext"
 });

test/fixtures/esnext/es6-classes/getter-setter-super.js

@@ -1,9 +1,11 @@
-class Animal {
+class Base {
   get sound() {
     return 'I am a ' + this.type + '.';
   }
 }
 
+class Animal extends Base {}
+
 class Cat extends Animal {
   get type() { return 'cat'; }
 

test/fixtures/generation/comments/computed-property-comments-2/expected.js

@@ -7,4 +7,5 @@ var test = {
     * Inside bracket init
     */
   "b"]: "2"
-}, ok = 42;
+},
+    ok = 42;

test/fixtures/generation/comments/variable-declarator-line-comment/expected.js

@@ -3,6 +3,7 @@ function test() {
   // Leading to VariableDeclarator
   // Leading to VariableDeclarator
   i = 20,
+
   // Leading to VariableDeclarator
   // Leading to VariableDeclarator
   j = 20;

test/fixtures/generation/comments/variable-declarator-multi-comment/expected.js

@@ -5,6 +5,7 @@ function test() {
    * Leading to VariableDeclarator
    */
   i = 20,
+
   /*
    * Leading to VariableDeclarator
    * Leading to VariableDeclarator

test/fixtures/generation/harmony-edgecase/yield-precedence/expected.js

@@ -1,5 +1,6 @@
 function* foo() {
-  var a = yield wat(), b = 2;
+  var a = yield wat(),
+      b = 2;
   var c = yield a = b;
   yield a, yield b;
   yield a = b;

test/fixtures/generation/types/UpdateExpression/actual.js

@@ -1,2 +1,3 @@
 ++i;
 i++;
+(foo++).test();

test/fixtures/generation/types/UpdateExpression/expected.js

@@ -1,2 +1,3 @@
 ++i;
 i++;
+(foo++).test();

test/fixtures/generation/types/VariableDeclaration-VariableDeclarator/expected.js

@@ -8,6 +8,9 @@ const foo = "foo";
 let foo, bar = "bar";
 var foo, bar = "bar";
 
-let foo = "foo", bar = "bar";
-var foo = "foo", bar = "bar";
-const foo = "foo", bar = "bar";
+let foo = "foo",
+    bar = "bar";
+var foo = "foo",
+    bar = "bar";
+const foo = "foo",
+      bar = "bar";

test/fixtures/transformation/es6-classes-loose/accessing-super-class/actual.js

@@ -0,0 +1,25 @@
+class Test extends Foo {
+  constructor() {
+    woops.super.test();
+    super();
+    super.test();
+
+    super(...arguments);
+    super("test", ...arguments);
+
+    super.test(...arguments);
+    super.test("test", ...arguments);
+  }
+
+  test() {
+    super();
+    super(...arguments);
+    super("test", ...arguments);
+  }
+
+  static foo() {
+    super();
+    super(...arguments);
+    super("test", ...arguments);
+  }
+}

test/fixtures/transformation/es6-classes-loose/accessing-super-class/expected.js

@@ -0,0 +1,57 @@
+"use strict";
+
+var _slice = Array.prototype.slice;
+var _prototypeProperties = function (child, staticProps, instanceProps) {
+  if (staticProps) Object.defineProperties(child, staticProps);
+  if (instanceProps) Object.defineProperties(child.prototype, instanceProps);
+};
+
+var _inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) subClass.__proto__ = superClass;
+};
+
+var Test = (function (Foo) {
+  function Test() {
+    var _Foo$prototype$test, _Foo$prototype$test2;
+    woops["super"].test();
+    Foo.call(this);
+    Foo.prototype.test.call(this);
+
+    Foo.call.apply(Foo, [this].concat(_slice.call(arguments)));
+    Foo.call.apply(Foo, [this, "test"].concat(_slice.call(arguments)));
+
+    (_Foo$prototype$test = Foo.prototype.test).call.apply(_Foo$prototype$test, [this].concat(_slice.call(arguments)));
+    (_Foo$prototype$test2 = Foo.prototype.test).call.apply(_Foo$prototype$test2, [this, "test"].concat(_slice.call(arguments)));
+  }
+
+  _inherits(Test, Foo);
+
+  Test.prototype.test = function () {
+    var _Foo$prototype$test3, _Foo$prototype$test4;
+    Foo.prototype.test.call(this);
+    (_Foo$prototype$test3 = Foo.prototype.test).call.apply(_Foo$prototype$test3, [this].concat(_slice.call(arguments)));
+    (_Foo$prototype$test4 = Foo.prototype.test).call.apply(_Foo$prototype$test4, [this, "test"].concat(_slice.call(arguments)));
+  };
+
+  Test.foo = function () {
+    var _Foo$foo, _Foo$foo2;
+    Foo.foo.call(this);
+    (_Foo$foo = Foo.foo).call.apply(_Foo$foo, [this].concat(_slice.call(arguments)));
+    (_Foo$foo2 = Foo.foo).call.apply(_Foo$foo2, [this, "test"].concat(_slice.call(arguments)));
+  };
+
+  _prototypeProperties(Test, {}, {});
+
+  return Test;
+})(Foo);

test/fixtures/transformation/es6-classes-loose/accessing-super-properties/actual.js

@@ -0,0 +1,6 @@
+class Test extends Foo {
+  constructor() {
+    super.test;
+    super.test.whatever;
+  }
+}

test/fixtures/transformation/es6-classes-loose/accessing-super-properties/expected.js

@@ -0,0 +1,27 @@
+"use strict";
+
+var _inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) subClass.__proto__ = superClass;
+};
+
+var Test = (function (Foo) {
+  function Test() {
+    Foo.prototype.test;
+    Foo.prototype.test.whatever;
+  }
+
+  _inherits(Test, Foo);
+
+  return Test;
+})(Foo);

test/fixtures/transformation/es6-classes-loose/calling-super-properties/actual.js

@@ -0,0 +1,10 @@
+class Test extends Foo {
+  constructor() {
+    super.test.whatever();
+    super.test();
+  }
+
+  static test() {
+    return super.wow();
+  }
+}

test/fixtures/transformation/es6-classes-loose/calling-super-properties/expected.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _prototypeProperties = function (child, staticProps, instanceProps) {
+  if (staticProps) Object.defineProperties(child, staticProps);
+  if (instanceProps) Object.defineProperties(child.prototype, instanceProps);
+};
+
+var _inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) subClass.__proto__ = superClass;
+};
+
+var Test = (function (Foo) {
+  function Test() {
+    Foo.prototype.test.whatever();
+    Foo.prototype.test.call(this);
+  }
+
+  _inherits(Test, Foo);
+
+  Test.test = function () {
+    return Foo.wow.call(this);
+  };
+
+  _prototypeProperties(Test, {});
+
+  return Test;
+})(Foo);

test/fixtures/transformation/es6-classes-loose/options.json

@@ -0,0 +1,3 @@
+{
+  "loose": ["classes"]
+}

test/fixtures/transformation/es6-classes-loose/super-class-id-member-expression/actual.js

@@ -0,0 +1,7 @@
+class BaseController extends Chaplin.Controller {
+
+}
+
+class BaseController2 extends Chaplin.Controller.Another {
+
+}

test/fixtures/transformation/es6-classes-loose/super-class-id-member-expression/expected.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) subClass.__proto__ = superClass;
+};
+
+var BaseController = (function (_Chaplin$Controller) {
+  function BaseController() {
+    if (_Chaplin$Controller != null) {
+      _Chaplin$Controller.apply(this, arguments);
+    }
+  }
+
+  _inherits(BaseController, _Chaplin$Controller);
+
+  return BaseController;
+})(Chaplin.Controller);
+
+var BaseController2 = (function (_Chaplin$Controller$Another) {
+  function BaseController2() {
+    if (_Chaplin$Controller$Another != null) {
+      _Chaplin$Controller$Another.apply(this, arguments);
+    }
+  }
+
+  _inherits(BaseController2, _Chaplin$Controller$Another);
+
+  return BaseController2;
+})(Chaplin.Controller.Another);

test/fixtures/transformation/es6-classes-loose/super-class/actual.js

@@ -0,0 +1 @@
+class Test extends Foo { }

test/fixtures/transformation/es6-classes-loose/super-class/expected.js

@@ -0,0 +1,28 @@
+"use strict";
+
+var _inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) subClass.__proto__ = superClass;
+};
+
+var Test = (function (Foo) {
+  function Test() {
+    if (Foo != null) {
+      Foo.apply(this, arguments);
+    }
+  }
+
+  _inherits(Test, Foo);
+
+  return Test;
+})(Foo);

test/fixtures/transformation/es6-classes-loose/super-function-fallback/actual.js

@@ -0,0 +1,5 @@
+class Test {
+  constructor() {
+    super.hasOwnProperty("test");
+  }
+}

test/fixtures/transformation/es6-classes-loose/super-function-fallback/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+var Test = function Test() {
+  Function.prototype.hasOwnProperty.call(this, "test");
+};

test/fixtures/transformation/es6-classes/accessing-super-class/actual.js

@@ -3,7 +3,6 @@ class Test extends Foo {
     woops.super.test();
     super();
     super.test();
-    foob(super);
 
     super(...arguments);
     super("test", ...arguments);

test/fixtures/transformation/es6-classes/accessing-super-class/expected.js

@@ -1,52 +1,89 @@
 "use strict";
 
 var _slice = Array.prototype.slice;
-var _inherits = function (child, parent) {
-  if (typeof parent !== "function" && parent !== null) {
-    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+var _prototypeProperties = function (child, staticProps, instanceProps) {
+  if (staticProps) Object.defineProperties(child, staticProps);
+  if (instanceProps) Object.defineProperties(child.prototype, instanceProps);
+};
+
+var _get = function get(object, property, receiver) {
+  var desc = Object.getOwnPropertyDescriptor(object, property);
+
+  if (desc === undefined) {
+    var parent = Object.getPrototypeOf(object);
+
+    if (parent === null) {
+      return undefined;
+    } else {
+      return get(parent, property, receiver);
+    }
+  } else if ("value" in desc && desc.writable) {
+    return desc.value;
+  } else {
+    var getter = desc.get;
+    if (getter === undefined) {
+      return undefined;
+    }
+    return getter.call(receiver);
   }
-  child.prototype = Object.create(parent && parent.prototype, {
+};
+
+var _inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
     constructor: {
-      value: child,
+      value: subClass,
       enumerable: false,
       writable: true,
       configurable: true
     }
   });
-  if (parent) child.__proto__ = parent;
+  if (superClass) subClass.__proto__ = superClass;
 };
 
-var Test = (function () {
-  var _Foo = Foo;
-  var Test = function Test() {
-    var _Foo$prototype$test, _Foo$prototype$test2;
+var Test = (function (Foo) {
+  function Test() {
+    var _get2, _get3;
     woops["super"].test();
-    _Foo.call(this);
-    _Foo.prototype.test.call(this);
-    foob(_Foo);
+    _get(Object.getPrototypeOf(Test.prototype), "constructor", this).call(this);
+    _get(Object.getPrototypeOf(Test.prototype), "test", this).call(this);
 
-    _Foo.call.apply(_Foo, [this].concat(_slice.call(arguments)));
-    _Foo.call.apply(_Foo, [this, "test"].concat(_slice.call(arguments)));
+    _get(Object.getPrototypeOf(Test.prototype), "constructor", this).apply(this, arguments);
+    (_get2 = _get(Object.getPrototypeOf(Test.prototype), "constructor", this)).call.apply(_get2, [this, "test"].concat(_slice.call(arguments)));
 
-    (_Foo$prototype$test = _Foo.prototype.test).call.apply(_Foo$prototype$test, [this].concat(_slice.call(arguments)));
-    (_Foo$prototype$test2 = _Foo.prototype.test).call.apply(_Foo$prototype$test2, [this, "test"].concat(_slice.call(arguments)));
-  };
+    _get(Object.getPrototypeOf(Test.prototype), "test", this).apply(this, arguments);
+    (_get3 = _get(Object.getPrototypeOf(Test.prototype), "test", this)).call.apply(_get3, [this, "test"].concat(_slice.call(arguments)));
+  }
 
-  _inherits(Test, _Foo);
+  _inherits(Test, Foo);
 
-  Test.prototype.test = function () {
-    var _Foo$prototype$test3, _Foo$prototype$test4;
-    _Foo.prototype.test.call(this);
-    (_Foo$prototype$test3 = _Foo.prototype.test).call.apply(_Foo$prototype$test3, [this].concat(_slice.call(arguments)));
-    (_Foo$prototype$test4 = _Foo.prototype.test).call.apply(_Foo$prototype$test4, [this, "test"].concat(_slice.call(arguments)));
-  };
-
-  Test.foo = function () {
-    var _Foo$foo, _Foo$foo2;
-    _Foo.foo.call(this);
-    (_Foo$foo = _Foo.foo).call.apply(_Foo$foo, [this].concat(_slice.call(arguments)));
-    (_Foo$foo2 = _Foo.foo).call.apply(_Foo$foo2, [this, "test"].concat(_slice.call(arguments)));
-  };
+  _prototypeProperties(Test, {
+    foo: {
+      value: function () {
+        var _get4;
+        _get(Object.getPrototypeOf(Test), "foo", this).call(this);
+        _get(Object.getPrototypeOf(Test), "foo", this).apply(this, arguments);
+        (_get4 = _get(Object.getPrototypeOf(Test), "foo", this)).call.apply(_get4, [this, "test"].concat(_slice.call(arguments)));
+      },
+      writable: true,
+      enumerable: true,
+      configurable: true
+    }
+  }, {
+    test: {
+      value: function () {
+        var _get5;
+        _get(Object.getPrototypeOf(Test.prototype), "test", this).call(this);
+        _get(Object.getPrototypeOf(Test.prototype), "test", this).apply(this, arguments);
+        (_get5 = _get(Object.getPrototypeOf(Test.prototype), "test", this)).call.apply(_get5, [this, "test"].concat(_slice.call(arguments)));
+      },
+      writable: true,
+      enumerable: true,
+      configurable: true
+    }
+  });
 
   return Test;
-})();
+})(Foo);

test/fixtures/transformation/es6-classes/accessing-super-properties/expected.js

@@ -1,28 +1,49 @@
 "use strict";
 
-var _inherits = function (child, parent) {
-  if (typeof parent !== "function" && parent !== null) {
-    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+var _get = function get(object, property, receiver) {
+  var desc = Object.getOwnPropertyDescriptor(object, property);
+
+  if (desc === undefined) {
+    var parent = Object.getPrototypeOf(object);
+
+    if (parent === null) {
+      return undefined;
+    } else {
+      return get(parent, property, receiver);
+    }
+  } else if ("value" in desc && desc.writable) {
+    return desc.value;
+  } else {
+    var getter = desc.get;
+    if (getter === undefined) {
+      return undefined;
+    }
+    return getter.call(receiver);
   }
-  child.prototype = Object.create(parent && parent.prototype, {
+};
+
+var _inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
     constructor: {
-      value: child,
+      value: subClass,
       enumerable: false,
       writable: true,
       configurable: true
     }
   });
-  if (parent) child.__proto__ = parent;
+  if (superClass) subClass.__proto__ = superClass;
 };
 
-var Test = (function () {
-  var _Foo = Foo;
-  var Test = function Test() {
-    _Foo.prototype.test;
-    _Foo.prototype.test.whatever;
-  };
+var Test = (function (Foo) {
+  function Test() {
+    _get(Object.getPrototypeOf(Test.prototype), "test", this);
+    _get(Object.getPrototypeOf(Test.prototype), "test", this).whatever;
+  }
 
-  _inherits(Test, _Foo);
+  _inherits(Test, Foo);
 
   return Test;
-})();
+})(Foo);

test/fixtures/transformation/es6-classes/bare-super/actual.js

@@ -0,0 +1,5 @@
+class Test {
+  constructor() {
+    console.log(super);
+  }
+}

test/fixtures/transformation/es6-classes/bare-super/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "illegal use of bare super"
+}

test/fixtures/transformation/es6-classes/calling-super-properties/expected.js

@@ -1,32 +1,65 @@
 "use strict";
 
-var _inherits = function (child, parent) {
-  if (typeof parent !== "function" && parent !== null) {
-    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+var _prototypeProperties = function (child, staticProps, instanceProps) {
+  if (staticProps) Object.defineProperties(child, staticProps);
+  if (instanceProps) Object.defineProperties(child.prototype, instanceProps);
+};
+
+var _get = function get(object, property, receiver) {
+  var desc = Object.getOwnPropertyDescriptor(object, property);
+
+  if (desc === undefined) {
+    var parent = Object.getPrototypeOf(object);
+
+    if (parent === null) {
+      return undefined;
+    } else {
+      return get(parent, property, receiver);
+    }
+  } else if ("value" in desc && desc.writable) {
+    return desc.value;
+  } else {
+    var getter = desc.get;
+    if (getter === undefined) {
+      return undefined;
+    }
+    return getter.call(receiver);
   }
-  child.prototype = Object.create(parent && parent.prototype, {
+};
+
+var _inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
     constructor: {
-      value: child,
+      value: subClass,
       enumerable: false,
       writable: true,
       configurable: true
     }
   });
-  if (parent) child.__proto__ = parent;
+  if (superClass) subClass.__proto__ = superClass;
 };
 
-var Test = (function () {
-  var _Foo = Foo;
-  var Test = function Test() {
-    _Foo.prototype.test.whatever();
-    _Foo.prototype.test.call(this);
-  };
+var Test = (function (Foo) {
+  function Test() {
+    _get(Object.getPrototypeOf(Test.prototype), "test", this).whatever();
+    _get(Object.getPrototypeOf(Test.prototype), "test", this).call(this);
+  }
 
-  _inherits(Test, _Foo);
+  _inherits(Test, Foo);
 
-  Test.test = function () {
-    return _Foo.wow.call(this);
-  };
+  _prototypeProperties(Test, {
+    test: {
+      value: function () {
+        return _get(Object.getPrototypeOf(Test), "wow", this).call(this);
+      },
+      writable: true,
+      enumerable: true,
+      configurable: true
+    }
+  });
 
   return Test;
-})();
+})(Foo);

test/fixtures/transformation/es6-classes/constructor/expected.js

@@ -1,31 +1,30 @@
 "use strict";
 
-var _inherits = function (child, parent) {
-  if (typeof parent !== "function" && parent !== null) {
-    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+var _inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
   }
-  child.prototype = Object.create(parent && parent.prototype, {
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
     constructor: {
-      value: child,
+      value: subClass,
       enumerable: false,
       writable: true,
       configurable: true
     }
   });
-  if (parent) child.__proto__ = parent;
+  if (superClass) subClass.__proto__ = superClass;
 };
 
 var Test = function Test() {
   this.state = "test";
 };
 
-var Foo = (function () {
-  var _Bar = Bar;
-  var Foo = function Foo() {
+var Foo = (function (Bar) {
+  function Foo() {
     this.state = "test";
-  };
+  }
 
-  _inherits(Foo, _Bar);
+  _inherits(Foo, Bar);
 
   return Foo;
-})();
+})(Bar);

test/fixtures/transformation/es6-classes/instance-getter-and-setter/expected.js

@@ -5,16 +5,21 @@ var _prototypeProperties = function (child, staticProps, instanceProps) {
   if (instanceProps) Object.defineProperties(child.prototype, instanceProps);
 };
 
-var Test = function Test() {};
+var Test = (function () {
+  function Test() {}
 
-_prototypeProperties(Test, null, {
-  test: {
-    get: function () {
-      return 5 + 5;
-    },
-    set: function (val) {
-      this._test = val;
-    },
-    enumerable: true
-  }
-});
+  _prototypeProperties(Test, null, {
+    test: {
+      get: function () {
+        return 5 + 5;
+      },
+      set: function (val) {
+        this._test = val;
+      },
+      enumerable: true,
+      configurable: true
+    }
+  });
+
+  return Test;
+})();