Skip to content

chore(experimental-utils): remove useless union types in ast-utils #3419

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 ast-utils #3419

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
50 changes: 24 additions & 26 deletions packages/experimental-utils/src/ast-utils/eslint-utils/predicates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,82 +2,80 @@ import * as eslintUtils from 'eslint-utils';
import { TSESTree } from '../../ts-estree';

const isArrowToken = eslintUtils.isArrowToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.PunctuatorToken & { value: '=>' };
const isNotArrowToken = eslintUtils.isNotArrowToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => boolean;

const isClosingBraceToken = eslintUtils.isClosingBraceToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.PunctuatorToken & { value: '}' };
const isNotClosingBraceToken = eslintUtils.isNotClosingBraceToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => boolean;

const isClosingBracketToken = eslintUtils.isClosingBracketToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.PunctuatorToken & { value: ']' };
const isNotClosingBracketToken = eslintUtils.isNotClosingBracketToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => boolean;

const isClosingParenToken = eslintUtils.isClosingParenToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.PunctuatorToken & { value: ')' };
const isNotClosingParenToken = eslintUtils.isNotClosingParenToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => boolean;

const isColonToken = eslintUtils.isColonToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.PunctuatorToken & { value: ':' };
const isNotColonToken = eslintUtils.isNotColonToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => boolean;

const isCommaToken = eslintUtils.isCommaToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.PunctuatorToken & { value: ',' };
const isNotCommaToken = eslintUtils.isNotCommaToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => boolean;

const isCommentToken = eslintUtils.isCommentToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.Comment;
const isNotCommentToken = eslintUtils.isNotCommentToken as <
T extends TSESTree.Token | TSESTree.Comment
>(
token: T,
) => token is Exclude<T, TSESTree.Comment>;
const isNotCommentToken = eslintUtils.isNotCommentToken as (
token: TSESTree.Token,
) => token is Exclude<TSESTree.Token, TSESTree.Comment>;

const isOpeningBraceToken = eslintUtils.isOpeningBraceToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.PunctuatorToken & { value: '{' };
const isNotOpeningBraceToken = eslintUtils.isNotOpeningBraceToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => boolean;

const isOpeningBracketToken = eslintUtils.isOpeningBracketToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.PunctuatorToken & { value: '[' };
const isNotOpeningBracketToken = eslintUtils.isNotOpeningBracketToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => boolean;

const isOpeningParenToken = eslintUtils.isOpeningParenToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.PunctuatorToken & { value: '(' };
const isNotOpeningParenToken = eslintUtils.isNotOpeningParenToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => boolean;

const isSemicolonToken = eslintUtils.isSemicolonToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => token is TSESTree.PunctuatorToken & { value: ';' };
const isNotSemicolonToken = eslintUtils.isNotSemicolonToken as (
token: TSESTree.Token | TSESTree.Comment,
token: TSESTree.Token,
) => boolean;

export {
Expand Down
4 changes: 2 additions & 2 deletions packages/experimental-utils/src/ast-utils/misc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const LINEBREAK_MATCHER = /\r\n|[\r\n\u2028\u2029]/;
* Determines whether two adjacent tokens are on the same line
*/
function isTokenOnSameLine(
left: TSESTree.Token | TSESTree.Comment,
right: TSESTree.Token | TSESTree.Comment,
left: TSESTree.Token,
right: TSESTree.Token,
): boolean {
return left.loc.end.line === right.loc.start.line;
}
Expand Down