Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compiling async arrows in uncompiled class fields #14752

Merged
merged 2 commits into from Jul 18, 2022
Merged

Fix compiling async arrows in uncompiled class fields #14752

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dc4125
Refactor helper-wrap-function for better type inference
nicolo-ribaudo Jul 13, 2022
592e27f
Fix compiling async arrows in uncompiled class fields
nicolo-ribaudo Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 11 additions & 10 deletions packages/babel-helper-wrap-function/src/index.ts
View file
Open in desktop
Expand Up @@ -6,7 +6,6 @@ import {
callExpression,
functionExpression,
isAssignmentPattern,
isArrowFunctionExpression,
isFunctionDeclaration,
isRestElement,
returnStatement,
Expand Down Expand Up @@ -95,19 +94,21 @@ function plainFunction(
noNewArrows: boolean,
ignoreFunctionLength: boolean,
) {
const { node } = path;
const isDeclaration = isFunctionDeclaration(node);
const isArrow = isArrowFunctionExpression(node);

let functionId = null;
if (isArrow) {
(path as NodePath<typeof node>).arrowFunctionToExpression({ noNewArrows });
let node;
if (path.isArrowFunctionExpression()) {
path = path.arrowFunctionToExpression({ noNewArrows });
nicolo-ribaudo marked this conversation as resolved.
Show resolved Hide resolved
node = path.node as t.FunctionDeclaration | t.FunctionExpression;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't TS already infer path.node types here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it still includes t.ArrowFunctionExpression 😕

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah it is likely confused by the reassignment.

} else {
functionId = node.id;
node.id = null;
node.type = "FunctionExpression";
node = path.node as t.FunctionDeclaration | t.FunctionExpression;
}

const isDeclaration = isFunctionDeclaration(node);

functionId = node.id;
node.id = null;
node.type = "FunctionExpression";

const built = callExpression(callId, [
node as Exclude<typeof node, t.FunctionDeclaration>,
]);
Expand Down
0 ...newableArrowFunctions-false/basic/exec.js → ...ssumption-noNewArrows-false/basic/exec.js
View file
Open in desktop
File renamed without changes.
0 ...ewableArrowFunctions-false/basic/input.js → ...sumption-noNewArrows-false/basic/input.js
View file
Open in desktop
File renamed without changes.
0 ...leArrowFunctions-false/basic/options.json → ...tion-noNewArrows-false/basic/options.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...wableArrowFunctions-false/basic/output.js → ...umption-noNewArrows-false/basic/output.js
View file
Open in desktop
Expand Up @@ -4,4 +4,4 @@ var _this = this;
babelHelpers.asyncToGenerator(function* () {
babelHelpers.newArrowCheck(this, _this);
return 2;
});
}).bind(this);
0 ...bleArrowFunctions-false/bluebird/input.js → ...ption-noNewArrows-false/bluebird/input.js
View file
Open in desktop
File renamed without changes.
0 ...rrowFunctions-false/bluebird/options.json → ...n-noNewArrows-false/bluebird/options.json
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions ...transform-async-to-generator/test/fixtures/regression/in-uncompiled-class-fields/input.js
View file
Open in desktop
@@ -0,0 +1,8 @@
// Angular needs to alwys compile async functions, even if
// the targets support class fields.
// https://github.com/babel/babel/issues/14749

class A {
a = async () => this;
b = async (x, y, z) => this;
}
25 changes: 25 additions & 0 deletions ...ransform-async-to-generator/test/fixtures/regression/in-uncompiled-class-fields/output.js
View file
Open in desktop
@@ -0,0 +1,25 @@
// Angular needs to alwys compile async functions, even if
// the targets support class fields.
// https://github.com/babel/babel/issues/14749
class A {
a = (() => {
var _this = this;

return babelHelpers.asyncToGenerator(function* () {
return _this;
});
})();
b = (() => {
var _this2 = this;

return function () {
var _ref2 = babelHelpers.asyncToGenerator(function* (x, y, z) {
return _this2;
});

return function (_x, _x2, _x3) {
return _ref2.apply(this, arguments);
};
}();
})();
}
18 changes: 15 additions & 3 deletions packages/babel-traverse/src/path/conversion.ts
View file
Open in desktop
Expand Up @@ -135,6 +135,13 @@ export function unwrapFunctionEnvironment(this: NodePath) {
hoistFunctionEnvironment(this);
}

function setType<N extends t.Node, T extends N["type"]>(
path: NodePath<N>,
type: T,
): asserts path is NodePath<Extract<N, { type: T }>> {
path.node.type = type;
}

/**
* Convert a given arrow function into a normal ES5 function expression.
*/
Expand All @@ -151,7 +158,7 @@ export function arrowFunctionToExpression(
specCompliant?: boolean | void;
noNewArrows?: boolean;
} = {},
) {
): NodePath<Exclude<t.Function, t.Method | t.ArrowFunctionExpression>> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

path.arrowFunctionToExpression is an API, should we defer the changes to minor?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we have modified these internal plugin APIs in the past even in patch releases, and this change isn't adding "new functionality" but just exposing more info from an existing functionality.

However, if you prefer to wait that's fine

if (!this.isArrowFunctionExpression()) {
throw (this as NodePath).buildCodeFrameError(
"Cannot convert non-arrow function to a function expression.",
Expand All @@ -166,7 +173,8 @@ export function arrowFunctionToExpression(

// @ts-expect-error TS requires explicit fn type annotation
fn.ensureBlock();
fn.node.type = "FunctionExpression";
setType(fn, "FunctionExpression");

if (!noNewArrows) {
const checkBinding = thisBinding
? null
Expand All @@ -178,7 +186,7 @@ export function arrowFunctionToExpression(
});
}

(fn.get("body") as NodePath<t.BlockStatement>).unshiftContainer(
fn.get("body").unshiftContainer(
"body",
expressionStatement(
callExpression(this.hub.addHelper("newArrowCheck"), [
Expand All @@ -200,7 +208,11 @@ export function arrowFunctionToExpression(
[checkBinding ? identifier(checkBinding.name) : thisExpression()],
),
);

return fn.get("callee.object");
}

return fn;
}

const getSuperCallsVisitor = mergeVisitors<{
Expand Down