diff --git a/packages/babel-helper-remap-async-to-generator/src/index.ts b/packages/babel-helper-remap-async-to-generator/src/index.ts index cb4e6edc6613..99b670b7ce63 100644 --- a/packages/babel-helper-remap-async-to-generator/src/index.ts +++ b/packages/babel-helper-remap-async-to-generator/src/index.ts @@ -11,7 +11,9 @@ const { yieldExpression, } = t; -const awaitVisitor = traverse.visitors.merge<{ wrapAwait: t.Expression }>([ +const awaitVisitor = traverse.visitors.merge<{ + wrapAwait: t.Expression | string; +}>([ { ArrowFunctionExpression(path) { path.skip(); @@ -23,7 +25,12 @@ const awaitVisitor = traverse.visitors.merge<{ wrapAwait: t.Expression }>([ path.replaceWith( yieldExpression( wrapAwait - ? callExpression(cloneNode(wrapAwait), [argument.node]) + ? callExpression( + typeof wrapAwait === "string" + ? path.hub.addHelper(wrapAwait) + : cloneNode(wrapAwait), + [argument.node], + ) : argument.node, ), ); @@ -35,9 +42,9 @@ const awaitVisitor = traverse.visitors.merge<{ wrapAwait: t.Expression }>([ export default function ( path: NodePath, helpers: { - wrapAsync: t.Identifier | string; - wrapAwait?: t.Identifier; - callAsync?: t.Identifier; + wrapAsync: t.Expression | string; + wrapAwait?: t.Expression | string; + callAsync?: string; }, noNewArrows?: boolean, ignoreFunctionLength?: boolean, diff --git a/packages/babel-helper-wrap-function/src/index.ts b/packages/babel-helper-wrap-function/src/index.ts index 87e9ef0dd137..d57eee9e3c5c 100644 --- a/packages/babel-helper-wrap-function/src/index.ts +++ b/packages/babel-helper-wrap-function/src/index.ts @@ -201,7 +201,7 @@ export default function wrapFunction( // TODO(Babel 8): Consider defaulting to false for spec compliance noNewArrows: boolean = true, ignoreFunctionLength: boolean = false, - callAsync?: t.Expression, + callAsync?: string, ) { if (callAsync) { if (path.isMethod()) { @@ -214,7 +214,11 @@ export default function wrapFunction( blockStatement(body.body), true, ); - body.body = [returnStatement(callExpression(callAsync, [container]))]; + body.body = [ + returnStatement( + callExpression(path.hub.addHelper(callAsync), [container]), + ), + ]; // Regardless of whether or not the wrapped function is a an async method // or generator the outer function should not be @@ -246,15 +250,14 @@ export default function wrapFunction( } else { node = path.node as t.FunctionDeclaration | t.FunctionExpression; } - - const isDeclaration = isFunctionDeclaration(node); + const isDeclaration = path.isFunctionDeclaration(); let built = node; if (!isCallExpression(node)) { functionId = node.id; node.id = null; node.type = "FunctionExpression"; - built = callExpression(callAsync, [ + built = callExpression(path.hub.addHelper(callAsync), [ node as t.FunctionExpression, identifier("this"), identifier("arguments"), @@ -289,8 +292,11 @@ export default function wrapFunction( wrapper.id || (!ignoreFunctionLength && params.length) ) { + // Because we previously mutated some `FunctionDeclaration` nodes to `FunctionExpression`. + path.type = isDeclaration + ? "FunctionDeclaration" + : "FunctionExpression"; path.replaceWith(wrapper); - markCallWrapped(path); } else { // we can omit this wrapper as the conditions it protects for do not apply @@ -305,11 +311,11 @@ export default function wrapFunction( } if (path.isMethod()) { - classOrObjectMethod(path, callId as t.Identifier); + classOrObjectMethod(path, callId as t.Expression); } else { plainFunction( path as NodePath>, - callId as t.Identifier, + callId as t.Expression, noNewArrows, ignoreFunctionLength, ); diff --git a/packages/babel-plugin-proposal-function-sent/src/index.ts b/packages/babel-plugin-proposal-function-sent/src/index.ts index 06bc0d2fea61..9825f8324ab8 100644 --- a/packages/babel-plugin-proposal-function-sent/src/index.ts +++ b/packages/babel-plugin-proposal-function-sent/src/index.ts @@ -67,15 +67,20 @@ export default declare(api => { ]), ); - wrapFunction.default( - fnPath, - "skipFirstGeneratorNext", - undefined, - undefined, - state.availableHelper("callSkipFirstGeneratorNext") - ? state.addHelper("callSkipFirstGeneratorNext") - : undefined, - ); + if (state.availableHelper("callSkipFirstGeneratorNext")) { + wrapFunction.default( + fnPath, + "skipFirstGeneratorNext", + undefined, + undefined, + "callSkipFirstGeneratorNext", + ); + } else { + wrapFunction.default( + fnPath, + state.addHelper("skipFirstGeneratorNext"), + ); + } }, }, }; diff --git a/packages/babel-plugin-transform-async-generator-functions/src/index.ts b/packages/babel-plugin-transform-async-generator-functions/src/index.ts index cba0be60a83a..b46baeec7e8b 100644 --- a/packages/babel-plugin-transform-async-generator-functions/src/index.ts +++ b/packages/babel-plugin-transform-async-generator-functions/src/index.ts @@ -85,13 +85,18 @@ export default declare(api => { // We don't need to pass the noNewArrows assumption, since // async generators are never arrow functions. - remapAsyncToGenerator.default(path, { - wrapAsync: state.addHelper("wrapAsyncGenerator"), - wrapAwait: state.addHelper("awaitAsyncGenerator"), - callAsync: state.availableHelper("callAsyncGenerator") - ? state.addHelper("callAsyncGenerator") - : undefined, - }); + if (state.availableHelper("callAsyncGenerator")) { + remapAsyncToGenerator.default(path, { + wrapAsync: "wrapAsyncGenerator", + wrapAwait: "awaitAsyncGenerator", + callAsync: "callAsyncGenerator", + }); + } else { + remapAsyncToGenerator.default(path, { + wrapAsync: state.addHelper("wrapAsyncGenerator"), + wrapAwait: state.addHelper("awaitAsyncGenerator"), + }); + } }, }; diff --git a/packages/babel-plugin-transform-async-to-generator/src/index.ts b/packages/babel-plugin-transform-async-to-generator/src/index.ts index 7a8f94837496..170cafd232fb 100644 --- a/packages/babel-plugin-transform-async-to-generator/src/index.ts +++ b/packages/babel-plugin-transform-async-to-generator/src/index.ts @@ -9,7 +9,7 @@ export interface Options { } type State = { - methodWrapper?: t.Identifier; + methodWrapper?: t.Expression; }; export default declare((api, options: Options) => { @@ -60,19 +60,29 @@ export default declare((api, options: Options) => { Function(path, state) { if (!path.node.async || path.node.generator) return; - remapAsyncToGenerator.default( - path, - { - wrapAsync: state.availableHelper("asyncToGenerator2") - ? "asyncToGenerator2" - : "asyncToGenerator", - callAsync: state.availableHelper("callAsync") - ? state.addHelper("callAsync") - : undefined, - }, - noNewArrows, - ignoreFunctionLength, - ); + if ( + state.availableHelper("callAsync") && + state.availableHelper("asyncToGenerator2") + ) { + remapAsyncToGenerator.default( + path, + { + wrapAsync: "asyncToGenerator2", + callAsync: "callAsync", + }, + noNewArrows, + ignoreFunctionLength, + ); + } else { + remapAsyncToGenerator.default( + path, + { + wrapAsync: state.addHelper("asyncToGenerator"), + }, + noNewArrows, + ignoreFunctionLength, + ); + } }, }, }; diff --git a/packages/babel-preset-env/test/fixtures/corejs2-babel-7/usage-shippedProposals/output.js b/packages/babel-preset-env/test/fixtures/corejs2-babel-7/usage-shippedProposals/output.js index d2fee1c7b66e..49f982e12d40 100644 --- a/packages/babel-preset-env/test/fixtures/corejs2-babel-7/usage-shippedProposals/output.js +++ b/packages/babel-preset-env/test/fixtures/corejs2-babel-7/usage-shippedProposals/output.js @@ -32,10 +32,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); } function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; } function _callAsyncGenerator(fn, self, args) { return new _AsyncGenerator(fn.apply(self, args)); } -function _awaitAsyncGenerator(e) { return new _OverloadYield(e, 0); } -function _wrapAsyncGenerator(fn) { return function () { return new _AsyncGenerator(fn.apply(this, arguments)); }; } function _AsyncGenerator(e) { var r, t; function resume(r, t) { try { var n = e[r](t), o = n.value, u = o instanceof _OverloadYield; Promise.resolve(u ? o.v : o).then(function (t) { if (u) { var i = "return" === r ? "return" : "next"; if (!o.k || t.done) return resume(i, t); t = e[i](t).value; } settle(n.done ? "return" : "normal", t); }, function (e) { resume("throw", e); }); } catch (e) { settle("throw", e); } } function settle(e, n) { switch (e) { case "return": r.resolve({ value: n, done: !0 }); break; case "throw": r.reject(n); break; default: r.resolve({ value: n, done: !1 }); } (r = r.next) ? resume(r.key, r.arg) : t = null; } this._invoke = function (e, n) { return new Promise(function (o, u) { var i = { key: e, arg: n, resolve: o, reject: u, next: null }; t ? t = t.next = i : (r = t = i, resume(e, n)); }); }, "function" != typeof e["return"] && (this["return"] = void 0); } _AsyncGenerator.prototype["function" == typeof Symbol && Symbol.asyncIterator || "@@asyncIterator"] = function () { return this; }, _AsyncGenerator.prototype.next = function (e) { return this._invoke("next", e); }, _AsyncGenerator.prototype["throw"] = function (e) { return this._invoke("throw", e); }, _AsyncGenerator.prototype["return"] = function (e) { return this._invoke("return", e); }; +function _awaitAsyncGenerator(e) { return new _OverloadYield(e, 0); } function _OverloadYield(t, e) { this.v = t, this.k = e; } var _x$y$a$b = { x: 1,