From fb6e3c8d5a5c1d95c8a5acc4e3dd167a8d76581c Mon Sep 17 00:00:00 2001 From: Bogdan Savluk Date: Mon, 15 Mar 2021 18:40:34 +0100 Subject: [PATCH 1/4] babel-helper-replace-supers flowts rename --- packages/babel-helper-replace-supers/src/{index.js => index.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/babel-helper-replace-supers/src/{index.js => index.ts} (100%) diff --git a/packages/babel-helper-replace-supers/src/index.js b/packages/babel-helper-replace-supers/src/index.ts similarity index 100% rename from packages/babel-helper-replace-supers/src/index.js rename to packages/babel-helper-replace-supers/src/index.ts From d7828697c75642b3e9bb98f39dcb61469fa559fe Mon Sep 17 00:00:00 2001 From: Bogdan Savluk Date: Mon, 15 Mar 2021 18:40:35 +0100 Subject: [PATCH 2/4] babel-helper-replace-supers flowts convert --- .../babel-helper-replace-supers/src/index.ts | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/packages/babel-helper-replace-supers/src/index.ts b/packages/babel-helper-replace-supers/src/index.ts index 7ae8b2799333..0cad43e5ede0 100644 --- a/packages/babel-helper-replace-supers/src/index.ts +++ b/packages/babel-helper-replace-supers/src/index.ts @@ -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"; @@ -252,25 +251,23 @@ const looseHandlers = { }, }; -type ReplaceSupersOptionsBase = {| - methodPath: NodePath, - superRef: Object, - constantSuper: boolean, - file: any, +type ReplaceSupersOptionsBase = { + methodPath: NodePath; + 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?: BabelNodeIdentifier; +}; type ReplaceSupersOptions = - | {| - ...ReplaceSupersOptionsBase, - getObjectRef: () => BabelNode, - |} - | {| - ...ReplaceSupersOptionsBase, - objectRef: BabelNode, - |}; + | ({ + getObjectRef: () => BabelNode; + } & ReplaceSupersOptionsBase) + | ({ + objectRef: BabelNode; + } & ReplaceSupersOptionsBase); export default class ReplaceSupers { constructor(opts: ReplaceSupersOptions) { @@ -287,7 +284,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; } @@ -298,7 +295,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()); From 51085e7a811c0e8ad822b269ec48981bad853cc4 Mon Sep 17 00:00:00 2001 From: Bogdan Savluk Date: Sun, 19 Apr 2020 03:23:01 +0200 Subject: [PATCH 3/4] babel-helper-replace-supers --- .../babel-helper-replace-supers/src/index.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/babel-helper-replace-supers/src/index.ts b/packages/babel-helper-replace-supers/src/index.ts index 0cad43e5ede0..5fa7418347d3 100644 --- a/packages/babel-helper-replace-supers/src/index.ts +++ b/packages/babel-helper-replace-supers/src/index.ts @@ -25,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, +) { // 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; @@ -59,7 +62,7 @@ export const environmentVisitor = { path.skip(); }, - "Method|ClassProperty"(path: NodePath) { + "Method|ClassProperty"(path: NodePath) { skipAllButComputedKey(path); }, }; @@ -252,21 +255,23 @@ const looseHandlers = { }; type ReplaceSupersOptionsBase = { - methodPath: NodePath; + methodPath: NodePath; 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 = | ({ - getObjectRef: () => BabelNode; + objectRef?: undefined; + getObjectRef: () => t.Node; } & ReplaceSupersOptionsBase) | ({ - objectRef: BabelNode; + objectRef: t.Node; + getObjectRef?: () => t.Node; } & ReplaceSupersOptionsBase); export default class ReplaceSupers { From a3062a491c2048f5573fcc315e252e1d8927278d Mon Sep 17 00:00:00 2001 From: Bogdan Savluk Date: Mon, 22 Feb 2021 03:06:06 +0100 Subject: [PATCH 4/4] babel-helper-replace-supers --- packages/babel-helper-replace-supers/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/babel-helper-replace-supers/src/index.ts b/packages/babel-helper-replace-supers/src/index.ts index 5fa7418347d3..51b1a2215ca7 100644 --- a/packages/babel-helper-replace-supers/src/index.ts +++ b/packages/babel-helper-replace-supers/src/index.ts @@ -257,7 +257,7 @@ const looseHandlers = { type ReplaceSupersOptionsBase = { methodPath: NodePath; superRef: any; - constantSuper: boolean; + constantSuper?: boolean; file: any; // objectRef might have been shadowed in child scopes, // in that case, we need to rename related variables.