v3.2.1

Support use of super inside instance setter.

.gitignore

@@ -10,3 +10,6 @@ test/tmp
 /runtime.js
 coverage
 dist
+.package.json
+packages/6to5-runtime/*.js
+packages/6to5-runtime/regenerator/*.js

.gitmodules

@@ -3,7 +3,10 @@
 	url = https://github.com/google/traceur-compiler
 [submodule "vendor/regenerator"]
 	path = vendor/regenerator
-	url = https://github.com/facebook/regenerator
+	url = https://github.com/6to5/regenerator-6to5
 [submodule "vendor/test262"]
 	path = vendor/test262
 	url = https://github.com/tc39/test262
+[submodule "vendor/compat-table"]
+	path = vendor/compat-table
+	url = https://github.com/kangax/compat-table

.istanbul.yml

@@ -0,0 +1,2 @@
+instrumentation:
+  root: lib

.jscsrc

@@ -0,0 +1,60 @@
+{
+  "excludeFiles": ["lib/6to5/transformation/templates"],
+  "disallowSpacesInNamedFunctionExpression": {
+    "beforeOpeningRoundBrace": true
+  },
+  "requireSpacesInAnonymousFunctionExpression": {
+    "beforeOpeningRoundBrace": true
+  },
+  "requireSpacesInAnonymousFunctionExpression": {
+    "beforeOpeningRoundBrace": true
+  },
+  "disallowSpacesInFunctionDeclaration": {
+    "beforeOpeningRoundBrace": true
+  },
+  "disallowSpacesInsideArrayBrackets": true,
+  "disallowSpacesInsideParentheses": true,
+  "disallowQuotedKeysInObjects": true,
+  "disallowSpaceAfterObjectKeys": true,
+  "disallowSpaceAfterPrefixUnaryOperators": true,
+  "disallowSpaceBeforePostfixUnaryOperators": true,
+  "disallowSpaceBeforeBinaryOperators": [
+    ","
+  ],
+  "disallowMixedSpacesAndTabs": true,
+  "disallowTrailingWhitespace": true,
+  "disallowYodaConditions": true,
+  "disallowKeywords": [ "with" ],
+  "disallowMultipleLineBreaks": true,
+  "requireSpaceBeforeBlockStatements": true,
+  "requireParenthesesAroundIIFE": true,
+  "requireSpacesInConditionalExpression": true,
+  "requireBlocksOnNewline": 1,
+  "requireCommaBeforeLineBreak": true,
+  "requireSpaceBeforeBinaryOperators": true,
+  "requireSpaceAfterBinaryOperators": true,
+  "requireCamelCaseOrUpperCaseIdentifiers": true,
+  "requireLineFeedAtFileEnd": true,
+  "requireCapitalizedConstructors": true,
+  "requireDotNotation": true,
+  "requireSpacesInForStatement": true,
+  "requireCurlyBraces": [
+    "do"
+  ],
+  "requireSpaceAfterKeywords": [
+    "if",
+    "else",
+    "for",
+    "while",
+    "do",
+    "switch",
+    "case",
+    "return",
+    "try",
+    "catch",
+    "typeof"
+  ],
+  "validateLineBreaks": "LF",
+  "validateQuoteMarks": "\"",
+  "validateIndentation": 2
+}

.jshintignore

@@ -1,3 +1 @@
-node_modules
-test
 lib/6to5/transformation/templates

.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,7 @@ Makefile
 dist
 tests.json
 CHANGELOG.md
+.package.json
+coverage
+vendor
+packages

.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: node_js
 node_js:
   - "0.10"

CHANGELOG.md

@@ -11,6 +11,431 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
+## 3.2.1
+
+ * **Bug Fix**
+  * Fix block scoping transformer rewriting breaks and continues to inner labels.
+
+## 3.2.0
+
+ * **Bug Fix**
+  * Fixed scope tracking for default parameters IIFE.
+  * Fixed block scoped functions.
+  * Improved `bin/6to5` path resolution.
+ * **New Feature**
+  * You can now trigger super setters in classes. Thanks [@kruppel](https://github.com/kruppel)!
+  * Add `resolveSourceMap` option.
+  * Better support and output for block scoping loops with labels.
+
+## 3.1.1
+
+ * **Polish**
+  * Drop `enumerable: false` clause from class method definitions as `enumerable` already defaults to `false`.
+ * **Bug Fix**
+  * Properly transform `XJSIdentifier` nodes referencing `this` into a `ThisExpression`.
+
+## 3.1.0
+
+ * **Breaking Change**
+  * [Make class methods unenumerable](https://esdiscuss.org/topic/classes-and-enumerability#content-61).
+
+## 3.0.16
+
+ * **Bug Fix**
+  * Don't ignore dynamic import specifiers.
+ * **Internal**
+  * Upgrade `regenerator-6to5`.
+ * **Polish**
+  * Use `Object.assign` in place of extends helper if it exists.
+  * Require individual `lodash` methods. Thanks [@stefanpenner](https://github.com/stefanpenner)!
+
+## 3.0.15
+
+ * **Bug Fix**
+  * Use `debug/node` instead of `debug` to avoid browserify using the browser version that references `window`.
+
+## 3.0.14
+
+ * **New Feature**
+  * Add `--optional` argument to `6to5-node`.
+ * **Bug Fix**
+  * Fix bug in `asyncToGenerator` helper where it was incorrectly calling generator iterator functions.
+
+## 3.0.13
+
+ * **Bug Fix**
+  * Fix modules loose mode using `modules` instead of `es6.modules`.
+
+## 3.0.12
+
+ * **Internal**
+  * Add internal debug messages.
+ * **Bug Fix**
+  * Add `noScope` option to `traverse.clearProperties`.
+
+## 3.0.11
+
+ * **Bug Fix**
+  * Fix `ast-types` `RestElement` definition.
+  * Make `es6.forOf` loose mode more versatile and support destructuring.
+
+## 3.0.10
+
+ * **Bug Fix**
+  * In `types.getIds` make sure the `declaration` inside of `ExportDeclaration` is actually a `Declaration`.
+
+## 3.0.9
+
+ * **Bug Fix**
+  * Make `t.isReferenced` more powerful, actually take into consideration all contexts were identifier nodes aren't actually references.
+  * Don't camelcase underscores when converting a string to a valid identifier.
+
+## 3.0.8
+
+ * **Bug Fix**
+  * Split up default function declaration exports due to regenerator destroying the parent export declaration.
+
+## 3.0.7
+
+ * **Internal**
+  * Upgrade `core-js` to `0.4.9`.
+ * **Bug Fix**
+  * Add id to function express scope tracking.
+
+## 3.0.6
+
+ * **Bug Fix**
+  * Fix block scope variable tracking stopping whenever it hits a new scope.
+  * Fix block scope variable tracking breaking on all block statement scopes that have a for loop parent.
+
+## 3.0.5
+
+ * **Internal**
+  * More reliable default parameter scope.
+
+## 3.0.4
+
+ * **Bug Fix**
+  * Remove traversal stops from block scope tracking.
+
+## 3.0.3
+
+ * **Internal**
+  * Ignore options starting with `_`.
+
+## 3.0.2
+
+ * **Internal**
+  * Add common plugin options to valid options list.
+
+## 3.0.1
+
+ * **Internal**
+  * Downgrade `kexec` as `1.1.0` throws compilation errors.
+
+## 3.0.0
+
+ * **Polish**
+  * Generated code autoindentation.
+  * Moved global uid registry to a scope registry resulting in nicer uids.
+  * `this` is now illegal in the top level scope when using the default `useStrict` transformer.
+  * New `asyncToGenerator` helper that's much more compact.
+  * Throw errors on unknown options.
+  * More reliable default parameter scope.
+  * Helpers are now compact and have no newlines.
+ * **Internal**
+  * Rewritten a lot of the internals to much simpler.
+  * Removed TDZ from default parameters as it was very wonky and unreliable.
+  * Upgrade `core-js` to `0.4.6`.
+  * Upgrade `acorn-6to5`.
+   * JSX support is now on-par with react-tools/esprima.
+   * Shorthand destructuring.
+ * **Bug Fix**
+  * Generators now work flawlessly with any parameter transformers.
+  * Optional async function transformers should not name their functions.
+  * Remove `unlink` event watching in `bin/6to5`.
+  * Fix regenerator variable declarations being incorrectly hoisted breaking scope.
+  * Transformers that attempted to simplify expressions that had no consequence now take into account whether it's one of the last statements/expressions in the script.
+ * **New Feature**
+  * New `selfContained` transformer.
+  * New `undeclaredVariableCheck` optional transformer.
+  * Added `--blacklist` and `--whitelist` options to `6to5-node`.
+ * **Breaking Change**
+  * Caching is now always enabled for the require hook. It also now no longer caches require resolutions.
+  * Bare `super();` only works inside of constructors.
+  * Removed the optional runtime in favor of the `selfContained` transformer.
+  * This shorthand has been removed from the playground.
+  * `6to5/polyfill` can now only be required **once**.
+  * **CLI**
+    * `--indent` option has been removed.
+    * `--include-regenerator` option has been removed.
+    * `--amd-modules-id` option has been removed, use `--module-ids` instead.
+  * **Options**
+    * `amdModuleIds` option has been removed, use `moduleIds` instead.
+    * `includeRegenerator` has been removed.
+    * `ignoreRegex` fallback has now been dropped from the require hook. `register(/foo/);`, `register({ ignoreRegex: /foo/ })` -> `register({ ignore: /foo/ })`.
+  * **Modules**
+    * Module interop now only collapses to `module.exports` when there's a **single** export that's default.
+    * Imports and exports are now illegal anywhere except the root level by default. Set `modules` to [loose mode](http://6to5.org/docs/usage/loose) to allow them everywhere.
+  * **Transformers**
+    * Optional fast transformer backwards compatibility support has been removed. Use [loose mode](https://6to5.org/docs/usage/loose).
+    * Removed the `coreAliasing` transformer in favor of `selfContained`.
+    * Renamed transformers:
+     * `specNoForInOfAssignment` -> `validation.noForInOfAssignment`
+     * `specSetters` -> `validation.setters`
+     * `specBlockScopedFunctions` -> `spec.blockScopedFunctions`
+     * `malletOperator` -> `playground.malletOperator`
+     * `methodBinding` -> `playground.methodBinding`
+     * `memoizationOperator` -> `playground.memoizationOperator`
+     * `objectGetterMemoization` -> `playground.objectGetterMemoization`
+     * `modules` -> `es6.modules`
+     * `propertyNameShorthand` -> `es6.properties.shorthand`
+     * `arrayComprehension` -> `es7.comprehensions`
+     * `generatorComprehension` -> `es7.comprehensions`
+     * `arrowFunctions` -> `es6.arrowFunctions`
+     * `classes` -> `es6.classes`
+     * `objectSpread` -> `es7.objectSpread`
+     * `exponentiationOperator` -> `es7.exponentiationOperator`
+     * `spread` -> `es6.spread`
+     * `templateLiterals` -> `es6.templateLiterals`
+     * `propertyMethodAssignment` -> `es6.properties.shorthand`
+     * `computedPropertyNames` -> `es6.properties.computed`
+     * `defaultParameters` -> `es6.parameters.default`
+     * `restParameters` -> `es6.parameters.rest`
+     * `destructuring` -> `es6.destructuring`
+     * `forOf` -> `es6.forOf`
+     * `unicodeRegex` -> `es6.unicodeRegex`
+     * `abstractReferences` -> `es7.abstractReferences`
+     * `constants` -> `es6.constants`
+     * `letScoping` -> `es6.blockScoping`
+     * `blockScopingTDZ` -> `es6.blockScopingTDZ`
+     * `generators` -> `regenerator`
+     * `protoToAssign` -> `spec.protoToAssign`
+     * `typeofSymbol` -> `spec.typeofSymbol`
+     * `coreAliasing` -> `selfContained`
+     * `undefinedToVoid` -> `spec.undefinedToVoid`
+     * `undeclaredVariableCheck` -> `validation.undeclaredVariableCheck`
+     * `specPropertyLiterals` -> `minification.propertyLiterals`
+     * `specMemberExpressionLiterals` -> `minification.memberExpressionLiterals`
+
+## 2.13.7
+
+ * **Bug Fix**
+  * Don't realias variables that are already declared in optional `coreAliasing` transformer.
+
+## 2.13.6
+
+ * **Bug Fix**
+  * Add `NewExpression` as a valid parent for parentheses insertion for `ConditionalExpression`.
+
+## 2.13.5
+
+ * **Bug Fix**
+  * Allow rest parameters to be destructuring patterns.
+ * **Internal**
+  * Upgrade `kexec` to `1.1.0`.
+
+## 2.13.4
+
+ * **Bug Fix**
+  * Fix ordering of destructuring and default params.
+  * Fix loop body scope.
+  * Fix `for...of` transformation not retaining it's scope.
+  * Add destructuring assignment support to scope tracking.
+ * **Polish**
+  * More reliable newlines for pretty printing variable declarations.
+
+## 2.13.3
+
+ * **Internal**
+  * Add `coverage` and `vendor` to npmignore.
+
+## 2.13.2
+
+ * **Bug Fix**
+  * Fix `super` inside of nested functions.
+ * **Internal**
+  * Move let scoping TDZ into a separate transformer until it's more solid.
+  * Use `process.stdin.write` instead of `console.log` in `bin` to avoid sprintfification.
+
+## 2.13.1
+
+ * **New Feature**
+  * Temporal dead zone for block binding.
+
+## 2.13.0
+
+ * **New Feature**
+  * Block scoped functions.
+  * Add `--loose all` option.
+  * Add playground mallet operator thanks to [@jridgewell](https://github.com/jridgewell).
+ * **Bug Fix**
+  * Rewrote large parts of the let scoping transformer. Now passes all known tests.
+ * **Internal**
+  * Even more optimisations thanks to the awesome [@gaearon](https://github.com/gaearon).
+  * Upgrade `acorn-6to5`.
+    * Fixes exponentation operator thanks to [@charliesome](https://github.com/charliesome).
+    * Fix flow optional parameters with types.
+  * Upgrade `chokidar` to `0.12.6`.
+  * Upgrade `commander` to `2.6.0`.
+  * Upgrade `core-js` to `0.4.5`.
+  * Upgrade `estraverse` to `1.9.1`.
+  * Upgrade `jshint` to `2.5.11`.
+  * Upgrade `regenerator` to `0.8.9`.
+  * Upgrade `regexpu` to `1.0.0`.
+  * Upgrade `source-map` to `0.1.43`.
+  * Upgrade `source-map-support` to `0.2.9`.
+  * Upgrade `browserify` to `8.1.1`.
+  * Upgrade `chai` to `1.10.0`.
+  * Upgrade `istanbul` to `0.3.5`.
+  * Upgrade `mocha` to `2.1.0`.
+  * Upgrade `uglify-js` to `2.4.16`.
+
+## 2.12.6
+
+ * **Bug Fix**
+  * Add missing flow type traversal keys.
+
+## 2.12.5
+
+ * **Internal**
+  * Fix incorrect `for...in` loop still causing `ember-script` issues.
+
+## 2.12.4
+
+ * **Polish**
+  * Rest parameters now allocate the array before populating.
+ * **Internal**
+  * `for...in` loops have been changed to optimised `for` loops - better performance and no enumeration of protoype keys.
+  * Parts of the code generator have now been optimised thanks to [gaearon](https://github.com/gaearon).
+
+## 2.12.3
+
+ * **Spec Compliancy**
+  * Optional `typeof` transformer checks for `undefined` before passing it to the helper.
+  * Class methods are now named.
+
+## 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**

CONTRIBUTING.md

@@ -1,6 +1,20 @@
 # Contributing
 
-Before contributing, please read the [code of conduct](https://github.com/6to5/6to5/blob/master/CODE_OF_CONDUCT.md).
+Contributions are always welcome, no matter how large or small. Before contributing, please read the [code of conduct](https://github.com/6to5/6to5/blob/master/CODE_OF_CONDUCT.md).
+
+## Developing
+
+#### Workflow
+
+* Fork the repository
+* Clone your fork and change directory to it (`git clone git@github.com:yourUserName/6to5.git && cd 6to5`)
+* Install the project dependencies (`make bootstrap`)
+* Link your forked clone (`npm link`)
+* Develop your changes ensuring you're fetching updates from upstream often
+* Ensure the test are passing (`make test`)
+* Create new pull request explaining your proposed change or reference an issue in your commit message
+
+#### Code Standards
 
  * **General**
    * No ES6 syntax features or methods, exclusively ES5.

Makefile

@@ -1,17 +1,19 @@
 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
+JSCS_CMD = node_modules/jscs/bin/jscs
 
 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 publish-runtime
 
 build:
 	mkdir -p dist
 
-	node bin/cache-templates
+	node tools/cache-templates
 
 	node $(BROWSERIFY_CMD) -e lib/6to5/polyfill.js >dist/polyfill.js
 	node $(UGLIFY_CMD) dist/polyfill.js >dist/polyfill.min.js
@@ -19,9 +21,6 @@ build:
 	node $(BROWSERIFY_CMD) lib/6to5/browser.js -s to5 >dist/6to5.js
 	node $(UGLIFY_CMD) dist/6to5.js >dist/6to5.min.js
 
-	node bin/6to5-runtime >dist/runtime.js
-	node $(UGLIFY_CMD) dist/runtime.js >dist/runtime.min.js
-
 	rm -rf templates.json
 
 clean:
@@ -29,6 +28,7 @@ clean:
 
 lint:
 	$(JSHINT_CMD) --reporter node_modules/jshint-stylish/stylish.js lib bin
+	$(JSCS_CMD) lib bin
 
 test-clean:
 	rm -rf test/tmp
@@ -39,17 +39,17 @@ test: lint
 
 test-simple:
 	# excludes test262
-	export SIMPLE_6TO5_TESTS=1
+	export SIMPLE_6TO5_TESTS=1; \
 	make test
 
 test-all:
 	# includes traceur, esnext, regenerator
-	export ALL_6TO5_TESTS=1
+	export ALL_6TO5_TESTS=1; \
 	make test
 
 test-cov:
-	export SIMPLE_6TO5_TESTS=1
 	rm -rf coverage
+	export SIMPLE_6TO5_TESTS=1; \
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
 
 test-travis: bootstrap
@@ -59,8 +59,8 @@ test-travis: bootstrap
 test-browser:
 	mkdir -p dist
 
-	node bin/cache-templates
-	node bin/cache-tests
+	node tools/cache-templates
+	node tools/cache-tests
 	node $(BROWSERIFY_CMD) -e test/_browser.js >dist/6to5-test.js
 	rm -rf templates.json tests.json
 
@@ -71,23 +71,43 @@ 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
-	cp dist/runtime.min.js runtime.js
 
-	node bin/cache-templates
+	node tools/cache-templates
 	test -f templates.json
 
-	read -p "Version: "  version; \
-  npm version $$version --message "v%s"
 	npm publish
 
 	git push --follow-tags
 
-	rm -rf templates.json browser.js runtime.js browser-polyfill.js
+	make publish-core
+	make publish-runtime
+
+	rm -rf templates.json browser.js browser-polyfill.js
+
+publish-runtime:
+	cd packages; \
+	node build-runtime.js; \
+	cd 6to5-runtime; \
+	npm publish
+
+publish-core:
+	tools/generate-core-package-json >package2.json
+	mv package.json .package.json
+	mv package2.json package.json
+
+	npm publish
+
+	rm -rf package.json
+	mv .package.json package.json
 
 bootstrap:
 	npm install
 	git submodule update --init
 	cd vendor/regenerator; npm install
+	cd vendor/compat-table; npm install object-assign

NOTES.md

@@ -1,8 +1,3 @@
 # Notes
 
- * Wildcard exports/imports wont normalise if `export default` is a non-object.
-
-## 3.0.0 breaking changes
-
- * Remove `allowImportExportEverywhere` option from acorn.
- * Remove this shorthand from playground.
+ * Wildcard exports/imports wont normalise if `export default` is a non-object. See [#224](https://github.com/6to5/6to5/issues/224).

README.md

@@ -2,28 +2,6 @@
   <img alt="6to5" src="https://raw.githubusercontent.com/6to5/logo/master/logo.png" width="546">
 </p>
 
-<p align="center">
-  <a href="https://gratipay.com/sebmck">
-    <img alt="Gratipay" src="https://img.shields.io/gratipay/sebmck.svg?style=flat">
-  </a>
-
-  <a href="https://travis-ci.org/6to5/6to5">
-    <img alt="Travis Status" src="http://img.shields.io/travis/6to5/6to5/master.svg?style=flat&amp;label=travis">
-  </a>
-
-  <a href="https://codeclimate.com/github/6to5/6to5">
-    <img alt="Code Climate Score" src="http://img.shields.io/codeclimate/github/6to5/6to5.svg?style=flat">
-  </a>
-
-  <a href="https://codeclimate.com/github/6to5/6to5">
-    <img alt="Coverage" src="http://img.shields.io/codeclimate/coverage/github/6to5/6to5.svg?style=flat">
-  </a>
-
-  <a href="https://david-dm.org/6to5/6to5">
-    <img alt="Dependency Status" src="http://img.shields.io/david/6to5/6to5.svg?style=flat">
-  </a>
-</p>
-
 <p align="center">
   <strong>6to5</strong> turns ES6+ code into vanilla ES5, so you can use next generation features <strong>today.</strong>
 </p>

bin/6to5-runtime

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-var runtime = require("../lib/6to5/runtime-generator");
-console.log(runtime(process.argv[2]));

bin/6to5/dir.js

@@ -1,9 +1,9 @@
-var chokidar = require("chokidar");
-var mkdirp   = require("mkdirp");
-var path     = require("path");
-var util     = require("./util");
-var fs       = require("fs");
-var _        = require("lodash");
+var outputFileSync = require("output-file-sync");
+var chokidar       = require("chokidar");
+var path           = require("path");
+var util           = require("./util");
+var fs             = require("fs");
+var _              = require("lodash");
 
 module.exports = function (commander, filenames, opts) {
   if (commander.sourceMapsInline) {
@@ -15,16 +15,13 @@ module.exports = function (commander, filenames, opts) {
 
     var data = util.compile(src, { sourceMapName: dest });
 
-    var up = path.normalize(dest + "/..");
-    mkdirp.sync(up);
-
     if (commander.sourceMaps) {
       var mapLoc = dest + ".map";
       data.code = util.addSourceMappingUrl(data.code, mapLoc);
-      fs.writeFileSync(mapLoc, JSON.stringify(data.map));
+      outputFileSync(mapLoc, JSON.stringify(data.map));
     }
 
-    fs.writeFileSync(dest, data.code);
+    outputFileSync(dest, data.code);
 
     console.log(src + " -> " + dest);
   };
@@ -54,12 +51,9 @@ module.exports = function (commander, filenames, opts) {
         ignoreInitial: true
       });
 
-      _.each(["add", "change", "unlink"], function (type) {
+      _.each(["add", "change"], function (type) {
         watcher.on(type, function (filename) {
-          // chop off the dirname plus the path separator
-          var relative = filename.slice(dirname.length + 1);
-
-          console.log(type, filename);
+          var relative = path.relative(dirname, filename) || filename;
           write(filename, relative);
         });
       });

bin/6to5/file.js

@@ -28,7 +28,7 @@ module.exports = function (commander, filenames) {
         map.setSourceContent(filename, result.actual);
 
         consumer.eachMapping(function (mapping) {
-          map._mappings.push({
+          map._mappings.add({
             generatedLine: mapping.generatedLine + offset,
             generatedColumn: mapping.generatedColumn,
             originalLine: mapping.originalLine,
@@ -63,7 +63,7 @@ module.exports = function (commander, filenames) {
 
       fs.writeFileSync(commander.outFile, result.code);
     } else {
-      console.log(result.code);
+      process.stdout.write(result.code + "\n");
     }
   };
 
@@ -77,7 +77,7 @@ module.exports = function (commander, filenames) {
       if (chunk !== null) code += chunk;
     });
 
-    process.stdin.on("end", function() {
+    process.stdin.on("end", function () {
       results.push(util.transform(commander.filename, code));
       output();
     });
@@ -117,7 +117,7 @@ module.exports = function (commander, filenames) {
         persistent: true,
         ignoreInitial: true
       }).on("all", function (type, filename) {
-        if (type === "add" || type === "change" || type === "unlink" ) {
+        if (type === "add" || type === "change") {
           console.log(type, filename);
           walk();
         }

bin/6to5/index.js

@@ -1,41 +1,40 @@
 #!/usr/bin/env node
 
 var commander = require("commander");
-var transform = require("../../lib/6to5/transformation/transform");
+var transform = require("../../lib/6to5/transformation");
 var util      = require("../../lib/6to5/util");
 var fs        = require("fs");
-var _         = require("lodash");
+var each      = require("lodash/collection/each");
+var keys      = require("lodash/object/keys");
 
 commander.option("-t, --source-maps-inline", "Append sourceMappingURL comment to bottom of code");
 commander.option("-s, --source-maps", "Save source map alongside the compiled code");
 commander.option("-f, --filename [filename]", "Filename to use when reading from stdin - this will be used in source-maps, errors etc [stdin]", "stdin");
 commander.option("-w, --watch", "Recompile files on changes");
-commander.option("-r, --runtime", "Replace 6to5 declarations with references to a runtime");
 commander.option("-e, --experimental", "Enable experimental support for proposed ES7 features");
 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("-L, --loose [list]", "List of transformers to enable loose mode ON", 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("-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("--keep-module-id-extensions", "Keep extensions when generating module ids", false);
 
-commander.on("--help", function(){
+commander.on("--help", function () {
   var outKeys = function (title, obj) {
     console.log("  " + title + ":");
     console.log();
 
-    var hasOptional = true;
-
-    _.each(_.keys(obj).sort(), function (key) {
+    each(keys(obj).sort(), function (key) {
       if (key[0] === "_") return;
 
       if (obj[key].optional) {
-        hasOptional = true;
         key = "[" + key + "]";
       }
 
@@ -60,7 +59,7 @@ var errors = [];
 
 var filenames = commander.args;
 
-_.each(filenames, function (filename) {
+each(filenames, function (filename) {
   if (!fs.existsSync(filename)) {
     errors.push(filename + " doesn't exist");
   }
@@ -98,17 +97,19 @@ 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,
+  sourceMapName:          commander.outFile,
+  experimental:           commander.experimental,
+  reactCompat:            commander.reactCompat,
+  playground:             commander.playground,
+  moduleIds:              commander.moduleIds,
+  blacklist:              commander.blacklist,
+  whitelist:              commander.whitelist,
+  sourceMap:              commander.sourceMaps || commander.sourceMapsInline,
+  optional:               commander.optional,
+  comments:               !commander.removeComments,
+  modules:                commander.modules,
+  loose:                  commander.loose
 };
 
 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

@@ -1,38 +1,41 @@
 #!/usr/bin/env node
 
-var roadrunner = require("roadrunner");
-var commander  = require("commander");
-var Module     = require("module");
-var path       = require("path");
-var repl       = require("repl");
-var to5        = require("../lib/6to5");
-var util       = require("../lib/6to5/util");
-var vm         = require("vm");
-var _          = require("lodash");
+var commander = require("commander");
+var Module    = require("module");
+var path      = require("path");
+var repl      = require("repl");
+var to5       = require("../lib/6to5");
+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 [code]", "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,.es,.jsx]");
+program.option("-r, --experimental", "Enable experimental support for proposed ES7 features");
+program.option("-g, --playground", "Enable playground support");
+program.option("-w, --whitelist [whitelist]", "Whitelist of transformers to ONLY use", util.list);
+program.option("-b, --blacklist [blacklist]", "Blacklist of transformers to NOT use", util.list);
+program.option("-o, --optional [optional]", "List of optional transformers to enable", util.list);
 
 var pkg = require("../package.json");
-commander.version(pkg.version);
-commander.usage("[options] [ -e script | script.js ] [arguments]");
-commander.parse(process.argv);
-
-if (commander.cache) roadrunner.load();
+program.version(pkg.version);
+program.usage("[options] [ -e script | script.js ] [arguments]");
+program.parse(process.argv);
 
 //
 
 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,
+  blacklist:    program.blacklist,
+  whitelist:    program.whitelist,
+  optional:     program.optional,
+  ignore:       program.ignore
 });
 
 //
@@ -40,24 +43,39 @@ to5.register({
 var _eval = function (code, filename) {
   code = to5.transform(code, {
     filename: filename,
-    blacklist: ["useStrict"],
-    experimental: commander.experimental,
-    playground: commander.playground
+    blacklist: ["useStrict"].concat(program.blacklist || []),
+    whitelist: program.whitelist,
+    optional: program.optional,
+    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 || program.print) {
+  var code = program.eval;
+  if (!code || code === true) code = program.print;
+
+  var result = _eval(code, "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);
 
     var i = 0;
+    var ignoreNext = false;
     _.each(args, function (arg, i2) {
-      if (arg[0] !== "-") {
+      if (ignoreNext) {
+        ignoreNext = false;
+        return;
+      }
+
+      if (arg[0] === "-") {
+        if (program[arg.slice(2)]) {
+          ignoreNext = true;
+        }
+      } else {
         i = i2;
         return false;
       }
@@ -77,8 +95,6 @@ if (commander.eval) {
   }
 }
 
-if (commander.cache) roadrunner.save();
-
 function replStart() {
   repl.start({
     prompt: "> ",
@@ -94,8 +110,8 @@ function replEval(code, context, filename, callback) {
   var result;
 
   try {
-    if (/^\((.*?)\n\)$/.test(code)) {
-      code = code.slice(1, -2); // remove "(" and "\n)"
+    if (code[0] === "(" && code[code.length - 1] === ")") {
+      code = code.slice(1, -1); // remove "(" and ")"
     }
 
     result = _eval(code, filename);

lib/6to5/browser.js

@@ -1,4 +1,6 @@
-var transform = module.exports = require("./transformation/transform");
+"use strict";
+
+var transform = module.exports = require("./transformation");
 
 transform.version = require("../../package").version;
 

lib/6to5/detection/index.js

@@ -0,0 +1,31 @@
+module.exports = detect;
+
+//var useragent = require("useragent");
+var traverse  = require("../traverse");
+
+var SYNTAX_KEYS = require("./syntax-keys");
+var visitors    = traverse.explode(require("./visitors"));
+
+function detect(ast) {
+  var stats = {
+    syntax: {},
+    builtins: {}
+  };
+
+  var detectedSyntax = function (name) {
+    stats.syntax[name] = true;
+  };
+
+  traverse(ast, {
+    enter: function (node, parent) {
+      if (SYNTAX_KEYS[node.type]) {
+        detectedSyntax(SYNTAX_KEYS[node.type]);
+      }
+
+      var visitor = visitors[node.type];
+      if (visitor) visitor(node, parent, detectedSyntax);
+    }
+  });
+
+  return stats;
+}

lib/6to5/detection/syntax-keys.json

@@ -0,0 +1,84 @@
+{
+  "ArrowFunctionExpression":   "es6.arrowFunctions",
+
+  "AwaitExpression":           "es7.asyncFunctions",
+
+  "ClassBody":                 "es6.classes",
+  "ClassDeclaration":          "es6.classes",
+  "ClassExpression":           "es6.classes",
+  "MethodDefinition":          "es6.classes",
+
+  "ComprehensionBlock":        "es7.comprehensions",
+  "ComprehensionExpression":   "es7.comprehensions",
+
+  "ForOfStatement":            "es6.forOf",
+
+  "ExportBatchSpecifier":      "es6.modules",
+  "ExportDeclaration":         "es6.modules",
+  "ExportSpecifier":           "es6.modules",
+  "ImportBatchSpecifier":      "es6.modules",
+  "ImportDeclaration":         "es6.modules",
+  "ImportSpecifier":           "es6.modules",
+
+  "ArrayPattern":              "es6.destructuring",
+  "AssignmentPattern":         "es6.destructuring",
+  "ObjectPattern":             "es6.destructuring",
+
+  "RestElement":               "es6.parameters.rest",
+
+  "SpreadElement":             "es6.spread",
+
+  "SpreadProperty":            "es7.objectSpread",
+
+  "TaggedTemplateExpression":  "es6.templateLiterals",
+  "TemplateElement":           "es6.templateLiterals",
+  "TemplateLiteral":           "es6.templateLiterals",
+
+  "VirtualPropertyExpression": "es7.abstractReferences",
+  "PrivateDeclaration":        "es7.abstractReferences",
+
+  "YieldExpression":           "es6.generators",
+
+  "AnyTypeAnnotation":           "flow",
+  "ArrayTypeAnnotation":         "flow",
+  "BooleanTypeAnnotation":       "flow",
+  "ClassProperty":               "flow",
+  "DeclareClass":                "flow",
+  "DeclareFunction":             "flow",
+  "DeclareModule":               "flow",
+  "DeclareVariable":             "flow",
+  "FunctionTypeAnnotation":      "flow",
+  "FunctionTypeParam":           "flow",
+  "GenericTypeAnnotation":       "flow",
+  "InterfaceExtends":            "flow",
+  "InterfaceDeclaration":        "flow",
+  "IntersectionTypeAnnotation":  "flow",
+  "NullableTypeAnnotation":      "flow",
+  "NumberTypeAnnotation":        "flow",
+  "StringLiteralTypeAnnotation": "flow",
+  "StringTypeAnnotation":        "flow",
+  "TupleTypeAnnotation":         "flow",
+  "TypeofTypeAnnotation":        "flow",
+  "TypeAlias":                   "flow",
+  "TypeAnnotation":              "flow",
+  "TypeParameterDeclaration":    "flow",
+  "TypeParameterInstantiation":  "flow",
+  "ObjectTypeAnnotation":        "flow",
+  "ObjectTypeCallProperty":      "flow",
+  "ObjectTypeIndexer":           "flow",
+  "ObjectTypeProperty":          "flow",
+  "QualifiedTypeIdentifier":     "flow",
+  "UnionTypeAnnotation":         "flow",
+  "VoidTypeAnnotation":          "flow",
+
+  "JSXAttribute":              "jsx",
+  "JSXClosingElement":         "jsx",
+  "JSXElement":                "jsx",
+  "JSXEmptyExpression":        "jsx",
+  "JSXExpressionContainer":    "jsx",
+  "JSXIdentifier":             "jsx",
+  "JSXMemberExpression":       "jsx",
+  "JSXNamespacedName":         "jsx",
+  "JSXOpeningElement":         "jsx",
+  "JSXSpreadAttribute":        "jsx"
+}

lib/6to5/detection/visitors.js

@@ -0,0 +1,54 @@
+var t = require("../types");
+var _ = require("lodash");
+
+exports.AssignmentExpression = function (node, parent, detected) {
+  if (node.operator === "**=") {
+    detected("es6.exponentation");
+  }
+};
+
+exports.BinaryExpression = function (node, parent, detected) {
+  if (node.operator === "**") {
+    detected("es6.exponentation");
+  }
+};
+
+exports.VariableDeclaration = function (node, parent, detected) {
+  if (node.kind === "let" || node.kind === "const") {
+    detected("es6.blockScoping");
+  }
+
+  if (node.kind === "const") {
+    detected("es6.constants");
+  }
+};
+
+exports.Property = function (node, parent, detected) {
+  if (node.shorthand || node.method) {
+    detected("es6.properties.shorthand");
+  }
+
+  if (node.kind === "set" || node.kind === "get") {
+    detected("es5.properties.mutators");
+  }
+
+  if (node.computed) {
+    detected("es6.properties.computed");
+  }
+};
+
+exports.AssignmentPattern = function (node, parent, detected) {
+  if (t.isFunction(parent) && _.contains(parent.params, node)) {
+    detected("es6.parameters.default");
+  }
+};
+
+exports.Function = function (node, parent, detected) {
+  if (node.generator) {
+    detected("es6.generators");
+  }
+
+  if (node.async) {
+    detected("es7.asyncFunctions");
+  }
+};

lib/6to5/file.js

@@ -1,21 +1,33 @@
+"use strict";
+
 module.exports = File;
 
 var SHEBANG_REGEX = /^\#\!.*/;
 
-var transform = require("./transformation/transform");
-var generate  = require("./generation/generator");
-var Scope     = require("./traverse/scope");
-var util      = require("./util");
-var t         = require("./types");
-var _         = require("lodash");
+var transform  = require("./transformation");
+var generate   = require("./generation");
+var clone      = require("./helpers/clone");
+var Scope      = require("./traverse/scope");
+var util       = require("./util");
+var t          = require("./types");
+var contains   = require("lodash/collection/contains");
+var each       = require("lodash/collection/each");
+var defaults   = require("lodash/object/defaults");
+var isFunction = require("lodash/lang/isFunction");
 
 function File(opts) {
-  this.dynamicImports   = [];
   this.dynamicImportIds = {};
+  this.dynamicImported  = [];
+  this.dynamicImports   = [];
+
+  this.dynamicData      = {};
+  this.data             = {};
+
+  this.lastStatements   = [];
   this.opts             = File.normaliseOptions(opts);
-  this.transformers     = this.getTransformers();
-  this.uids             = {};
   this.ast              = {};
+
+  this.buildTransformers();
 }
 
 File.helpers = [
@@ -24,6 +36,7 @@ File.helpers = [
   "prototype-properties",
   "apply-constructor",
   "tagged-template-literal",
+  "tagged-template-literal-loose",
   "interop-require",
   "to-array",
   "sliced-to-array",
@@ -35,34 +48,69 @@ File.helpers = [
   "async-to-generator",
   "interop-require-wildcard",
   "typeof",
-  "exports-wildcard",
-  "extends"
+  "extends",
+  "get",
+  "set"
 ];
 
-File.excludeHelpersFromRuntime = [
-  "async-to-generator",
-  "typeof"
+File.validOptions = [
+  "filename",
+  "filenameRelative",
+  "blacklist",
+  "whitelist",
+  "loose",
+  "optional",
+  "modules",
+  "sourceMap",
+  "sourceMapName",
+  "sourceFileName",
+  "sourceRoot",
+  "moduleRoot",
+  "moduleIds",
+  "comments",
+  "reactCompat",
+  "keepModuleIdExtensions",
+  "code",
+  "ast",
+  "format",
+  "playground",
+  "experimental",
+  "resolveModuleSource",
+
+  // these are used by plugins
+  "ignore",
+  "only",
+  "extensions",
+  "accept"
 ];
 
 File.normaliseOptions = function (opts) {
-  opts = _.cloneDeep(opts || {});
+  opts = clone(opts);
 
-  _.defaults(opts, {
-    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,
-    code:         true,
-    ast:          true
+  for (var key in opts) {
+    if (key[0] !== "_" && File.validOptions.indexOf(key) < 0) {
+      throw new ReferenceError("Unknown option: " + key);
+    }
+  }
+
+  defaults(opts, {
+    keepModuleIdExtensions: false,
+    resolveModuleSource:    null,
+    experimental:           false,
+    reactCompat:            false,
+    playground:             false,
+    whitespace:             true,
+    moduleIds:              false,
+    blacklist:              [],
+    whitelist:              [],
+    sourceMap:              false,
+    optional:               [],
+    comments:               true,
+    filename:               "unknown",
+    modules:                "common",
+    loose:                  [],
+    code:                   true,
+    ast:                    true
   });
 
   // normalise windows path separators to unix
@@ -70,50 +118,61 @@ 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);
 
-  _.defaults(opts, {
+  if (contains(opts.loose, "all")) {
+    opts.loose = Object.keys(transform.transformers);
+  }
+
+  defaults(opts, {
     moduleRoot: opts.sourceRoot
   });
 
-  _.defaults(opts, {
+  defaults(opts, {
     sourceRoot: opts.moduleRoot
   });
 
-  _.defaults(opts, {
+  defaults(opts, {
     filenameRelative: opts.filename
   });
 
-  _.defaults(opts, {
+  defaults(opts, {
     sourceFileName: opts.filenameRelative,
     sourceMapName:  opts.filenameRelative
   });
 
-  if (opts.runtime === true) {
-    opts.runtime = "to5Runtime";
-  }
-
   if (opts.playground) {
     opts.experimental = true;
   }
 
-  transform._ensureTransformerNames("blacklist", opts.blacklist);
-  transform._ensureTransformerNames("whitelist", opts.whitelist);
-  transform._ensureTransformerNames("optional", opts.optional);
+  opts.blacklist = transform._ensureTransformerNames("blacklist", opts.blacklist);
+  opts.whitelist = transform._ensureTransformerNames("whitelist", opts.whitelist);
+  opts.optional = transform._ensureTransformerNames("optional", opts.optional);
+  opts.loose = transform._ensureTransformerNames("loose", opts.loose);
 
   return opts;
 };
 
-File.prototype.getTransformers = function () {
+File.prototype.isLoose = function (key) {
+  return contains(this.opts.loose, key);
+};
+
+File.prototype.buildTransformers = function () {
   var file = this;
-  var transformers = [];
-  var secondPassTransformers = [];
 
-  _.each(transform.transformers, function (transformer) {
-    if (transformer.canRun(file)) {
-      transformers.push(transformer);
+  var transformers = {};
 
+  var secondaryStack = [];
+  var stack = [];
+
+  each(transform.transformers, function (transformer, key) {
+    var pass = transformers[key] = transformer.buildPass(file);
+
+    if (pass.canRun(file)) {
+      stack.push(pass);
       if (transformer.secondPass) {
-        secondPassTransformers.push(transformer);
+        secondaryStack.push(pass);
       }
 
       if (transformer.manipulateOptions) {
@@ -122,7 +181,8 @@ File.prototype.getTransformers = function () {
     }
   });
 
-  return transformers.concat(secondPassTransformers);
+  this.transformerStack = stack.concat(secondaryStack);
+  this.transformers = transformers;
 };
 
 File.prototype.toArray = function (node, i) {
@@ -142,7 +202,7 @@ File.prototype.toArray = function (node, i) {
 };
 
 File.prototype.getModuleFormatter = function (type) {
-  var ModuleFormatter = _.isFunction(type) ? type : transform.moduleFormatters[type];
+  var ModuleFormatter = isFunction(type) ? type : transform.moduleFormatters[type];
 
   if (!ModuleFormatter) {
     var loc = util.resolve(type);
@@ -168,6 +228,26 @@ File.prototype.parseShebang = function (code) {
   return code;
 };
 
+File.prototype.set = function (key, val) {
+  return this.data[key] = val;
+};
+
+File.prototype.setDynamic = function (key, fn) {
+  this.dynamicData[key] = fn;
+};
+
+File.prototype.get = function (key) {
+  var data = this.data[key];
+  if (data) {
+    return data;
+  } else {
+    var dynamic = this.dynamicData[key];
+    if (dynamic) {
+      return this.set(key, dynamic());
+    }
+  }
+};
+
 File.prototype.addImport = function (source, name) {
   name = name || source;
   var id = this.dynamicImportIds[name];
@@ -178,14 +258,20 @@ File.prototype.addImport = function (source, name) {
     var specifiers = [t.importSpecifier(t.identifier("default"), id)];
     var declar = t.importDeclaration(specifiers, t.literal(source));
     declar._blockHoist = 3;
-    this.dynamicImports.push(declar);
+    this.dynamicImported.push(declar);
+
+    this.moduleFormatter.importSpecifier(specifiers[0], declar, this.dynamicImports);
   }
 
   return id;
 };
 
+File.prototype.isConsequenceExpressionStatement = function (node) {
+  return t.isExpressionStatement(node) && this.lastStatements.indexOf(node) >= 0;
+};
+
 File.prototype.addHelper = function (name) {
-  if (!_.contains(File.helpers, name)) {
+  if (!contains(File.helpers, name)) {
     throw new ReferenceError("unknown declaration " + name);
   }
 
@@ -194,22 +280,21 @@ File.prototype.addHelper = function (name) {
   var declar = program._declarations && program._declarations[name];
   if (declar) return declar.id;
 
-  var ref;
-  var runtimeNamespace = this.opts.runtime;
-  if (runtimeNamespace && !_.contains(File.excludeHelpersFromRuntime, name)) {
+  var runtime = this.get("runtimeIdentifier");
+  if (runtime) {
     name = t.identifier(t.toIdentifier(name));
-    return t.memberExpression(t.identifier(runtimeNamespace), name);
+    return t.memberExpression(runtime, name);
   } else {
-    ref = util.template(name);
+    var ref = util.template(name);
+    ref._compact = true;
+    var uid = this.generateUidIdentifier(name);
+    this.scope.push({
+      key: name,
+      id: uid,
+      init: ref
+    });
+    return uid;
   }
-
-  var uid = this.generateUidIdentifier(name);
-  this.scope.push({
-    key: name,
-    id: uid,
-    init: ref
-  });
-  return uid;
 };
 
 File.prototype.errorWithNode = function (node, msg, Error) {
@@ -232,7 +317,12 @@ File.prototype.parse = function (code) {
 
   code = this.addCode(code);
 
-  return util.parse(this.opts, code, function (tree) {
+  var opts = this.opts;
+
+  opts.allowImportExportEverywhere = this.isLoose("es6.modules");
+  //opts.strictMode = this.transformers.useStrict.canRun();
+
+  return util.parse(opts, code, function (tree) {
     self.transform(tree);
     return self.generate();
   });
@@ -241,20 +331,27 @@ File.prototype.parse = function (code) {
 File.prototype.transform = function (ast) {
   var self = this;
 
+  util.debug(this.opts.filename);
+
   this.ast = ast;
-  this.scope = new Scope(ast.program);
-  this.moduleFormatter = this.getModuleFormatter(this.opts.modules);
+  this.lastStatements = t.getLastStatements(ast.program);
+  this.scope = new Scope(ast.program, ast, null, this);
+
+  var modFormatter = this.moduleFormatter = this.getModuleFormatter(this.opts.modules);
+  if (modFormatter.init && this.transformers["es6.modules"].canRun()) {
+    modFormatter.init();
+  }
 
   var astRun = function (key) {
-    _.each(self.transformers, function (transformer) {
-      transformer.astRun(self, key);
+    each(self.transformerStack, function (pass) {
+      pass.astRun(key);
     });
   };
 
   astRun("enter");
 
-  _.each(this.transformers, function (transformer) {
-    transformer.transform(self);
+  each(this.transformerStack, function (pass) {
+    pass.transform();
   });
 
   astRun("exit");
@@ -295,22 +392,23 @@ File.prototype.generateUid = function (name, scope) {
   scope = scope || this.scope;
 
   var uid;
+  var i = 0;
   do {
-    uid = this._generateUid(name);
+    uid = this._generateUid(name, i);
+    i++;
   } while (scope.has(uid));
   return uid;
 };
 
 File.prototype.generateUidIdentifier = function (name, scope) {
-  return t.identifier(this.generateUid(name, scope));
+  scope = scope || this.scope;
+  var id = t.identifier(this.generateUid(name, scope));
+  scope.add(id);
+  return id;
 };
 
-File.prototype._generateUid = function (name) {
-  var uids = this.uids;
-  var i = uids[name] || 1;
-
+File.prototype._generateUid = function (name, i) {
   var id = name;
   if (i > 1) id += i;
-  uids[name] = i + 1;
   return "_" + id;
 };

lib/6to5/generation/buffer.js

@@ -1,7 +1,11 @@
+"use strict";
+
 module.exports = Buffer;
 
-var util = require("../util");
-var _    = require("lodash");
+var util      = require("../util");
+var isNumber  = require("lodash/lang/isNumber");
+var isBoolean = require("lodash/lang/isBoolean");
+var contains  = require("lodash/collection/contains");
 
 function Buffer(position, format) {
   this.position = position;
@@ -61,39 +65,67 @@ 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);
 };
 
 Buffer.prototype.newline = function (i, removeLast) {
-  if (this.format.compact) return;
-
-  if (_.isBoolean(i)) {
-    removeLast = i;
-    i = null;
-  }
-
-  if (_.isNumber(i)) {
-    if (this.endsWith("{\n")) i--;
-    if (this.endsWith(util.repeat(i, "\n"))) return;
-
-    var self = this;
-    _.times(i, function () {
-      self.newline(null, removeLast);
-    });
+  if (this.format.compact) {
+    this.space();
     return;
   }
 
+  removeLast = removeLast || false;
+
+  if (isNumber(i)) {
+    if (this.endsWith("{\n")) i--;
+    if (this.endsWith(util.repeat(i, "\n"))) return;
+
+    while (i--) {
+      this._newline(removeLast);
+    }
+    return;
+  }
+
+  if (isBoolean(i)) {
+    removeLast = i;
+  }
+
+  this._newline(removeLast);
+};
+
+Buffer.prototype._newline = function (removeLast) {
   if (removeLast && this.isLast("\n")) this.removeLast("\n");
 
   this.removeLast(" ");
 
   // remove whitespace if last character was a newline
-  this.buf = this.buf.replace(/\n +$/, "\n");
-
+  this._removeSpacesAfterLastNewline();
   this._push("\n");
 };
 
+/**
+ * If buffer ends with a newline and some spaces after it, trim those spaces.
+ */
+Buffer.prototype._removeSpacesAfterLastNewline = function () {
+  var lastNewlineIndex = this.buf.lastIndexOf("\n");
+  if (lastNewlineIndex === -1)
+    return;
+
+  var index = this.buf.length - 1;
+  while (index > lastNewlineIndex) {
+    if (this.buf[index] !== " ") {
+      break;
+    }
+
+    index--;
+  }
+
+  if (index === lastNewlineIndex) {
+    this.buf = this.buf.substring(0, index + 1);
+  }
+};
+
 Buffer.prototype.push = function (str, noIndent) {
   if (this._indent && !noIndent && str !== "\n") {
     // we have an indent level and we aren't pushing a newline
@@ -115,13 +147,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/generators/base.js

@@ -1,3 +1,5 @@
+"use strict";
+
 exports.File = function (node, print) {
   print(node.program);
 };

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

@@ -1,3 +1,5 @@
+"use strict";
+
 exports.ClassExpression =
 exports.ClassDeclaration = function (node, print) {
   this.push("class");

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

@@ -1,3 +1,5 @@
+"use strict";
+
 exports.ComprehensionBlock = function (node, print) {
   this.keyword("for");
   this.push("(");

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

@@ -1,6 +1,8 @@
-var util = require("../../util");
-var t    = require("../../types");
-var _    = require("lodash");
+"use strict";
+
+var util     = require("../../util");
+var t        = require("../../types");
+var isNumber = require("lodash/lang/isNumber");
 
 exports.UnaryExpression = function (node, print) {
   var hasSpace = /[a-z]$/.test(node.operator);
@@ -62,7 +64,7 @@ exports.CallExpression = function (node, print) {
 
   var separator = ",";
 
-  if (node._prettyPrint) {
+  if (node._prettyCall) {
     separator += "\n";
     this.newline();
     this.indent();
@@ -74,7 +76,7 @@ exports.CallExpression = function (node, print) {
     separator: separator
   });
 
-  if (node._prettyPrint) {
+  if (node._prettyCall) {
     this.newline();
     this.dedent();
   }
@@ -85,7 +87,11 @@ exports.CallExpression = function (node, print) {
 var buildYieldAwait = function (keyword) {
   return function (node, print) {
     this.push(keyword);
-    if (node.delegate) this.push("*");
+
+    if (node.delegate || node.all) {
+      this.push("*");
+    }
+
     if (node.argument) {
       this.space();
       print(node.argument);
@@ -110,7 +116,9 @@ exports.LogicalExpression =
 exports.AssignmentPattern =
 exports.AssignmentExpression = function (node, print) {
   print(node.left);
-  this.push(" " + node.operator + " ");
+  this.space();
+  this.push(node.operator);
+  this.space();
   print(node.right);
 };
 
@@ -125,7 +133,7 @@ exports.MemberExpression = function (node, print) {
   }
 
   var computed = node.computed;
-  if (t.isLiteral(node.property) && _.isNumber(node.property.value)) {
+  if (t.isLiteral(node.property) && isNumber(node.property.value)) {
     computed = true;
   }
 

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

@@ -1,3 +1,35 @@
-exports.ClassProperty = function () {
-  throw new Error("not implemented");
+"use strict";
+
+exports.AnyTypeAnnotation =
+exports.ArrayTypeAnnotation =
+exports.BooleanTypeAnnotation =
+exports.ClassProperty =
+exports.DeclareClass =
+exports.DeclareFunction =
+exports.DeclareModule =
+exports.DeclareVariable =
+exports.FunctionTypeAnnotation =
+exports.FunctionTypeParam =
+exports.GenericTypeAnnotation =
+exports.InterfaceExtends =
+exports.InterfaceDeclaration =
+exports.IntersectionTypeAnnotation =
+exports.NullableTypeAnnotation =
+exports.NumberTypeAnnotation =
+exports.StringLiteralTypeAnnotation =
+exports.StringTypeAnnotation =
+exports.TupleTypeAnnotation =
+exports.TypeofTypeAnnotation =
+exports.TypeAlias =
+exports.TypeAnnotation =
+exports.TypeParameterDeclaration =
+exports.TypeParameterInstantiation =
+exports.ObjectTypeAnnotation =
+exports.ObjectTypeCallProperty =
+exports.ObjectTypeIndexer =
+exports.ObjectTypeProperty =
+exports.QualifiedTypeIdentifier =
+exports.UnionTypeAnnotation =
+exports.VoidTypeAnnotation = function () {
+  // todo: implement these once we have a `--keep-types` option
 };

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

@@ -1,7 +1,9 @@
-var t = require("../../types");
-var _ = require("lodash");
+"use strict";
 
-exports.XJSAttribute = function (node, print) {
+var t    = require("../../types");
+var each = require("lodash/collection/each");
+
+exports.JSXAttribute = function (node, print) {
   print(node.name);
   if (node.value) {
     this.push("=");
@@ -9,35 +11,35 @@ exports.XJSAttribute = function (node, print) {
   }
 };
 
-exports.XJSIdentifier = function (node) {
+exports.JSXIdentifier = function (node) {
   this.push(node.name);
 };
 
-exports.XJSNamespacedName = function (node, print) {
+exports.JSXNamespacedName = function (node, print) {
   print(node.namespace);
   this.push(":");
   print(node.name);
 };
 
-exports.XJSMemberExpression = function (node, print) {
+exports.JSXMemberExpression = function (node, print) {
   print(node.object);
   this.push(".");
   print(node.property);
 };
 
-exports.XJSSpreadAttribute = function (node, print) {
+exports.JSXSpreadAttribute = function (node, print) {
   this.push("{...");
   print(node.argument);
   this.push("}");
 };
 
-exports.XJSExpressionContainer = function (node, print) {
+exports.JSXExpressionContainer = function (node, print) {
   this.push("{");
   print(node.expression);
   this.push("}");
 };
 
-exports.XJSElement = function (node, print) {
+exports.JSXElement = function (node, print) {
   var self = this;
 
   var open = node.openingElement;
@@ -45,7 +47,7 @@ exports.XJSElement = function (node, print) {
   if (open.selfClosing) return;
 
   this.indent();
-  _.each(node.children, function (child) {
+  each(node.children, function (child) {
     if (t.isLiteral(child)) {
       self.push(child.value);
     } else {
@@ -57,22 +59,22 @@ exports.XJSElement = function (node, print) {
   print(node.closingElement);
 };
 
-exports.XJSOpeningElement = function (node, print) {
+exports.JSXOpeningElement = function (node, print) {
   this.push("<");
   print(node.name);
   if (node.attributes.length > 0) {
-    this.space();
+    this.push(" ");
     print.join(node.attributes, { separator: " " });
   }
   this.push(node.selfClosing ? " />" : ">");
 };
 
-exports.XJSClosingElement = function (node, print) {
+exports.JSXClosingElement = function (node, print) {
   this.push("</");
   print(node.name);
   this.push(">");
 };
 
-exports.XJSEmptyExpression = function () {
+exports.JSXEmptyExpression = function () {
 
 };

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

@@ -1,30 +1,14 @@
+"use strict";
+
 var t = require("../../types");
 
 exports._params = function (node, print) {
-  var self = this;
-
   this.push("(");
 
   print.join(node.params, {
-    separator: ", ",
-    iterator: function (param, i) {
-      var def = node.defaults && node.defaults[i];
-      if (def) {
-        self.push(" = ");
-        print(def);
-      }
-    }
+    separator: ", "
   });
 
-  if (node.rest) {
-    if (node.params.length) {
-      this.push(", ");
-    }
-
-    this.push("...");
-    print(node.rest);
-  }
-
   this.push(")");
 };
 
@@ -52,7 +36,7 @@ exports._method = function (node, print) {
   }
 
   this._params(value, print);
-  this.space();
+  this.push(" ");
   print(value.body);
 };
 
@@ -61,8 +45,11 @@ exports.FunctionExpression = function (node, print) {
   if (node.async) this.push("async ");
   this.push("function");
   if (node.generator) this.push("*");
-  this.space();
-  if (node.id) print(node.id);
+  this.push(" ");
+  if (node.id) {
+    this.space();
+    print(node.id);
+  }
   this._params(node, print);
   this.space();
   print(node.body);
@@ -71,7 +58,7 @@ exports.FunctionExpression = function (node, print) {
 exports.ArrowFunctionExpression = function (node, print) {
   if (node.async) this.push("async ");
 
-  if (node.params.length === 1 && !node.defaults.length && !node.rest && t.isIdentifier(node.params[0])) {
+  if (node.params.length === 1 && t.isIdentifier(node.params[0])) {
     print(node.params[0]);
   } else {
     this._params(node, print);

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

@@ -1,9 +1,11 @@
-var t = require("../../types");
-var _ = require("lodash");
+"use strict";
+
+var t    = require("../../types");
+var each = require("lodash/collection/each");
 
 exports.ImportSpecifier = function (node, print) {
-  if (node.id && node.id.name === "default") {
-    print(node.name);
+  if (t.isSpecifierDefault(node)) {
+    print(t.getSpecifierName(node));
   } else {
     return exports.ExportSpecifier.apply(this, arguments);
   }
@@ -64,12 +66,12 @@ exports.ImportDeclaration = function (node, print) {
   if (specfiers && specfiers.length) {
     var foundImportSpecifier = false;
 
-    _.each(node.specifiers, function (spec, i) {
+    each(node.specifiers, function (spec, i) {
       if (+i > 0) {
         self.push(", ");
       }
 
-      var isDefault = spec.id && spec.id.name === "default";
+      var isDefault = t.isSpecifierDefault(spec);
 
       if (!isDefault && spec.type !== "ImportBatchSpecifier" && !foundImportSpecifier) {
         foundImportSpecifier = true;

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

@@ -1,6 +1,8 @@
-var _ = require("lodash");
+"use strict";
 
-_.each(["BindMemberExpression", "BindFunctionExpression"], function (type) {
+var each = require("lodash/collection/each");
+
+each(["BindMemberExpression", "BindFunctionExpression"], function (type) {
   exports[type] = function () {
     throw new ReferenceError("Trying to render non-standard playground node " + JSON.stringify(type));
   };

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

@@ -1,4 +1,7 @@
-var t = require("../../types");
+"use strict";
+
+var util = require("../../util");
+var t    = require("../../types");
 
 exports.WithStatement = function (node, print) {
   this.keyword("with");
@@ -12,12 +15,13 @@ exports.IfStatement = function (node, print) {
   this.keyword("if");
   this.push("(");
   print(node.test);
-  this.push(") ");
+  this.push(")");
+  this.space();
 
   print.indentOnComments(node.consequent);
 
   if (node.alternate) {
-    if (this.isLast("}")) this.space();
+    if (this.isLast("}")) this.push(" ");
     this.keyword("else");
     print.indentOnComments(node.alternate);
   }
@@ -31,13 +35,13 @@ exports.ForStatement = function (node, print) {
   this.push(";");
 
   if (node.test) {
-    this.space();
+    this.push(" ");
     print(node.test);
   }
   this.push(";");
 
   if (node.update) {
-    this.space();
+    this.push(" ");
     print(node.update);
   }
 
@@ -84,7 +88,7 @@ var buildLabelStatement = function (prefix, key) {
 
     var label = node[key || "label"];
     if (label) {
-      this.space();
+      this.push(" ");
       print(label);
     }
 
@@ -106,7 +110,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 ");
@@ -132,7 +145,9 @@ exports.SwitchStatement = function (node, print) {
   this.keyword("switch");
   this.push("(");
   print(node.discriminant);
-  this.push(") {");
+  this.push(")");
+  this.space();
+  this.push("{");
   print.sequence(node.cases, { indent: true });
   this.push("}");
 };
@@ -157,7 +172,25 @@ exports.DebuggerStatement = function () {
 exports.VariableDeclaration = function (node, print, parent) {
   this.push(node.kind + " ");
 
-  print.join(node.declarations, { separator: ", " });
+  var hasInits = false;
+  // don't add whitespace to loop heads
+  if (!t.isFor(parent)) {
+    for (var i = 0; i < node.declarations.length; i++) {
+      if (node.declarations[i].init) {
+        // has an init so let's split it up over multiple lines
+        hasInits = true;
+      }
+    }
+  }
+
+  var sep = ",";
+  if (hasInits) {
+    sep += "\n" + util.repeat(node.kind.length + 1);
+  } else {
+    sep += " ";
+  }
+
+  print.join(node.declarations, { separator: sep });
 
   if (!t.isFor(parent)) {
     this.semicolon();
@@ -173,7 +206,9 @@ exports.PrivateDeclaration = function (node, print) {
 exports.VariableDeclarator = function (node, print) {
   if (node.init) {
     print(node.id);
-    this.push(" = ");
+    this.space();
+    this.push("=");
+    this.space();
     print(node.init);
   } else {
     print(node.id);

lib/6to5/generation/generators/template-literals.js

@@ -1,4 +1,6 @@
-var _ = require("lodash");
+"use strict";
+
+var each = require("lodash/collection/each");
 
 exports.TaggedTemplateExpression = function (node, print) {
   print(node.tag);
@@ -16,7 +18,7 @@ exports.TemplateLiteral = function (node, print) {
   var self   = this;
   var len    = quasis.length;
 
-  _.each(quasis, function (quasi, i) {
+  each(quasis, function (quasi, i) {
     print(quasi);
 
     if (i + 1 < len) {

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

@@ -1,9 +1,12 @@
-var _ = require("lodash");
+"use strict";
+
+var each = require("lodash/collection/each");
 
 exports.Identifier = function (node) {
   this.push(node.name);
 };
 
+exports.RestElement =
 exports.SpreadElement =
 exports.SpreadProperty = function (node, print) {
   this.push("...");
@@ -59,7 +62,7 @@ exports.ArrayPattern = function (node, print) {
 
   this.push("[");
 
-  _.each(elems, function (elem, i) {
+  each(elems, function (elem, i) {
     if (!elem) {
       // If the array expression ends with a hole, that hole
       // will be ignored by the interpreter, but if it ends with

lib/6to5/generation/index.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function (ast, opts, code) {
   var gen = new CodeGenerator(ast, opts, code);
   return gen.generate();
@@ -5,21 +7,24 @@ module.exports = function (ast, opts, code) {
 
 module.exports.CodeGenerator = CodeGenerator;
 
-var Whitespace = require("./whitespace");
-var SourceMap  = require("./source-map");
-var Position   = require("./position");
-var Buffer     = require("./buffer");
-var util       = require("../util");
-var n          = require("./node");
-var t          = require("../types");
-var _          = require("lodash");
+var detectIndent = require("detect-indent");
+var Whitespace   = require("./whitespace");
+var SourceMap    = require("./source-map");
+var Position     = require("./position");
+var Buffer       = require("./buffer");
+var util         = require("../util");
+var n            = require("./node");
+var t            = require("../types");
+var each         = require("lodash/collection/each");
+var extend       = require("lodash/object/extend");
+var merge        = require("lodash/object/merge");
 
 function CodeGenerator(ast, opts, code) {
   opts = opts || {};
 
   this.comments = ast.comments || [];
   this.tokens   = ast.tokens || [];
-  this.format   = CodeGenerator.normaliseOptions(opts);
+  this.format   = CodeGenerator.normaliseOptions(code, opts);
   this.ast      = ast;
 
   this.whitespace = new Whitespace(this.tokens, this.comments);
@@ -28,20 +33,24 @@ function CodeGenerator(ast, opts, code) {
   this.buffer     = new Buffer(this.position, this.format);
 }
 
-_.each(Buffer.prototype, function (fn, key) {
+each(Buffer.prototype, function (fn, key) {
   CodeGenerator.prototype[key] = function () {
     return fn.apply(this.buffer, arguments);
   };
 });
 
-CodeGenerator.normaliseOptions = function (opts) {
-  return _.merge({
+CodeGenerator.normaliseOptions = function (code, opts) {
+  var indent = detectIndent(code);
+  var style  = indent.indent;
+  if (!style || style === " ") style = "  ";
+
+  return merge({
     parentheses: true,
     comments: opts.comments == null || opts.comments,
     compact: false,
     indent: {
       adjustMultilineComment: true,
-      style: "  ",
+      style: style,
       base: 0
     }
   }, opts.format || {});
@@ -62,8 +71,8 @@ CodeGenerator.generators = {
   jsx:              require("./generators/jsx")
 };
 
-_.each(CodeGenerator.generators, function (generator) {
-  _.extend(CodeGenerator.prototype, generator);
+each(CodeGenerator.generators, function (generator) {
+  extend(CodeGenerator.prototype, generator);
 });
 
 CodeGenerator.prototype.generate = function () {
@@ -72,7 +81,7 @@ CodeGenerator.prototype.generate = function () {
   this.print(ast);
 
   var comments = [];
-  _.each(ast.comments, function (comment) {
+  each(ast.comments, function (comment) {
     if (!comment._displayed) comments.push(comment);
   });
   this._printComments(comments);
@@ -114,6 +123,15 @@ CodeGenerator.prototype.buildPrint = function (parent) {
 CodeGenerator.prototype.print = function (node, parent, opts) {
   if (!node) return "";
 
+  if (parent && parent._compact) {
+    node._compact = true;
+  }
+
+  var oldCompact = this.format.compact;
+  if (node._compact) {
+    this.format.compact = true;
+  }
+
   var self = this;
 
   opts = opts || {};
@@ -125,7 +143,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);
@@ -178,6 +196,8 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
   } else {
     throw new ReferenceError("unknown node of type " + JSON.stringify(node.type) + " with constructor " + JSON.stringify(node && node.constructor.name));
   }
+
+  this.format.compact = oldCompact;
 };
 
 CodeGenerator.prototype.printJoin = function (print, nodes, opts) {
@@ -190,7 +210,7 @@ CodeGenerator.prototype.printJoin = function (print, nodes, opts) {
 
   if (opts.indent) self.indent();
 
-  _.each(nodes, function (node, i) {
+  each(nodes, function (node, i) {
     print(node, {
       statement: opts.statement,
       after: function () {
@@ -255,7 +275,7 @@ CodeGenerator.prototype.getComments = function (key, node, parent) {
     nodes.push(node.argument);
   }
 
-  _.each(nodes, function (node) {
+  each(nodes, function (node) {
     comments = comments.concat(self._getComments(key, node));
   });
 
@@ -273,11 +293,11 @@ CodeGenerator.prototype._printComments = function (comments) {
 
   var self = this;
 
-  _.each(comments, function (comment) {
+  each(comments, function (comment) {
     var skip = false;
 
     // find the original comment in the ast and set it as displayed
-    _.each(self.ast.comments, function (origComment) {
+    each(self.ast.comments, function (origComment) {
       if (origComment.start === comment.start) {
         // comment has already been output
         if (origComment._displayed) skip = true;

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

@@ -1,19 +1,27 @@
+"use strict";
+
 module.exports = Node;
 
 var whitespace = require("./whitespace");
 var parens     = require("./parentheses");
 var t          = require("../../types");
-var _          = require("lodash");
+var each       = require("lodash/collection/each");
+var some       = require("lodash/collection/some");
 
 var find = function (obj, node, parent) {
+  if (!obj) return;
   var result;
 
-  _.each(obj, function (fn, type) {
-    if (t["is" + type](node)) {
+  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;
 };
@@ -23,13 +31,11 @@ function Node(node, parent) {
   this.node   = node;
 }
 
-Node.prototype.isUserWhitespacable = function () {
-  return t.isUserWhitespacable(this.node);
+Node.isUserWhitespacable = function (node) {
+  return t.isUserWhitespacable(node);
 };
 
-Node.prototype.needsWhitespace = function (type) {
-  var parent = this.parent;
-  var node   = this.node;
+Node.needsWhitespace = function (node, parent, type) {
   if (!node) return 0;
 
   if (t.isExpressionStatement(node)) {
@@ -39,31 +45,28 @@ Node.prototype.needsWhitespace = function (type) {
   var lines = find(whitespace[type].nodes, node, parent);
   if (lines) return lines;
 
-  _.each(find(whitespace[type].list, node, parent), function (expr) {
+  each(find(whitespace[type].list, node, parent), function (expr) {
     lines = Node.needsWhitespace(expr, node, type);
     if (lines) return false;
   });
   return lines || 0;
 };
 
-Node.prototype.needsWhitespaceBefore = function () {
-  return this.needsWhitespace("before");
+Node.needsWhitespaceBefore = function (node, parent) {
+  return Node.needsWhitespace(node, parent, "before");
 };
 
-Node.prototype.needsWhitespaceAfter = function () {
-  return this.needsWhitespace("after");
+Node.needsWhitespaceAfter = function (node, parent) {
+  return Node.needsWhitespace(node, parent, "after");
 };
 
-Node.prototype.needsParens = function () {
-  var parent = this.parent;
-  var node   = this.node;
-
+Node.needsParens = function (node, parent) {
   if (!parent) return false;
 
   if (t.isNewExpression(parent) && parent.callee === node) {
     if (t.isCallExpression(node)) return true;
 
-    var hasCall = _.some(node, function (val) {
+    var hasCall = some(node, function (val) {
       return t.isCallExpression(val);
     });
     if (hasCall) return true;
@@ -72,10 +75,7 @@ Node.prototype.needsParens = function () {
   return find(parens, node, parent);
 };
 
-Node.prototype.needsParensNoLineTerminator = function () {
-  var parent = this.parent;
-  var node   = this.node;
-
+Node.needsParensNoLineTerminator = function (node, parent) {
   if (!parent) return false;
 
   // no comments
@@ -95,11 +95,18 @@ Node.prototype.needsParensNoLineTerminator = function () {
   return false;
 };
 
-_.each(Node.prototype, function (fn, key) {
-  Node[key] = function (node, parent) {
-    var n = new Node(node, parent);
+each(Node, function (fn, key) {
+  Node.prototype[key] = function () {
+    // Avoid leaking arguments to prevent deoptimization
+    var args = new Array(arguments.length + 2);
 
-    var args = _.toArray(arguments).slice(2);
-    return n[key].apply(n, args);
+    args[0] = this.node;
+    args[1] = this.parent;
+
+    for (var i = 0; i < args.length; i++) {
+      args[i + 2] = arguments[i];
+    }
+
+    return Node[key].apply(null, args);
   };
 });

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

@@ -1,9 +1,11 @@
-var t = require("../../types");
-var _ = require("lodash");
+"use strict";
+
+var t    = require("../../types");
+var each = require("lodash/collection/each");
 
 var PRECEDENCE = {};
 
-_.each([
+each([
   ["||"],
   ["&&"],
   ["|"],
@@ -16,11 +18,18 @@ _.each([
   ["*", "/", "%"],
   ["**"]
 ], function (tier, i) {
-  _.each(tier, function (op) {
+  each(tier, function (op) {
     PRECEDENCE[op] = i;
   });
 });
 
+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" });
@@ -142,8 +151,10 @@ exports.ConditionalExpression = function (node, parent) {
     return true;
   }
 
-  if (t.isCallExpression(parent) && parent.callee === node) {
-    return true;
+  if (t.isCallExpression(parent) || t.isNewExpression(parent)) {
+    if (parent.callee === node) {
+      return true;
+    }
   }
 
   if (t.isConditionalExpression(parent) && parent.test === node) {

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

@@ -1,5 +1,9 @@
-var _ = require("lodash");
-var t = require("../../types");
+"use strict";
+
+var t        = require("../../types");
+var each     = require("lodash/collection/each");
+var map      = require("lodash/collection/map");
+var isNumber = require("lodash/lang/isNumber");
 
 exports.before = {
   nodes: {
@@ -29,6 +33,10 @@ exports.before = {
 
 exports.after = {
   nodes: {
+    LogicalExpression: function (node) {
+      return t.isFunction(node.left) || t.isFunction(node.right);
+    },
+
     AssignmentExpression: function (node) {
       if (t.isFunction(node.right)) {
         return 1;
@@ -38,7 +46,7 @@ exports.after = {
 
   list: {
     VariableDeclaration: function (node) {
-      return _.map(node.declarations, "init");
+      return map(node.declarations, "init");
     },
 
     ArrayExpression: function (node) {
@@ -51,7 +59,7 @@ exports.after = {
   }
 };
 
-_.each({
+each({
   Function: 1,
   Class: 1,
   For: 1,
@@ -62,11 +70,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,6 +1,6 @@
-module.exports = Position;
+"use strict";
 
-var _ = require("lodash");
+module.exports = Position;
 
 function Position() {
   this.line = 1;
@@ -8,26 +8,22 @@ function Position() {
 }
 
 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/source-map.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = SourceMap;
 
 var sourceMap = require("source-map");

lib/6to5/generation/whitespace.js

@@ -1,25 +1,62 @@
+"use strict";
+
 module.exports = Whitespace;
 
-var _ = require("lodash");
+var sortBy = require("lodash/collection/sortBy");
+
+/**
+ * Returns `i`th number from `base`, continuing from 0 when `max` is reached.
+ * Useful for shifting `for` loop by a fixed number but going over all items.
+ *
+ * @param {Number} i Current index in the loop
+ * @param {Number} base Start index for which to return 0
+ * @param {Number} max Array length
+ * @returns {Number} shiftedIndex
+ */
+function getLookupIndex(i, base, max) {
+  i += base;
+
+  if (i >= max)
+    i -= max;
+
+  return i;
+}
 
 function Whitespace(tokens, comments) {
-  this.tokens = _.sortBy(tokens.concat(comments), "start");
-  this.used   = [];
+  this.tokens = sortBy(tokens.concat(comments), "start");
+  this.used   = {};
+
+  // Profiling this code shows that while generator passes over it, indexes
+  // returned by `getNewlinesBefore` and `getNewlinesAfter` are always increasing.
+
+  // We use this implementation detail for an optimization: instead of always
+  // starting to look from `this.tokens[0]`, we will start `for` loops from the
+  // previous successful match. We will enumerate all tokens—but the common
+  // case will be much faster.
+
+  this._lastFoundIndex = 0;
 }
 
 Whitespace.prototype.getNewlinesBefore = function (node) {
   var startToken;
   var endToken;
   var tokens = this.tokens;
+  var token;
+
+  for (var j = 0; j < tokens.length; j++) {
+    // optimize for forward traversal by shifting for loop index
+    var i = getLookupIndex(j, this._lastFoundIndex, this.tokens.length);
+    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;
+
+      this._lastFoundIndex = i;
+      break;
     }
-  });
+  }
 
   return this.getNewlinesBetween(startToken, endToken);
 };
@@ -28,32 +65,44 @@ Whitespace.prototype.getNewlinesAfter = function (node) {
   var startToken;
   var endToken;
   var tokens = this.tokens;
+  var token;
+
+  for (var j = 0; j < tokens.length; j++) {
+    // optimize for forward traversal by shifting for loop index
+    var i = getLookupIndex(j, this._lastFoundIndex, this.tokens.length);
+    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;
+
+      this._lastFoundIndex = i;
+      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;
+    }
   }
 };
 
 Whitespace.prototype.getNewlinesBetween = function (startToken, endToken) {
   var start = startToken ? startToken.loc.end.line : 1;
   var end   = endToken.loc.start.line;
-
   var lines = 0;
 
   for (var line = start; line < end; line++) {
-    if (!_.contains(this.used, line)) {
-      this.used.push(line);
+    if (typeof this.used[line] === "undefined") {
+      this.used[line] = true;
       lines++;
     }
   }

lib/6to5/helpers/clone.js

@@ -0,0 +1,12 @@
+"use strict";
+
+module.exports = function cloneDeep(obj) {
+  var obj2 = {};
+  if (!obj) return obj2;
+
+  for (var key in obj) {
+    obj2[key] = obj[key];
+  }
+
+  return obj2;
+};

lib/6to5/helpers/code-frame.js

@@ -0,0 +1,79 @@
+// syntax highlighting based on https://github.com/dominictarr/ansi-highlight by the fantastic Dominic Tarr
+
+var supportsColor = require("supports-color");
+var tokenize      = require("js-tokenizer");
+var chalk         = require("chalk");
+var util          = require("../util");
+
+var defs = {
+  string1:  "red",
+  string2:  "red",
+  punct:    ["white", "bold"],
+  curly:    "green",
+  parens:   ["blue", "bold"],
+  square:   ["yellow"],
+  name:     "white",
+  keyword:  ["cyan"],
+  number:   "magenta",
+  regexp:   "magenta",
+  comment1: "grey",
+  comment2: "grey"
+};
+
+var highlight = function (text) {
+  var colorize = function (str, col) {
+    if (!col) return str;
+
+    if (Array.isArray(col)) {
+      col.forEach(function (col) {
+        str = chalk[col](str);
+      });
+    } else {
+      str = chalk[col](str);
+    }
+    return str;
+  };
+
+  return tokenize(text, true).map(function (str) {
+    var type = tokenize.type(str);
+    return colorize(str, defs[type]);
+  }).join("");
+};
+
+module.exports = function (lines, lineNumber, colNumber) {
+  colNumber = Math.max(colNumber, 0);
+
+  if (supportsColor) {
+    lines = highlight(lines);
+  }
+
+  lines = lines.split(/\r\n|[\n\r\u2028\u2029]/);
+
+  var start = Math.max(lineNumber - 3, 0);
+  var end   = Math.min(lines.length, lineNumber + 3);
+  var width = (end + "").length;
+
+  if (!lineNumber && !colNumber) {
+    start = 0;
+    end = lines.length;
+  }
+
+  return "\n" + lines.slice(start, end).map(function (line, i) {
+    var curr = i + start + 1;
+
+    var gutter = curr === lineNumber ? "> " : "  ";
+
+    var sep = curr + util.repeat(width + 1);
+    gutter += sep + "| ";
+
+    var str = gutter + line;
+
+    if (colNumber && curr === lineNumber) {
+      str += "\n";
+      str += util.repeat(gutter.length - 2);
+      str += "|" + util.repeat(colNumber) + "^";
+    }
+
+    return str;
+  }).join("\n");
+};

lib/6to5/helpers/object.js

@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = function () {
+  return Object.create(null);
+};

lib/6to5/helpers/to-fast-properties.js

@@ -0,0 +1,17 @@
+"use strict";
+
+/**
+ * A trick from Bluebird to force V8 to use fast properties for an object.
+ * Read more: http://stackoverflow.com/questions/24987896/
+ *
+ * Use %HasFastProperties(obj) and --allow-natives-syntax to check whether
+ * a particular object already has fast properties.
+ */
+
+module.exports = function toFastProperties(obj) {
+  /*jshint -W027*/
+  function f() {}
+  f.prototype = obj;
+  return f;
+  eval(obj);
+};

lib/6to5/index.js

@@ -1,14 +1,14 @@
-var transform = require("./transformation/transform");
-var util      = require("./util");
-var fs        = require("fs");
-var _         = require("lodash");
+"use strict";
+
+var transform  = require("./transformation");
+var util       = require("./util");
+var fs         = require("fs");
+var isFunction = require("lodash/lang/isFunction");
 
 exports.version = require("../../package").version;
 
 exports.types = require("./types");
 
-exports.runtime = require("./runtime-generator");
-
 exports.register = function (opts) {
   var register = require("./register");
   if (opts != null) register(opts);
@@ -27,7 +27,7 @@ exports._util = util;
 exports.transform = transform;
 
 exports.transformFile = function (filename, opts, callback) {
-  if (_.isFunction(opts)) {
+  if (isFunction(opts)) {
     callback = opts;
     opts = {};
   }

lib/6to5/patch.js

@@ -1,22 +1,31 @@
-var t = require("./types");
-var _ = require("lodash");
+"use strict";
+
+var t      = require("./types");
+var extend = require("lodash/object/extend");
+
+require("./types/node");
 
 // estraverse
 
 var estraverse = require("estraverse");
-_.extend(estraverse.VisitorKeys, t.VISITOR_KEYS);
+extend(estraverse.VisitorKeys, t.VISITOR_KEYS);
 
-// regenerator/recast/ast-types
+// regenerator-6to5/ast-types
 
 var types = require("ast-types");
 var def   = types.Type.def;
 var or    = types.Type.or;
 
+def("File")
+  .bases("Node")
+  .build("program")
+  .field("program", def("Program"));
+
 def("AssignmentPattern")
-    .bases("Pattern")
-    .build("left", "right")
-    .field("left", def("Pattern"))
-    .field("right", def("Expression"));
+  .bases("Pattern")
+  .build("left", "right")
+  .field("left", def("Pattern"))
+  .field("right", def("Expression"));
 
 // Acorn - Same as ImportNamespaceSpecifier but `id` is `name`
 def("ImportBatchSpecifier")
@@ -24,6 +33,11 @@ def("ImportBatchSpecifier")
   .build("name")
   .field("name", def("Identifier"));
 
+def("RestElement")
+  .bases("Pattern")
+  .build("argument")
+  .field("argument", def("expression"));
+
 // Abstract references
 def("VirtualPropertyExpression")
   .bases("Expression")

lib/6to5/polyfill.js

@@ -1,2 +1,9 @@
+"use strict";
+
+if (global._6to5Polyfill) {
+  throw new Error("only one instance of 6to5/polyfill is allowed");
+}
+global._6to5Polyfill = true;
+
 require("core-js/shim");
-require("regenerator/runtime");
+require("regenerator-6to5/runtime");

lib/6to5/register-browser.js

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

lib/6to5/register-cache.js

@@ -0,0 +1,36 @@
+"use strict";
+
+var path = require("path");
+var os   = require("os");
+var fs   = require("fs");
+
+var FILENAME = path.join(os.tmpdir(), "6to5.json");
+var data = {};
+
+exports.save = function () {
+  fs.writeFileSync(FILENAME, JSON.stringify(data, null, "  "));
+};
+
+exports.load = function () {
+  if (!fs.existsSync(FILENAME)) return;
+
+  try {
+    data = JSON.parse(fs.readFileSync(FILENAME));
+  } catch (err) {
+    return;
+  }
+
+  process.on("exit", exports.save);
+
+  var sigint = function () {
+    process.removeListener("SIGINT", sigint);
+    exports.save();
+    process.kill(process.pid, "SIGINT");
+  };
+
+  process.on("SIGINT", sigint);
+};
+
+exports.get = function () {
+  return data;
+};

lib/6to5/register.js

@@ -1,11 +1,14 @@
+"use strict";
+
 require("./polyfill");
 
 var sourceMapSupport = require("source-map-support");
-var roadrunner       = require("roadrunner");
+var registerCache    = require("./register-cache");
 var util             = require("./util");
 var to5              = require("./index");
 var fs               = require("fs");
-var _                = require("lodash");
+var extend           = require("lodash/object/extend");
+var each             = require("lodash/collection/each");
 
 sourceMapSupport.install({
   retrieveSourceMap: function (source) {
@@ -23,46 +26,8 @@ sourceMapSupport.install({
 
 //
 
-var blacklist  = [];
-
-var blacklistTest = function (transformer, code) {
-  try {
-    if (_.isFunction(code)) {
-      code();
-    } else {
-      new Function(code);
-    }
-    blacklist.push(transformer);
-  } catch (err) {
-    if (err.name !== "SyntaxError") throw err;
-  }
-};
-
-blacklistTest("arrayComprehension", "var foo = [for (foo of bar) foo * foo];");
-blacklistTest("generatorComprehension", "var foo = (for (foo of bar) foo * foo)");
-blacklistTest("arrowFunctions", "var foo = x => x * x;");
-blacklistTest("classes", "class Foo {}");
-blacklistTest("computedPropertyNames", "var foo = { [foo]: bar };");
-blacklistTest("constants", function () {
-  try {
-    new Function("const foo = 'foo';\nfoo = 'wow';");
-  } catch (err) {
-    return; // constants are supported
-  }
-  throw new SyntaxError;
-});
-blacklistTest("defaultParamaters", "var foo = function (bar = 0) {};");
-blacklistTest("destructuring", "var { x, y } = { x: 0, y: 0 };");
-blacklistTest("forOf", "for (var foo of bar) {}");
-blacklistTest("generators", "function* foo() {}\nasync function bar() {}"); // generators/async functions delegated to same transformer
-blacklistTest("letScoping", "let foo = 0;");
-blacklistTest("modules", 'import foo from "from";');
-blacklistTest("propertyMethodAssignment", "{ get foo() {} }");
-blacklistTest("propertyNameShorthand", "var foo = { x, y };");
-blacklistTest("restParameters", "function foo(...bar) {}");
-blacklistTest("spread", "foo(...bar);");
-blacklistTest("templateLiterals", "var foo = `foo`;");
-blacklistTest("unicodeRegex", function () { new RegExp("foo", "u"); });
+registerCache.load();
+var cache = registerCache.get();
 
 //
 
@@ -70,7 +35,6 @@ var transformOpts = {};
 var ignoreRegex   = /node_modules/;
 var onlyRegex;
 var whitelist     = [];
-var cache;
 var exts          = {};
 var maps          = {};
 var old           = require.extensions[".js"];
@@ -93,9 +57,8 @@ var loader = function (m, filename) {
     }
   }
 
-  result = result || to5.transformFileSync(filename, _.extend({
+  result = result || to5.transformFileSync(filename, extend({
     whitelist: whitelist,
-    blacklist: blacklist,
     sourceMap: true,
     ast:       false
   }, transformOpts));
@@ -111,38 +74,35 @@ var loader = function (m, filename) {
 };
 
 var hookExtensions = function (_exts) {
-  _.each(exts, function (old, ext) {
+  each(exts, function (old, ext) {
     require.extensions[ext] = old;
   });
 
   exts = {};
 
-  _.each(_exts, function (ext) {
+  each(_exts, function (ext) {
     exts[ext] = require.extensions[ext];
     require.extensions[ext] = loader;
   });
 };
 
-hookExtensions([".es6", ".es", ".js"]);
+hookExtensions(util.canCompile.EXTENSIONS);
 
 module.exports = function (opts) {
   // normalise options
   opts = opts || {};
-  if (_.isRegExp(opts)) opts = { ignore: opts };
-  if (opts.ignoreRegex != null) opts.ignore = opts.ignoreRegex;
 
   if (opts.only != null) onlyRegex = util.regexify(opts.only);
   if (opts.ignore != null) ignoreRegex = util.regexify(opts.ignore);
 
   if (opts.extensions) hookExtensions(util.arrayify(opts.extensions));
 
-  if (opts.cache) cache = opts.cache;
   if (opts.cache === false) cache = null;
-  if (opts.cache === true) {
-    roadrunner.load();
-    roadrunner.setup();
-    cache = roadrunner.get("6to5");
-  }
 
-  _.extend(transformOpts, opts);
+  delete opts.extensions;
+  delete opts.ignore;
+  delete opts.cache;
+  delete opts.only;
+
+  extend(transformOpts, opts);
 };

lib/6to5/runtime-generator.js

@@ -1,33 +0,0 @@
-var generator = require("./generation/generator");
-var util      = require("./util");
-var File      = require("./file");
-var t         = require("./types");
-var _         = require("lodash");
-
-module.exports = function (namespace) {
-  namespace = t.identifier(t.toIdentifier(namespace || "to5Runtime"));
-
-  var body      = [];
-  var container = t.functionExpression(null, [t.identifier("global")], t.blockStatement(body));
-  var tree      = t.program([t.expressionStatement(t.callExpression(container, [util.template("self-global")]))]);
-
-  body.push(t.variableDeclaration("var", [
-    t.variableDeclarator(
-      namespace,
-      t.assignmentExpression("=", t.memberExpression(t.identifier("global"), namespace), t.objectExpression([]))
-    )
-  ]));
-
-  _.each(File.helpers, function (name) {
-    if (_.contains(File.excludeHelpersFromRuntime, name)) {
-      return false;
-    }
-
-    var key = t.identifier(t.toIdentifier(name));
-    body.push(t.expressionStatement(
-      t.assignmentExpression("=", t.memberExpression(namespace, key), util.template(name))
-    ));
-  });
-
-  return generator(tree).code;
-};

lib/6to5/transformation/helpers/build-binary-assignment-operator-transformer.js

@@ -0,0 +1,46 @@
+"use strict";
+
+var explode = require("./explode-assignable-expression");
+var t       = require("../../types");
+
+module.exports = function (exports, opts) {
+  var isAssignment = function (node) {
+    return node.operator === opts.operator + "=";
+  };
+
+  var buildAssignment = function (left, right) {
+    return t.assignmentExpression("=", left, right);
+  };
+
+  exports.ExpressionStatement = function (node, parent, scope, context, file) {
+    // hit the `AssignmentExpression` one below
+    if (file.isConsequenceExpressionStatement(node)) return;
+
+    var expr = node.expression;
+    if (!isAssignment(expr)) return;
+
+    var nodes    = [];
+    var exploded = explode(expr.left, nodes, file, scope, true);
+
+    nodes.push(t.expressionStatement(
+      buildAssignment(exploded.ref, opts.build(exploded.uid, expr.right))
+    ));
+
+    return nodes;
+  };
+
+  exports.AssignmentExpression = function (node, parent, scope, context, file) {
+    if (!isAssignment(node)) return;
+
+    var nodes    = [];
+    var exploded = explode(node.left, nodes, file, scope);
+    nodes.push(buildAssignment(exploded.ref, opts.build(exploded.uid, node.right)));
+
+    return t.toSequenceExpression(nodes, scope);
+  };
+
+  exports.BinaryExpression = function (node) {
+    if (node.operator !== opts.operator) return;
+    return opts.build(node.left, node.right);
+  };
+};

lib/6to5/transformation/helpers/build-comprehension.js

@@ -0,0 +1,25 @@
+"use strict";
+
+var t = require("../../types");
+
+module.exports = function build(node, buildBody) {
+  var self = node.blocks.shift();
+  if (!self) return;
+
+  var child = build(node, buildBody);
+  if (!child) {
+    // last item
+    child = buildBody();
+
+    // add a filter as this is our final stop
+    if (node.filter) {
+      child = t.ifStatement(node.filter, t.blockStatement([child]));
+    }
+  }
+
+  return t.forOfStatement(
+    t.variableDeclaration("let", [t.variableDeclarator(self.left)]),
+    self.right,
+    t.blockStatement([child])
+  );
+};

lib/6to5/transformation/helpers/build-conditional-assignment-operator-transformer.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var explode = require("./explode-assignable-expression");
+var t       = require("../../types");
+
+module.exports = function (exports, opts) {
+  var buildAssignment = function (left, right) {
+    return t.assignmentExpression("=", left, right);
+  };
+
+  exports.ExpressionStatement = function (node, parent, scope, context, file) {
+    // hit the `AssignmentExpression` one below
+    if (file.isConsequenceExpressionStatement(node)) return;
+
+    var expr = node.expression;
+    if (!opts.is(expr, file)) return;
+
+    var nodes = [];
+
+    var exploded = explode(expr.left, nodes, file, scope);
+
+    nodes.push(t.ifStatement(
+      opts.build(exploded.uid, file),
+      t.expressionStatement(buildAssignment(exploded.ref, expr.right))
+    ));
+
+    return nodes;
+  };
+
+  exports.AssignmentExpression = function (node, parent, scope, context, file) {
+    if (!opts.is(node, file)) return;
+
+    var nodes    = [];
+    var exploded = explode(node.left, nodes, file, scope);
+
+    nodes.push(t.logicalExpression(
+      "&&",
+      opts.build(exploded.uid, file),
+      buildAssignment(exploded.ref, node.right)
+    ));
+
+    // todo: duplicate expression node
+    nodes.push(exploded.ref);
+
+    return t.toSequenceExpression(nodes, scope);
+  };
+};

lib/6to5/transformation/helpers/explode-assignable-expression.js

@@ -0,0 +1,73 @@
+"use strict";
+
+var t = require("../../types");
+
+var getObjRef = function (node, nodes, file, scope) {
+  var ref;
+  if (t.isIdentifier(node)) {
+    if (scope.has(node.name, true)) {
+      // this variable is declared in scope so we can be 100% sure
+      // that evaluating it multiple times wont trigger a getter
+      // or something else
+      return node;
+    } else {
+      // could possibly trigger a getter so we need to only evaluate
+      // it once
+      ref = node;
+    }
+  } else if (t.isMemberExpression(node)) {
+    ref = node.object;
+
+    if (t.isIdentifier(ref) && scope.has(ref.name)) {
+      // the object reference that we need to save is locally declared
+      // so as per the previous comment we can be 100% sure evaluating
+      // it multiple times will be safe
+      return ref;
+    }
+  } else {
+    throw new Error("We can't explode this node type " + node.type);
+  }
+
+  var temp = scope.generateUidBasedOnNode(ref);
+  nodes.push(t.variableDeclaration("var", [
+    t.variableDeclarator(temp, ref)
+  ]));
+  return temp;
+};
+
+var getPropRef = function (node, nodes, file, scope) {
+  var prop = node.property;
+  var key = t.toComputedKey(node, prop);
+  if (t.isLiteral(key)) return key;
+
+  var temp = scope.generateUidBasedOnNode(prop);
+  nodes.push(t.variableDeclaration("var", [
+    t.variableDeclarator(temp, prop)
+  ]));
+  return temp;
+};
+
+module.exports = function (node, nodes, file, scope, allowedSingleIdent) {
+  var obj;
+  if (t.isIdentifier(node) && allowedSingleIdent) {
+    obj = node;
+  } else {
+    obj = getObjRef(node, nodes, file, scope);
+  }
+
+  var ref, uid;
+
+  if (t.isIdentifier(node)) {
+    ref = node;
+    uid = obj;
+  } else {
+    var prop = getPropRef(node, nodes, file, scope);
+    var computed = node.computed || t.isLiteral(prop);
+    uid = ref = t.memberExpression(obj, prop, computed);
+  }
+
+  return {
+    uid: uid,
+    ref: ref
+  };
+};

lib/6to5/transformation/helpers/name-method.js

@@ -0,0 +1,51 @@
+"use strict";
+
+var traverse = require("../../traverse");
+var util     = require("../../util");
+var t        = require("../../types");
+
+var visitor = {
+  enter: function (node, parent, scope, context, state) {
+    // check if this node is an identifier that matches the same as our function id
+    if (!t.isIdentifier(node, { name: state.id })) return;
+
+    // check if this node is the one referenced
+    if (!t.isReferenced(node, parent)) return;
+
+    // check that we don't have a local variable declared as that removes the need
+    // for the wrapper
+    var localDeclar = scope.get(state.id, true);
+    if (localDeclar !== state.outerDeclar) return;
+
+    state.selfReference = true;
+    context.stop();
+  }
+};
+
+exports.property = function (node, file, scope) {
+  var key = t.toComputedKey(node, node.key);
+  if (!t.isLiteral(key)) return node; // we can't set a function id with this
+
+  var id = t.toIdentifier(key.value);
+  key = t.identifier(id);
+
+  var state = {
+    id: id,
+    selfReference: false,
+    outerDeclar: scope.get(id, true),
+  };
+
+  traverse(node, visitor, scope, state);
+
+  if (state.selfReference) {
+    // todo: support generators
+    node.value = util.template("property-method-assignment-wrapper", {
+      FUNCTION: node.value,
+      FUNCTION_ID: key,
+      FUNCTION_KEY: scope.generateUidIdentifier(id),
+      WRAPPER_KEY: scope.generateUidIdentifier(id + "Wrapper")
+    });
+  } else {
+    node.value.id = key;
+  }
+};

lib/6to5/transformation/helpers/remap-async-to-generator.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var traverse = require("../../traverse");
+var t        = require("../../types");
+
+var visitor = {
+  enter: function (node, parent, scope, context) {
+    if (t.isFunction(node)) context.skip();
+
+    if (t.isAwaitExpression(node)) {
+      node.type = "YieldExpression";
+
+      if (node.all) {
+        // await* foo; -> yield Promise.all(foo);
+        node.all = false;
+        node.argument = t.callExpression(t.memberExpression(t.identifier("Promise"), t.identifier("all")), [node.argument]);
+      }
+    }
+  }
+};
+
+module.exports = function (node, callId, scope) {
+  node.async = false;
+  node.generator = true;
+
+  traverse(node, visitor, scope);
+
+  var call = t.callExpression(callId, [node]);
+  var id = node.id;
+  delete node.id;
+
+  if (t.isFunctionDeclaration(node)) {
+    var declar = t.variableDeclaration("let", [
+      t.variableDeclarator(id, call)
+    ]);
+    declar._blockHoist = true;
+    return declar;
+  } else {
+    return call;
+  }
+};

lib/6to5/transformation/helpers/replace-supers.js

@@ -0,0 +1,289 @@
+"use strict";
+
+module.exports = ReplaceSupers;
+
+var traverse = require("../../traverse");
+var t        = require("../../types");
+
+/**
+ * Description
+ *
+ * @param {Object} opts
+ */
+
+function ReplaceSupers(opts) {
+  this.topLevelThisReference = null;
+  this.methodNode            = opts.methodNode;
+  this.className             = opts.className;
+  this.superName             = opts.superName;
+  this.isLoose               = opts.isLoose;
+  this.scope                 = opts.scope;
+  this.file                  = opts.file;
+}
+
+/**
+ * Sets a super class value of the named property.
+ *
+ * @example
+ *
+ *   _set(Object.getPrototypeOf(CLASS.prototype), "METHOD", "VALUE", this)
+ *
+ * @param {Node} property
+ * @param {boolean} isStatic
+ * @param {boolean} isComputed
+ *
+ * @returns {Node}
+ */
+ReplaceSupers.prototype.setSuperProperty = function (property, value, isStatic, isComputed, thisExpression) {
+  return t.callExpression(
+    this.file.addHelper("set"),
+    [
+      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),
+      value,
+      thisExpression
+    ]
+  );
+};
+
+/**
+ * Gets a node representing the super class value of the named property.
+ *
+ * @example
+ *
+ *   _get(Object.getPrototypeOf(CLASS.prototype), "METHOD", this)
+ *
+ * @param {Node} property
+ * @param {boolean} isStatic
+ * @param {boolean} isComputed
+ *
+ * @returns {Node}
+ */
+
+ReplaceSupers.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}
+ */
+
+ReplaceSupers.prototype.looseSuperProperty = function (methodNode, id, parent) {
+  var methodName = methodNode.key;
+  var superName  = this.superName || t.identifier("Function");
+
+  if (parent.property === id) {
+    return;
+  } else if (t.isCallExpression(parent, { callee: id })) {
+    // super(); -> ClassName.prototype.MethodName.call(this);
+    parent.arguments.unshift(t.thisExpression());
+
+    if (methodName.name === "constructor") {
+      // constructor() { super(); }
+      return t.memberExpression(superName, t.identifier("call"));
+    } else {
+      id = superName;
+
+      // foo() { super(); }
+      if (!methodNode.static) {
+        id = t.memberExpression(id, t.identifier("prototype"));
+      }
+
+      id = t.memberExpression(id, methodName, methodNode.computed);
+      return t.memberExpression(id, t.identifier("call"));
+    }
+  } else if (t.isMemberExpression(parent) && !methodNode.static) {
+    // super.test -> ClassName.prototype.test
+    return t.memberExpression(superName, t.identifier("prototype"));
+  } else {
+    return superName;
+  }
+};
+
+/**
+ * Description
+ */
+
+ReplaceSupers.prototype.replace = function () {
+  this.traverseLevel(this.methodNode.value, true);
+};
+
+var visitor = {
+  enter: function (node, parent, scope, context, state) {
+    var topLevel = state.topLevel;
+    var self = state.self;
+
+    if (t.isFunction(node) && !t.isArrowFunctionExpression(node)) {
+      // we need to call traverseLevel again so we're context aware
+      self.traverseLevel(node, false);
+      return context.skip();
+    }
+
+    if (t.isProperty(node, { method: true }) || t.isMethodDefinition(node)) {
+      // break on object methods
+      return context.skip();
+    }
+
+    var getThisReference = topLevel ?
+      // top level so `this` is the instance
+      t.thisExpression :
+      // not in the top level so we need to create a reference
+      self.getThisReference;
+
+    var callback = self.specHandle;
+    if (self.isLoose) callback = self.looseHandle;
+    return callback.call(self, getThisReference, node, parent);
+  }
+};
+
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {Boolean} topLevel
+ */
+
+ReplaceSupers.prototype.traverseLevel = function (node, topLevel) {
+  var state = { self: this, topLevel: topLevel };
+  traverse(node, visitor, this.scope, state);
+};
+
+/**
+ * Description
+ */
+
+ReplaceSupers.prototype.getThisReference = function () {
+  if (this.topLevelThisReference) {
+    return this.topLevelThisReference;
+  } else {
+    var ref = this.topLevelThisReference = this.file.generateUidIdentifier("this");
+    this.methodNode.value.body.body.unshift(t.variableDeclaration("var", [
+      t.variableDeclarator(this.topLevelThisReference, t.thisExpression())
+    ]));
+    return ref;
+  }
+};
+
+/**
+ * Description
+ *
+ * @param {Function} getThisReference
+ * @param {Object} node
+ * @param {Object} parent
+ */
+
+ReplaceSupers.prototype.looseHandle = function (getThisReference, node, parent) {
+  if (t.isIdentifier(node, { name: "super" })) {
+    return this.looseSuperProperty(this.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());
+  }
+};
+
+/**
+ * Description
+ *
+ * @param {Function} getThisReference
+ * @param {Object} node
+ * @param {Object} parent
+ */
+
+ReplaceSupers.prototype.specHandle = function (getThisReference, node, parent) {
+  var methodNode = this.methodNode;
+  var property;
+  var computed;
+  var args;
+  var thisReference;
+
+  if (t.isIdentifier(node, { name: "super" })) {
+    if (!(t.isMemberExpression(parent) && !parent.computed && parent.property === node)) {
+      throw this.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;
+
+      // bare `super` call is illegal inside non-constructors
+      //  - https://esdiscuss.org/topic/super-call-in-methods
+      //  - https://twitter.com/wycats/status/544553184396836864
+      if (methodNode.key.name !== "constructor") {
+        var methodName = methodNode.key.name || "METHOD_NAME";
+        throw this.file.errorWithNode(node, "Direct super call is illegal in non-constructor, use super." + methodName + "() instead");
+      }
+    } else {
+      if (!t.isMemberExpression(callee)) return;
+      if (callee.object.name !== "super") return;
+
+      // 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;
+  } else if (t.isAssignmentExpression(node)) {
+    if (!t.isIdentifier(node.left.object, { name: "super" })) return;
+    if (methodNode.kind !== "set") return;
+
+    thisReference = getThisReference();
+    // super.name = "val"; -> _set(Object.getPrototypeOf(ClassName.prototype), "name", this);
+    return this.setSuperProperty(node.left.property, node.right, methodNode.static, node.left.computed, thisReference);
+  }
+
+  if (!property) return;
+
+  thisReference = getThisReference();
+  var superProperty = this.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;
+  }
+};

lib/6to5/transformation/helpers/use-strict.js

@@ -1,13 +1,15 @@
+"use strict";
+
 var t = require("../../types");
 
-exports._has = function (node) {
+exports.has = function (node) {
   var first = node.body[0];
   return t.isExpressionStatement(first) && t.isLiteral(first.expression, { value: "use strict" });
 };
 
-exports._wrap = function (node, callback) {
+exports.wrap = function (node, callback) {
   var useStrictNode;
-  if (exports._has(node)) {
+  if (exports.has(node)) {
     useStrictNode = node.body.shift();
   }
 
@@ -17,11 +19,3 @@ exports._wrap = function (node, callback) {
     node.body.unshift(useStrictNode);
   }
 };
-
-exports.ast = {
-  exit: function (ast) {
-    if (!exports._has(ast.program)) {
-      ast.program.body.unshift(t.expressionStatement(t.literal("use strict")));
-    }
-  }
-};

lib/6to5/transformation/index.js

@@ -0,0 +1,73 @@
+"use strict";
+
+module.exports = transform;
+
+var Transformer = require("./transformer");
+var object      = require("../helpers/object");
+var File        = require("../file");
+var util        = require("../util");
+var each        = require("lodash/collection/each");
+
+function transform(code, opts) {
+  var file = new File(opts);
+  return file.parse(code);
+}
+
+transform.fromAst = function (ast, code, opts) {
+  ast = util.normaliseAst(ast);
+
+  var file = new File(opts);
+  file.addCode(code);
+  file.transform(ast);
+  return file.generate();
+};
+
+transform._ensureTransformerNames = function (type, rawKeys) {
+  var keys = [];
+
+  for (var i = 0; i < rawKeys.length; i++) {
+    var key = rawKeys[i];
+
+    var deprecatedKey = transform.deprecatedTransformerMap[key];
+    if (deprecatedKey) {
+      // deprecated key, remap it to the new one
+      console.error(
+        "The transformer " + key + " has been renamed to " + deprecatedKey +
+        " in v3.0.0 - backwards compatibilty will be removed 4.0.0"
+      );
+      rawKeys.push(deprecatedKey);
+    } else if (transform.transformers[key]) {
+      // valid key
+      keys.push(key);
+    } else if (transform.namespaces[key]) {
+      // namespace, append all transformers within this namespace
+      keys = keys.concat(transform.namespaces[key]);
+    } else {
+      // invalid key
+      throw new ReferenceError(
+        "Unknown transformer " + key + " specified in " + type + " - " +
+        "transformer key names have been changed in 3.0.0 see " +
+        "the changelog for more info " +
+        "https://github.com/6to5/6to5/blob/master/CHANGELOG.md#300"
+      );
+    }
+  }
+
+  return keys;
+};
+
+transform.transformers = object();
+transform.namespaces   = object();
+
+transform.deprecatedTransformerMap = require("./transformers/deprecated");
+transform.moduleFormatters = require("./modules");
+
+var rawTransformers = require("./transformers");
+
+each(rawTransformers, function (transformer, key) {
+  var namespace = key.split(".")[0];
+  transform.namespaces[namespace] = transform.namespaces[namespace] || [];
+  transform.namespaces[namespace].push(key);
+
+  transform.transformers[key] = new Transformer(key, transformer);
+});

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

@@ -1,81 +1,135 @@
+"use strict";
+
 module.exports = DefaultFormatter;
 
 var traverse = require("../../traverse");
+var object   = require("../../helpers/object");
 var util     = require("../../util");
 var t        = require("../../types");
-var _        = require("lodash");
+var extend   = require("lodash/object/extend");
 
 function DefaultFormatter(file) {
   this.file = file;
+  this.ids  = object();
 
-  this.localExports = this.getLocalExports();
-  this.localImports = this.getLocalImports();
+  this.hasNonDefaultExports = false;
+
+  this.hasLocalExports = false;
+  this.hasLocalImports = false;
+
+  this.localImportOccurences = object();
+  this.localExports = object();
+  this.localImports = object();
+
+  this.getLocalExports();
+  this.getLocalImports();
 
   this.remapAssignments();
-
-  //this.checkCollisions();
 }
 
-DefaultFormatter.prototype.getLocalExports = function () {
-  var localExports = {};
+DefaultFormatter.prototype.doDefaultExportInterop = function (node) {
+  return node.default && !this.noInteropRequire && !this.hasNonDefaultExports;
+};
 
-  traverse(this.file.ast, {
-    enter: function (node) {
-      var declar = node && node.declaration;
-      if (t.isExportDeclaration(node) && declar && t.isStatement(declar)) {
-        _.extend(localExports, t.getIds(declar, true));
+DefaultFormatter.prototype.bumpImportOccurences = function (node) {
+  var source = node.source.value;
+  var occurs = this.localImportOccurences;
+  occurs[source] = occurs[source] || 0;
+  occurs[source] += node.specifiers.length;
+};
+
+var exportsVisitor = {
+  enter: function (node, parent, scope, context, formatter) {
+    var declar = node && node.declaration;
+    if (t.isExportDeclaration(node)) {
+      formatter.hasLocalImports = true;
+
+      if (declar && t.isStatement(declar)) {
+        extend(formatter.localExports, t.getDeclarations(declar));
+      }
+
+      if (!node.default) {
+        formatter.hasNonDefaultExports = true;
+      }
+
+      if (node.source) {
+        formatter.bumpImportOccurences(node);
       }
     }
-  });
+  }
+};
 
-  return localExports;
+DefaultFormatter.prototype.getLocalExports = function () {
+  traverse(this.file.ast, exportsVisitor, this.file.scope, this);
+};
+
+var importsVisitor = {
+  enter: function (node, parent, scope, context, formatter) {
+    if (t.isImportDeclaration(node)) {
+      formatter.hasLocalImports = true;
+      extend(formatter.localImports, t.getDeclarations(node));
+      formatter.bumpImportOccurences(node);
+    }
+  }
 };
 
 DefaultFormatter.prototype.getLocalImports = function () {
-  var localImports = {};
-
-  traverse(this.file.ast, {
-    enter: function (node) {
-      if (t.isImportDeclaration(node)) {
-        _.extend(localImports, t.getIds(node, true));
-      }
-    }
-  });
-
-  return localImports;
+  traverse(this.file.ast, importsVisitor, this.file.scope, this);
 };
 
-DefaultFormatter.prototype.checkCollisions = function () {
-  // todo: all check export collissions
+var remapVisitor = {
+  enter: function (node, parent, scope, context, formatter) {
+    if (t.isUpdateExpression(node) && formatter.isLocalReference(node.argument, scope)) {
+      context.skip();
 
-  var localImports = this.localImports;
-  var file = this.file;
+      // expand to long file assignment expression
+      var assign = t.assignmentExpression(node.operator[0] + "=", node.argument, t.literal(1));
 
-  var isLocalReference = function (node) {
-    return t.isIdentifier(node) && _.has(localImports, node.name) && localImports[node.name] !== node;
-  };
+      // remap this assignment expression
+      var remapped = formatter.remapExportAssignment(assign);
 
-  var check = function (node) {
-    if (isLocalReference(node)) {
-      throw file.errorWithNode(node, "Illegal assignment of module import");
-    }
-  };
-
-  traverse(file.ast, {
-    enter: function (node) {
-      if (t.isAssignmentExpression(node)) {
-
-        var left = node.left;
-        if (t.isMemberExpression(left)) {
-          while (left.object) left = left.object;
-        }
-
-        check(left);
-      } else if (t.isDeclaration(node)) {
-        _.each(t.getIds(node, true), check);
+      // we don't need to change the result
+      if (t.isExpressionStatement(parent) || node.prefix) {
+        return remapped;
       }
+
+      var nodes = [];
+      nodes.push(remapped);
+
+      var operator;
+      if (node.operator === "--") {
+        operator = "+";
+      } else { // "++"
+        operator = "-";
+      }
+      nodes.push(t.binaryExpression(operator, node.argument, t.literal(1)));
+
+      return t.sequenceExpression(nodes);
     }
-  });
+
+    if (t.isAssignmentExpression(node) && formatter.isLocalReference(node.left, scope)) {
+      context.skip();
+      return formatter.remapExportAssignment(node);
+    }
+  }
+};
+
+DefaultFormatter.prototype.remapAssignments = function () {
+  if (this.hasLocalImports) {
+    traverse(this.file.ast, remapVisitor, this.file.scope, this);
+  }
+};
+
+DefaultFormatter.prototype.isLocalReference = function (node) {
+  var localImports = this.localImports;
+  return t.isIdentifier(node) && localImports[node.name] && localImports[node.name] !== node;
+};
+
+DefaultFormatter.prototype.checkLocalReference = function (node) {
+  var file = this.file;
+  if (this.isLocalReference(node)) {
+    throw file.errorWithNode(node, "Illegal assignment of module import");
+  }
 };
 
 DefaultFormatter.prototype.remapExportAssignment = function (node) {
@@ -90,51 +144,10 @@ DefaultFormatter.prototype.remapExportAssignment = function (node) {
   );
 };
 
-DefaultFormatter.prototype.remapAssignments = function () {
+DefaultFormatter.prototype.isLocalReference = function (node, scope) {
   var localExports = this.localExports;
-  var self = this;
-
-  var isLocalReference = function (node, scope) {
-    var name = node.name;
-    return t.isIdentifier(node) && localExports[name] && localExports[name] === scope.get(name, true);
-  };
-
-  traverse(this.file.ast, {
-    enter: function (node, parent, scope) {
-      if (t.isUpdateExpression(node) && isLocalReference(node.argument, scope)) {
-        this.skip();
-
-        // expand to long file assignment expression
-        var assign = t.assignmentExpression(node.operator[0] + "=", node.argument, t.literal(1));
-
-        // remap this assignment expression
-        var remapped = self.remapExportAssignment(assign);
-
-        // we don't need to change the result
-        if (t.isExpressionStatement(parent) || node.prefix) {
-          return remapped;
-        }
-
-        var nodes = [];
-        nodes.push(remapped);
-
-        var operator;
-        if (node.operator === "--") {
-          operator = "+";
-        } else { // "++"
-          operator = "-";
-        }
-        nodes.push(t.binaryExpression(operator, node.argument, t.literal(1)));
-
-        return t.sequenceExpression(nodes);
-      }
-
-      if (t.isAssignmentExpression(node) && isLocalReference(node.left, scope)) {
-        this.skip();
-        return self.remapExportAssignment(node);
-      }
-    }
-  });
+  var name = node.name;
+  return t.isIdentifier(node) && localExports[name] && localExports[name] === scope.get(name, true);
 };
 
 DefaultFormatter.prototype.getModuleName = function () {
@@ -156,8 +169,10 @@ DefaultFormatter.prototype.getModuleName = function () {
     filenameRelative = filenameRelative.replace(sourceRootRegEx, "");
   }
 
-  // remove extension
-  filenameRelative = filenameRelative.replace(/\.(.*?)$/, "");
+  if (!opts.keepModuleIdExtensions) {
+    // remove extension
+    filenameRelative = filenameRelative.replace(/\.(.*?)$/, "");
+  }
 
   moduleName += filenameRelative;
 
@@ -186,25 +201,37 @@ DefaultFormatter.prototype._hoistExport = function (declar, assign, priority) {
   return assign;
 };
 
-DefaultFormatter.prototype._exportSpecifier = function (getRef, specifier, node, nodes) {
+DefaultFormatter.prototype.getExternalReference = function (node, nodes) {
+  var ids = this.ids;
+  var id = node.source.value;
+
+  if (ids[id]) {
+    return ids[id];
+  } else {
+    return this.ids[id] = this._getExternalReference(node, nodes);
+  }
+};
+
+DefaultFormatter.prototype.exportSpecifier = function (specifier, node, nodes) {
   var inherits = false;
   if (node.specifiers.length === 1) inherits = node;
 
   if (node.source) {
+    var ref = this.getExternalReference(node, nodes);
+
     if (t.isExportBatchSpecifier(specifier)) {
       // export * from "foo";
-      nodes.push(this._exportsWildcard(getRef(), node));
+      nodes.push(this.buildExportsWildcard(ref, node));
     } else {
-      var ref;
       if (t.isSpecifierDefault(specifier) && !this.noInteropRequire) {
         // importing a default so we need to normalise it
-        ref = t.callExpression(this.file.addHelper("interop-require"), [getRef()]);
+        ref = t.callExpression(this.file.addHelper("interop-require"), [ref]);
       } else {
-        ref = t.memberExpression(getRef(), specifier.id);
+        ref = t.memberExpression(ref, t.getSpecifierId(specifier));
       }
 
       // export { foo } from "test";
-      nodes.push(this._exportsAssign(
+      nodes.push(this.buildExportsAssignment(
         t.getSpecifierName(specifier),
         ref,
         node
@@ -212,17 +239,18 @@ DefaultFormatter.prototype._exportSpecifier = function (getRef, specifier, node,
     }
   } else {
     // export { foo };
-    nodes.push(this._exportsAssign(t.getSpecifierName(specifier), specifier.id, node));
+    nodes.push(this.buildExportsAssignment(t.getSpecifierName(specifier), specifier.id, node));
   }
 };
 
-DefaultFormatter.prototype._exportsWildcard = function (objectIdentifier) {
-  return t.expressionStatement(t.callExpression(this.file.addHelper("exports-wildcard"), [
+DefaultFormatter.prototype.buildExportsWildcard = function (objectIdentifier) {
+  return t.expressionStatement(t.callExpression(this.file.addHelper("defaults"), [
+    t.identifier("exports"),
     t.callExpression(this.file.addHelper("interop-require-wildcard"), [objectIdentifier])
   ]));
 };
 
-DefaultFormatter.prototype._exportsAssign = function (id, init) {
+DefaultFormatter.prototype.buildExportsAssignment = function (id, init) {
   return util.template("exports-assign", {
     VALUE: init,
     KEY:   id
@@ -241,13 +269,13 @@ DefaultFormatter.prototype.exportDeclaration = function (node, nodes) {
   var assign;
 
   if (t.isVariableDeclaration(declar)) {
-    for (var i in declar.declarations) {
+    for (var i = 0; i < declar.declarations.length; i++) {
       var decl = declar.declarations[i];
 
-      decl.init = this._exportsAssign(decl.id, decl.init, node).expression;
+      decl.init = this.buildExportsAssignment(decl.id, decl.init, node).expression;
 
       var newDeclar = t.variableDeclaration(declar.kind, [decl]);
-      if (i === "0") t.inherits(newDeclar, declar);
+      if (i === 0) t.inherits(newDeclar, declar);
       nodes.push(newDeclar);
     }
   } else {
@@ -258,7 +286,7 @@ DefaultFormatter.prototype.exportDeclaration = function (node, nodes) {
       nodes.push(declar);
     }
 
-    assign = this._exportsAssign(id, ref, node);
+    assign = this.buildExportsAssignment(id, ref, node);
 
     nodes.push(assign);
 

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

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

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

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

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

@@ -1,18 +1,22 @@
+"use strict";
+
 module.exports = AMDFormatter;
 
 var DefaultFormatter = require("./_default");
 var CommonFormatter  = require("./common");
 var util             = require("../../util");
 var t                = require("../../types");
-var _                = require("lodash");
+var contains         = require("lodash/collection/contains");
+var values           = require("lodash/object/values");
 
 function AMDFormatter() {
-  DefaultFormatter.apply(this, arguments);
-  this.ids  = {};
+  CommonFormatter.apply(this, arguments);
 }
 
 util.inherits(AMDFormatter, DefaultFormatter);
 
+AMDFormatter.prototype.init = CommonFormatter.prototype.init;
+
 AMDFormatter.prototype.buildDependencyLiterals = function () {
   var names = [];
   for (var name in this.ids) {
@@ -38,7 +42,7 @@ AMDFormatter.prototype.transform = function (ast) {
 
   // build up define container
 
-  var params = _.values(this.ids);
+  var params = values(this.ids);
   if (this.passModuleArg) params.unshift(t.identifier("module"));
   params.unshift(t.identifier("exports"));
 
@@ -66,33 +70,29 @@ AMDFormatter.prototype.getModuleName = function () {
   }
 };
 
-AMDFormatter.prototype._push = function (node) {
-  var id  = node.source.value;
-  var ids = this.ids;
-
-  if (ids[id]) {
-    return ids[id];
-  } else {
-    return this.ids[id] = this.file.generateUidIdentifier(id);
-  }
+AMDFormatter.prototype._getExternalReference = function (node) {
+  return this.file.generateUidIdentifier(node.source.value);
 };
 
 AMDFormatter.prototype.importDeclaration = function (node) {
-  this._push(node);
+  this.getExternalReference(node);
 };
 
 AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
   var key = t.getSpecifierName(specifier);
-  var ref = this._push(node);
+  var ref = this.getExternalReference(node);
 
-  if (t.isImportBatchSpecifier(specifier)) {
+  if (contains(this.file.dynamicImported, node)) {
+    // Prevent unnecessary renaming of dynamic imports.
+    this.ids[node.source.value] = ref;
+  } else if (t.isImportBatchSpecifier(specifier)) {
     // import * as bar from "foo";
   } else if (t.isSpecifierDefault(specifier) && !this.noInteropRequire) {
     // import foo from "foo";
     ref = t.callExpression(this.file.addHelper("interop-require"), [ref]);
   } else {
     // import {foo} from "foo";
-    ref = t.memberExpression(ref, specifier.id, false);
+    ref = t.memberExpression(ref, t.getSpecifierId(specifier), false);
   }
 
   nodes.push(t.variableDeclaration("var", [
@@ -101,16 +101,9 @@ AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
 };
 
 AMDFormatter.prototype.exportDeclaration = function (node) {
-  if (node.default) {
+  if (this.doDefaultExportInterop(node)) {
     this.passModuleArg = true;
   }
 
   CommonFormatter.prototype.exportDeclaration.apply(this, arguments);
 };
-
-AMDFormatter.prototype.exportSpecifier = function (specifier, node, nodes) {
-  var self = this;
-  return this._exportSpecifier(function () {
-    return self._push(node);
-  }, specifier, node, nodes);
-};

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

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

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

@@ -1,36 +1,35 @@
+"use strict";
+
 module.exports = CommonJSFormatter;
 
 var DefaultFormatter = require("./_default");
-var traverse         = require("../../traverse");
 var util             = require("../../util");
 var t                = require("../../types");
+var contains         = require("lodash/collection/contains");
 
-function CommonJSFormatter(file) {
+function CommonJSFormatter() {
   DefaultFormatter.apply(this, arguments);
-
-  var hasNonDefaultExports = false;
-  traverse(file.ast, {
-    enter: function (node) {
-      if (t.isExportDeclaration(node) && !node.default) hasNonDefaultExports = true;
-    }
-  });
-  this.hasNonDefaultExports = hasNonDefaultExports;
 }
 
 util.inherits(CommonJSFormatter, DefaultFormatter);
 
+CommonJSFormatter.prototype.init = function () {
+  if (this.hasNonDefaultExports) {
+    this.file.ast.program.body.push(util.template("exports-module-declaration", true));
+  }
+};
+
 CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
   var variableName = t.getSpecifierName(specifier);
 
+  var ref = this.getExternalReference(node, nodes);
+
   // import foo from "foo";
   if (t.isSpecifierDefault(specifier)) {
-    nodes.push(t.variableDeclaration("var", [
-      t.variableDeclarator(variableName,
-        t.callExpression(this.file.addHelper("interop-require"), [util.template("require", {
-          MODULE_NAME: node.source
-        })])
-      )
-    ]));
+    if (!contains(this.file.dynamicImported, node)) {
+      ref = t.callExpression(this.file.addHelper("interop-require"), [ref]);
+    }
+    nodes.push(t.variableDeclaration("var", [t.variableDeclarator(variableName, ref)]));
   } else {
     if (specifier.type === "ImportBatchSpecifier") {
       // import * as bar from "foo";
@@ -38,17 +37,18 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
         t.variableDeclarator(
           variableName,
           t.callExpression(this.file.addHelper("interop-require-wildcard"), [
-            t.callExpression(t.identifier("require"), [node.source])
+            ref
           ])
         )
       ]));
     } else {
-      // import foo from "foo";
-      nodes.push(util.template("require-assign-key", {
-        VARIABLE_NAME: variableName,
-        MODULE_NAME:   node.source,
-        KEY:           specifier.id
-      }));
+      // import { foo } from "foo";
+      nodes.push(t.variableDeclaration("var", [
+        t.variableDeclarator(
+          variableName,
+          t.memberExpression(ref, t.getSpecifierId(specifier))
+        )
+      ]));
     }
   }
 };
@@ -61,45 +61,35 @@ CommonJSFormatter.prototype.importDeclaration = function (node, nodes) {
 };
 
 CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
-  if (node.default && !this.exportIdentifier) {
+  if (this.doDefaultExportInterop(node)) {
     var declar = node.declaration;
-    var assign;
+    var assign = util.template("exports-default-assign", {
+      VALUE: this._pushStatement(declar, nodes)
+    }, true);
 
-    // module.exports = VALUE;
-    var templateName = "exports-default-module";
-
-    // exports = module.exports = VALUE;
-    if (this.hasNonDefaultExports) templateName = "exports-default-module-override";
-
-    if (t.isFunctionDeclaration(declar) || !this.hasNonDefaultExports) {
-      assign = util.template(templateName, {
-        VALUE: this._pushStatement(declar, nodes)
-      }, true);
-
-      // hoist to the top if this default is a function
-      nodes.push(this._hoistExport(declar, assign, 3));
-      return;
-    } else {
-      // 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 = _extends(exports["default"], exports)
-      //
-
-      assign = util.template("common-export-default-assign", {
-        EXTENDS_HELPER: this.file.addHelper("extends")
-      }, true);
-      assign._blockHoist = 0;
-
-      nodes.push(assign);
+    if (t.isFunctionDeclaration(declar)) {
+      // we can hoist this assignment to the top of the file
+      assign._blockHoist = 3;
     }
+
+    nodes.push(assign);
+    return;
   }
 
   DefaultFormatter.prototype.exportDeclaration.apply(this, arguments);
 };
 
-CommonJSFormatter.prototype.exportSpecifier = function (specifier, node, nodes) {
-  this._exportSpecifier(function () {
-    return t.callExpression(t.identifier("require"), [node.source]);
-  }, specifier, node, nodes);
+CommonJSFormatter.prototype._getExternalReference = function (node, nodes) {
+  var source = node.source.value;
+  var call = t.callExpression(t.identifier("require"), [node.source]);
+
+  if (this.localImportOccurences[source] > 1) {
+    var uid = this.file.generateUidIdentifier(source);
+    nodes.push(t.variableDeclaration("var", [
+      t.variableDeclarator(uid, call)
+    ]));
+    return uid;
+  } else {
+    return call;
+  }
 };

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

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = IgnoreFormatter;
 
 var t = require("../../types");

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

@@ -0,0 +1,10 @@
+module.exports = {
+  commonStrict: require("./common-strict"),
+  amdStrict:    require("./amd-strict"),
+  umdStrict:    require("./umd-strict"),
+  common:       require("./common"),
+  system:       require("./system"),
+  ignore:       require("./ignore"),
+  amd:          require("./amd"),
+  umd:          require("./umd")
+};

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

@@ -1,27 +1,34 @@
+"use strict";
+
 module.exports = SystemFormatter;
 
-var AMDFormatter = require("./amd");
-var useStrict    = require("../transformers/use-strict");
-var traverse     = require("../../traverse");
-var util         = require("../../util");
-var t            = require("../../types");
-var _            = require("lodash");
+var DefaultFormatter = require("./_default");
+var AMDFormatter     = require("./amd");
+var useStrict        = require("../helpers/use-strict");
+var traverse         = require("../../traverse");
+var util             = require("../../util");
+var t                = require("../../types");
+var last             = require("lodash/array/last");
+var each             = require("lodash/collection/each");
+var map              = require("lodash/collection/map");
 
 function SystemFormatter(file) {
-  this.exportIdentifier  = file.generateUidIdentifier("export");
+  this.exportIdentifier = file.generateUidIdentifier("export");
   this.noInteropRequire = true;
 
-  AMDFormatter.apply(this, arguments);
+  DefaultFormatter.apply(this, arguments);
 }
 
 util.inherits(SystemFormatter, AMDFormatter);
 
+SystemFormatter.prototype.init = function () {};
+
 SystemFormatter.prototype._addImportSource = function (node, exportNode) {
   node._importSource = exportNode.source && exportNode.source.value;
   return node;
 };
 
-SystemFormatter.prototype._exportsWildcard = function (objectIdentifier, node) {
+SystemFormatter.prototype.buildExportsWildcard = function (objectIdentifier, node) {
   var leftIdentifier = this.file.generateUidIdentifier("key");
   var valIdentifier  = t.memberExpression(objectIdentifier, leftIdentifier, true);
 
@@ -38,7 +45,7 @@ SystemFormatter.prototype._exportsWildcard = function (objectIdentifier, node) {
   return this._addImportSource(t.forInStatement(left, right, block), node);
 };
 
-SystemFormatter.prototype._exportsAssign = function (id, init, node) {
+SystemFormatter.prototype.buildExportsAssignment = function (id, init, node) {
   var call = this.buildExportCall(t.literal(id.name), init, true);
   return this._addImportSource(call, node);
 };
@@ -58,34 +65,98 @@ SystemFormatter.prototype.buildExportCall = function (id, init, isStatement) {
 
 SystemFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
   AMDFormatter.prototype.importSpecifier.apply(this, arguments);
-  this._addImportSource(_.last(nodes), node);
+  this._addImportSource(last(nodes), node);
+};
+
+var runnerSettersVisitor = {
+  enter: function (node, parent, scope, context, state) {
+    if (node._importSource === state.source) {
+      if (t.isVariableDeclaration(node)) {
+        each(node.declarations, function (declar) {
+          state.hoistDeclarators.push(t.variableDeclarator(declar.id));
+          state.nodes.push(t.expressionStatement(
+            t.assignmentExpression("=", declar.id, declar.init)
+          ));
+        });
+      } else {
+        state.nodes.push(node);
+      }
+
+      context.remove();
+    }
+  }
 };
 
 SystemFormatter.prototype.buildRunnerSetters = function (block, hoistDeclarators) {
-  return t.arrayExpression(_.map(this.ids, function (uid, source) {
-    var nodes = [];
+  var scope = this.file.scope;
 
-    traverse(block, {
-      enter: function (node) {
-        if (node._importSource === source) {
-          if (t.isVariableDeclaration(node)) {
-            _.each(node.declarations, function (declar) {
-              hoistDeclarators.push(t.variableDeclarator(declar.id));
-              nodes.push(t.expressionStatement(
-                t.assignmentExpression("=", declar.id, declar.init)
-              ));
-            });
-          } else {
-            nodes.push(node);
-          }
+  return t.arrayExpression(map(this.ids, function (uid, source) {
+    var state = {
+      source:           source,
+      nodes:            [],
+      hoistDeclarators: hoistDeclarators
+    };
 
-          this.remove();
+    traverse(block, runnerSettersVisitor, scope, state);
+
+    return t.functionExpression(null, [uid], t.blockStatement(state.nodes));
+  }));
+};
+
+var hoistVariablesVisitor = {
+  enter: function (node, parent, scope, context, hoistDeclarators) {
+    if (t.isFunction(node)) {
+      // nothing inside is accessible
+      return context.skip();
+    }
+
+    if (t.isVariableDeclaration(node)) {
+      if (node.kind !== "var" && !t.isProgram(parent)) { // let, const
+        // can't be accessed
+        return;
+      }
+
+      // ignore block hoisted nodes as these can be left in
+      if (node._blockHoist) return;
+
+      var nodes = [];
+
+      for (var i = 0; i < node.declarations.length; i++) {
+        var declar = node.declarations[i];
+        hoistDeclarators.push(t.variableDeclarator(declar.id));
+        if (declar.init) {
+          // no initializer so we can just hoist it as-is
+          var assign = t.expressionStatement(t.assignmentExpression("=", declar.id, declar.init));
+          nodes.push(assign);
         }
       }
-    });
 
-    return t.functionExpression(null, [uid], t.blockStatement(nodes));
-  }));
+      // for (var i in test)
+      // for (var i = 0;;)
+      if (t.isFor(parent)) {
+        if (parent.left === node) {
+          return node.declarations[0].id;
+        }
+
+        if (parent.init === node) {
+          return t.toSequenceExpression(nodes, scope);
+        }
+      }
+
+      return nodes;
+    }
+  }
+};
+
+var hoistFunctionsVisitor = {
+  enter: function (node, parent, scope, context, handlerBody) {
+    if (t.isFunction(node)) context.skip();
+
+    if (t.isFunctionDeclaration(node) || node._blockHoist) {
+      handlerBody.push(node);
+      context.remove();
+    }
+  }
 };
 
 SystemFormatter.prototype.transform = function (ast) {
@@ -111,46 +182,8 @@ SystemFormatter.prototype.transform = function (ast) {
   var returnStatement = handlerBody.pop();
 
   // hoist up all variable declarations
-  traverse(block, {
-    enter: function (node, parent, scope) {
-      if (t.isFunction(node)) {
-        // nothing inside is accessible
-        return this.skip();
-      }
+  traverse(block, hoistVariablesVisitor, this.file.scope, hoistDeclarators);
 
-      if (t.isVariableDeclaration(node)) {
-        if (node.kind !== "var" && !t.isProgram(parent)) { // let, const
-          // can't be accessed
-          return;
-        }
-
-        var nodes = [];
-
-        _.each(node.declarations, function (declar) {
-          hoistDeclarators.push(t.variableDeclarator(declar.id));
-          if (declar.init) {
-            // no initializer so we can just hoist it as-is
-            var assign = t.expressionStatement(t.assignmentExpression("=", declar.id, declar.init));
-            nodes.push(assign);
-          }
-        });
-
-        // for (var i in test)
-        // for (var i = 0;;)
-        if (t.isFor(parent)) {
-          if (parent.left === node) {
-            return node.declarations[0].id;
-          }
-
-          if (parent.init === node) {
-            return t.toSequenceExpression(nodes, scope);
-          }
-        }
-
-        return nodes;
-      }
-    }
-  });
   if (hoistDeclarators.length) {
     var hoistDeclar = t.variableDeclaration("var", hoistDeclarators);
     hoistDeclar._blockHoist = true;
@@ -158,20 +191,11 @@ SystemFormatter.prototype.transform = function (ast) {
   }
 
   // hoist up function declarations for circular references
-  traverse(block, {
-    enter: function (node) {
-      if (t.isFunction(node)) this.skip();
-
-      if (t.isFunctionDeclaration(node) || node._blockHoist) {
-        handlerBody.push(node);
-        this.remove();
-      }
-    }
-  });
+  traverse(block, hoistFunctionsVisitor, this.file.scope, handlerBody);
 
   handlerBody.push(returnStatement);
 
-  if (useStrict._has(block)) {
+  if (useStrict.has(block)) {
     handlerBody.unshift(block.body.shift());
   }
 

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

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

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

@@ -1,9 +1,11 @@
+"use strict";
+
 module.exports = UMDFormatter;
 
 var AMDFormatter = require("./amd");
 var util         = require("../../util");
 var t            = require("../../types");
-var _            = require("lodash");
+var values       = require("lodash/object/values");
 
 function UMDFormatter() {
   AMDFormatter.apply(this, arguments);
@@ -24,24 +26,25 @@ UMDFormatter.prototype.transform = function (ast) {
 
   // factory
 
-  var ids  = _.values(this.ids);
+  var ids  = values(this.ids);
   var args = [t.identifier("exports")];
   if (this.passModuleArg) args.push(t.identifier("module"));
   args = args.concat(ids);
 
   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 +52,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/array-comprehension-for-each.js

@@ -1,3 +0,0 @@
-ARRAY.forEach(function (KEY) {
-
-});

lib/6to5/transformation/templates/async-to-generator.js

@@ -3,35 +3,26 @@
     var gen = fn.apply(this, arguments);
 
     return new Promise(function (resolve, reject) {
-      function step(getNext) {
-        var next;
+      var callNext = step.bind(null, "next");
+      var callThrow = step.bind(null, "throw");
 
+      function step(key, arg) {
         try {
-          next = getNext();
-        } catch(e) {
-          reject(e);
+          var info = gen[key](arg);
+          var value = info.value;
+        } catch (error) {
+          reject(error);
           return;
         }
 
-        if (next.done) {
-          resolve(next.value);
-          return;
+        if (info.done) {
+          resolve(value);
+        } else {
+          Promise.resolve(value).then(callNext, callThrow);
         }
-
-        Promise.resolve(next.value).then(function (v) {
-          step(function () {
-            return gen.next(v);
-          });
-        }, function (e) {
-          step(function () {
-            return gen["throw"](e);
-          });
-        });
       }
 
-      step(function () {
-        return gen.next();
-      });
+      callNext();
     });
-  }
+  };
 })

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 +0,0 @@
-module.exports = EXTENDS_HELPER(exports["default"], exports);

lib/6to5/transformation/templates/exports-default-module-override.js

@@ -1 +0,0 @@
-exports = module.exports = VALUE;

lib/6to5/transformation/templates/exports-module-declaration.js

@@ -0,0 +1 @@
+exports.__esModule = true;

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

@@ -1,8 +1,10 @@
-(function (target) {
+Object.assign || (function (target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i];
     for (var key in source) {
-      target[key] = source[key];
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        target[key] = source[key];
+      }
     }
   }
   return target;

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

@@ -0,0 +1,14 @@
+for (var LOOP_OBJECT = OBJECT,
+         IS_ARRAY = Array.isArray(LOOP_OBJECT),
+         INDEX = 0,
+         LOOP_OBJECT = IS_ARRAY ? LOOP_OBJECT : LOOP_OBJECT[Symbol.iterator]();;) {
+  var ID;
+  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/interop-require-wildcard.js

@@ -1,3 +1,3 @@
 (function (obj) {
-  return obj && obj.constructor === Object ? obj : { default: obj };
+  return obj && obj.__esModule ? obj : { default: obj };
 })

lib/6to5/transformation/templates/interop-require.js

@@ -1,3 +1,3 @@
 (function (obj) {
-  return obj && (obj["default"] || obj);
+  return obj && obj.__esModule ? obj.default : obj;
 })

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/rest.js

@@ -1,3 +1,3 @@
-for (var KEY = START; KEY < ARGUMENTS.length; KEY++) {
+for (var LEN = ARGUMENTS.length, ARRAY = Array(ARRAY_LEN), KEY = START; KEY < LEN; KEY++) {
   ARRAY[ARRAY_KEY] = ARGUMENTS[KEY];
 }

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

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

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/tagged-template-literal.js

@@ -3,4 +3,3 @@
       raw: { value: Object.freeze(raw) }
   }));
 });
-

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

@@ -1,99 +0,0 @@
-module.exports = transform;
-
-var Transformer = require("./transformer");
-var File        = require("../file");
-var util        = require("../util");
-var _           = require("lodash");
-
-function transform(code, opts) {
-  var file = new File(opts);
-  return file.parse(code);
-}
-
-transform.fromAst = function (ast, code, opts) {
-  ast = util.normaliseAst(ast);
-
-  var file = new File(opts);
-  file.addCode(code);
-  file.transform(ast);
-  return file.generate();
-};
-
-transform._ensureTransformerNames = function (type, keys) {
-  for (var i in keys) {
-    var key = keys[i];
-    if (!_.has(transform.transformers, key)) {
-      throw new ReferenceError("unknown transformer " + key + " specified in " + type);
-    }
-  }
-};
-
-transform.transformers = {};
-
-transform.moduleFormatters = {
-  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"),
-
-  // playground
-  methodBinding:             require("./transformers/playground-method-binding"),
-  memoizationOperator:       require("./transformers/playground-memoization-operator"),
-  objectGetterMemoization:   require("./transformers/playground-object-getter-memoization"),
-
-  asyncToGenerator:          require("./transformers/optional-async-to-generator"),
-  bluebirdCoroutines:        require("./transformers/optional-bluebird-coroutines"),
-
-  react:                     require("./transformers/react"),
-  modules:                   require("./transformers/es6-modules"),
-  propertyNameShorthand:     require("./transformers/es6-property-name-shorthand"),
-  arrayComprehension:        require("./transformers/es7-array-comprehension"),
-  generatorComprehension:    require("./transformers/es7-generator-comprehension"),
-  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"),
-  destructuring:             require("./transformers/es6-destructuring"),
-  defaultParameters:         require("./transformers/es6-default-parameters"),
-  forOf:                     require("./transformers/es6-for-of"),
-  unicodeRegex:              require("./transformers/es6-unicode-regex"),
-  abstractReferences:        require("./transformers/es7-abstract-references"),
-
-  constants:                 require("./transformers/es6-constants"),
-  letScoping:                require("./transformers/es6-let-scoping"),
-
-  _blockHoist:               require("./transformers/_block-hoist"),
-
-  generators:                require("./transformers/es6-generators"),
-  restParameters:            require("./transformers/es6-rest-parameters"),
-
-  protoToAssign:             require("./transformers/optional-proto-to-assign"),
-
-  _declarations:             require("./transformers/_declarations"),
-
-  // wrap up
-  useStrict:                 require("./transformers/use-strict"),
-  _aliasFunctions:           require("./transformers/_alias-functions"),
-  _moduleFormatter:          require("./transformers/_module-formatter"),
-
-  typeofSymbol:              require("./transformers/optional-typeof-symbol"),
-  coreAliasing:              require("./transformers/optional-core-aliasing"),
-  undefinedToVoid:           require("./transformers/optional-undefined-to-void"),
-
-  // spec
-  specPropertyLiterals:         require("./transformers/spec-property-literals"),
-  specMemberExpressionLiterals: require("./transformers/spec-member-expression-literals")
-}, function (transformer, key) {
-  transform.transformers[key] = new Transformer(key, transformer);
-});

lib/6to5/transformation/transformer-pass.js

@@ -0,0 +1,72 @@
+module.exports = TransformerPass;
+
+var traverse = require("../traverse");
+var util     = require("../util");
+var contains = require("lodash/collection/contains");
+
+/**
+ * This class is responsible for traversing over the provided `File`s
+ * AST and running it's parent transformers handlers over it.
+ */
+
+function TransformerPass(file, transformer) {
+  this.transformer = transformer;
+  this.handlers    = transformer.handlers;
+  this.file        = file;
+}
+
+TransformerPass.prototype.astRun = function (key) {
+  var handlers = this.handlers;
+  var file = this.file;
+
+  if (handlers.ast && handlers.ast[key]) {
+    handlers.ast[key](file.ast, file);
+  }
+};
+
+TransformerPass.prototype.canRun = function () {
+  var transformer = this.transformer;
+
+  var opts = this.file.opts;
+  var key  = transformer.key;
+  if (key[0] === "_") return true;
+
+  var blacklist = opts.blacklist;
+  if (blacklist.length && contains(blacklist, key)) return false;
+
+  var whitelist = opts.whitelist;
+  if (whitelist.length && !contains(whitelist, key)) return false;
+
+  if (transformer.optional && !contains(opts.optional, key)) return false;
+
+  if (transformer.experimental && !opts.experimental) return false;
+
+  return true;
+};
+
+var transformVisitor = {
+  enter: function (node, parent, scope, context, state) {
+    var fns = state.handlers[node.type];
+    if (!fns) return;
+    return fns.enter(node, parent, scope, context, state.file, state.pass);
+  },
+
+  exit: function (node, parent, scope, context, state) {
+    var fns = state.handlers[node.type];
+    if (!fns) return;
+    return fns.exit(node, parent, scope, context, state.file, state.pass);
+  }
+};
+
+TransformerPass.prototype.transform = function () {
+  var file = this.file;
+
+  util.debug(file.opts.filename + ": Running transformer " + this.transformer.key);
+
+  this.astRun("before");
+
+  var state = { file: file, handlers: this.handlers, pass: this };
+  traverse(file.ast, transformVisitor, file.scope, state);
+
+  this.astRun("after");
+};