Skip to content

fix(linter/plugins): fix type definition for VisitorObject #20065

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

Merged
graphite-app merged 1 commit into from
Mar 6, 2026
+22 −4
Merged

fix(linter/plugins): fix type definition for VisitorObject #20065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions apps/oxlint/src-js/generated/visitor.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@

import type * as ESTree from "./types.d.ts";

export interface VisitorObject {
type BivarianceHackHandler<Handler extends (...args: any) => any> = {
bivarianceHack(...args: Parameters<Handler>): ReturnType<Handler>;
}["bivarianceHack"];

interface StrictVisitorObject {
DebuggerStatement?: (node: ESTree.DebuggerStatement) => void;
"DebuggerStatement:exit"?: (node: ESTree.DebuggerStatement) => void;
EmptyStatement?: (node: ESTree.EmptyStatement) => void;
Expand Down Expand Up @@ -384,5 +388,10 @@ export interface VisitorObject {
"TSTypeReference:exit"?: (node: ESTree.TSTypeReference) => void;
TSUnionType?: (node: ESTree.TSUnionType) => void;
"TSUnionType:exit"?: (node: ESTree.TSUnionType) => void;
[key: string]: (node: ESTree.Node) => void;
}

export type VisitorObject = {
[K in keyof StrictVisitorObject]?:
| BivarianceHackHandler<Exclude<StrictVisitorObject[K], undefined>>
| undefined;
} & Record<string, BivarianceHackHandler<(node: ESTree.Node) => void> | undefined>;
13 changes: 11 additions & 2 deletions tasks/ast_tools/src/generators/estree_visit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,13 +507,22 @@ fn generate(codegen: &Codegen) -> Codes {
}}
");

// See https://github.com/DefinitelyTyped/DefinitelyTyped/pull/20219 for why we need "Bivariance hack"
#[rustfmt::skip]
let visitor_type_oxlint = format!("
import type * as ESTree from './types.d.ts';

export interface VisitorObject {{
{visitor_type} [key: string]: (node: ESTree.Node) => void;
type BivarianceHackHandler<Handler extends (...args: any) => any> = {{
bivarianceHack(...args: Parameters<Handler>): ReturnType<Handler>;
}}[\"bivarianceHack\"];

interface StrictVisitorObject {{
{visitor_type}
}}

export type VisitorObject = {{
[K in keyof StrictVisitorObject]?: BivarianceHackHandler<Exclude<StrictVisitorObject[K], undefined>> | undefined;
}} & Record<string, BivarianceHackHandler<(node: ESTree.Node) => void> | undefined>;
");

// Type definitions for walk.js.
Expand Down
Loading