v5.0.10

Take 2: Fix class decorator scoping.

CHANGELOG.md

@@ -13,6 +13,15 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 5.0.9
+
+ * **Polish**
+  * Use `moduleId` for UMD global name if available.
+ * **Bug Fix**
+  * Fix UMD global `module` variable shadowing the `amd`/`common` `module` variable.
+  * Fix Flow param type annotation regression.
+  * Fix function name collision `toString` wrapper. Thanks [@alawatthe](https://github.com/alawatthe)!
+
 ## 5.0.8
 
  * **Bug Fix**

CONTRIBUTING.md

@@ -35,13 +35,13 @@ This is mostly overkill and you can limit the tests to a select few by directly
 running them with `mocha`:
 
 ```sh
-$ mocha test/transformation.js
+$ mocha test/core/transformation.js
 ```
 
 Use mocha's `--grep` option to run a subset of tests by name:
 
 ```sh
-$ mocha test/transformation.js --grep es7
+$ mocha test/core/transformation.js --grep es7
 ```
 
 #### Workflow

package.json

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

packages/babel-cli/bin/_babel-node

@@ -4,6 +4,7 @@ var pathIsAbsolute = require("path-is-absolute");
 var commander      = require("commander");
 var Module         = require("module");
 var babel          = require("babel-core");
+var inspect        = require("util").inspect;
 var path           = require("path");
 var repl           = require("repl");
 var util           = require("babel-core").util;
@@ -71,7 +72,10 @@ if (program.eval || program.print) {
   global.require = module.require.bind(module);
 
   var result = _eval(code, global.__filename);
-  if (program.print) console.log(result);
+  if (program.print) {
+    var output = _.isString(result) ? result : inspect(result);
+    process.stdout.write(output + "\n");
+  }
 } else {
   if (program.args.length) {
     // slice all arguments up to the first filename since they're babel args that we handle

packages/babel-cli/package.json

@@ -1,14 +1,14 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.0.7",
+  "version": "5.0.9",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",
   "preferGlobal": true,
   "dependencies": {
     "chokidar": "^0.12.6",
-    "babel-core": "^5.0.7",
+    "babel-core": "^5.0.9",
     "commander": "^2.6.0",
     "fs-readdir-recursive": "^0.1.0",
     "output-file-sync": "^1.1.0",

packages/babel-runtime/package.json

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

src/acorn/src/expression.js

@@ -250,7 +250,7 @@ pp.parseExprAtom = function(refShorthandDefaultPos) {
     return this.finishNode(node, type)
 
   case tt._yield:
-    if (this.inGenerator) unexpected()
+    if (this.inGenerator) this.unexpected()
 
   case tt._do:
     if (this.options.features["es7.doExpressions"]) {

src/acorn/src/lval.js

@@ -125,7 +125,9 @@ pp.parseBindingList = function(close, allowEmpty, allowTrailingComma) {
       this.expect(close)
       break
     } else {
-      elts.push(this.parseAssignableListItemTypes(this.parseMaybeDefault()))
+      var left = this.parseMaybeDefault()
+      this.parseAssignableListItemTypes(left)
+      elts.push(this.parseMaybeDefault(null, left))
     }
   }
   return elts

src/babel/transformation/modules/_default.js

@@ -46,7 +46,7 @@ var remapVisitor = {
       }
     }
 
-    if (t.isAssignmentExpression(node)) {
+    if (t.isAssignmentExpression(node) && !node._ignoreModulesRemap) {
       var exported = formatter.getExport(node.left, scope);
       if (exported) {
         this.skip();

src/babel/transformation/modules/umd.js

@@ -47,8 +47,8 @@ export default class UMDFormatter extends AMDFormatter {
 
     // globals
 
-    var browserArgs = [t.memberExpression(t.identifier("module"), t.identifier("exports"))];
-    if (this.passModuleArg) browserArgs.push(t.identifier("module"));
+    var browserArgs = [];
+    if (this.passModuleArg) browserArgs.push(t.identifier("mod"));
 
     for (let name in this.ids) {
       var id = this.defaultIds[name] || t.identifier(t.toIdentifier(name));
@@ -60,12 +60,17 @@ export default class UMDFormatter extends AMDFormatter {
     var moduleName = this.getModuleName();
     if (moduleName) defineArgs.unshift(t.literal(moduleName));
 
+    //
+    var globalArg = this.file.opts.basename;
+    if (moduleName) globalArg = moduleName;
+    globalArg = t.identifier(t.toIdentifier(globalArg));
+
     var runner = util.template("umd-runner-body", {
       AMD_ARGUMENTS: defineArgs,
       COMMON_TEST: commonTests,
       COMMON_ARGUMENTS: commonArgs,
       BROWSER_ARGUMENTS: browserArgs,
-      GLOBAL_ARG: t.identifier(t.toIdentifier(this.file.opts.basename))
+      GLOBAL_ARG: globalArg
     });
 
     //

src/babel/transformation/templates/property-method-assignment-wrapper-generator.js

@@ -4,7 +4,7 @@
   }
 
   FUNCTION_ID.toString = function () {
-    return FUNCTION_ID.toString();
+    return FUNCTION_KEY.toString();
   };
 
   return FUNCTION_ID;

src/babel/transformation/templates/property-method-assignment-wrapper.js

@@ -4,7 +4,7 @@
   }
 
   FUNCTION_ID.toString = function () {
-    return FUNCTION_ID.toString();
+    return FUNCTION_KEY.toString();
   }
 
   return FUNCTION_ID;

src/babel/transformation/templates/umd-runner-body.js

@@ -4,8 +4,8 @@
   } else if (COMMON_TEST) {
     factory(COMMON_ARGUMENTS);
   } else {
-    var module = { exports: {} };
-    factory(BROWSER_ARGUMENTS);
-    global.GLOBAL_ARG = module.exports;
+    var mod = { exports: {} };
+    factory(mod.exports, BROWSER_ARGUMENTS);
+    global.GLOBAL_ARG = mod.exports;
   }
 });

src/babel/transformation/transformers/es6/classes.js

@@ -30,7 +30,7 @@ var collectPropertyReferencesVisitor = {
       }
 
       if (this.isReferenced() && scope.getBinding(node.name) === state.scope.getBinding(node.name)) {
-        state.references[node.name] = true;;
+        state.references[node.name] = true;
       }
     }
   }
@@ -170,21 +170,36 @@ class ClassTransformer {
 
     this.buildBody();
 
+    var decorators = this.node.decorators;
+    var classCheckRef = classRef;
+
+    if (decorators) {
+      classCheckRef = this.scope.generateUidIdentifier(classRef);
+    }
+
     constructorBody.body.unshift(t.expressionStatement(t.callExpression(file.addHelper("class-call-check"), [
       t.thisExpression(),
-      classRef
+      classCheckRef
     ])));
 
     //
 
-    var decorators = this.node.decorators;
     if (decorators) {
+      if (this.className) {
+        body.push(t.variableDeclaration("var", [
+          t.variableDeclarator(classCheckRef, classRef)
+        ]));
+      }
+
       for (var i = 0; i < decorators.length; i++) {
         var decorator = decorators[i];
-        body.push(util.template("class-decorator", {
+
+        var decoratorNode = util.template("class-decorator", {
           DECORATOR: decorator.expression,
           CLASS_REF: classRef
-        }, true));
+        }, true);
+        decoratorNode.expression._ignoreModulesRemap = true;
+        body.push(decoratorNode);
       }
     }
 

src/babel/transformation/transformers/es6/destructuring.js

@@ -332,7 +332,7 @@ class DestructuringTransformer {
       if (t.isSpreadProperty(prop)) continue;
 
       var key = prop.key;
-      if (t.isIdentifier(key)) key = t.literal(prop.key.name);
+      if (t.isIdentifier(key) && !prop.computed) key = t.literal(prop.key.name);
       keys.push(key);
     }
 

src/babel/types/visitor-keys.json

@@ -11,8 +11,8 @@
   "CallExpression":            ["callee", "arguments"],
   "CatchClause":               ["param", "body"],
   "ClassBody":                 ["body"],
-  "ClassDeclaration":          ["id", "body", "superClass", "typeParameters", "superTypeParameters", "implements"],
-  "ClassExpression":           ["id", "body", "superClass", "typeParameters", "superTypeParameters", "implements"],
+  "ClassDeclaration":          ["id", "body", "superClass", "typeParameters", "superTypeParameters", "implements", "decorators"],
+  "ClassExpression":           ["id", "body", "superClass", "typeParameters", "superTypeParameters", "implements", "decorators"],
   "ComprehensionBlock":        ["left", "right", "body"],
   "ComprehensionExpression":   ["filter", "blocks", "body"],
   "ConditionalExpression":     ["test", "consequent", "alternate"],
@@ -40,12 +40,12 @@
   "LogicalExpression":         ["left", "right"],
   "MemberExpression":          ["object", "property"],
   "MetaProperty":              ["meta", "property"],
-  "MethodDefinition":          ["key", "value"],
+  "MethodDefinition":          ["key", "value", "decorators"],
   "NewExpression":             ["callee", "arguments"],
   "ObjectExpression":          ["properties"],
   "ObjectPattern":             ["properties", "typeAnnotation"],
   "Program":                   ["body"],
-  "Property":                  ["key", "value"],
+  "Property":                  ["key", "value", "decorators"],
   "RestElement":               ["argument", "typeAnnotation"],
   "ReturnStatement":           ["argument"],
   "SequenceExpression":        ["expressions"],

test/acorn/tests-flow.js

@@ -10959,7 +10959,7 @@ var fbTestFixture = {
       }
     },
   },
-    'Bounded Polymorphism': {
+  'Bounded Polymorphism': {
     'class A<T: Foo> {}': {
       type: 'ClassDeclaration',
       id: {

test/core/fixtures/transformation/es6.destructuring/es7-object-rest/actual.js

@@ -1,4 +1,5 @@
 var z = {};
 var { ...x } = z;
 var { x, ...y } = z;
+var { [x]: x, ...y } = z;
 (function({ x, ...y }) { })

test/core/fixtures/transformation/es6.destructuring/es7-object-rest/expected.js

@@ -4,6 +4,8 @@ var z = {};
 var x = babelHelpers.objectWithoutProperties(z, []);
 var x = z.x;
 var y = babelHelpers.objectWithoutProperties(z, ["x"]);
+var x = z[x];
+var y = babelHelpers.objectWithoutProperties(z, [x]);
 
 (function (_ref) {
   var x = _ref.x;

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

@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined" && typeof module !== "undefined") {
     factory(exports, module);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, module);
-    global.actual = module.exports;
+    factory(mod.exports, mod);
+    global.actual = mod.exports;
   }
 })(this, function (exports, module) {
   "use strict";
@@ -41,4 +41,4 @@
 
   module.exports = Foo;
   module.exports = foo;
-});
+});

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

@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
   "use strict";

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

@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports);
-    global.actual = module.exports;
+    factory(mod.exports);
+    global.actual = mod.exports;
   }
 })(this, function (exports) {
   "use strict";
@@ -23,4 +23,4 @@
   exports["default"] = foo;
   exports["default"] = foo;
   exports.bar = bar;
-});
+});

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

@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports);
-    global.actual = module.exports;
+    factory(mod.exports);
+    global.actual = mod.exports;
   }
 })(this, function (exports) {
   "use strict";
@@ -43,4 +43,4 @@
   };
 
   exports.foo8 = foo8;
-});
+});

test/core/fixtures/transformation/es6.modules-umd/get-module-name-option/expected.js

@@ -4,12 +4,12 @@
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports);
-    global.actual = module.exports;
+    factory(mod.exports);
+    global.myCustomModuleName = mod.exports;
   }
 })(this, function (exports) {
   "use strict";
-});
+});

test/core/fixtures/transformation/es6.modules-umd/hoist-function-exports/expected.js

@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("./evens"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.evens);
-    global.actual = module.exports;
+    factory(mod.exports, global.evens);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _evens) {
   "use strict";
@@ -28,4 +28,4 @@
     };
   })(_evens.isEven);
   exports.isOdd = isOdd;
-});
+});

test/core/fixtures/transformation/es6.modules-umd/imports-default/expected.js

@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
   "use strict";
@@ -21,4 +21,4 @@
 
   _foo2;
   _foo22;
-});
+});

test/core/fixtures/transformation/es6.modules-umd/imports-glob/expected.js

@@ -4,14 +4,14 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
   "use strict";
 
   _foo;
-});
+});

test/core/fixtures/transformation/es6.modules-umd/imports-mixing/expected.js

@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
   "use strict";
@@ -18,4 +18,4 @@
   var _foo2 = _interopRequire(_foo);
 
   _foo.baz;
-});
+});

test/core/fixtures/transformation/es6.modules-umd/imports-named/expected.js

@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
   "use strict";
@@ -19,4 +19,4 @@
   _foo.bar;
   _foo.bar;
   _foo.xyz;
-});
+});

test/core/fixtures/transformation/es6.modules-umd/imports/expected.js

@@ -4,12 +4,12 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo, global.fooBar, global.directoryFooBar);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo, global.fooBar, global.directoryFooBar);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
-});
+});

test/core/fixtures/transformation/es6.modules-umd/module-id/actual.js

@@ -0,0 +1 @@
+foobar();

test/core/fixtures/transformation/es6.modules-umd/module-id/expected.js

@@ -0,0 +1,17 @@
+(function (global, factory) {
+  if (typeof define === "function" && define.amd) {
+    define("MyLib", ["exports"], factory);
+  } else if (typeof exports !== "undefined") {
+    factory(exports);
+  } else {
+    var mod = {
+      exports: {}
+    };
+    factory(mod.exports);
+    global.MyLib = mod.exports;
+  }
+})(this, function (exports) {
+  "use strict";
+
+  foobar();
+});

test/core/fixtures/transformation/es6.modules-umd/module-id/options.json

@@ -0,0 +1,3 @@
+{
+  "moduleId": "MyLib"
+}

test/core/fixtures/transformation/es6.modules-umd/module-name/expected.js

@@ -4,14 +4,14 @@
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports);
-    global.actual = module.exports;
+    factory(mod.exports);
+    global.es6ModulesUmdModuleNameExpected = mod.exports;
   }
 })(this, function (exports) {
   "use strict";
 
   foobar();
-});
+});

test/core/fixtures/transformation/es6.modules-umd/overview/expected.js

@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo2, global.fooBar, global.directoryFooBar);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo2, global.fooBar, global.directoryFooBar);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
@@ -29,4 +29,4 @@
 
   _foo.bar;
   _foo.foo;
-});
+});

test/core/fixtures/transformation/es6.modules-umd/remap/expected.js

@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports);
-    global.actual = module.exports;
+    factory(mod.exports);
+    global.actual = mod.exports;
   }
 })(this, function (exports) {
   "use strict";
@@ -42,4 +42,4 @@
   exports.f = d;
 
   exports.f = exports.e = d = 4;
-});
+});

test/core/fixtures/transformation/es7.decorators/class-modules/actual.js

@@ -0,0 +1,6 @@
+import foo from "foo";
+
+@foo
+export default class Foo {
+
+}

test/core/fixtures/transformation/es7.decorators/class-modules/expected.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _foo = require("foo");
+
+var _foo2 = babelHelpers.interopRequireWildcard(_foo);
+
+var Foo = (function () {
+  function Foo() {
+    babelHelpers.classCallCheck(this, _Foo);
+  }
+
+  var _Foo = Foo;
+  Foo = _foo2["default"](Foo) || Foo;
+  return Foo;
+})();
+
+exports["default"] = Foo;
+module.exports = exports["default"];

test/core/fixtures/transformation/es7.decorators/class/actual.js

@@ -12,3 +12,10 @@ var Foo2 = @bar class Foo {
 var Bar2 = @foo @bar class Bar {
 
 };
+
+@foo
+class Baz{
+  constructor(baz) {
+    this.baz = baz;
+  }
+}

test/core/fixtures/transformation/es7.decorators/class/expected.js

@@ -2,18 +2,20 @@
 
 var Foo = (function () {
   function Foo() {
-    babelHelpers.classCallCheck(this, Foo);
+    babelHelpers.classCallCheck(this, _Foo);
   }
 
+  var _Foo = Foo;
   Foo = foo(Foo) || Foo;
   return Foo;
 })();
 
 var Bar = (function () {
   function Bar() {
-    babelHelpers.classCallCheck(this, Bar);
+    babelHelpers.classCallCheck(this, _Bar);
   }
 
+  var _Bar = Bar;
   Bar = foo(Bar) || Bar;
   Bar = bar(Bar) || Bar;
   return Bar;
@@ -21,19 +23,33 @@ var Bar = (function () {
 
 var Foo2 = (function () {
   function Foo() {
-    babelHelpers.classCallCheck(this, Foo);
+    babelHelpers.classCallCheck(this, _Foo2);
   }
 
+  var _Foo2 = Foo;
   Foo = bar(Foo) || Foo;
   return Foo;
 })();
 
 var Bar2 = (function () {
   function Bar() {
-    babelHelpers.classCallCheck(this, Bar);
+    babelHelpers.classCallCheck(this, _Bar2);
   }
 
+  var _Bar2 = Bar;
   Bar = foo(Bar) || Bar;
   Bar = bar(Bar) || Bar;
   return Bar;
-})();
+})();
+
+var Baz = (function () {
+  function Baz(baz) {
+    babelHelpers.classCallCheck(this, _Baz);
+
+    this.baz = baz;
+  }
+
+  var _Baz = Baz;
+  Baz = foo(Baz) || Baz;
+  return Baz;
+})();

test/core/fixtures/transformation/misc/regression-1168/actual.js

@@ -0,0 +1,3 @@
+function test(x: string = "hi"): string {
+  return x;
+}

test/core/fixtures/transformation/misc/regression-1168/expected.js

@@ -0,0 +1,7 @@
+"use strict";
+
+function test() {
+  var x = arguments[0] === undefined ? "hi" : arguments[0];
+
+  return x;
+}

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

@@ -4,14 +4,14 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("babel-runtime/helpers/interop-require"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo, global._interopRequire);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo, global._interopRequire);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo, _babelRuntimeHelpersInteropRequire) {
   "use strict";
 
   var _foo2 = _babelRuntimeHelpersInteropRequire["default"](_foo);
-});
+});

test/core/fixtures/transformation/spec.function-name/assignment/expected.js

@@ -6,7 +6,7 @@ var i = (function (_i) {
   }
 
   i.toString = function () {
-    return i.toString();
+    return _i.toString();
   };
 
   return i;
@@ -17,4 +17,4 @@ var i = (function (_i) {
 var j = function j() {
   var _ = 5;
   j = _.j;
-};
+};

test/core/fixtures/transformation/spec.function-name/object/expected.js

@@ -13,7 +13,7 @@ var obj = {
     }
 
     h.toString = function () {
-      return h.toString();
+      return _h.toString();
     };
 
     return h;
@@ -24,4 +24,4 @@ var obj = {
   m: function m() {
     doSmth();
   }
-};
+};

test/core/fixtures/transformation/spec.function-name/own-bindings/expected.js

@@ -10,7 +10,7 @@ var f = (function (_f) {
   }
 
   f.toString = function () {
-    return f.toString();
+    return _f.toString();
   };
 
   return f;
@@ -23,9 +23,9 @@ var obj = {
     }
 
     f.toString = function () {
-      return f.toString();
+      return _f2.toString();
     };
 
     return f;
   })(function (f) {})
-};
+};

test/core/fixtures/transformation/spec.function-name/self-reference/expected.js

@@ -6,10 +6,10 @@ var f = (function (_f) {
   }
 
   f.toString = function () {
-    return f.toString();
+    return _f.toString();
   };
 
   return f;
 })(function () {
   console.log(f, g);
-});
+});