From 8daade806150983640b18b10d90cb081f3ca8f8a Mon Sep 17 00:00:00 2001 From: Armano Date: Sat, 14 Dec 2019 02:14:26 +0100 Subject: [PATCH 1/3] chore(types): improve typing for getTokenType and convertBodyExpressions --- packages/typescript-estree/src/convert.ts | 4 ++-- packages/typescript-estree/src/node-utils.ts | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts index 25937fc89025..12f99ae058c9 100644 --- a/packages/typescript-estree/src/convert.ts +++ b/packages/typescript-estree/src/convert.ts @@ -268,7 +268,7 @@ export class Converter { private convertBodyExpressions( nodes: ts.NodeArray, parent: ts.SourceFile | ts.Block | ts.ModuleBlock, - ): any[] { + ): TSESTree.Statement[] { let allowDirectives = canContainDirective(parent); return ( @@ -400,7 +400,7 @@ export class Converter { : null; } else if (key === 'decorators') { if (node.decorators && node.decorators.length) { - result.decorators = node.decorators.map((el: any) => + result.decorators = node.decorators.map(el => this.convertChild(el), ); } diff --git a/packages/typescript-estree/src/node-utils.ts b/packages/typescript-estree/src/node-utils.ts index 69e4542b106a..3be603b5ce5e 100644 --- a/packages/typescript-estree/src/node-utils.ts +++ b/packages/typescript-estree/src/node-utils.ts @@ -450,11 +450,11 @@ export function isOptional(node: { * @param token the ts.Token * @returns the token type */ -// ts.Node types are ugly -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export function getTokenType(token: any): AST_TOKEN_TYPES { +export function getTokenType( + token: ts.Identifier | ts.Token, +): AST_TOKEN_TYPES { // Need two checks for keywords since some are also identifiers - if (token.originalKeywordKind) { + if ('originalKeywordKind' in token) { switch (token.originalKeywordKind) { case SyntaxKind.NullKeyword: return AST_TOKEN_TYPES.Null; @@ -572,7 +572,7 @@ export function convertToken( loc: getLocFor(start, end, ast), }; - if (newToken.type === 'RegularExpression') { + if (newToken.type === AST_TOKEN_TYPES.RegularExpression) { newToken.regex = { pattern: value.slice(1, value.lastIndexOf('/')), flags: value.slice(value.lastIndexOf('/') + 1), From 752a78bc2597ec6a9bd4c435dca672018034fda4 Mon Sep 17 00:00:00 2001 From: Armano Date: Mon, 16 Dec 2019 02:23:28 +0100 Subject: [PATCH 2/3] chore(types): remove unnecessary any cast and type --- packages/typescript-estree/src/convert.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts index 12f99ae058c9..e7bda7d3a599 100644 --- a/packages/typescript-estree/src/convert.ts +++ b/packages/typescript-estree/src/convert.ts @@ -1340,7 +1340,7 @@ export class Converter { } case SyntaxKind.Parameter: { - let parameter: any; + let parameter: TSESTree.RestElement | TSESTree.BindingName; let result: TSESTree.RestElement | TSESTree.AssignmentPattern; if (node.dotDotDotToken) { @@ -1349,7 +1349,7 @@ export class Converter { argument: this.convertChild(node.name), }); } else if (node.initializer) { - parameter = this.convertChild(node.name); + parameter = this.convertChild(node.name) as TSESTree.BindingName; result = this.createNode(node, { type: AST_NODE_TYPES.AssignmentPattern, left: parameter, @@ -1584,7 +1584,7 @@ export class Converter { case SyntaxKind.PrefixUnaryExpression: case SyntaxKind.PostfixUnaryExpression: { - const operator = (getTextForTokenKind(node.operator) ?? '') as any; + const operator = getTextForTokenKind(node.operator) ?? ''; /** * ESTree uses UpdateExpression for ++/-- */ From af90f5b1e22242987745b4fcb1e7619e978e9237 Mon Sep 17 00:00:00 2001 From: Armano Date: Mon, 16 Dec 2019 22:08:24 +0100 Subject: [PATCH 3/3] chore(types): restore original condition --- packages/typescript-estree/src/node-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/typescript-estree/src/node-utils.ts b/packages/typescript-estree/src/node-utils.ts index 3be603b5ce5e..3e09c2f616fe 100644 --- a/packages/typescript-estree/src/node-utils.ts +++ b/packages/typescript-estree/src/node-utils.ts @@ -454,7 +454,7 @@ export function getTokenType( token: ts.Identifier | ts.Token, ): AST_TOKEN_TYPES { // Need two checks for keywords since some are also identifiers - if ('originalKeywordKind' in token) { + if ('originalKeywordKind' in token && token.originalKeywordKind) { switch (token.originalKeywordKind) { case SyntaxKind.NullKeyword: return AST_TOKEN_TYPES.Null; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy