Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork2.8k
fix(type-utils): treat intrinsic types as if they are from lib and never match error types#6869
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
4 commits Select commitHold shift + click to select a range
24e4d57 fix(type-utils): treat intrinsic types as if they are from lib and ne…
RebeccaStevensebfbb87 Update packages/type-utils/tests/TypeOrValueSpecifier.test.ts
JoshuaKGoldbergbe42475 chore: bump ts-api-utils to 1.0.1
RebeccaStevense04ca7b refactor: use isIntrinsicErrorType
RebeccaStevensFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletionpackages/eslint-plugin/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionpackages/type-utils/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
26 changes: 23 additions & 3 deletionspackages/type-utils/src/TypeOrValueSpecifier.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| import { getCanonicalFileName } from '@typescript-eslint/typescript-estree'; | ||
| import type { JSONSchema4 } from '@typescript-eslint/utils/json-schema'; | ||
| import path from 'path'; | ||
| import * as tsutils from 'ts-api-utils'; | ||
| import type * as ts from 'typescript'; | ||
| interface FileSpecifier { | ||
| @@ -122,6 +123,9 @@ function specifierNameMatches(type: ts.Type, name: string[] | string): boolean { | ||
| if (typeof name === 'string') { | ||
| name = [name]; | ||
| } | ||
| if (name.some(item => item === type.intrinsicName)) { | ||
| return true; | ||
| } | ||
| const symbol = type.aliasSymbol ?? type.getSymbol(); | ||
| if (symbol === undefined) { | ||
| return false; | ||
| @@ -163,11 +167,29 @@ function typeDeclaredInPackage( | ||
| ); | ||
| } | ||
| function typeDeclaredInLib( | ||
| declarationFiles: ts.SourceFile[], | ||
| program: ts.Program, | ||
| ): boolean { | ||
| // Assertion: The type is not an error type. | ||
| // Intrinsic type (i.e. string, number, boolean, etc) - Treat it as if it's from lib. | ||
| if (declarationFiles.length === 0) { | ||
JoshuaKGoldberg marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| return true; | ||
| } | ||
| return declarationFiles.some(declaration => | ||
| program.isSourceFileDefaultLibrary(declaration), | ||
| ); | ||
| } | ||
| export function typeMatchesSpecifier( | ||
| type: ts.Type, | ||
| specifier: TypeOrValueSpecifier, | ||
| program: ts.Program, | ||
| ): boolean { | ||
| if (tsutils.isIntrinsicErrorType(type)) { | ||
| return false; | ||
| } | ||
| if (typeof specifier === 'string') { | ||
| return specifierNameMatches(type, specifier); | ||
| } | ||
| @@ -183,9 +205,7 @@ export function typeMatchesSpecifier( | ||
| case 'file': | ||
| return typeDeclaredInFile(specifier.path, declarationFiles, program); | ||
| case 'lib': | ||
| return typeDeclaredInLib(declarationFiles, program); | ||
| case 'package': | ||
| return typeDeclaredInPackage(specifier.package, declarationFiles); | ||
| } | ||
18 changes: 18 additions & 0 deletionspackages/type-utils/tests/TypeOrValueSpecifier.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionpackages/typescript-estree/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletionsyarn.lock
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.