v4.7.3

add tests for babel-external-helpers

.gitignore

@@ -12,5 +12,6 @@ coverage
 dist
 .package.json
 packages/babel-runtime/*.js
+packages/babel-runtime/helpers/*.js
 packages/babel-runtime/regenerator/*.js
 lib

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "4.7.2",
+  "version": "4.7.3",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",

packages/babel-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "4.7.1",
+  "version": "4.7.2",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>"
 }

packages/build-runtime.js

@@ -1,11 +1,12 @@
 "use strict";
 
-var transform    = require("../lib/babel/transformation");
-var buildHelpers = require("../lib/babel/build-helpers");
-var util         = require("../lib/babel/util");
-var fs           = require("fs");
-var t            = require("../lib/babel/types");
-var _            = require("lodash");
+var transform = require("../lib/babel/transformation");
+var each      = require("lodash/collection/each");
+var File      = require("../lib/babel/transformation/file");
+var util      = require("../lib/babel/util");
+var fs        = require("fs");
+var t         = require("../lib/babel/types");
+var _         = require("lodash");
 
 var relative = function (filename) {
   return __dirname + "/babel-runtime/" + filename;
@@ -39,22 +40,26 @@ var updatePackage = function () {
 
 var selfContainify = function (code) {
   return transform(code, {
-    optional: ["selfContained"]
+    optional: ["runtime"]
   }).code;
 };
 
-var buildHelpers2 = function () {
-  var body = util.template("self-contained-helpers-head");
-  var tree = t.program(body);
-
-  buildHelpers(body, t.identifier("helpers"));
+var buildHelper = function (helperName) {
+  var tree = t.program(
+    util.template("self-contained-helpers-head", {
+      HELPER: util.template(helperName)
+    })
+  );
 
   return transform.fromAst(tree, null, {
-    optional: ["selfContained"]
+    optional: ["runtime"]
   }).code;
 };
 
-writeFile("helpers.js", buildHelpers2());
+each(File.helpers, function (helperName) {
+  writeFile("helpers/" + helperName + ".js", buildHelper(helperName));
+});
+
 writeFile("core-js.js", readFile("core-js/library", true));
 writeFile("regenerator/index.js", readFile("regenerator-babel/runtime-module", true));
 writeFile("regenerator/runtime.js", selfContainify(readFile("regenerator-babel/runtime")));

src/babel/build-external-helpers.js

@@ -1,7 +1,8 @@
-import buildHelpers from "./build-helpers";
 import generator from "./generation";
 import * as messages from "./messages";
 import * as util from  "./util";
+import File from "./transformation/file";
+import each from "lodash/collection/each";
 import t from "./types";
 
 function buildGlobal(namespace, builder) {
@@ -49,8 +50,20 @@ function buildVar(namespace, builder) {
   return t.program(body);
 }
 
+function buildHelpers(body, namespace, whitelist = []) {
+  each(File.helpers, function (name) {
+    if (whitelist.length && whitelist.indexOf(name) === -1) return;
+
+    var key = t.identifier(t.toIdentifier(name));
+    body.push(t.expressionStatement(
+      t.assignmentExpression("=", t.memberExpression(namespace, key), util.template(name))
+    ));
+  });
+}
+
 export default function (whitelist, outputType = "global") {
   var namespace = t.identifier("babelHelpers");
+
   var builder = function (body) {
     return buildHelpers(body, namespace, whitelist);
   };

src/babel/build-helpers.js

@@ -1,15 +0,0 @@
-import File from "./transformation/file";
-import * as util from  "./util";
-import each from "lodash/collection/each";
-import t from "./types";
-
-export default function (body, namespace, whitelist = []) {
-  each(File.helpers, function (name) {
-    if (whitelist.length && whitelist.indexOf(name) === -1) return;
-
-    var key = t.identifier(t.toIdentifier(name));
-    body.push(t.expressionStatement(
-      t.assignmentExpression("=", t.memberExpression(namespace, key), util.template(name))
-    ));
-  });
-};

src/babel/transformation/file.js

@@ -377,10 +377,13 @@ export default class File {
 
     this.usedHelpers[name] = true;
 
+    var generator = this.get("helperGenerator");
     var runtime = this.get("helpersNamespace");
-    if (runtime) {
-      name = t.identifier(t.toIdentifier(name));
-      return t.memberExpression(runtime, name);
+    if (generator) {
+      return generator(name);
+    } else if (runtime) {
+      var id = t.identifier(t.toIdentifier(name));
+      return t.memberExpression(runtime, id);
     } else {
       var ref = util.template(name);
       ref._compact = true;
@@ -531,7 +534,7 @@ export default class File {
       result.code += "\n" + convertSourceMap.fromObject(result.map).toComment();
     }
 
-    if (opts.sourceMap === "both") {
+    if (opts.sourceMap === "inline") {
       result.map = null;
     }
 

src/babel/transformation/templates/self-contained-helpers-head.js

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

src/babel/transformation/transformers/other/runtime.js

@@ -81,8 +81,8 @@ export function Program(node, parent, scope, file) {
 }
 
 export function pre(file) {
-  file.setDynamic("helpersNamespace", function () {
-    return file.addImport("babel-runtime/helpers", "babelHelpers");
+  file.set("helperGenerator", function (name) {
+    return file.addImport("babel-runtime/helpers/" + name, name);
   });
 
   file.setDynamic("coreIdentifier", function () {

src/babel/traversal/path.js

@@ -61,7 +61,7 @@ export default class TraversalPath {
     this.shouldSkip   = false;
     this.shouldStop   = false;
 
-    this.parentPath = parentPath;
+    this.parentPath = parentPath || this.parentPath;
     this.context    = context;
     this.state      = context.state;
     this.opts       = context.opts;

test/fixtures/bin/babel-external-helpers/--output-type global/options.json

@@ -0,0 +1,3 @@
+{
+  "args": ["--whitelist", "nonexistent"]
+}

test/fixtures/bin/babel-external-helpers/--output-type global/stdout.txt

@@ -0,0 +1,3 @@
+(function (global) {
+  var babelHelpers = global.babelHelpers = {};
+})(typeof global === "undefined" ? self : global);

test/fixtures/bin/babel-external-helpers/--output-type umd/options.json

@@ -0,0 +1,3 @@
+{
+  "args": ["--whitelist", "nonexistent", "--output-type", "umd"]
+}

test/fixtures/bin/babel-external-helpers/--output-type umd/stdout.txt

@@ -0,0 +1,11 @@
+(function (root, factory) {
+  if (typeof define === "function" && define.amd) {
+    define(["exports"], factory);
+  } else if (typeof exports === "object") {
+    factory(exports);
+  } else {
+    factory(root.babelHelpers = {});
+  }
+})(this, function (global) {
+  var babelHelpers = global;
+})

test/fixtures/bin/babel-external-helpers/--output-type var/options.json

@@ -0,0 +1,3 @@
+{
+  "args": ["--whitelist", "nenexistent", "--output-type", "var"]
+}

test/fixtures/bin/babel-external-helpers/--output-type var/stdout.txt

@@ -0,0 +1 @@
+var babelHelpers = {};

test/fixtures/bin/babel-external-helpers/--whitelist/options.json

@@ -0,0 +1,3 @@
+{
+  "args": ["--whitelist", "slice,has-own"]
+}

test/fixtures/bin/babel-external-helpers/--whitelist/stdout.txt

@@ -0,0 +1,5 @@
+(function (global) {
+  var babelHelpers = global.babelHelpers = {};
+  babelHelpers.hasOwn = Object.prototype.hasOwnProperty;
+  babelHelpers.slice = Array.prototype.slice;
+})(typeof global === "undefined" ? self : global);

test/fixtures/transformation/runtime/full/expected.js

@@ -4,7 +4,9 @@ var _core = require("babel-runtime/core-js")["default"];
 
 var _regeneratorRuntime = require("babel-runtime/regenerator")["default"];
 
-var _babelHelpers = require("babel-runtime/helpers")["default"];
+var _interopRequire = require("babel-runtime/helpers/interop-require")["default"];
+
+var _interopRequireWildcard = require("babel-runtime/helpers/interop-require-wildcard")["default"];
 
 var giveWord = _regeneratorRuntime.mark(function giveWord() {
   return _regeneratorRuntime.wrap(function giveWord$(context$1$0) {
@@ -24,9 +26,9 @@ exports.giveWord = giveWord;
 
 var _someModule = require("someModule");
 
-var foo = _babelHelpers.interopRequire(_someModule);
+var foo = _interopRequire(_someModule);
 
-var bar = _babelHelpers.interopRequireWildcard(_someModule);
+var bar = _interopRequireWildcard(_someModule);
 
 var myWord = _core.Symbol("abc");
 exports.myWord = myWord;

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

@@ -1,7 +1,7 @@
-define(["exports", "foo", "babel-runtime/helpers"], function (exports, _foo, _babelRuntimeHelpers) {
+define(["exports", "foo", "babel-runtime/helpers/interop-require"], function (exports, _foo, _babelRuntimeHelpersInteropRequire) {
   "use strict";
 
-  var _babelHelpers = _babelRuntimeHelpers["default"];
+  var _interopRequire = _babelRuntimeHelpersInteropRequire["default"];
 
-  var foo = _babelHelpers.interopRequire(_foo);
+  var foo = _interopRequire(_foo);
 });

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

@@ -1,5 +1,5 @@
 "use strict";
 
-var _babelHelpers = require("babel-runtime/helpers")["default"];
+var _interopRequire = require("babel-runtime/helpers/interop-require")["default"];
 
-var foo = _babelHelpers.interopRequire(require("foo"));
+var foo = _interopRequire(require("foo"));

test/fixtures/transformation/runtime/modules-system/expected.js

@@ -1,14 +1,14 @@
-System.register(["babel-runtime/helpers"], function (_export) {
-  var _babelHelpers;
+System.register(["babel-runtime/helpers/to-consumable-array"], function (_export) {
+  var _toConsumableArray;
 
   return {
-    setters: [function (_babelRuntimeHelpers) {
-      _babelHelpers = _babelRuntimeHelpers["default"];
+    setters: [function (_babelRuntimeHelpersToConsumableArray) {
+      _toConsumableArray = _babelRuntimeHelpersToConsumableArray["default"];
     }],
     execute: function () {
       "use strict";
 
-      foo.apply(undefined, _babelHelpers.toConsumableArray(bar));
+      foo.apply(undefined, _toConsumableArray(bar));
     }
   };
 });

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

@@ -1,13 +1,13 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo", "babel-runtime/helpers"], factory);
+    define(["exports", "foo", "babel-runtime/helpers/interop-require"], factory);
   } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"), require("babel-runtime/helpers"));
+    factory(exports, require("foo"), require("babel-runtime/helpers/interop-require"));
   }
-})(function (exports, _foo, _babelRuntimeHelpers) {
+})(function (exports, _foo, _babelRuntimeHelpersInteropRequire) {
   "use strict";
 
-  var _babelHelpers = _babelRuntimeHelpers["default"];
+  var _interopRequire = _babelRuntimeHelpersInteropRequire["default"];
 
-  var foo = _babelHelpers.interopRequire(_foo);
+  var foo = _interopRequire(_foo);
 });