Skip to content

chore(experimental-utils): remove useless union types in ts-eslint #3420

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
merged 1 commit into from
May 28, 2021
Merged

chore(experimental-utils): remove useless union types in ts-eslint #3420

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
2 changes: 1 addition & 1 deletion packages/experimental-utils/src/ts-eslint/Rule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ interface ReportDescriptorNodeOptionalLoc {
/**
* The Node or AST Token which the report is being attached to
*/
readonly node: TSESTree.Node | TSESTree.Comment | TSESTree.Token;
readonly node: TSESTree.Node | TSESTree.Token;
/**
* An override of the location of the report
*/
Expand Down
44 changes: 22 additions & 22 deletions packages/experimental-utils/src/ts-eslint/SourceCode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ declare class TokenStore {
* @returns An object representing the token.
*/
getFirstTokenBetween<T extends SourceCode.CursorWithSkipOptions>(
left: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
right: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
left: TSESTree.Node | TSESTree.Token,
right: TSESTree.Node | TSESTree.Token,
options?: T,
): SourceCode.ReturnTypeFromOptions<T> | null;
/**
Expand All @@ -77,8 +77,8 @@ declare class TokenStore {
* @returns Tokens between left and right.
*/
getFirstTokensBetween<T extends SourceCode.CursorWithCountOptions>(
left: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
right: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
left: TSESTree.Node | TSESTree.Token,
right: TSESTree.Node | TSESTree.Token,
options?: T,
): SourceCode.ReturnTypeFromOptions<T>[];
/**
Expand All @@ -99,8 +99,8 @@ declare class TokenStore {
* @returns An object representing the token.
*/
getLastTokenBetween<T extends SourceCode.CursorWithSkipOptions>(
left: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
right: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
left: TSESTree.Node | TSESTree.Token,
right: TSESTree.Node | TSESTree.Token,
options?: T,
): SourceCode.ReturnTypeFromOptions<T> | null;
/**
Expand All @@ -121,8 +121,8 @@ declare class TokenStore {
* @returns Tokens between left and right.
*/
getLastTokensBetween<T extends SourceCode.CursorWithCountOptions>(
left: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
right: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
left: TSESTree.Node | TSESTree.Token,
right: TSESTree.Node | TSESTree.Token,
options?: T,
): SourceCode.ReturnTypeFromOptions<T>[];
/**
Expand All @@ -132,7 +132,7 @@ declare class TokenStore {
* @returns An object representing the token.
*/
getTokenAfter<T extends SourceCode.CursorWithSkipOptions>(
node: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
node: TSESTree.Node | TSESTree.Token,
options?: T,
): SourceCode.ReturnTypeFromOptions<T> | null;
/**
Expand All @@ -142,7 +142,7 @@ declare class TokenStore {
* @returns An object representing the token.
*/
getTokenBefore<T extends SourceCode.CursorWithSkipOptions>(
node: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
node: TSESTree.Node | TSESTree.Token,
options?: T,
): SourceCode.ReturnTypeFromOptions<T> | null;
/**
Expand Down Expand Up @@ -184,7 +184,7 @@ declare class TokenStore {
* @returns Tokens.
*/
getTokensAfter<T extends SourceCode.CursorWithCountOptions>(
node: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
node: TSESTree.Node | TSESTree.Token,
options?: T,
): SourceCode.ReturnTypeFromOptions<T>[];
/**
Expand All @@ -194,7 +194,7 @@ declare class TokenStore {
* @returns Tokens.
*/
getTokensBefore<T extends SourceCode.CursorWithCountOptions>(
node: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
node: TSESTree.Node | TSESTree.Token,
options?: T,
): SourceCode.ReturnTypeFromOptions<T>[];
/**
Expand All @@ -205,8 +205,8 @@ declare class TokenStore {
* @returns Tokens between left and right.
*/
getTokensBetween<T extends SourceCode.CursorWithCountOptions>(
left: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
right: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
left: TSESTree.Node | TSESTree.Token,
right: TSESTree.Node | TSESTree.Token,
padding?: T,
): SourceCode.ReturnTypeFromOptions<T>[];
/**
Expand All @@ -217,8 +217,8 @@ declare class TokenStore {
* @returns Tokens between left and right.
*/
getTokensBetween<T extends SourceCode.CursorWithCountOptions>(
left: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
right: TSESTree.Node | TSESTree.Token | TSESTree.Comment,
left: TSESTree.Node | TSESTree.Token,
right: TSESTree.Node | TSESTree.Token,
padding?: number,
): SourceCode.ReturnTypeFromOptions<T>[];
}
Expand Down Expand Up @@ -303,8 +303,8 @@ declare class SourceCodeBase extends TokenStore {
* @returns True if there is a whitespace character between any of the tokens found between the two given nodes or tokens.
*/
isSpaceBetween?(
first: TSESTree.Token | TSESTree.Comment | TSESTree.Node,
second: TSESTree.Token | TSESTree.Comment | TSESTree.Node,
first: TSESTree.Token | TSESTree.Node,
second: TSESTree.Token | TSESTree.Node,
): boolean;
/**
* Determines if two nodes or tokens have at least one whitespace character
Expand Down Expand Up @@ -342,8 +342,10 @@ declare class SourceCodeBase extends TokenStore {
text: string;
/**
* All of the tokens and comments in the AST.
*
* TODO: rename to 'tokens'
*/
tokensAndComments: (TSESTree.Comment | TSESTree.Token)[];
tokensAndComments: TSESTree.Token[];
/**
* The visitor keys to traverse AST.
*/
Expand Down Expand Up @@ -394,9 +396,7 @@ namespace SourceCode {
[nodeType: string]: string[];
}

export type FilterPredicate = (
tokenOrComment: TSESTree.Token | TSESTree.Comment,
) => boolean;
export type FilterPredicate = (token: TSESTree.Token) => boolean;

export type ReturnTypeFromOptions<T> = T extends { includeComments: true }
? TSESTree.Token
Expand Down