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

convert @babel/helper-replace-supers to typescript #12926

Merged
merged 4 commits into from Mar 16, 2021
Merged

convert @babel/helper-replace-supers to typescript #12926

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb6e3c8
babel-helper-replace-supers flowts rename
zxbodya Mar 15, 2021
d782869
babel-helper-replace-supers flowts convert
zxbodya Mar 15, 2021
51085e7
babel-helper-replace-supers
zxbodya Apr 19, 2020
a3062a4
babel-helper-replace-supers
zxbodya Feb 22, 2021
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
42 changes: 22 additions & 20 deletions .../babel-helper-replace-supers/src/index.js → .../babel-helper-replace-supers/src/index.ts
View file
Open in desktop
@@ -1,4 +1,3 @@
// @flow
import type { HubInterface, NodePath } from "@babel/traverse";
import traverse from "@babel/traverse";
import memberExpressionToFunctions from "@babel/helper-member-expression-to-functions";
Expand Down Expand Up @@ -26,8 +25,11 @@ function getPrototypeOfExpression(objectRef, isStatic, file, isPrivateMethod) {
return t.callExpression(file.addHelper("getPrototypeOf"), [targetRef]);
}

export function skipAllButComputedKey(path: NodePath) {
export function skipAllButComputedKey(
path: NodePath<t.Method | t.ClassProperty | t.ClassPrivateProperty>,
) {
// If the path isn't computed, just skip everything.
// @ts-expect-error todo(flow->ts) check node type before cheking the property
if (!path.node.computed) {
path.skip();
return;
Expand Down Expand Up @@ -60,7 +62,7 @@ export const environmentVisitor = {
path.skip();
},

"Method|ClassProperty"(path: NodePath) {
"Method|ClassProperty"(path: NodePath<t.Method | t.ClassProperty>) {
skipAllButComputedKey(path);
},
};
Expand Down Expand Up @@ -252,25 +254,25 @@ const looseHandlers = {
},
};

type ReplaceSupersOptionsBase = {|
methodPath: NodePath,
superRef: Object,
constantSuper: boolean,
file: any,
type ReplaceSupersOptionsBase = {
methodPath: NodePath<any>;
superRef: any;
constantSuper?: boolean;
file: any;
// objectRef might have been shadowed in child scopes,
// in that case, we need to rename related variables.
refToPreserve?: BabelNodeIdentifier,
|};
refToPreserve?: t.Identifier;
};

type ReplaceSupersOptions =
| {|
...ReplaceSupersOptionsBase,
getObjectRef: () => BabelNode,
|}
| {|
...ReplaceSupersOptionsBase,
objectRef: BabelNode,
|};
| ({
objectRef?: undefined;
getObjectRef: () => t.Node;
} & ReplaceSupersOptionsBase)
| ({
objectRef: t.Node;
getObjectRef?: () => t.Node;
} & ReplaceSupersOptionsBase);

export default class ReplaceSupers {
constructor(opts: ReplaceSupersOptions) {
Expand All @@ -287,7 +289,7 @@ export default class ReplaceSupers {
this.constantSuper = process.env.BABEL_8_BREAKING
? opts.constantSuper
: // Fallback to isLoose for backward compatibility
opts.constantSuper ?? (opts: any).isLoose;
opts.constantSuper ?? (opts as any).isLoose;
this.opts = opts;
}

Expand All @@ -298,7 +300,7 @@ export default class ReplaceSupers {
declare isStatic: boolean;
declare methodPath: NodePath;
declare opts: ReplaceSupersOptions;
declare superRef: Object;
declare superRef: any;

getObjectRef() {
return t.cloneNode(this.opts.objectRef || this.opts.getObjectRef());
Expand Down