Skip to content

Replace Node interface with discriminated unions #64040

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

Open
Arnaud Barré (ArnaudBarre) wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Replace Node interface with discriminated unions #64040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d62a514
Fix kind field for ImportDeclaration/TypeAliasDeclaration
ArnaudBarre Aug 23, 2026
3f07051
Define Expression/Statement/... as unions
ArnaudBarre Aug 23, 2026
c331a91
Node type as union
ArnaudBarre Aug 26, 2026
21c4bca
AI review: update encoder
ArnaudBarre Aug 26, 2026
2865838
Fix type errors in is.ts
ArnaudBarre Aug 26, 2026
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
18 changes: 10 additions & 8 deletions packages/typescript/src/api/node/node.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

import {
getTokenPosOfNode,
type JSDoc,
ModifierFlags,
type Node,
type NodeArray,
type NodeBase,
type SourceFile,
SyntaxKind,
} from "../../ast/index.ts";
Expand Down Expand Up @@ -153,13 +155,13 @@ export class RemoteNodeList extends Array<RemoteNode> implements NodeArray<Remot
}
}

forEachNode<T>(visitNode: (node: RemoteNode) => T | undefined): T | undefined {
forEachNode<T>(visitNode: (node: Node) => T | undefined): T | undefined {
if (!this.length) return;
let next = this.index + 1;
while (next) {
const child = this.getOrCreateChildAtNodeIndex(next);
next = child.next;
const result = visitNode(child as RemoteNode);
const result = visitNode(child as Node);
if (result) return result;
}
}
Expand Down Expand Up @@ -222,7 +224,7 @@ export class RemoteNodeList extends Array<RemoteNode> implements NodeArray<Remot
}
}

export class RemoteNode extends RemoteNodeBase implements Node {
export class RemoteNode extends RemoteNodeBase implements NodeBase {
protected static NODE_LEN: number = NODE_LEN;
protected override get sourceFile(): SourceFileInfo {
return this._sourceFile;
Expand All @@ -244,7 +246,7 @@ export class RemoteNode extends RemoteNodeBase implements Node {
const child = this.getOrCreateChildAtNodeIndex(next);
if (child instanceof RemoteNodeList) {
if (visitList) {
const result = visitList(child);
const result = visitList(child as NodeArray<Node>);
if (result) {
return result;
}
Expand All @@ -257,7 +259,7 @@ export class RemoteNode extends RemoteNodeBase implements Node {
}
}
else if (child.kind !== SyntaxKind.JSDoc) {
const result = visitNode(child);
const result = visitNode(child as Node);
if (result) {
return result;
}
Expand All @@ -268,16 +270,16 @@ export class RemoteNode extends RemoteNodeBase implements Node {
}
}

get jsDoc(): readonly Node[] | undefined {
get jsDoc(): readonly JSDoc[] | undefined {
if (!this.hasChildren()) {
return undefined;
}
let result: Node[] | undefined;
let result: JSDoc[] | undefined;
let next = this.index + 1;
do {
const child = this.getOrCreateChildAtNodeIndex(next);
if (!(child instanceof RemoteNodeList) && child.kind === SyntaxKind.JSDoc) {
(result ??= []).push(child);
(result ??= []).push(child as unknown as JSDoc);
}
next = child.next;
}
Expand Down
Loading