remove exportsWildcard helper in favor of defaults #430

CHANGELOG.md

@@ -11,6 +11,11 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
+## 2.9.3
+
+ * **Bug Fix**
+  * Remove `exportsWildcard` helper in favor of `defaults`.
+
 ## 2.9.2
 
  * **Bug Fix**

lib/6to5/file.js

@@ -35,7 +35,6 @@ File.helpers = [
   "async-to-generator",
   "interop-require-wildcard",
   "typeof",
-  "exports-wildcard",
   "extends",
   "get",
   "observe-delete",

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

@@ -217,9 +217,9 @@ DefaultFormatter.prototype._exportSpecifier = function (getRef, specifier, node,
 };
 
 DefaultFormatter.prototype._exportsWildcard = function (objectIdentifier) {
-  return t.expressionStatement(t.callExpression(this.file.addHelper("exports-wildcard"), [
-    t.callExpression(this.file.addHelper("interop-require-wildcard"), [objectIdentifier]),
-    t.identifier("exports")
+  return t.expressionStatement(t.callExpression(this.file.addHelper("defaults"), [
+    t.identifier("exports"),
+    t.callExpression(this.file.addHelper("interop-require-wildcard"), [objectIdentifier])
   ]));
 };
 

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

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

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

@@ -7,15 +7,17 @@ define(["exports", "foo"], function (exports, _foo) {
     };
   };
 
-  var _exportsWildcard = function (obj, exports) {
-    for (var i in obj) {
-      if (exports[i] !== undefined) {
-        exports[i] = obj[i];
+  var _defaults = function (obj, defaults) {
+    for (var key in defaults) {
+      if (obj[key] === undefined) {
+        obj[key] = defaults[key];
       }
     }
+
+    return obj;
   };
 
-  _exportsWildcard(_interopRequireWildcard(_foo), exports);
+  _defaults(exports, _interopRequireWildcard(_foo));
 
   exports.foo = _foo.foo;
   exports.foo = _foo.foo;

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

@@ -7,15 +7,17 @@ define(["exports", "foo"], function (exports, _foo) {
     };
   };
 
-  var _exportsWildcard = function (obj, exports) {
-    for (var i in obj) {
-      if (exports[i] !== undefined) {
-        exports[i] = obj[i];
+  var _defaults = function (obj, defaults) {
+    for (var key in defaults) {
+      if (obj[key] === undefined) {
+        obj[key] = defaults[key];
       }
     }
+
+    return obj;
   };
 
-  _exportsWildcard(_interopRequireWildcard(_foo), exports);
+  _defaults(exports, _interopRequireWildcard(_foo));
 
   exports.foo = _foo.foo;
   exports.foo = _foo.foo;

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

@@ -6,15 +6,17 @@ var _interopRequireWildcard = function (obj) {
   };
 };
 
-var _exportsWildcard = function (obj, exports) {
-  for (var i in obj) {
-    if (exports[i] !== undefined) {
-      exports[i] = obj[i];
+var _defaults = function (obj, defaults) {
+  for (var key in defaults) {
+    if (obj[key] === undefined) {
+      obj[key] = defaults[key];
     }
   }
+
+  return obj;
 };
 
-_exportsWildcard(_interopRequireWildcard(require("foo")), exports);
+_defaults(exports, _interopRequireWildcard(require("foo")));
 
 exports.foo = require("foo").foo;
 exports.foo = require("foo").foo;

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

@@ -6,15 +6,17 @@ var _interopRequireWildcard = function (obj) {
   };
 };
 
-var _exportsWildcard = function (obj, exports) {
-  for (var i in obj) {
-    if (exports[i] !== undefined) {
-      exports[i] = obj[i];
+var _defaults = function (obj, defaults) {
+  for (var key in defaults) {
+    if (obj[key] === undefined) {
+      obj[key] = defaults[key];
     }
   }
+
+  return obj;
 };
 
-_exportsWildcard(_interopRequireWildcard(require("foo")), exports);
+_defaults(exports, _interopRequireWildcard(require("foo")));
 
 exports.foo = require("foo").foo;
 exports.foo = require("foo").foo;

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

@@ -13,15 +13,17 @@
     };
   };
 
-  var _exportsWildcard = function (obj, exports) {
-    for (var i in obj) {
-      if (exports[i] !== undefined) {
-        exports[i] = obj[i];
+  var _defaults = function (obj, defaults) {
+    for (var key in defaults) {
+      if (obj[key] === undefined) {
+        obj[key] = defaults[key];
       }
     }
+
+    return obj;
   };
 
-  _exportsWildcard(_interopRequireWildcard(_foo), exports);
+  _defaults(exports, _interopRequireWildcard(_foo));
 
   exports.foo = _foo.foo;
   exports.foo = _foo.foo;

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

@@ -13,15 +13,17 @@
     };
   };
 
-  var _exportsWildcard = function (obj, exports) {
-    for (var i in obj) {
-      if (exports[i] !== undefined) {
-        exports[i] = obj[i];
+  var _defaults = function (obj, defaults) {
+    for (var key in defaults) {
+      if (obj[key] === undefined) {
+        obj[key] = defaults[key];
       }
     }
+
+    return obj;
   };
 
-  _exportsWildcard(_interopRequireWildcard(_foo), exports);
+  _defaults(exports, _interopRequireWildcard(_foo));
 
   exports.foo = _foo.foo;
   exports.foo = _foo.foo;