{"body":"Fix and enforce generic array type syntax","files":[{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/.eslintrc.js"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/scripts\/jest\/makeTransform.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/scripts\/jest\/setupEnvE2E.js"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/scripts\/prettier.js"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/CompilerError.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/Entrypoint\/Program.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/BuildHIR.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/HIR.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/HIRBuilder.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/Inference\/AnalyseFunctions.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CollectReferencedGlobals.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/RenameVariables.ts"},{"status":"M","path":"compiler\/packages\/babel-plugin-react-forget\/src\/SSA\/EnterSSA.ts"}],"patch":"diff --git a\/compiler\/packages\/babel-plugin-react-forget\/.eslintrc.js b\/compiler\/packages\/babel-plugin-react-forget\/.eslintrc.js\nindex f0362087d9..b56cb97bce 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/.eslintrc.js\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/.eslintrc.js\n@@ -73,7 +73,7 @@ module.exports = {\n \"off\",\n \"constructor\",\n ],\n- \"@typescript-eslint\/array-type\": [\"off\", \"generic\"],\n+ \"@typescript-eslint\/array-type\": [\"error\", { default: \"generic\" }],\n \"@typescript-eslint\/triple-slash-reference\": \"off\",\n },\n parser: \"@typescript-eslint\/parser\",\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/scripts\/jest\/makeTransform.ts b\/compiler\/packages\/babel-plugin-react-forget\/scripts\/jest\/makeTransform.ts\nindex b32acb8174..5a7c71babd 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/scripts\/jest\/makeTransform.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/scripts\/jest\/makeTransform.ts\n@@ -43,8 +43,10 @@ module.exports = (useForget: boolean) => {\n ? [\n ReactForgetFunctionTransform,\n {\n- \/\/ Jest hashes the babel config as a cache breaker.\n- \/\/ (see https:\/\/github.com\/jestjs\/jest\/blob\/v29.6.2\/packages\/babel-jest\/src\/index.ts#L84)\n+ \/*\n+ * Jest hashes the babel config as a cache breaker.\n+ * (see https:\/\/github.com\/jestjs\/jest\/blob\/v29.6.2\/packages\/babel-jest\/src\/index.ts#L84)\n+ *\/\n compilerCacheKey: execSync(\n \"yarn --silent --cwd ..\/.. hash packages\/babel-plugin-react-forget\/dist\"\n ).toString(),\n@@ -70,8 +72,10 @@ module.exports = (useForget: boolean) => {\n ) {\n const arg = path.node.arguments[0];\n if (arg.type === \"StringLiteral\") {\n- \/\/ The compiler adds requires of \"React\", which is expected to be a wrapper\n- \/\/ around the \"react\" package. For tests, we just rewrite the require.\n+ \/*\n+ * The compiler adds requires of \"React\", which is expected to be a wrapper\n+ * around the \"react\" package. For tests, we just rewrite the require.\n+ *\/\n if (arg.value === \"React\") {\n arg.value = \"react\";\n }\n@@ -90,8 +94,10 @@ module.exports = (useForget: boolean) => {\n esmodules: true,\n },\n } as any);\n- \/\/ typecast needed as DefinitelyTyped does not have updated Babel configs types yet\n- \/\/ (missing passPerPreset and targets).\n+ \/*\n+ * typecast needed as DefinitelyTyped does not have updated Babel configs types yet\n+ * (missing passPerPreset and targets).\n+ *\/\n }\n \n return {\n@@ -104,8 +110,10 @@ function isReactComponentLike(fn: NodePath): boolean {\n let isReactComponent = false;\n let hasNoUseForgetDirective = false;\n \n- \/\/ React components start with an upper case letter,\n- \/\/ React hooks start with `use`\n+ \/*\n+ * React components start with an upper case letter,\n+ * React hooks start with `use`\n+ *\/\n if (\n fn.node.id == null ||\n (fn.node.id.name[0].toUpperCase() !== fn.node.id.name[0] &&\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/scripts\/jest\/setupEnvE2E.js b\/compiler\/packages\/babel-plugin-react-forget\/scripts\/jest\/setupEnvE2E.js\nindex 7f0ff80e6c..0236b4c1f7 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/scripts\/jest\/setupEnvE2E.js\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/scripts\/jest\/setupEnvE2E.js\n@@ -7,8 +7,10 @@\n \n const React = require(\"react\");\n \n-\/\/ Our e2e babel transform currently only compiles functions, not programs.\n-\/\/ As a result, our e2e transpiled code does not contain an import for `useMemoCache`\n-\/\/ This is a hack.\n+\/*\n+ * Our e2e babel transform currently only compiles functions, not programs.\n+ * As a result, our e2e transpiled code does not contain an import for `useMemoCache`\n+ * This is a hack.\n+ *\/\n React.useMemoCache = React.unstable_useMemoCache;\n globalThis.useMemoCache = React.unstable_useMemoCache;\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/scripts\/prettier.js b\/compiler\/packages\/babel-plugin-react-forget\/scripts\/prettier.js\nindex 47d68fae77..4a17fb2eca 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/scripts\/prettier.js\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/scripts\/prettier.js\n@@ -7,8 +7,10 @@\n \n \"use strict\";\n \n-\/\/ Based on similar script in React\n-\/\/ https:\/\/github.com\/facebook\/react\/blob\/main\/scripts\/prettier\/index.js\n+\/*\n+ * Based on similar script in React\n+ * https:\/\/github.com\/facebook\/react\/blob\/main\/scripts\/prettier\/index.js\n+ *\/\n \n const chalk = require(\"chalk\");\n const glob = require(\"glob\");\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/CompilerError.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/CompilerError.ts\nindex 198d3a34b7..e15a11973b 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/CompilerError.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/CompilerError.ts\n@@ -98,7 +98,7 @@ export class CompilerErrorDetail {\n }\n \n export class CompilerError extends Error {\n- details: CompilerErrorDetail[] = [];\n+ details: Array = [];\n \n static invariant(\n condition: unknown,\n@@ -171,7 +171,7 @@ export class CompilerError extends Error {\n throw errors;\n }\n \n- constructor(...args: any[]) {\n+ constructor(...args: Array) {\n super(...args);\n this.name = \"ReactCompilerError\";\n }\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/Entrypoint\/Program.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/Entrypoint\/Program.ts\nindex 441ae7e77a..f5020b559c 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/Entrypoint\/Program.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/Entrypoint\/Program.ts\n@@ -35,11 +35,11 @@ import {\n export type CompilerPass = {\n opts: PluginOptions;\n filename: string | null;\n- comments: (t.CommentBlock | t.CommentLine)[];\n+ comments: Array;\n };\n \n function findDirectiveEnablingMemoization(\n- directives: t.Directive[]\n+ directives: Array\n ): t.Directive | null {\n for (const directive of directives) {\n const directiveValue = directive.value.value;\n@@ -51,7 +51,7 @@ function findDirectiveEnablingMemoization(\n }\n \n function findDirectiveDisablingMemoization(\n- directives: t.Directive[],\n+ directives: Array,\n options: PluginOptions\n ): t.Directive | null {\n for (const directive of directives) {\n@@ -222,7 +222,7 @@ export function compileProgram(\n );\n const lintError = suppressionsToCompilerError(suppressions);\n let hasCriticalError = lintError != null;\n- const compiledFns: CompileResult[] = [];\n+ const compiledFns: Array = [];\n \n const traverseFunction = (fn: BabelFn, pass: CompilerPass): void => {\n const fnType = getReactFunctionType(fn, pass);\n@@ -333,7 +333,7 @@ export function compileProgram(\n }\n }\n \n- const externalFunctions: ExternalFunction[] = [];\n+ const externalFunctions: Array = [];\n let gating: null | ExternalFunction = null;\n try {\n \/\/ TODO: check for duplicate import specifiers\n@@ -705,7 +705,7 @@ function getFunctionName(\n \n function checkFunctionReferencedBeforeDeclarationAtTopLevel(\n program: NodePath,\n- fns: BabelFn[]\n+ fns: Array\n ): CompilerError | null {\n const fnIds = new Set(\n fns\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/BuildHIR.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/BuildHIR.ts\nindex 642736e32e..5101f362b8 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/BuildHIR.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/BuildHIR.ts\n@@ -70,12 +70,12 @@ export function lower(\n func: NodePath,\n env: Environment,\n bindings: Bindings | null = null,\n- capturedRefs: t.Identifier[] = [],\n+ capturedRefs: Array = [],\n \/\/ the outermost function being compiled, in case lower() is called recursively (for lambdas)\n parent: NodePath | null = null\n ): Result {\n const builder = new HIRBuilder(env, parent ?? func, bindings, capturedRefs);\n- const context: Place[] = [];\n+ const context: Array = [];\n \n for (const ref of capturedRefs ?? []) {\n context.push({\n@@ -168,7 +168,7 @@ export function lower(\n }\n });\n \n- let directives: string[] = [];\n+ let directives: Array = [];\n const body = func.get(\"body\");\n if (body.isExpression()) {\n const fallthrough = builder.reserve(\"block\");\n@@ -730,7 +730,7 @@ function lowerStatement(\n * Iterate through cases in reverse order, so that previous blocks can fallthrough\n * to successors\n *\/\n- const cases: Case[] = [];\n+ const cases: Array = [];\n let hasDefault = false;\n for (let ii = stmt.get(\"cases\").length - 1; ii >= 0; ii--) {\n const case_: NodePath = stmt.get(\"cases\")[ii];\n@@ -3827,7 +3827,7 @@ function gatherCapturedDeps(\n | t.ObjectMethod\n >,\n componentScope: Scope\n-): { identifiers: t.Identifier[]; refs: Place[] } {\n+): { identifiers: Array; refs: Array } {\n const capturedIds: Map = new Map();\n const capturedRefs: Set = new Set();\n const seenPaths: Set = new Set();\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/HIR.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/HIR.ts\nindex 69ab35fc12..007ddfe6e4 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/HIR.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/HIR.ts\n@@ -55,7 +55,7 @@ export type ReactiveFunction = {\n async: boolean;\n body: ReactiveBlock;\n env: Environment;\n- directives: string[];\n+ directives: Array;\n };\n \n export type ReactiveScopeBlock = {\n@@ -281,7 +281,7 @@ export type HIRFunction = {\n body: HIR;\n generator: boolean;\n async: boolean;\n- directives: string[];\n+ directives: Array;\n };\n \n export type FunctionEffect = {\n@@ -423,7 +423,7 @@ export type BranchTerminal = {\n export type SwitchTerminal = {\n kind: \"switch\";\n test: Place;\n- cases: Case[];\n+ cases: Array;\n fallthrough: BlockId | null;\n id: InstructionId;\n loc: SourceLocation;\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/HIRBuilder.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/HIRBuilder.ts\nindex d70eda0887..966b778fb2 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/HIRBuilder.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/HIR\/HIRBuilder.ts\n@@ -104,7 +104,7 @@ export default class HIRBuilder {\n #current: WipBlock;\n #entry: BlockId;\n #scopes: Array = [];\n- #context: t.Identifier[];\n+ #context: Array;\n #bindings: Bindings;\n #env: Environment;\n #exceptionHandlerStack: Array = [];\n@@ -115,7 +115,7 @@ export default class HIRBuilder {\n return this.#env.nextIdentifierId;\n }\n \n- get context(): t.Identifier[] {\n+ get context(): Array {\n return this.#context;\n }\n \n@@ -131,7 +131,7 @@ export default class HIRBuilder {\n env: Environment,\n parentFunction: NodePath, \/\/ the outermost function being compiled\n bindings: Bindings | null = null,\n- context: t.Identifier[] | null = null\n+ context: Array | null = null\n ) {\n this.#env = env;\n this.#bindings = bindings ?? new Map();\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/Inference\/AnalyseFunctions.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/Inference\/AnalyseFunctions.ts\nindex 011c8147eb..abcab6773e 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/Inference\/AnalyseFunctions.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/Inference\/AnalyseFunctions.ts\n@@ -117,7 +117,7 @@ function lower(func: HIRFunction): void {\n function infer(\n loweredFunc: LoweredFunction,\n state: IdentifierState,\n- context: Place[]\n+ context: Array\n ): void {\n const mutations = new Map();\n for (const operand of loweredFunc.func.context) {\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\nindex 31d13943bd..11296c1059 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n@@ -1069,7 +1069,7 @@ function codegenDependency(\n return object;\n }\n \n-function withLoc t.Node>(\n+function withLoc) => t.Node>(\n fn: T\n ): (\n loc: SourceLocation | null | undefined,\n@@ -1109,7 +1109,7 @@ const createStringLiteral = withLoc(t.stringLiteral);\n \n function createHookGuard(\n guard: ExternalFunction,\n- stmts: t.Statement[],\n+ stmts: Array,\n before: GuardKind,\n after: GuardKind\n ): t.TryStatement {\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CollectReferencedGlobals.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CollectReferencedGlobals.ts\nindex 58494c031d..3ca0d54fd9 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CollectReferencedGlobals.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CollectReferencedGlobals.ts\n@@ -34,7 +34,7 @@ class Visitor extends ReactiveFunctionVisitor> {\n \n override visitReactiveFunctionValue(\n _id: InstructionId,\n- _dependencies: Place[],\n+ _dependencies: Array,\n fn: ReactiveFunction,\n state: Set\n ): void {\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\nindex a810af95da..7af588c544 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\n@@ -65,7 +65,7 @@ class Visitor extends ReactiveFunctionVisitor {\n \n override visitReactiveFunctionValue(\n _id: InstructionId,\n- _dependencies: Place[],\n+ _dependencies: Array,\n fn: ReactiveFunction,\n state: VisitorState\n ): void {\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/RenameVariables.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/RenameVariables.ts\nindex cb0df0500e..f8f690b3cd 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/RenameVariables.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/RenameVariables.ts\n@@ -104,7 +104,7 @@ class Visitor extends ReactiveFunctionVisitor {\n \n override visitReactiveFunctionValue(\n _id: InstructionId,\n- _dependencies: Place[],\n+ _dependencies: Array,\n _fn: ReactiveFunction,\n _state: Scopes\n ): void {\ndiff --git a\/compiler\/packages\/babel-plugin-react-forget\/src\/SSA\/EnterSSA.ts b\/compiler\/packages\/babel-plugin-react-forget\/src\/SSA\/EnterSSA.ts\nindex 5067088ed7..1a0c26089b 100644\n--- a\/compiler\/packages\/babel-plugin-react-forget\/src\/SSA\/EnterSSA.ts\n+++ b\/compiler\/packages\/babel-plugin-react-forget\/src\/SSA\/EnterSSA.ts\n@@ -33,7 +33,7 @@ type IncompletePhi = {\n \n type State = {\n defs: Map;\n- incompletePhis: IncompletePhi[];\n+ incompletePhis: Array;\n };\n \n class SSABuilder {\n@@ -213,7 +213,7 @@ class SSABuilder {\n }\n \n print(): void {\n- const text: string[] = [];\n+ const text: Array = [];\n for (const [block, state] of this.#states) {\n text.push(`bb${block.id}:`);\n for (const [oldId, newId] of state.defs) {\n","commit":{"revision":"cd3f56bb18a88562d767d466ecae489fb3c2fb86","shortRevision":"cd3f56bb18","authorName":"Sathya Gunasekaran","authoredAt":"2024-04-02T15:31:25+01:00","authorEmail":"gsathya.ceg@gmail.com","subject":"[eslint] Enforce generic array type syntax"},"parents":["1de6c5aea207ac2beac375aa80287acfcfb567a0"]}

dillon1000/react

Files changed