use default property on 6to5-runtime modules - fixes #774

lib/6to5/transformation/file.js

@@ -18,9 +18,10 @@ var each       = require("lodash/collection/each");
 var t          = require("../types");
 
 function File(opts) {
-  this.dynamicImportIds = {};
-  this.dynamicImported  = [];
-  this.dynamicImports   = [];
+  this.dynamicImportedNoDefault = [];
+  this.dynamicImportIds         = {};
+  this.dynamicImported          = [];
+  this.dynamicImports           = [];
 
   this.dynamicData      = {};
   this.data             = {};
@@ -273,7 +274,7 @@ File.prototype.get = function (key) {
   }
 };
 
-File.prototype.addImport = function (source, name) {
+File.prototype.addImport = function (source, name, noDefault) {
   name = name || source;
   var id = this.dynamicImportIds[name];
 
@@ -283,7 +284,9 @@ 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.dynamicImported.push(declar);
+    if (noDefault) this.dynamicImportedNoDefault.push(declar);
 
     this.moduleFormatter.importSpecifier(specifiers[0], declar, this.dynamicImports);
   }

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

@@ -4,10 +4,10 @@ module.exports = AMDFormatter;
 
 var DefaultFormatter = require("./_default");
 var CommonFormatter  = require("./common");
-var util             = require("../../util");
-var t                = require("../../types");
 var includes         = require("lodash/collection/includes");
 var values           = require("lodash/object/values");
+var util             = require("../../util");
+var t                = require("../../types");
 
 function AMDFormatter() {
   CommonFormatter.apply(this, arguments);
@@ -81,12 +81,12 @@ AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
   var key = t.getSpecifierName(specifier);
   var ref = this.getExternalReference(node);
 
-  if (includes(this.file.dynamicImported, node)) {
+  if (includes(this.file.dynamicImportedNoDefault, 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.noInteropRequireImport) {
+  } else if (!includes(this.file.dynamicImported, node) && t.isSpecifierDefault(specifier) && !this.noInteropRequireImport) {
     // import foo from "foo";
     ref = t.callExpression(this.file.addHelper("interop-require"), [ref]);
   } else {

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

@@ -31,8 +31,8 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
 
   // import foo from "foo";
   if (t.isSpecifierDefault(specifier)) {
-    if (!includes(this.file.dynamicImported, node)) {
-      if (this.noInteropRequireImport) {
+    if (!includes(this.file.dynamicImportedNoDefault, node)) {
+      if (this.noInteropRequireImport || includes(this.file.dynamicImported, node)) {
         ref = t.memberExpression(ref, t.identifier("default"));
       } else {
         ref = t.callExpression(this.file.addHelper("interop-require"), [ref]);

lib/6to5/transformation/templates/self-contained-helpers-head.js

@@ -0,0 +1,2 @@
+var helpers = exports.default = {};
+exports.__esModule = true;

lib/6to5/transformation/transformer.js

@@ -55,6 +55,8 @@ Transformer.prototype.normalize = function (transformer) {
       return;
     }
 
+    if (type === "enter" || type === "exit") return;
+
     if (isFunction(fns)) fns = { enter: fns };
 
     if (!isObject(fns)) return;

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

@@ -86,11 +86,12 @@ module.exports = {
   _declarations:                           require("./internal/declarations"),
 
   _aliasFunctions:                         require("./internal/alias-functions"),
-  _moduleFormatter:                        require("./internal/module-formatter"),
 
   "spec.typeofSymbol":                     require("./spec/typeof-symbol"),
   "spec.undefinedToVoid":                  require("./spec/undefined-to-void"),
 
+  _moduleFormatter:                        require("./internal/module-formatter"),
+
   "es3.propertyLiterals":                  require("./es3/property-literals"),
   "es3.memberExpressionLiterals":          require("./es3/member-expression-literals"),
 

lib/6to5/transformation/transformers/internal/module-formatter.js

@@ -2,11 +2,9 @@
 
 var useStrict = require("../../helpers/use-strict");
 
-exports.post = function (file) {
+exports.Program = function (program, parent, scope, file) {
   if (!file.transformers["es6.modules"].canRun()) return;
 
-  var program = file.ast.program;
-
   useStrict.wrap(program, function () {
     program.body = file.dynamicImports.concat(program.body);
   });

lib/6to5/transformation/transformers/other/bluebird-coroutines.js

@@ -15,7 +15,7 @@ exports.Function = function (node, parent, scope, file) {
 
   return remapAsyncToGenerator(
     node,
-    t.memberExpression(file.addImport("bluebird"), t.identifier("coroutine")),
+    t.memberExpression(file.addImport("bluebird", null, true), t.identifier("coroutine")),
     scope
   );
 };

lib/6to5/transformation/transformers/other/self-contained.js

@@ -78,8 +78,8 @@ exports.manipulateOptions = function (opts) {
   if (opts.whitelist.length) opts.whitelist.push("es6.modules");
 };
 
-exports.post = function (file) {
-  file.scope.traverse(file.ast, astVisitor, file);
+exports.Program = function (node, parent, scope, file) {
+  scope.traverse(node, astVisitor, file);
 };
 
 exports.pre = function (file) {

lib/6to5/transformation/transformers/other/use-strict.js

@@ -3,8 +3,7 @@
 var useStrict = require("../../helpers/use-strict");
 var t         = require("../../../types");
 
-exports.post = function (file) {
-  var program = file.ast.program;
+exports.Program = function (program) {
   if (!useStrict.has(program)) {
     program.body.unshift(t.expressionStatement(t.literal("use strict")));
   }

lib/6to5/traversal/path.js

@@ -109,7 +109,7 @@ TraversalPath.prototype.call = function (key) {
   if (!node) return;
 
   var opts = this.opts;
-  var fn   = opts[key];
+  var fn   = opts[key] || opts;
   if (opts[node.type]) fn = opts[node.type][key] || fn;
 
   var replacement = fn.call(this, node, this.parent, this.scope, this.state);

lib/6to5/util.js

@@ -109,6 +109,8 @@ exports.template = function (name, nodes, keepExpression) {
     traverse(template, templateVisitor, null, nodes);
   }
 
+  if (template.body.length > 1) return template.body;
+
   var node = template.body[0];
 
   if (!keepExpression && t.isExpressionStatement(node)) {