v5.6.12

CHANGELOG.md

@@ -13,6 +13,11 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 5.6.12
+
+ * **Bug Fix**
+  * Fix finding parent for top-level shadowed functions.
+
 ## 5.6.11
 
  ** **Internal**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-core",
   "description": "A compiler for writing next generation JavaScript",
-  "version": "5.6.11",
+  "version": "5.6.12",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",

packages/babel-cli/package.json

@@ -1,14 +1,14 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.6.10",
+  "version": "5.6.11",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
   "repository": "babel/babel",
   "preferGlobal": true,
   "dependencies": {
-    "babel-core": "^5.6.10",
+    "babel-core": "^5.6.11",
     "chokidar": "^1.0.0",
     "commander": "^2.6.0",
     "convert-source-map": "^1.1.0",

packages/babel-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "5.6.10",
+  "version": "5.6.11",
   "license": "MIT",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",

src/babel/transformation/transformers/internal/shadow-functions.js

@@ -8,27 +8,26 @@ function remap(path, key, create) {
   // ensure that we're shadowed
   if (!path.inShadow()) return;
 
-  var shadowed = path.node._shadowedFunctionLiteral;
+  var shadowFunction = path.node._shadowedFunctionLiteral;
   var currentFunction;
 
   var fnPath = path.findParent(function (path) {
-    if (shadowed) {
-      // only match our shadowed function parent
-      if (path === shadowed) {
-        // found our target reference function
-        currentFunction = path;
-        return true;
-      } else {
-        return false;
-      }
-    } else if (path.isFunction() || path.isProgram()) {
-      // catch current function in case this is the shadowed one
-      if (!currentFunction) currentFunction = path;
-
-      return !path.is("shadow");
-    } else {
-      return false;
+    if (path.isProgram() || path.isFunction()) {
+      // catch current function in case this is the shadowed one and we can ignore it
+      currentFunction = currentFunction || path;
     }
+
+    if (path.isProgram()) {
+      return true;
+    } else if (path.isFunction()) {
+      if (shadowFunction) {
+        return path === shadowFunction || path.node === shadowFunction.node;
+      } else {
+        return !path.is("shadow");
+      }
+    }
+
+    return false;
   });
 
   // no point in realiasing if we're in this function