fix(scope-manager): exclude Program from DefinitionBase node types (typescript-eslint#11469)

dbarabashh · kirkwaiblinger · web-flow · commit c068a4fd12f2 · 2025-09-03T11:34:18.000-04:00
* fix: exclude Program from DefinitionBase node types

* fix eslint

* Add NodeWithParent type

---------

Co-authored-by: Kirk Waiblinger &lt;53019676+kirkwaiblinger@users.noreply.github.com&gt;
diff --git a/packages/eslint-plugin/src/rules/no-confusing-void-expression.ts b/packages/eslint-plugin/src/rules/no-confusing-void-expression.ts
@@ -1,4 +1,8 @@
-import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
+import type {
+  NodeWithParent,
+  TSESLint,
+  TSESTree,
+} from '@typescript-eslint/utils';
 
 import { AST_NODE_TYPES } from '@typescript-eslint/utils';
 import * as tsutils from 'ts-api-utils';
@@ -300,8 +304,8 @@ export default createRule<Options, MessageId>({
      * @param node The void expression node to check.
      * @returns Invalid ancestor node if it was found. `null` otherwise.
      */
-    function findInvalidAncestor(node: TSESTree.Node): InvalidAncestor | null {
-      const parent = nullThrows(node.parent, NullThrowsReasons.MissingParent);
+    function findInvalidAncestor(node: NodeWithParent): InvalidAncestor | null {
+      const parent = node.parent;
       if (
         parent.type === AST_NODE_TYPES.SequenceExpression &&
         node !== parent.expressions[parent.expressions.length - 1]
@@ -365,17 +369,14 @@ export default createRule<Options, MessageId>({
     /** Checks whether the return statement is the last statement in a function body. */
     function isFinalReturn(node: TSESTree.ReturnStatement): boolean {
       // the parent must be a block
-      const block = nullThrows(node.parent, NullThrowsReasons.MissingParent);
+      const block = node.parent;
       if (block.type !== AST_NODE_TYPES.BlockStatement) {
         // e.g. `if (cond) return;` (not in a block)
         return false;
       }
 
       // the block's parent must be a function
-      const blockParent = nullThrows(
-        block.parent,
-        NullThrowsReasons.MissingParent,
-      );
+      const blockParent = block.parent;
       if (
         ![
           AST_NODE_TYPES.ArrowFunctionExpression,
diff --git a/packages/eslint-plugin/src/util/collectUnusedVariables.ts b/packages/eslint-plugin/src/util/collectUnusedVariables.ts
@@ -438,8 +438,8 @@ function isMergableExported(variable: ScopeVariable): boolean {
 
     if (
       (MERGABLE_TYPES.has(def.node.type) &&
-        def.node.parent?.type === AST_NODE_TYPES.ExportNamedDeclaration) ||
-      def.node.parent?.type === AST_NODE_TYPES.ExportDefaultDeclaration
+        def.node.parent.type === AST_NODE_TYPES.ExportNamedDeclaration) ||
+      def.node.parent.type === AST_NODE_TYPES.ExportDefaultDeclaration
     ) {
       return true;
     }
@@ -458,14 +458,12 @@ function isExported(variable: ScopeVariable): boolean {
     let node = definition.node;
 
     if (node.type === AST_NODE_TYPES.VariableDeclarator) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      node = node.parent!;
+      node = node.parent;
     } else if (definition.type === TSESLint.Scope.DefinitionType.Parameter) {
       return false;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    return node.parent!.type.startsWith('Export');
+    return node.parent.type.startsWith('Export');
   });
 }
 
diff --git a/packages/scope-manager/src/definition/DefinitionBase.ts b/packages/scope-manager/src/definition/DefinitionBase.ts
@@ -1,4 +1,4 @@
-import type { TSESTree } from '@typescript-eslint/types';
+import type { NodeWithParent, TSESTree } from '@typescript-eslint/types';
 
 import type { DefinitionType } from './DefinitionType';
 
@@ -8,7 +8,7 @@ const generator = createIdGenerator();
 
 export abstract class DefinitionBase<
   Type extends DefinitionType,
-  Node extends TSESTree.Node,
+  Node extends NodeWithParent,
   Parent extends TSESTree.Node | null,
   Name extends TSESTree.Node,
 > {
diff --git a/packages/scope-manager/src/definition/ImplicitGlobalVariableDefinition.ts b/packages/scope-manager/src/definition/ImplicitGlobalVariableDefinition.ts
@@ -1,11 +1,11 @@
-import type { TSESTree } from '@typescript-eslint/types';
+import type { NodeWithParent, TSESTree } from '@typescript-eslint/types';
 
 import { DefinitionBase } from './DefinitionBase';
 import { DefinitionType } from './DefinitionType';
 
 export class ImplicitGlobalVariableDefinition extends DefinitionBase<
   DefinitionType.ImplicitGlobalVariable,
-  TSESTree.Node,
+  NodeWithParent,
   null,
   TSESTree.BindingName
 > {
diff --git a/packages/scope-manager/src/referencer/Reference.ts b/packages/scope-manager/src/referencer/Reference.ts
@@ -1,4 +1,4 @@
-import type { TSESTree } from '@typescript-eslint/types';
+import type { NodeWithParent, TSESTree } from '@typescript-eslint/types';
 
 import type { Scope } from '../scope';
 import type { Variable } from '../variable';
@@ -12,7 +12,7 @@ export enum ReferenceFlag {
 }
 
 export interface ReferenceImplicitGlobal {
-  node: TSESTree.Node;
+  node: NodeWithParent;
   pattern: TSESTree.BindingName;
   ref?: Reference;
 }
diff --git a/packages/types/src/ts-estree.ts b/packages/types/src/ts-estree.ts
@@ -251,3 +251,4 @@ declare module './generated/ast-spec' {
 }
 
 export * as TSESTree from './generated/ast-spec';
+export type NodeWithParent = Exclude<TSESTree.Node, TSESTree.Program>;
diff --git a/packages/utils/src/ts-estree.ts b/packages/utils/src/ts-estree.ts
@@ -1,11 +1,11 @@
 // for convenience's sake - export the types directly from here so consumers
 // don't need to reference/install both packages in their code
-
 export {
   AST_NODE_TYPES,
   AST_TOKEN_TYPES,
   TSESTree,
 } from '@typescript-eslint/types';
+export type { NodeWithParent } from '@typescript-eslint/types';
 
 export type {
   ParserServices,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { TSESTree } from '@typescript-eslint/types';`
	`1`	`+import type { NodeWithParent, TSESTree } from '@typescript-eslint/types';`
`2`	`2`
`3`	`3`	`import type { Scope } from '../scope';`
`4`	`4`	`import type { Variable } from '../variable';`
`@@ -12,7 +12,7 @@ export enum ReferenceFlag {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`export interface ReferenceImplicitGlobal {`
`15`		`- node: TSESTree.Node;`
	`15`	`+ node: NodeWithParent;`
`16`	`16`	`pattern: TSESTree.BindingName;`
`17`	`17`	`ref?: Reference;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -251,3 +251,4 @@ declare module './generated/ast-spec' {`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`export * as TSESTree from './generated/ast-spec';`
	`254`	`+export type NodeWithParent = Exclude<TSESTree.Node, TSESTree.Program>;`