babel-source 5.0.6 → 5.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzEwNDY1YWQ5N2I0ZjM5Y2QwNjg0MjQwY2RjNWQyZGZkY2Q5YjJlMw==
+    YjRlYzhkN2I3N2YxY2NmZmY2ZWI0ZmQxNjRjODU2OTFhOTVlYWVjOQ==
   data.tar.gz: !binary |-
-    MGU5YjcyMmNmM2NlMmI3YzAzNGFhYTU3MDNjYzAxZmVlNWZhZjlhZQ==
+    OGFlM2QxYmVkOTMyZWQxYzIzMmIzMGUyZTExMGRlYzczM2QyODVkMA==
 SHA512:
   metadata.gz: !binary |-
-    ODBjNjk3NDcwODdkZjZhMmFkZDY4YjNhOWMxMTg3YmQ5Mzc2Nzg1NGRkYThh
-    ZThjNGU1Mjc3NTQzY2Y4MGI1N2E2MzVjNTgyMWUwZTM2OTc4NmRjMzEyZDAx
-    NTgxYjY5MzYxZGMzNWY3Y2YwYWIzZjEzNTI5M2VmYTY5YjU0MDM=
+    MjljNTQwZjY4MjJmZDRlM2RkYWE2ZmNlZTY1ZGVhNTAyNDhhMzI0MGQ4YzBj
+    MDRiMWZjMzg1ZGMxNDBiYThiMjUwMTlmNTdjZDJhYjk3NDc5YTlmY2UzMDkz
+    ZGJhNDU4N2VhNWIyZmRkYWYxNTkzYjYzODBlYzdjOGY4OGRkNGY=
   data.tar.gz: !binary |-
-    M2QxYjY2NTUxZWFlZTk3MTg3NzVjMTgzZGVkMmY1ZWI2NTI3YTgzOGFmNDkz
-    NjdlMTI3ZjUyOThmMDYwYzdmNzcwMjUxZDI3MDY3Y2U5MWU3ZGM4ZGY0OGZi
-    MTA4ZGFiMzE5MzU3NDI4N2JlZjBhZWQ5ZWEzOGU2MWE3Njk2NGY=
+    YWM4ZWY1M2RjYTAzM2E4YzZjMmNkYjNmOGUwNGViN2M2ZTBmYjBkNWY0NDNi
+    OTFhZGI4Y2MxODA3NzcyYjJhZGViODlmZGYzN2EzNmEzYTU5MzE2YjVkZmNm
+    MWIxZTU4MGU4YTYyODBhYmYxYmUzYjI1MzhlZDU1OWE0YTBmYzg=

data/lib/babel.js

@@ -8590,23 +8590,7 @@ var File = (function () {
 
   File.prototype.shouldIgnore = function shouldIgnore() {
     var opts = this.opts;
-
-    var filename = opts.filename;
-    var ignore = opts.ignore;
-    var only = opts.only;
-
-    if (only.length) {
-      for (var i = 0; i < only.length; i++) {
-        if (only[i].test(filename)) return false;
-      }
-      return true;
-    } else if (ignore.length) {
-      for (var i = 0; i < ignore.length; i++) {
-        if (ignore[i].test(filename)) return true;
-      }
-    }
-
-    return false;
+    return util.shouldIgnore(opts.filename, opts.ignore, opts.only);
   };
 
   File.prototype.parse = (function (_parse) {
@@ -10435,7 +10419,6 @@ var importsVisitor = {
     enter: function enter(node, parent, scope, formatter) {
       formatter.hasLocalImports = true;
       extend(formatter.localImports, this.getBindingIdentifiers());
-      formatter.bumpImportOccurences(node);
     }
   }
 };
@@ -10443,7 +10426,7 @@ var importsVisitor = {
 var exportsVisitor = traverse.explode({
   ExportDeclaration: {
     enter: function enter(node, parent, scope, formatter) {
-      formatter.hasLocalImports = true;
+      formatter.hasLocalExports = true;
 
       var declar = this.get("declaration");
       if (declar.isStatement()) {
@@ -10470,10 +10453,6 @@ var exportsVisitor = traverse.explode({
           formatter.hasNonDefaultExports = true;
         }
       }
-
-      if (node.source) {
-        formatter.bumpImportOccurences(node);
-      }
     }
   }
 });
@@ -10493,7 +10472,6 @@ var DefaultFormatter = (function () {
     this.hasLocalExports = false;
     this.hasLocalImports = false;
 
-    this.localImportOccurences = object();
     this.localExports = object();
     this.localImports = object();
 
@@ -10509,18 +10487,6 @@ var DefaultFormatter = (function () {
     return (t.isExportDefaultDeclaration(node) || t.isSpecifierDefault(node)) && !this.noInteropRequireExport && !this.hasNonDefaultExports;
   };
 
-  DefaultFormatter.prototype.bumpImportOccurences = function bumpImportOccurences(node) {
-    var source = node.source.value;
-    var occurs = this.localImportOccurences;
-    var _occurs = occurs;
-    var _source = source;
-    if (!_occurs[_source]) _occurs[_source] = 0;
-
-    if (node.specifiers) {
-      occurs[source] += node.specifiers.length;
-    }
-  };
-
   DefaultFormatter.prototype.getLocalExports = function getLocalExports() {
     this.file.path.traverse(exportsVisitor, this);
   };
@@ -10530,7 +10496,7 @@ var DefaultFormatter = (function () {
   };
 
   DefaultFormatter.prototype.remapAssignments = function remapAssignments() {
-    if (this.hasLocalImports) {
+    if (this.hasLocalExports || this.hasLocalImports) {
       this.file.path.traverse(remapVisitor, this);
     }
   };
@@ -10781,8 +10747,6 @@ var t = _interopRequireWildcard(require("../../types"));
 
 var AMDFormatter = (function (_DefaultFormatter) {
   function AMDFormatter() {
-    this.init = CommonFormatter.prototype.init;
-
     _classCallCheck(this, AMDFormatter);
 
     if (_DefaultFormatter != null) {
@@ -10792,6 +10756,10 @@ var AMDFormatter = (function (_DefaultFormatter) {
 
   _inherits(AMDFormatter, _DefaultFormatter);
 
+  AMDFormatter.prototype.init = function init() {
+    CommonFormatter.prototype._init.call(this, this.hasNonDefaultExports);
+  };
+
   AMDFormatter.prototype.buildDependencyLiterals = function buildDependencyLiterals() {
     var names = [];
     for (var name in this.ids) {
@@ -10880,16 +10848,35 @@ var AMDFormatter = (function (_DefaultFormatter) {
     this.internalRemap[specifier.local.name] = ref;
   };
 
-  AMDFormatter.prototype.exportSpecifier = function exportSpecifier() {
-    CommonFormatter.prototype.exportSpecifier.apply(this, arguments);
+  AMDFormatter.prototype.exportSpecifier = function exportSpecifier(specifier, node, nodes) {
+    if (this.doDefaultExportInterop(specifier)) {
+      nodes.push(util.template("exports-default-assign", {
+        VALUE: specifier.local
+      }, true));
+    } else {
+      CommonFormatter.prototype.exportSpecifier.apply(this, arguments);
+    }
   };
 
-  AMDFormatter.prototype.exportDeclaration = function exportDeclaration(node) {
+  AMDFormatter.prototype.exportDeclaration = function exportDeclaration(node, nodes) {
     if (this.doDefaultExportInterop(node)) {
       this.passModuleArg = true;
+
+      var declar = node.declaration;
+      var assign = util.template("exports-default-assign", {
+        VALUE: this._pushStatement(declar, nodes)
+      }, true);
+
+      if (t.isFunctionDeclaration(declar)) {
+        // we can hoist this assignment to the top of the file
+        assign._blockHoist = 3;
+      }
+
+      nodes.push(assign);
+      return;
     }
 
-    CommonFormatter.prototype.exportDeclaration.apply(this, arguments);
+    DefaultFormatter.prototype.exportDeclaration.apply(this, arguments);
   };
 
   return AMDFormatter;
@@ -10939,13 +10926,17 @@ var CommonJSFormatter = (function (_DefaultFormatter) {
   _inherits(CommonJSFormatter, _DefaultFormatter);
 
   CommonJSFormatter.prototype.init = function init() {
+    this._init(this.hasLocalExports);
+  };
+
+  CommonJSFormatter.prototype._init = function _init(conditional) {
     var file = this.file;
     var scope = file.scope;
 
     scope.rename("module");
     scope.rename("exports");
 
-    if (!this.noInteropRequireImport && this.hasNonDefaultExports) {
+    if (!this.noInteropRequireImport && conditional) {
       var templateName = "exports-module-declaration";
       if (this.file.isLoose("es6.modules")) templateName += "-loose";
       var declar = util.template(templateName, true);
@@ -10954,6 +10945,14 @@ var CommonJSFormatter = (function (_DefaultFormatter) {
     }
   };
 
+  CommonJSFormatter.prototype.transform = function transform(program) {
+    DefaultFormatter.prototype.transform.apply(this, arguments);
+
+    if (this.hasDefaultOnlyExport) {
+      program.body.push(t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier("module"), t.identifier("exports")), t.memberExpression(t.identifier("exports"), t.identifier("default")))));
+    }
+  };
+
   CommonJSFormatter.prototype.importSpecifier = function importSpecifier(specifier, node, nodes) {
     var variableName = specifier.local;
 
@@ -10967,7 +10966,11 @@ var CommonJSFormatter = (function (_DefaultFormatter) {
         if (this.noInteropRequireImport) {
           this.internalRemap[variableName.name] = t.memberExpression(ref, t.identifier("default"));
         } else if (!includes(this.file.dynamicImported, node)) {
-          nodes.push(t.variableDeclaration("var", [t.variableDeclarator(variableName, t.callExpression(this.file.addHelper("interop-require"), [ref]))]));
+          var uid = this.scope.generateUidBasedOnNode(node, "import");
+
+          nodes.push(t.variableDeclaration("var", [t.variableDeclarator(uid, t.callExpression(this.file.addHelper("interop-require-wildcard"), [ref]))]));
+
+          this.internalRemap[variableName.name] = t.memberExpression(uid, t.identifier("default"));
         }
       }
     } else {
@@ -10994,29 +10997,15 @@ var CommonJSFormatter = (function (_DefaultFormatter) {
 
   CommonJSFormatter.prototype.exportSpecifier = function exportSpecifier(specifier, node, nodes) {
     if (this.doDefaultExportInterop(specifier)) {
-      nodes.push(util.template("exports-default-assign", {
-        VALUE: specifier.local
-      }, true));
-      return;
-    } else {
-      DefaultFormatter.prototype.exportSpecifier.apply(this, arguments);
+      this.hasDefaultOnlyExport = true;
     }
+
+    DefaultFormatter.prototype.exportSpecifier.apply(this, arguments);
   };
 
   CommonJSFormatter.prototype.exportDeclaration = function exportDeclaration(node, nodes) {
     if (this.doDefaultExportInterop(node)) {
-      var declar = node.declaration;
-      var assign = util.template("exports-default-assign", {
-        VALUE: this._pushStatement(declar, nodes)
-      }, true);
-
-      if (t.isFunctionDeclaration(declar)) {
-        // we can hoist this assignment to the top of the file
-        assign._blockHoist = 3;
-      }
-
-      nodes.push(assign);
-      return;
+      this.hasDefaultOnlyExport = true;
     }
 
     DefaultFormatter.prototype.exportDeclaration.apply(this, arguments);
@@ -17993,6 +17982,9 @@ var TraversalPath = (function () {
       var binding = this.scope.getBinding(this.node.name);
       if (!binding || !binding.constant) return;
 
+      // todo: take into consideration infinite recursion #1149
+      return;
+
       if (binding.path === this) {
         return this;
       } else {
@@ -20386,6 +20378,7 @@ exports.list = list;
 exports.regexify = regexify;
 exports.arrayify = arrayify;
 exports.booleanify = booleanify;
+exports.shouldIgnore = shouldIgnore;
 
 //
 
@@ -20475,8 +20468,10 @@ function list(val) {
     return [];
   } else if (Array.isArray(val)) {
     return val;
-  } else {
+  } else if (typeof val === "string") {
     return val.split(",");
+  } else {
+    return [val];
   }
 }
 
@@ -20507,6 +20502,21 @@ function booleanify(val) {
   return val;
 }
 
+function shouldIgnore(filename, ignore, only) {
+  if (only.length) {
+    for (var i = 0; i < only.length; i++) {
+      if (only[i].test(filename)) return false;
+    }
+    return true;
+  } else if (ignore.length) {
+    for (var i = 0; i < ignore.length; i++) {
+      if (ignore[i].test(filename)) return true;
+    }
+  }
+
+  return false;
+}
+
 var templateVisitor = {
   enter: function enter(node, parent, scope, nodes) {
     if (t.isExpressionStatement(node)) {
@@ -49731,7 +49741,7 @@ module.exports = function (str) {
 module.exports={
   "name": "babel-core",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",

data/lib/babel/source.rb

@@ -1,7 +1,7 @@
 module Babel
   module Source
-    VERSION = "5.0.6"
-    DATE = Time.at(1428063223)
+    VERSION = "5.0.7"
+    DATE = Time.at(1428083371)
     PATH = File.expand_path("../..", __FILE__)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babel-source
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 5.0.7
 platform: ruby
 authors:
 - Sebastian McKenzie