v1.12.18

Prefer module provided `global` rather than `window` reference

CHANGELOG.md

@@ -1,3 +1,28 @@
+# 1.12.18
+
+ * Use `global` reference instead of `window`.
+
+# 1.12.17
+
+ * Add `moduleName`, `sourceRoot` and `filenameRelative` options - thanks @darvelo!
+ * Traversal optimisations.
+
+# 1.12.16
+
+ * Fix comments not being retained from `MethodDefinition` in classes.
+ * Add temporal dead zone in default parameters.
+
+# 1.12.15
+
+ * Update `acorn-6to5`.
+
+# 1.12.14
+
+ * Fix duplicate let scoping in functions.
+ * Make JSX whitespace more React-compliant.
+ * Add `_memberExpressionKeywords` transformer that turns keyword identifiers to computed literals.
+ * Upgrade `regenerator-6to5`.
+
 # 1.12.13
 
  * Support duplicate constants within different block scopes.

doc/features.md

@@ -133,11 +133,13 @@ for (var i of [1, 2, 3]) {
 ## Generators
 
 ```javascript
+
 ```
 
 ## Generator comprehension
 
 ```javascript
+
 ```
 
 ## Let scoping
@@ -151,6 +153,7 @@ for (let i in arr) {
 ## Modules
 
 ```javascript
+
 ```
 
 ## Numeric literals

doc/modules.md

@@ -66,7 +66,7 @@ export function bar() {
 **Out**
 
 ```javascript
-define(["exports", "foo"], function (exports, _foo) {
+define("filename", ["exports", "foo"], function (exports, _foo) {
   exports.bar = bar;
 
   var foo = _foo.default;
@@ -94,7 +94,7 @@ export function bar() {
 ```javascript
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
+    define("filename", ["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }
@@ -111,7 +111,6 @@ export function bar() {
 
 ### Ignore
 
-
 **In**
 
 ```javascript

doc/plugins.md

@@ -11,5 +11,5 @@
  - [Jest](https://github.com/6to5/6to5-jest)
  - [Karma](https://github.com/shuhei/karma-6to5-preprocessor)
  - [Mocha](https://github.com/6to5/6to5-mocha)
- - [Rails](https://github.com/6to5/6to5-rails)
+ - [Rails](https://github.com/josh/sprockets-es6) or via [browserify-rails](https://github.com/6to5/6to5-rails)
  - [webpack](https://github.com/Couto/6to5-loader)

doc/usage.md

@@ -83,6 +83,10 @@ to5.transformFile("filename.js", options, function (err, result) {
   // Default: "unknown"
   filename: "filename",
 
+  // Filename relative to `sourceRoot`
+  // Default: `filename` option.
+  filenameRelative: "",
+
   // List of transformers to EXCLUDE.
   // Run `6to5 --help` to see a full list of transformers.
   blacklist: [],
@@ -103,13 +107,20 @@ to5.transformFile("filename.js", options, function (err, result) {
   sourceMap: true,
 
   // Set `file` on returned source map.
-  // Default: `filename` option.
+  // Default: `filenameRelative` option.
   sourceMapName: "filename",
 
   // Set `sources[0]` on returned source map.
-  // Default: `filename` option.
+  // Default: `filenameRelative` option.
   sourceFileName: "filename",
 
+  // The root from which all sources are relative
+  sourceRoot: "assets/scripts",
+
+  // Optional prefix for the AMD module formatter that will be prepend to the
+  // filename on module definitions
+  moduleRoot: "my-app",
+
   // Optionally replace all 6to5 helper declarations with a referenece to this
   // variable. If set to `true` then the default namespace is used "to5Runtime".
   // Default: false

lib/6to5/browser.js

@@ -12,7 +12,7 @@ transform.load = function (url, callback, opts, hold) {
   opts = opts || {};
   opts.filename = opts.filename || url;
 
-  var xhr = window.ActiveXObject ? new window.ActiveXObject("Microsoft.XMLHTTP") : new window.XMLHttpRequest();
+  var xhr = global.ActiveXObject ? new global.ActiveXObject("Microsoft.XMLHTTP") : new global.XMLHttpRequest();
   xhr.open("GET", url, true);
   if ("overrideMimeType" in xhr) xhr.overrideMimeType("text/plain");
 
@@ -60,7 +60,7 @@ var runScripts = function () {
     }
   };
 
-  var _scripts = window.document.getElementsByTagName("script");
+  var _scripts = global.document.getElementsByTagName("script");
   for (var i in _scripts) {
     var _script = _scripts[i];
     if (types.indexOf(_script.type) >= 0) scripts.push(_script);
@@ -73,8 +73,8 @@ var runScripts = function () {
   exec();
 };
 
-if (window.addEventListener) {
-  window.addEventListener("DOMContentLoaded", runScripts, false);
-} else {
-  window.attachEvent("onload", runScripts);
+if (global.addEventListener) {
+  global.addEventListener("DOMContentLoaded", runScripts, false);
+} else if (global.attachEvent) {
+  global.attachEvent("onload", runScripts);
 }

lib/6to5/file.js

@@ -39,8 +39,12 @@ File.normaliseOptions = function (opts) {
   opts.filename = opts.filename.replace(/\\/g, "/");
 
   _.defaults(opts, {
-    sourceFileName: opts.filename,
-    sourceMapName:  opts.filename
+    filenameRelative: opts.filename
+  });
+
+  _.defaults(opts, {
+    sourceFileName: opts.filenameRelative,
+    sourceMapName:  opts.filenameRelative
   });
 
   if (opts.runtime === true) {

lib/6to5/generation/source-map.js

@@ -9,7 +9,8 @@ function SourceMap(position, opts, code) {
 
   if (opts.sourceMap) {
     this.map = new sourceMap.SourceMapGenerator({
-      file: opts.sourceMapName
+      file: opts.sourceMapName,
+      sourceRoot: opts.sourceRoot
     });
 
     this.map.setSourceContent(opts.sourceFileName, code);

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

@@ -29,12 +29,41 @@ AMDFormatter.prototype.transform = function (ast) {
   var params = _.values(this.ids);
   params.unshift(t.identifier("exports"));
 
+  var moduleName = this.getModuleName();
+
   var container = t.functionExpression(null, params, t.blockStatement(body));
-  var call = t.callExpression(t.identifier("define"), [names, container]);
+  var call = t.callExpression(t.identifier("define"), [t.literal(moduleName), names, container]);
 
   program.body = [t.expressionStatement(call)];
 };
 
+AMDFormatter.prototype.getModuleName = function () {
+  var opts = this.file.opts;
+  var filenameRelative = opts.filenameRelative;
+  var moduleName = "";
+
+  if (opts.moduleRoot) {
+    moduleName = opts.moduleRoot + "/";
+  }
+
+  if (!opts.filenameRelative) {
+    return moduleName + opts.filename.replace(/^\//, "");
+  }
+
+  if (opts.sourceRoot) {
+    // remove sourceRoot from filename
+    var sourceRootRegEx = new RegExp("^" + opts.sourceRoot + "\/?");
+    filenameRelative = filenameRelative.replace(sourceRootRegEx, "");
+  }
+
+  // remove extension
+  filenameRelative = filenameRelative.replace(/\.(.*?)$/, "");
+
+  moduleName += filenameRelative;
+
+  return moduleName;
+};
+
 AMDFormatter.prototype._push = function (node) {
   var id  = node.source.value;
   var ids = this.ids;

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

@@ -32,8 +32,10 @@ UMDFormatter.prototype.transform = function (ast) {
 
   // runner
 
+  var moduleName = this.getModuleName();
+
   var runner = util.template("umd-runner-body", {
-    AMD_ARGUMENTS: t.arrayExpression([t.literal("exports")].concat(names)),
+    AMD_ARGUMENTS: [t.literal(moduleName), t.arrayExpression([t.literal("exports")].concat(names))],
 
     COMMON_ARGUMENTS: names.map(function (name) {
       return t.callExpression(t.identifier("require"), [name]);

lib/6to5/transformation/transform.js

@@ -27,37 +27,39 @@ transform.moduleFormatters = {
 };
 
 _.each({
-  modules:                  require("./transformers/modules"),
-  propertyNameShorthand:    require("./transformers/property-name-shorthand"),
-  constants:                require("./transformers/constants"),
-  arrayComprehension:       require("./transformers/array-comprehension"),
-  generatorComprehension:   require("./transformers/generator-comprehension"),
-  arrowFunctions:           require("./transformers/arrow-functions"),
-  classes:                  require("./transformers/classes"),
+  modules:                   require("./transformers/modules"),
+  propertyNameShorthand:     require("./transformers/property-name-shorthand"),
+  arrayComprehension:        require("./transformers/array-comprehension"),
+  generatorComprehension:    require("./transformers/generator-comprehension"),
+  arrowFunctions:            require("./transformers/arrow-functions"),
+  classes:                   require("./transformers/classes"),
 
-  _propertyLiterals:        require("./transformers/_property-literals"),
-  computedPropertyNames:    require("./transformers/computed-property-names"),
+  _propertyLiterals:         require("./transformers/_property-literals"),
+  computedPropertyNames:     require("./transformers/computed-property-names"),
 
-  spread:                   require("./transformers/spread"),
-  templateLiterals:         require("./transformers/template-literals"),
-  propertyMethodAssignment: require("./transformers/property-method-assignment"),
-  defaultParameters:        require("./transformers/default-parameters"),
-  restParameters:           require("./transformers/rest-parameters"),
-  destructuring:            require("./transformers/destructuring"),
-  forOf:                    require("./transformers/for-of"),
-  letScoping:               require("./transformers/let-scoping"),
-  unicodeRegex:             require("./transformers/unicode-regex"),
+  spread:                    require("./transformers/spread"),
+  templateLiterals:          require("./transformers/template-literals"),
+  propertyMethodAssignment:  require("./transformers/property-method-assignment"),
+  defaultParameters:         require("./transformers/default-parameters"),
+  restParameters:            require("./transformers/rest-parameters"),
+  destructuring:             require("./transformers/destructuring"),
+  forOf:                     require("./transformers/for-of"),
+  unicodeRegex:              require("./transformers/unicode-regex"),
 
-  react:                    require("./transformers/react"),
+  constants:                 require("./transformers/constants"),
+  letScoping:                require("./transformers/let-scoping"),
 
-  _aliasFunctions:          require("./transformers/_alias-functions"),
-  _blockHoist:              require("./transformers/_block-hoist"),
-  _declarations:            require("./transformers/_declarations"),
+  react:                     require("./transformers/react"),
 
-  generators:               require("./transformers/generators"),
-  useStrict:                require("./transformers/use-strict"),
+  _aliasFunctions:           require("./transformers/_alias-functions"),
+  _blockHoist:               require("./transformers/_block-hoist"),
+  _declarations:             require("./transformers/_declarations"),
 
-  _moduleFormatter:         require("./transformers/_module-formatter")
+  generators:                require("./transformers/generators"),
+  useStrict:                 require("./transformers/use-strict"),
+
+  _memberExpressionKeywords: require("./transformers/_member-expression-keywords"),
+  _moduleFormatter:          require("./transformers/_module-formatter")
 }, function (transformer, key) {
   transform.transformers[key] = new Transformer(key, transformer);
 });

lib/6to5/transformation/transformers/_member-expression-keywords.js

@@ -0,0 +1,10 @@
+var esutils = require("esutils");
+var t = require("../../types");
+
+exports.MemberExpression = function (node) {
+  var prop = node.property;
+  if (t.isIdentifier(prop) && esutils.keyword.isKeywordES6(prop.name, true)) {
+    node.property = t.literal(prop.name);
+    node.computed = true;
+  }
+};

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

@@ -254,6 +254,7 @@ Class.prototype.pushConstructor = function (method) {
 
   this.hasConstructor = true;
   t.inherits(construct, fn);
+  t.inheritsComments(construct, method);
 
   construct.defaults = fn.defaults;
   construct.params   = fn.params;

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

@@ -9,24 +9,27 @@ exports.ForOfStatement =
 exports.ForStatement = function (node, parent, file) {
   var constants = {};
 
-  var check = function (node, names, parent) {
-    _.each(names, function (name) {
+  var check = function (parent, names) {
+    _.each(names, function (nameNode, name) {
       if (!_.has(constants, name)) return;
       if (parent && t.isBlockStatement(parent) && parent !== constants[name]) return;
 
-      throw file.errorWithNode(node, name + " is read-only");
+      throw file.errorWithNode(nameNode, name + " is read-only");
     });
   };
 
   var getIds = function (node) {
-    return t.getIds(node, false, ["MemberExpression"]);
+    return t.getIds(node, true, ["MemberExpression"]);
   };
 
   _.each(node.body, function (child, parent) {
     if (child && t.isVariableDeclaration(child, { kind: "const" })) {
       _.each(child.declarations, function (declar) {
-        _.each(getIds(declar), function (name) {
-          check(declar, [name], parent);
+        _.each(getIds(declar), function (nameNode, name) {
+          var names = {};
+          names[name] = nameNode;
+          check(parent, names);
+
           constants[name] = parent;
         });
 
@@ -42,9 +45,10 @@ exports.ForStatement = function (node, parent, file) {
 
   traverse(node, function (child, parent) {
     if (child._ignoreConstant) return;
+    if (t.isVariableDeclaration(child)) return;
 
-    if (t.isDeclaration(child) || t.isAssignmentExpression(child)) {
-      check(child, getIds(child), parent);
+    if (t.isVariableDeclarator(child) || t.isDeclaration(child) || t.isAssignmentExpression(child)) {
+      check(parent, getIds(child));
     }
   });
 };

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

@@ -1,21 +1,70 @@
-var util = require("../../util");
-var t    = require("../../types");
-var _    = require("lodash");
+var traverse = require("../../traverse");
+var util     = require("../../util");
+var t        = require("../../types");
+var _        = require("lodash");
 
-exports.Function = function (node) {
+exports.Function = function (node, parent, file, scope) {
   if (!node.defaults || !node.defaults.length) return;
   t.ensureBlock(node);
 
+  var ids = node.params.map(function (param) {
+    return t.getIds(param);
+  });
+
+  var closure = false;
+
   _.each(node.defaults, function (def, i) {
     if (!def) return;
 
     var param = node.params[i];
 
-    node.body.body.unshift(util.template("if-undefined-set-to", {
-      VARIABLE: param,
-      DEFAULT: def
+    // temporal dead zone check - here we prevent accessing of params that
+    // are to the right - ie. uninitialized parameters
+    _.each(ids.slice(i), function (ids) {
+      var check = function (node, parent) {
+        if (!t.isIdentifier(node) || !t.isReferenced(node, parent)) return;
+
+        if (_.contains(ids, node.name)) {
+          throw file.errorWithNode(node, "Temporal dead zone - accessing a variable before it's initialized");
+        }
+
+        if (scope.has(node.name)) {
+          closure = true;
+        }
+      };
+
+      check(def, node);
+      traverse(def, check);
+    });
+
+    // we're accessing a variable that's already defined within this function
+    var has = scope.get(param.name);
+    if (has && !_.contains(node.params, has)) {
+      closure = true;
+    }
+  });
+
+  var body = [];
+
+  _.each(node.defaults, function (def, i) {
+    if (!def) return;
+
+    body.push(util.template("if-undefined-set-to", {
+      VARIABLE: node.params[i],
+      DEFAULT:  def
     }, true));
   });
 
+  if (closure) {
+    var container = t.functionExpression(null, [], node.body, node.generator);
+    container._aliasFunction = true;
+
+    body.push(t.returnStatement(t.callExpression(container, [])));
+
+    node.body = t.blockStatement(body);
+  } else {
+    node.body.body = body.concat(node.body.body);
+  }
+
   node.defaults = [];
 };

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

@@ -74,7 +74,6 @@ function LetScoping(forParent, block, parent, file, scope) {
 
   this.letReferences = {};
   this.body          = [];
-  this.info          = this.getInfo();
 }
 
 /**
@@ -87,8 +86,10 @@ LetScoping.prototype.run = function () {
   if (block._letDone) return;
   block._letDone = true;
 
+  this.info = this.getInfo();
+
   // this is a block within a `Function` so we can safely leave it be
-  if (t.isFunction(this.parent)) return;
+  if (t.isFunction(this.parent)) return this.noClosure();
 
   // this block has no let references so let's clean up
   if (!this.info.keys.length) return this.noClosure();

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

@@ -106,11 +106,35 @@ exports.XJSElement = {
   exit: function (node) {
     var callExpr = node.openingElement;
 
-    var childrenToRender = node.children.filter(function(child) {
-      return !(t.isLiteral(child) && _.isString(child.value) && child.value.match(/^[ \t]*[\r\n][ \t\r\n]*$/));
-    });
+    _.each(node.children, function (child) {
+      if (t.isLiteral(child)) {
+        var lines = child.value.split(/\r\n|\n|\r/);
+
+        _.each(lines, function (line, i) {
+          var isFirstLine = i === 0;
+          var isLastLine = i === lines.length - 1;
+
+          // replace rendered whitespace tabs with spaces
+          var trimmedLine = line.replace(/\t/g, ' ');
+
+          // trim whitespace touching a newline
+          if (!isFirstLine) {
+            trimmedLine = trimmedLine.replace(/^[ ]+/, '');
+          }
+
+          // trim whitespace touching an endline
+          if (!isLastLine) {
+            trimmedLine = trimmedLine.replace(/[ ]+$/, '');
+          }
+
+          if (trimmedLine) {
+            callExpr.arguments.push(t.literal(trimmedLine));
+          }
+        });
+
+        return;
+      }
 
-    _.each(childrenToRender, function (child) {
       callExpr.arguments.push(child);
     });
 

lib/6to5/traverse/index.js

@@ -29,25 +29,32 @@ function traverse(parent, callbacks, opts) {
   // normalise callbacks
   if (_.isFunction(callbacks)) callbacks = { enter: callbacks };
 
-  _.each(keys, function (key) {
+  for (var i in keys) {
+    var key = keys[i];
     var nodes = parent[key];
-    if (!nodes) return;
+    if (!nodes) continue;
+
+    var updated = false;
 
     var handle = function (obj, key) {
       var node = obj[key];
       if (!node) return;
 
       // type is blacklisted
-      if (_.contains(blacklistTypes, node.type)) return;
+      if (blacklistTypes.indexOf(node.type) > -1) return;
 
       // replace node
       var maybeReplace = function (result) {
         if (result === false) return;
-        if (result != null) node = obj[key] = result;
+
+        if (result != null) {
+          updated = true;
+          node = obj[key] = result;
+        }
       };
 
       //
-      var opts2 = _.clone(opts);
+      var opts2 = { scope: opts.scope, blacklist: opts.blacklist };
       if (t.isScope(node)) opts2.scope = new Scope(opts.scope, node);
 
       // enter
@@ -69,15 +76,15 @@ function traverse(parent, callbacks, opts) {
     };
 
     if (_.isArray(nodes)) {
-      _.each(nodes, function (node, i) {
+      for (i in nodes) {
         handle(nodes, i);
-      });
+      }
 
-      parent[key] = _.flatten(parent[key]);
+      if (updated) parent[key] = _.flatten(parent[key]);
     } else {
       handle(parent, key);
     }
-  });
+  }
 }
 
 traverse.removeProperties = function (tree) {

lib/6to5/traverse/scope.js

@@ -9,24 +9,30 @@ var FOR_KEYS = ["left", "init"];
 function Scope(parent, block) {
   this.parent = parent;
   this.block  = block;
-  this.ids    = this.getIds();
 
-  this.getIds();
+  this.info         = this.getInfo();
+  this.declarations = this.info.declarations;
 }
 
-Scope.prototype.getIds = function () {
+Scope.prototype.getInfo = function () {
   var block = this.block;
-  if (block._scopeIds) return block._scopeIds;
+  if (block._scope) return block._scope;
 
   var self = this;
-  var ids  = block._scopeIds = {};
+  var info = block._scope = {
+    declarations: {}
+  };
+
+  var add = function (node) {
+    self.addDeclaration(node, info.declarations);
+  };
 
   // ForStatement - left, init
 
   if (t.isFor(block)) {
     _.each(FOR_KEYS, function (key) {
       var node = block[key];
-      if (t.isLet(node)) self.add(node, ids);
+      if (t.isLet(node)) add(node);
     });
 
     block = block.body;
@@ -37,14 +43,14 @@ Scope.prototype.getIds = function () {
   if (t.isBlockStatement(block) || t.isProgram(block)) {
     _.each(block.body, function (node) {
       // check for non-var `VariableDeclaration`s
-      if (t.isLet(node)) self.add(node, ids);
+      if (t.isLet(node)) add(node);
     });
   }
 
   // CatchClause - param
 
   if (t.isCatchClause(block)) {
-    self.add(block.param, ids);
+    add(block.param);
   }
 
   // Program, Function - var variables
@@ -54,7 +60,7 @@ Scope.prototype.getIds = function () {
       if (t.isFor(node)) {
         _.each(FOR_KEYS, function (key) {
           var declar = node[key];
-          if (t.isVar(declar)) self.add(declar, ids);
+          if (t.isVar(declar)) add(declar);
         });
       }
 
@@ -65,26 +71,26 @@ Scope.prototype.getIds = function () {
       // we've ran into a declaration!
       // we'll let the BlockStatement scope deal with `let` declarations
       if (t.isDeclaration(node) && !t.isLet(node)) {
-        self.add(node, ids);
+        add(node);
       }
     });
   }
 
-  // Function - params
+  // Function - params, rest
 
   if (t.isFunction(block)) {
-    this.add(block.rest, ids);
+    add(block.rest);
     _.each(block.params, function (param) {
-      self.add(param, ids);
+      add(param);
     });
   }
 
-  return ids;
+  return info;
 };
 
-Scope.prototype.add = function (node, ids) {
+Scope.prototype.addDeclaration = function (node, declarations) {
   if (!node) return;
-  _.merge(ids || this.ids, t.getIds(node, true));
+  _.merge(declarations || this.declarations, t.getIds(node, true));
 };
 
 Scope.prototype.get = function (id) {
@@ -92,7 +98,7 @@ Scope.prototype.get = function (id) {
 };
 
 Scope.prototype.getOwn = function (id) {
-  return _.has(this.ids, id) && this.ids[id];
+  return _.has(this.declarations, id) && this.declarations[id];
 };
 
 Scope.prototype.parentGet = function (id) {

lib/6to5/types/index.js

@@ -70,6 +70,9 @@ t.isReferenced = function (node, parent) {
   // we're a property key so we aren't referenced
   if (t.isProperty(parent) && parent.key === node) return false;
 
+  // we're a variable declarator id so we aren't referenced
+  if (t.isVariableDeclarator(parent) && parent.id === node) return false;
+
   var isMemberExpression = t.isMemberExpression(parent);
 
   // we're in a member expression and we're the computed property so we're referenced
@@ -161,7 +164,7 @@ t.toBlock = function (node, parent) {
 t.getIds = function (node, map, ignoreTypes) {
   ignoreTypes = ignoreTypes || [];
 
-  var search = [node];
+  var search = [].concat(node);
   var ids    = {};
 
   while (search.length) {
@@ -185,14 +188,6 @@ t.getIds = function (node, map, ignoreTypes) {
   return ids;
 };
 
-t.isLet = function (node) {
-  return t.isVariableDeclaration(node) && (node.kind !== "var" || node._let);
-};
-
-t.isVar = function (node) {
-  return t.isVariableDeclaration(node, { kind: "var" }) && !node._let;
-};
-
 t.getIds.nodes = {
   AssignmentExpression: "left",
   ImportSpecifier: "id",
@@ -214,13 +209,32 @@ t.getIds.arrays = {
   ObjectPattern: "properties"
 };
 
+t.isLet = function (node) {
+  return t.isVariableDeclaration(node) && (node.kind !== "var" || node._let);
+};
+
+t.isVar = function (node) {
+  return t.isVariableDeclaration(node, { kind: "var" }) && !node._let;
+};
+
+t.removeComments = function (child) {
+  delete child.leadingComments;
+  delete child.trailingComments;
+  return child;
+};
+
+t.inheritsComments = function (child, parent) {
+  child.leadingComments  = _.compact([].concat(child.leadingComments, parent.leadingComments));
+  child.trailingComments = _.compact([].concat(child.trailingComments, parent.trailingComments));
+  return child;
+};
+
 t.inherits = function (child, parent) {
-  child.loc              = parent.loc;
-  child.end              = parent.end;
-  child.range            = parent.range;
-  child.start            = parent.start;
-  child.leadingComments  = parent.leadingComments;
-  child.trailingComments = parent.trailingComments;
+  child.loc   = parent.loc;
+  child.end   = parent.end;
+  child.range = parent.range;
+  child.start = parent.start;
+  t.inheritsComments(child, parent);
   return child;
 };
 

lib/6to5/util.js

@@ -106,8 +106,13 @@ exports.buildDefineProperties = function (mutatorMap) {
       if (key[0] === "_") return;
 
       node = _.clone(node);
+      var inheritNode = node;
       if (t.isMethodDefinition(node)) node = node.value;
-      mapNode.properties.push(t.property("init", t.identifier(key), node));
+
+      var prop = t.property("init", t.identifier(key), node);
+      t.inheritsComments(prop, inheritNode);
+      t.removeComments(inheritNode);
+      mapNode.properties.push(prop);
     });
 
     objExpr.properties.push(propNode);
@@ -271,9 +276,5 @@ try {
 } catch (err) {
   if (err.code !== "MODULE_NOT_FOUND") throw err;
 
-  Object.defineProperty(exports, "templates", {
-    get: function () {
-      return exports.templates = loadTemplates();
-    }
-  });
+  exports.templates = loadTemplates();
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "1.12.13",
+  "version": "1.12.18",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -44,11 +44,11 @@
     "es6-symbol": "0.1.1",
     "regexpu": "0.3.0",
     "source-map": "0.1.40",
-    "regenerator-6to5": "https://github.com/6to5/regenerator-6to5/archive/75925940a7bb67d1ee8afec36b6d6eec072fb47c.tar.gz",
+    "regenerator-6to5": "https://github.com/6to5/regenerator-6to5/archive/a9c53518af063ffef410f826225f8ee250131932.tar.gz",
     "chokidar": "0.10.5",
     "source-map-support": "0.2.8",
     "esutils": "1.1.4",
-    "acorn-6to5": "https://github.com/6to5/acorn-6to5/archive/a6c34ba73e215bd16ee585f6794f6a6587820c58.tar.gz",
+    "acorn-6to5": "https://github.com/6to5/acorn-6to5/archive/74d8e9bed20ba302d3504f53d0b1c649968959e1.tar.gz",
     "estraverse": "^1.7.0"
   },
   "devDependencies": {

test/_helper.js

@@ -48,8 +48,9 @@ exports.get = function (entryName) {
       var execLoc   = taskDir + "/exec.js";
 
       var taskOpts = _.merge({
-        filename: actualLocAlias,
-        sourceMapName: expectLocAlias
+        filenameRelative: expectLocAlias,
+        sourceFileName:   actualLocAlias,
+        sourceMapName:    expectLocAlias
       }, _.cloneDeep(suite.options));
 
       var taskOptsLoc = taskDir + "/options.json";
@@ -60,6 +61,7 @@ exports.get = function (entryName) {
         disabled: taskName[0] === ".",
         options: taskOpts,
         exec: {
+          loc: execLoc,
           code: readFile(execLoc),
           filename: execLocAlias,
         },

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

@@ -19,7 +19,7 @@ var _extends = function (child, parent) {
 
 var Test = (function (Foo) {
   var Test = function Test() {
-    woops.super.test();
+    woops["super"].test();
     Foo.call(this);
     Foo.prototype.test.call(this);
     foob(Foo);

test/fixtures/transformation/default-parameters/multiple/expected.js

@@ -1,8 +1,8 @@
 "use strict";
 
 var t = function (t, f) {
-  if (f === undefined) f = 5;
   if (t === undefined) t = "foo";
+  if (f === undefined) f = 5;
   return t + " bar " + f;
 };
 

test/fixtures/transformation/default-parameters/tdz-2/actual.js

@@ -0,0 +1 @@
+function foo(a=b, b) {}

test/fixtures/transformation/default-parameters/tdz-2/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Temporal dead zone - accessing a variable before it's initialized"
+}

test/fixtures/transformation/default-parameters/tdz-3/exec.js

@@ -0,0 +1,4 @@
+assert.equal((function(a, b=a++){
+  function b(){}
+  return a;
+})(1), 2);

test/fixtures/transformation/default-parameters/tdz/actual.js

@@ -0,0 +1 @@
+function foo(a=a) {}

test/fixtures/transformation/default-parameters/tdz/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Temporal dead zone - accessing a variable before it's initialized"
+}

test/fixtures/transformation/let-scoping/exec-duplicate-function-scope/exec.js

@@ -0,0 +1,10 @@
+function test () {
+  let value = "outer";
+
+  return (function () {
+    let value = "inner";
+    return value;
+  })();
+}
+
+assert(test(), "inner");

test/fixtures/transformation/misc/_member-expression-keywords/actual.js

@@ -0,0 +1,4 @@
+test.catch;
+test.catch["foo"];
+test["catch"];
+test["catch"]["foo"];

test/fixtures/transformation/misc/_member-expression-keywords/expected.js

@@ -0,0 +1,6 @@
+"use strict";
+
+test["catch"];
+test["catch"]["foo"];
+test["catch"];
+test["catch"]["foo"];

test/fixtures/transformation/misc/_property-literals/actual.js

@@ -0,0 +1,6 @@
+var obj = {
+  "test": "foob",
+  "!@#$": "foob",
+  "33rd": "foob",
+  fooBar: "foob"
+};

test/fixtures/transformation/misc/_property-literals/expected.js

@@ -0,0 +1,8 @@
+"use strict";
+
+var obj = {
+  test: "foob",
+  "!@#$": "foob",
+  "33rd": "foob",
+  fooBar: "foob"
+};

test/fixtures/transformation/modules-amd/exports-default/expected.js

@@ -1,15 +1,15 @@
-define(["exports"], function (exports) {
+define("modules-amd/exports-default/expected", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = 42;
-  exports.default = {};
-  exports.default = [];
-  exports.default = foo;
-  exports.default = function () {};
-  exports.default = function () {};
+  exports["default"] = 42;
+  exports["default"] = {};
+  exports["default"] = [];
+  exports["default"] = foo;
+  exports["default"] = function () {};
+  exports["default"] = function () {};
   function foo() {}
-  exports.default = foo;
+  exports["default"] = foo;
   var Foo = function Foo() {};
 
-  exports.default = Foo;
-});
+  exports["default"] = Foo;
+});

test/fixtures/transformation/modules-amd/exports-from/expected.js

@@ -1,4 +1,4 @@
-define(["exports", "foo"], function (exports, _foo) {
+define("modules-amd/exports-from/expected", ["exports", "foo"], function (exports, _foo) {
   "use strict";
 
   (function (obj) {
@@ -11,7 +11,7 @@ define(["exports", "foo"], function (exports, _foo) {
   exports.foo = _foo.foo;
   exports.bar = _foo.bar;
   exports.bar = _foo.foo;
-  exports.default = _foo.foo;
-  exports.default = _foo.foo;
+  exports["default"] = _foo.foo;
+  exports["default"] = _foo.foo;
   exports.bar = _foo.bar;
 });

test/fixtures/transformation/modules-amd/exports-named/expected.js

@@ -1,11 +1,11 @@
-define(["exports"], function (exports) {
+define("modules-amd/exports-named/expected", ["exports"], function (exports) {
   "use strict";
 
   exports.foo = foo;
   exports.foo = foo;
   exports.bar = bar;
   exports.bar = foo;
-  exports.default = foo;
-  exports.default = foo;
+  exports["default"] = foo;
+  exports["default"] = foo;
   exports.bar = bar;
 });

test/fixtures/transformation/modules-amd/exports-variable/expected.js

@@ -1,4 +1,4 @@
-define(["exports"], function (exports) {
+define("modules-amd/exports-variable/expected", ["exports"], function (exports) {
   "use strict";
 
   exports.foo7 = foo7;
@@ -12,4 +12,4 @@ define(["exports"], function (exports) {
   var foo8 = function foo8() {};
 
   exports.foo8 = foo8;
-});
+});

test/fixtures/transformation/modules-amd/hoist-function-exports/expected.js

@@ -1,4 +1,4 @@
-define(["exports", "./evens"], function (exports, _evens) {
+define("modules-amd/hoist-function-exports/expected", ["exports", "./evens"], function (exports, _evens) {
   "use strict";
 
   exports.nextOdd = nextOdd;
@@ -12,4 +12,4 @@ define(["exports", "./evens"], function (exports, _evens) {
       return !isEven(n);
     };
   })(isEven);
-});
+});

test/fixtures/transformation/modules-amd/imports-default/expected.js

@@ -1,6 +1,6 @@
-define(["exports", "foo"], function (exports, _foo) {
+define("modules-amd/imports-default/expected", ["exports", "foo"], function (exports, _foo) {
   "use strict";
 
-  var foo = _foo.default;
-  var foo = _foo.default;
+  var foo = _foo["default"];
+  var foo = _foo["default"];
 });

test/fixtures/transformation/modules-amd/imports-glob/expected.js

@@ -1,4 +1,4 @@
-define(["exports", "foo"], function (exports, _foo) {
+define("modules-amd/imports-glob/expected", ["exports", "foo"], function (exports, _foo) {
   "use strict";
 
   var foo = _foo;

test/fixtures/transformation/modules-amd/imports-mixing/expected.js

@@ -1,6 +1,6 @@
-define(["exports", "foo"], function (exports, _foo) {
+define("modules-amd/imports-mixing/expected", ["exports", "foo"], function (exports, _foo) {
   "use strict";
 
-  var foo = _foo.default;
+  var foo = _foo["default"];
   var xyz = _foo.baz;
 });

test/fixtures/transformation/modules-amd/imports-named/expected.js

@@ -1,4 +1,4 @@
-define(["exports", "foo"], function (exports, _foo) {
+define("modules-amd/imports-named/expected", ["exports", "foo"], function (exports, _foo) {
   "use strict";
 
   var bar = _foo.bar;

test/fixtures/transformation/modules-amd/imports/expected.js

@@ -1,3 +1,3 @@
-define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+define("modules-amd/imports/expected", ["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
-});
+});

test/fixtures/transformation/modules-amd/overview/expected.js

@@ -1,12 +1,12 @@
-define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+define("modules-amd/overview/expected", ["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
 
-  var foo = _foo.default;
+  var foo = _foo["default"];
   var foo = _foo;
   var bar = _foo.bar;
   var bar = _foo.foo;
   exports.test = test;
   var test = exports.test = 5;
 
-  exports.default = test;
-});
+  exports["default"] = test;
+});

test/fixtures/transformation/modules-common/exports-default/expected.js

@@ -1,13 +1,13 @@
 "use strict";
 
-exports.default = 42;
-exports.default = {};
-exports.default = [];
-exports.default = foo;
-exports.default = function () {};
-exports.default = function () {};
+exports["default"] = 42;
+exports["default"] = {};
+exports["default"] = [];
+exports["default"] = foo;
+exports["default"] = function () {};
+exports["default"] = function () {};
 function foo() {}
-exports.default = foo;
+exports["default"] = foo;
 var Foo = function Foo() {};
 
-exports.default = Foo;
+exports["default"] = Foo;

test/fixtures/transformation/modules-common/exports-from/expected.js

@@ -10,6 +10,6 @@ exports.foo = require("foo").foo;
 exports.foo = require("foo").foo;
 exports.bar = require("foo").bar;
 exports.bar = require("foo").foo;
-exports.default = require("foo").foo;
-exports.default = require("foo").foo;
-exports.bar = require("foo").bar;
+exports["default"] = require("foo").foo;
+exports["default"] = require("foo").foo;
+exports.bar = require("foo").bar;

test/fixtures/transformation/modules-common/exports-named/expected.js

@@ -4,6 +4,6 @@ exports.foo = foo;
 exports.foo = foo;
 exports.bar = bar;
 exports.bar = foo;
-exports.default = foo;
-exports.default = foo;
-exports.bar = bar;
+exports["default"] = foo;
+exports["default"] = foo;
+exports.bar = bar;

test/fixtures/transformation/modules-common/imports-default/expected.js

@@ -1,4 +1,4 @@
 "use strict";
 
-var foo = require("foo").default;
-var foo = require("foo").default;
+var foo = require("foo")["default"];
+var foo = require("foo")["default"];

test/fixtures/transformation/modules-common/imports-mixing/expected.js

@@ -1,4 +1,4 @@
 "use strict";
 
-var foo = require("foo").default;
+var foo = require("foo")["default"];
 var xyz = require("foo").baz;

test/fixtures/transformation/modules-common/overview/expected.js

@@ -6,7 +6,7 @@ require("foo-bar");
 
 require("./directory/foo-bar");
 
-var foo = require("foo").default;
+var foo = require("foo")["default"];
 var foo = require("foo");
 
 var bar = require("foo").bar;
@@ -14,4 +14,4 @@ var bar = require("foo").foo;
 exports.test = test;
 var test = exports.test = 5;
 
-exports.default = test;
+exports["default"] = test;

test/fixtures/transformation/modules-umd/exports-default/expected.js

@@ -1,21 +1,21 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports"], factory);
+    define("modules-umd/exports-default/expected", ["exports"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports);
   }
 })(function (exports) {
   "use strict";
 
-  exports.default = 42;
-  exports.default = {};
-  exports.default = [];
-  exports.default = foo;
-  exports.default = function () {};
-  exports.default = function () {};
+  exports["default"] = 42;
+  exports["default"] = {};
+  exports["default"] = [];
+  exports["default"] = foo;
+  exports["default"] = function () {};
+  exports["default"] = function () {};
   function foo() {}
-  exports.default = foo;
+  exports["default"] = foo;
   var Foo = function Foo() {};
 
-  exports.default = Foo;
-});
+  exports["default"] = Foo;
+});

test/fixtures/transformation/modules-umd/exports-from/expected.js

@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
+    define("modules-umd/exports-from/expected", ["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }
@@ -17,7 +17,7 @@
   exports.foo = _foo.foo;
   exports.bar = _foo.bar;
   exports.bar = _foo.foo;
-  exports.default = _foo.foo;
-  exports.default = _foo.foo;
+  exports["default"] = _foo.foo;
+  exports["default"] = _foo.foo;
   exports.bar = _foo.bar;
-});
+});

test/fixtures/transformation/modules-umd/exports-named/expected.js

@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports"], factory);
+    define("modules-umd/exports-named/expected", ["exports"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports);
   }
@@ -11,7 +11,7 @@
   exports.foo = foo;
   exports.bar = bar;
   exports.bar = foo;
-  exports.default = foo;
-  exports.default = foo;
+  exports["default"] = foo;
+  exports["default"] = foo;
   exports.bar = bar;
 });

test/fixtures/transformation/modules-umd/exports-variable/expected.js

@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports"], factory);
+    define("modules-umd/exports-variable/expected", ["exports"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports);
   }
@@ -18,4 +18,4 @@
   var foo8 = function foo8() {};
 
   exports.foo8 = foo8;
-});
+});

test/fixtures/transformation/modules-umd/hoist-function-exports/expected.js

@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "./evens"], factory);
+    define("modules-umd/hoist-function-exports/expected", ["exports", "./evens"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("./evens"));
   }
@@ -18,4 +18,4 @@
       return !isEven(n);
     };
   })(isEven);
-});
+});

test/fixtures/transformation/modules-umd/imports-default/expected.js

@@ -1,12 +1,12 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
+    define("modules-umd/imports-default/expected", ["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
   "use strict";
 
-  var foo = _foo.default;
-  var foo = _foo.default;
+  var foo = _foo["default"];
+  var foo = _foo["default"];
 });

test/fixtures/transformation/modules-umd/imports-glob/expected.js

@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
+    define("modules-umd/imports-glob/expected", ["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }

test/fixtures/transformation/modules-umd/imports-mixing/expected.js

@@ -1,12 +1,12 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
+    define("modules-umd/imports-mixing/expected", ["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
   "use strict";
 
-  var foo = _foo.default;
+  var foo = _foo["default"];
   var xyz = _foo.baz;
 });

test/fixtures/transformation/modules-umd/imports-named/expected.js

@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
+    define("modules-umd/imports-named/expected", ["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }

test/fixtures/transformation/modules-umd/imports/expected.js

@@ -1,9 +1,9 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
+    define("modules-umd/imports/expected", ["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   }
 })(function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
-});
+});

test/fixtures/transformation/modules-umd/overview/expected.js

@@ -1,18 +1,18 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
+    define("modules-umd/overview/expected", ["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   }
 })(function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
 
-  var foo = _foo.default;
+  var foo = _foo["default"];
   var foo = _foo;
   var bar = _foo.bar;
   var bar = _foo.foo;
   exports.test = test;
   var test = exports.test = 5;
 
-  exports.default = test;
-});
+  exports["default"] = test;
+});

test/transformation.js

@@ -9,21 +9,20 @@ var _         = require("lodash");
 var run = function (task) {
   var actual = task.actual;
   var expect = task.expect;
-  var opts   = task.options;
   var exec   = task.exec;
 
-  var getOpts = function (filename) {
+  var getOpts = function (self) {
     return _.merge({
       whtiespace: true,
-      filename: filename
-    }, opts);
+      filename:   self.loc
+    }, task.options);
   };
 
   var execCode = exec.code;
   var result;
 
   if (execCode) {
-    result = transform(execCode, getOpts(exec.filename));
+    result = transform(execCode, getOpts(exec));
     execCode = result.code;
 
     require("../lib/6to5/polyfill");
@@ -39,7 +38,7 @@ var run = function (task) {
     var actualCode = actual.code;
     var expectCode = expect.code;
 
-    result     = transform(actualCode, getOpts(actual.filename));
+    result     = transform(actualCode, getOpts(actual));
     actualCode = result.code;
 
     chai.expect(actualCode).to.be.equal(expectCode, actual.loc + " !== " + expect.loc);