feat: made BaseNode.parent non-optional (#5252)

* feat\!: made BaseNode.parent non-optional * Also fixed up for non-null assertions now being redundant * Also fixed up for non-null assertions now being redundant (again) * Fix lint: value type * fix(utils): removed `TRuleListener` generic from the `createRule` (#5036) * refactor(utils)!: removed `TRuleListener` generic from the `createRule` * refactor!: removed `TRuleListener` generic from the `CLIEngine` and `RuleCreateFunction` * chore: document and refactor 'extra' to 'parserSettings' (#5834) * chore(website): fix renamed Sponsorship docs link (#5882) * docs: Mention wide globs performance implications in monorepos docs and parser README (#5864) * docs: Mention wide globs performance implications in monorepos docs and parser readme * Update docs/linting/typed-linting/MONOREPOS.md Co-authored-by: Josh Goldberg <git@joshuakgoldberg.com> Co-authored-by: Josh Goldberg <git@joshuakgoldberg.com> Co-authored-by: Adnan Hashmi <56730784+adnanhashmi09@users.noreply.github.com> * feat: create TSTypeQuery node when TSImportType has isTypeOf (#3076) * feat: update TSImportType node * fix: update visitor keys * chore: document and refactor 'extra' to 'parserSettings' (#5834) * chore(website): fix renamed Sponsorship docs link (#5882) * docs: Mention wide globs performance implications in monorepos docs and parser README (#5864) * docs: Mention wide globs performance implications in monorepos docs and parser readme * Update docs/linting/typed-linting/MONOREPOS.md Co-authored-by: Josh Goldberg <git@joshuakgoldberg.com> Co-authored-by: Josh Goldberg <git@joshuakgoldberg.com> Co-authored-by: Adnan Hashmi <56730784+adnanhashmi09@users.noreply.github.com> * feat(scope-manager): ignore ECMA version (#5889) * feat(scope-manager): ignore ECMA version * chore: document and refactor 'extra' to 'parserSettings' (#5834) * chore(website): fix renamed Sponsorship docs link (#5882) * Remove much more * Fix WebLinter lint * docs: Mention wide globs performance implications in monorepos docs and parser README (#5864) * docs: Mention wide globs performance implications in monorepos docs and parser readme * Update docs/linting/typed-linting/MONOREPOS.md Co-authored-by: Josh Goldberg <git@joshuakgoldberg.com> * chore: add auto-canary release for v6 (#5883) Co-authored-by: Adnan Hashmi <56730784+adnanhashmi09@users.noreply.github.com> * feat: remove semantically invalid properties from TSEnumDeclaration, TSInterfaceDeclaration and TSModuleDeclaration (#4863) * chore: remove invalid properties from ast nodes * chore: remove invalid code in scope-manager and typescript-estree * chore: re-write snapshots that were using invalid properties * feat: remove modifiers union from ast types Co-authored-by: Juan García <juank1809@gmail.com> Co-authored-by: Josh Goldberg <git@joshuakgoldberg.com> * fix(eslint-plugin): remove valid-typeof disable in eslint-recommended (#5381) * feat(utils): remove (ts-)eslint-scope types (#5256) * chore(utils)\!: remove (ts-)eslint-scope types * Remove eslint-scope dep * More file deletions * fix(eslint-plugin): [explicit-module-boundary-types] remove shouldTrackReferences option from schema (#5399) * One more post-merge cleanup * fix lint errors in new files after merge Co-authored-by: Mateusz Burzyński <mateuszburzynski@gmail.com> Co-authored-by: Adnan Hashmi <56730784+adnanhashmi09@users.noreply.github.com> Co-authored-by: Armano <armano2@users.noreply.github.com> Co-authored-by: Juan García <82288753+juank1809@users.noreply.github.com> Co-authored-by: Juan García <juank1809@gmail.com> Co-authored-by: Brad Zacher <brad.zacher@gmail.com>
typescript-eslint · Nov 25, 2022 · a4768f3 · a4768f3
1 parent 9851338
commit a4768f3
Show file tree

Hide file tree

Showing 43 changed files with 70 additions and 108 deletions.
diff --git a/packages/ast-spec/src/index.ts b/packages/ast-spec/src/index.ts
@@ -1,5 +1,6 @@
 export * from './base/Accessibility';
 export * from './base/BaseNode'; // this is exported so that the `types` package can merge the decl and add the `parent` property
+export * from './base/NodeOrTokenData';
 export * from './base/OptionalRangeAndLoc';
 export * from './base/Position';
 export * from './base/Range';

diff --git a/packages/ast-spec/src/special/Program/spec.ts b/packages/ast-spec/src/special/Program/spec.ts
@@ -1,10 +1,10 @@
 import type { AST_NODE_TYPES } from '../../ast-node-types';
-import type { BaseNode } from '../../base/BaseNode';
+import type { NodeOrTokenData } from '../../base/NodeOrTokenData';
 import type { Comment } from '../../unions/Comment';
 import type { ProgramStatement } from '../../unions/Statement';
 import type { Token } from '../../unions/Token';
 
-export interface Program extends BaseNode {
+export interface Program extends NodeOrTokenData {
   type: AST_NODE_TYPES.Program;
   body: ProgramStatement[];
   sourceType: 'module' | 'script';

diff --git a/packages/eslint-plugin/src/rules/array-type.ts b/packages/eslint-plugin/src/rules/array-type.ts
@@ -154,7 +154,6 @@ export default util.createRule<Options, MessageIds>({
     return {
       TSArrayType(node): void {
         const isReadonly =
-          node.parent &&
           node.parent.type === AST_NODE_TYPES.TSTypeOperator &&
           node.parent.operator === 'readonly';
 
@@ -171,7 +170,7 @@ export default util.createRule<Options, MessageIds>({
           currentOption === 'generic'
             ? 'errorStringGeneric'
             : 'errorStringGenericSimple';
-        const errorNode = isReadonly ? node.parent! : node;
+        const errorNode = isReadonly ? node.parent : node;
 
         context.report({
           node: errorNode,

diff --git a/packages/eslint-plugin/src/rules/consistent-generic-constructors.ts b/packages/eslint-plugin/src/rules/consistent-generic-constructors.ts
@@ -96,7 +96,7 @@ export default createRule<Options, MessageIds>({
             const hasParens =
               sourceCode.getTokenAfter(rhs.callee)?.value === '(';
             const extraComments = new Set(
-              sourceCode.getCommentsInside(lhs.parent!),
+              sourceCode.getCommentsInside(lhs.parent),
             );
             sourceCode
               .getCommentsInside(lhs.typeParameters)
@@ -105,7 +105,7 @@ export default createRule<Options, MessageIds>({
               node,
               messageId: 'preferConstructor',
               *fix(fixer) {
-                yield fixer.remove(lhs.parent!);
+                yield fixer.remove(lhs.parent);
                 for (const comment of extraComments) {
                   yield fixer.insertTextAfter(
                     rhs.callee,

diff --git a/packages/eslint-plugin/src/rules/consistent-type-assertions.ts b/packages/eslint-plugin/src/rules/consistent-type-assertions.ts
@@ -134,7 +134,6 @@ export default util.createRule<Options, MessageIds>({
 
       if (
         options.objectLiteralTypeAssertions === 'allow-as-parameter' &&
-        node.parent &&
         (node.parent.type === AST_NODE_TYPES.NewExpression ||
           node.parent.type === AST_NODE_TYPES.CallExpression ||
           node.parent.type === AST_NODE_TYPES.ThrowStatement ||

diff --git a/packages/eslint-plugin/src/rules/explicit-module-boundary-types.ts b/packages/eslint-plugin/src/rules/explicit-module-boundary-types.ts
@@ -269,7 +269,7 @@ export default util.createRule<Options, MessageIds>({
     }
 
     function isExportedHigherOrderFunction(node: FunctionNode): boolean {
-      let current = node.parent;
+      let current: TSESTree.Node | undefined = node.parent;
       while (current) {
         if (current.type === AST_NODE_TYPES.ReturnStatement) {
           // the parent of a return will always be a block statement, so we can skip over it

diff --git a/packages/eslint-plugin/src/rules/indent.ts b/packages/eslint-plugin/src/rules/indent.ts
@@ -210,6 +210,7 @@ export default util.createRule<Options, MessageIds>({
         return rules.ConditionalExpression({
           type: AST_NODE_TYPES.ConditionalExpression,
           test: {
+            parent: node,
             type: AST_NODE_TYPES.BinaryExpression,
             operator: 'extends',
             left: node.checkType as any,
@@ -371,6 +372,7 @@ export default util.createRule<Options, MessageIds>({
           type: AST_NODE_TYPES.ObjectExpression,
           properties: [
             {
+              parent: node,
               type: AST_NODE_TYPES.Property,
               key: node.typeParameter as any,
               value: node.typeAnnotation as any,

diff --git a/packages/eslint-plugin/src/rules/init-declarations.ts b/packages/eslint-plugin/src/rules/init-declarations.ts
@@ -49,7 +49,7 @@ export default createRule<Options, MessageIds>({
     function isAncestorNamespaceDeclared(
       node: TSESTree.VariableDeclaration,
     ): boolean {
-      let ancestor = node.parent;
+      let ancestor: TSESTree.Node | undefined = node.parent;
 
       while (ancestor) {
         if (

diff --git a/packages/eslint-plugin/src/rules/no-base-to-string.ts b/packages/eslint-plugin/src/rules/no-base-to-string.ts
@@ -178,10 +178,7 @@ export default util.createRule<Options, MessageIds>({
         checkExpression(memberExpr.object);
       },
       TemplateLiteral(node: TSESTree.TemplateLiteral): void {
-        if (
-          node.parent &&
-          node.parent.type === AST_NODE_TYPES.TaggedTemplateExpression
-        ) {
+        if (node.parent.type === AST_NODE_TYPES.TaggedTemplateExpression) {
           return;
         }
         for (const expression of node.expressions) {

diff --git a/packages/eslint-plugin/src/rules/no-confusing-void-expression.ts b/packages/eslint-plugin/src/rules/no-confusing-void-expression.ts
@@ -186,7 +186,7 @@ export default util.createRule<Options, MessageId>({
                 // put a semicolon at the beginning of the line
                 newReturnStmtText = `;${newReturnStmtText}`;
               }
-              if (returnStmt.parent?.type !== AST_NODE_TYPES.BlockStatement) {
+              if (returnStmt.parent.type !== AST_NODE_TYPES.BlockStatement) {
                 // e.g. `if (cond) return console.error();`
                 // add braces if not inside a block
                 newReturnStmtText = `{ ${newReturnStmtText} }`;

diff --git a/packages/eslint-plugin/src/rules/no-explicit-any.ts b/packages/eslint-plugin/src/rules/no-explicit-any.ts
@@ -83,7 +83,6 @@ export default util.createRule<Options, MessageIds>({
     function isNodeRestElementInFunction(node: TSESTree.Node): boolean {
       return (
         node.type === AST_NODE_TYPES.RestElement &&
-        typeof node.parent !== 'undefined' &&
         isNodeValidFunction(node.parent)
       );
     }

diff --git a/packages/eslint-plugin/src/rules/no-extraneous-class.ts b/packages/eslint-plugin/src/rules/no-extraneous-class.ts
@@ -82,10 +82,9 @@ export default util.createRule<Options, MessageIds>({
       ClassBody(node): void {
         const parent = node.parent as
           | TSESTree.ClassDeclaration
-          | TSESTree.ClassExpression
-          | undefined;
+          | TSESTree.ClassExpression;
 
-        if (!parent || parent.superClass || isAllowWithDecorator(parent)) {
+        if (parent.superClass || isAllowWithDecorator(parent)) {
           return;
         }
 

diff --git a/packages/eslint-plugin/src/rules/no-invalid-void-type.ts b/packages/eslint-plugin/src/rules/no-invalid-void-type.ts
@@ -166,11 +166,6 @@ export default util.createRule<[Options], MessageIds>({
 
     return {
       TSVoidKeyword(node: TSESTree.TSVoidKeyword): void {
-        /* istanbul ignore next */
-        if (!node.parent?.parent) {
-          return;
-        }
-
         // checks T<..., void, ...> against specification of allowInGenericArguments option
         if (
           node.parent.type === AST_NODE_TYPES.TSTypeParameterInstantiation &&
@@ -211,7 +206,7 @@ export default util.createRule<[Options], MessageIds>({
         // default cases
         if (
           validParents.includes(node.parent.type) &&
-          !invalidGrandParents.includes(node.parent.parent.type)
+          !invalidGrandParents.includes(node.parent.parent!.type)
         ) {
           return;
         }
@@ -235,7 +230,7 @@ export default util.createRule<[Options], MessageIds>({
 function getNotReturnOrGenericMessageId(
   node: TSESTree.TSVoidKeyword,
 ): MessageIds {
-  return node.parent!.type === AST_NODE_TYPES.TSUnionType
+  return node.parent.type === AST_NODE_TYPES.TSUnionType
     ? 'invalidVoidUnionConstituent'
     : 'invalidVoidNotReturnOrGeneric';
 }
diff --git a/packages/eslint-plugin/src/rules/no-misused-new.ts b/packages/eslint-plugin/src/rules/no-misused-new.ts
@@ -70,7 +70,7 @@ export default util.createRule({
       ): void {
         if (
           isMatchingParentType(
-            node.parent!.parent as TSESTree.TSInterfaceDeclaration,
+            node.parent.parent as TSESTree.TSInterfaceDeclaration,
             node.returnType,
           )
         ) {
@@ -93,10 +93,7 @@ export default util.createRule({
         node: TSESTree.MethodDefinition,
       ): void {
         if (node.value.type === AST_NODE_TYPES.TSEmptyBodyFunctionExpression) {
-          if (
-            node.parent &&
-            isMatchingParentType(node.parent.parent, node.value.returnType)
-          ) {
+          if (isMatchingParentType(node.parent.parent, node.value.returnType)) {
             context.report({
               node,
               messageId: 'errorMessageClass',

diff --git a/packages/eslint-plugin/src/rules/no-namespace.ts b/packages/eslint-plugin/src/rules/no-namespace.ts
@@ -67,8 +67,7 @@ export default util.createRule<Options, MessageIds>({
         node: TSESTree.TSModuleDeclaration,
       ): void {
         if (
-          (node.parent &&
-            node.parent.type === AST_NODE_TYPES.TSModuleDeclaration) ||
+          node.parent.type === AST_NODE_TYPES.TSModuleDeclaration ||
           (allowDefinitionFiles && util.isDefinitionFile(filename)) ||
           (allowDeclarations && isDeclaration(node))
         ) {

diff --git a/packages/eslint-plugin/src/rules/no-redeclare.ts b/packages/eslint-plugin/src/rules/no-redeclare.ts
@@ -103,7 +103,7 @@ export default util.createRule<Options, MessageIds>({
       const identifiers = variable.identifiers
         .map(id => ({
           identifier: id,
-          parent: id.parent!,
+          parent: id.parent,
         }))
         // ignore function declarations because TS will treat them as an overload
         .filter(

diff --git a/packages/eslint-plugin/src/rules/no-redundant-type-constituents.ts b/packages/eslint-plugin/src/rules/no-redundant-type-constituents.ts
@@ -155,7 +155,6 @@ function describeLiteralTypeNode(typeNode: TSESTree.TypeNode): string {
 function isNodeInsideReturnType(node: TSESTree.TSUnionType): boolean {
   return !!(
     node.parent?.type === AST_NODE_TYPES.TSTypeAnnotation &&
-    node.parent.parent &&
     (util.isFunctionType(node.parent.parent) ||
       util.isFunction(node.parent.parent))
   );

diff --git a/packages/eslint-plugin/src/rules/no-unused-vars.ts b/packages/eslint-plugin/src/rules/no-unused-vars.ts
@@ -167,10 +167,10 @@ export default util.createRule<Options, MessageIds>({
       ): boolean {
         if (options.ignoreRestSiblings) {
           const hasRestSiblingDefinition = variable.defs.some(def =>
-            hasRestSibling(def.name.parent!),
+            hasRestSibling(def.name.parent),
           );
           const hasRestSiblingReference = variable.references.some(ref =>
-            hasRestSibling(ref.identifier.parent!),
+            hasRestSibling(ref.identifier.parent),
           );
 
           return hasRestSiblingDefinition || hasRestSiblingReference;

diff --git a/packages/eslint-plugin/src/rules/no-use-before-define.ts b/packages/eslint-plugin/src/rules/no-use-before-define.ts
@@ -116,9 +116,6 @@ function referenceContainsTypeQuery(node: TSESTree.Node): boolean {
 
     case AST_NODE_TYPES.TSQualifiedName:
     case AST_NODE_TYPES.Identifier:
-      if (!node.parent) {
-        return false;
-      }
       return referenceContainsTypeQuery(node.parent);
 
     default:
@@ -196,7 +193,7 @@ function isInInitializer(
     return false;
   }
 
-  let node = variable.identifiers[0].parent;
+  let node: TSESTree.Node | undefined = variable.identifiers[0].parent;
   const location = reference.identifier.range[1];
 
   while (node) {

diff --git a/packages/eslint-plugin/src/rules/no-useless-constructor.ts b/packages/eslint-plugin/src/rules/no-useless-constructor.ts
@@ -19,9 +19,7 @@ function checkAccessibility(node: TSESTree.MethodDefinition): boolean {
       return false;
     case 'public':
       if (
-        node.parent &&
         node.parent.type === AST_NODE_TYPES.ClassBody &&
-        node.parent.parent &&
         'superClass' in node.parent.parent &&
         node.parent.parent.superClass
       ) {

diff --git a/packages/eslint-plugin/src/rules/prefer-as-const.ts b/packages/eslint-plugin/src/rules/prefer-as-const.ts
@@ -49,7 +49,7 @@ export default util.createRule({
               {
                 messageId: 'variableSuggest',
                 fix: (fixer): TSESLint.RuleFix[] => [
-                  fixer.remove(typeNode.parent!),
+                  fixer.remove(typeNode.parent),
                   fixer.insertTextAfter(valueNode, ' as const'),
                 ],
               },

diff --git a/packages/eslint-plugin/src/rules/prefer-function-type.ts b/packages/eslint-plugin/src/rules/prefer-function-type.ts
@@ -99,7 +99,6 @@ export default util.createRule({
         }
 
         const fixable =
-          node.parent &&
           node.parent.type === AST_NODE_TYPES.ExportDefaultDeclaration;
 
         const fix = fixable
@@ -137,7 +136,6 @@ export default util.createRule({
               }
 
               const isParentExported =
-                node.parent &&
                 node.parent.type === AST_NODE_TYPES.ExportNamedDeclaration;
 
               if (
@@ -154,12 +152,7 @@ export default util.createRule({
                   );
                 }, '');
                 // comments should move before export and not between export and interface declaration
-                fixes.push(
-                  fixer.insertTextBefore(
-                    node.parent as TSESTree.Node | TSESTree.Token,
-                    commentsText,
-                  ),
-                );
+                fixes.push(fixer.insertTextBefore(node.parent, commentsText));
               } else {
                 comments.forEach(comment => {
                   let commentText =

diff --git a/packages/eslint-plugin/src/rules/prefer-nullish-coalescing.ts b/packages/eslint-plugin/src/rules/prefer-nullish-coalescing.ts
@@ -111,7 +111,7 @@ export default util.createRule<Options, MessageIds>({
       function* fix(
         fixer: TSESLint.RuleFixer,
       ): IterableIterator<TSESLint.RuleFix> {
-        if (node.parent && util.isLogicalOrOperator(node.parent)) {
+        if (util.isLogicalOrOperator(node.parent)) {
           // '&&' and '??' operations cannot be mixed without parentheses (e.g. a && b ?? c)
           if (
             node.left.type === AST_NODE_TYPES.LogicalExpression &&

diff --git a/packages/eslint-plugin/src/rules/prefer-optional-chain.ts b/packages/eslint-plugin/src/rules/prefer-optional-chain.ts
@@ -122,7 +122,7 @@ export default util.createRule({
       ): void {
         // selector guarantees this cast
         const initialExpression = (
-          initialIdentifierOrNotEqualsExpr.parent!.type ===
+          initialIdentifierOrNotEqualsExpr.parent.type ===
           AST_NODE_TYPES.ChainExpression
             ? initialIdentifierOrNotEqualsExpr.parent.parent
             : initialIdentifierOrNotEqualsExpr.parent

diff --git a/packages/eslint-plugin/src/rules/prefer-return-this-type.ts b/packages/eslint-plugin/src/rules/prefer-return-this-type.ts
@@ -151,7 +151,7 @@ export default createRule({
 
     return {
       'ClassBody > MethodDefinition'(node: TSESTree.MethodDefinition): void {
-        checkFunction(node.value, node.parent!.parent as ClassLikeDeclaration);
+        checkFunction(node.value, node.parent.parent as ClassLikeDeclaration);
       },
       'ClassBody > PropertyDefinition'(
         node: TSESTree.PropertyDefinition,
@@ -165,7 +165,7 @@ export default createRule({
           return;
         }
 
-        checkFunction(node.value, node.parent!.parent as ClassLikeDeclaration);
+        checkFunction(node.value, node.parent.parent as ClassLikeDeclaration);
       },
     };
   },

diff --git a/packages/eslint-plugin/src/rules/promise-function-async.ts b/packages/eslint-plugin/src/rules/promise-function-async.ts
@@ -121,13 +121,12 @@ export default util.createRule<Options, MessageIds>({
         return;
       }
 
-      if (node.parent?.type === AST_NODE_TYPES.TSAbstractMethodDefinition) {
+      if (node.parent.type === AST_NODE_TYPES.TSAbstractMethodDefinition) {
         // Abstract method can't be async
         return;
       }
 
       if (
-        node.parent &&
         (node.parent.type === AST_NODE_TYPES.Property ||
           node.parent.type === AST_NODE_TYPES.MethodDefinition) &&
         (node.parent.kind === 'get' || node.parent.kind === 'set')
@@ -153,10 +152,8 @@ export default util.createRule<Options, MessageIds>({
         loc: util.getFunctionHeadLoc(node, sourceCode),
         fix: fixer => {
           if (
-            node.parent &&
-            (node.parent.type === AST_NODE_TYPES.MethodDefinition ||
-              (node.parent.type === AST_NODE_TYPES.Property &&
-                node.parent.method))
+            node.parent.type === AST_NODE_TYPES.MethodDefinition ||
+            (node.parent.type === AST_NODE_TYPES.Property && node.parent.method)
           ) {
             // this function is a class method or object function property shorthand
             const method = node.parent;
@@ -219,7 +216,6 @@ export default util.createRule<Options, MessageIds>({
         node: TSESTree.FunctionExpression,
       ): void {
         if (
-          node.parent &&
           node.parent.type === AST_NODE_TYPES.MethodDefinition &&
           node.parent.kind === 'method'
         ) {

diff --git a/packages/eslint-plugin/src/rules/require-array-sort-compare.ts b/packages/eslint-plugin/src/rules/require-array-sort-compare.ts
@@ -78,7 +78,7 @@ export default util.createRule<Options, MessageIds>({
         }
 
         if (util.isTypeArrayTypeOrUnionOfArrayTypes(calleeObjType, checker)) {
-          context.report({ node: callee.parent!, messageId: 'requireCompare' });
+          context.report({ node: callee.parent, messageId: 'requireCompare' });
         }
       },
     };

diff --git a/packages/eslint-plugin/src/rules/restrict-template-expressions.ts b/packages/eslint-plugin/src/rules/restrict-template-expressions.ts
@@ -117,7 +117,7 @@ export default util.createRule<Options, MessageId>({
     return {
       TemplateLiteral(node: TSESTree.TemplateLiteral): void {
         // don't check tagged template literals
-        if (node.parent!.type === AST_NODE_TYPES.TaggedTemplateExpression) {
+        if (node.parent.type === AST_NODE_TYPES.TaggedTemplateExpression) {
           return;
         }
 

diff --git a/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts b/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts
@@ -221,7 +221,7 @@ export default util.createRule<Options, MessageIds>({
                 ? 'Intersection'
                 : 'Union',
           };
-          if (node.parent?.type === AST_NODE_TYPES.TSTypeAliasDeclaration) {
+          if (node.parent.type === AST_NODE_TYPES.TSTypeAliasDeclaration) {
             messageId = 'notSortedNamed';
             data.name = node.parent.id.name;
           }