Visitar URL original
More specific inference for constrained 'infer' types in template literal types by rbuckton · Pull Request #48094 · microsoft/TypeScript · GitHub
Skip to content

More specific inference for constrained 'infer' types in template literal types #48094

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
Ron Buckton (rbuckton) merged 10 commits into from
May 27, 2022
Merged

More specific inference for constrained 'infer' types in template literal types #48094

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0758d84
More specific inference for constrained 'infer' types in template lit…
rbuckton Mar 2, 2022
c8da16a
PR feedback
rbuckton Mar 22, 2022
55d4c3d
Add inference priority for template type placeholders
rbuckton Mar 22, 2022
b897272
Infer to a preferred constraint instead of a union
rbuckton Mar 24, 2022
2f15741
Add reduceType
rbuckton Mar 24, 2022
06685cb
Switch tests to use infer..extends
rbuckton Apr 5, 2022
67d7ce5
Add missing primitive constraint cases
rbuckton Apr 6, 2022
00c4b26
Update .types tests
rbuckton Apr 7, 2022
e502377
Remove TemplateTypePlaceholderPriority
rbuckton May 24, 2022
9ccca98
Remove reduceType
rbuckton May 24, 2022
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
Prev Previous commit
Next Next commit
Add missing primitive constraint cases
  • Loading branch information
@rbuckton
rbuckton committed May 9, 2022
commit 67d7ce5e92c168dbfb5337b3ce69d52e732310d2
19 changes: 12 additions & 7 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,15 +265,15 @@ namespace ts {

const enum TemplateTypePlaceholderPriority {
Never, // lowest
Null,
Undefined,
BooleanLiterals,
KeywordLiterals, // true | false | null | undefined
Boolean,
BigIntLiterals,
BigInt,
NumberLiterals,
Enums,
Number,
StringLiterals,
TemplateLiterals,
String, // highest
}

Expand Down Expand Up @@ -22745,15 +22745,18 @@ namespace ts {

function getTemplateTypePlaceholderPriority(type: Type) {
return type.flags & TypeFlags.String ? TemplateTypePlaceholderPriority.String :
type.flags & TypeFlags.TemplateLiteral ? TemplateTypePlaceholderPriority.TemplateLiterals :
type.flags & TypeFlags.StringMapping ? TemplateTypePlaceholderPriority.StringLiterals :
type.flags & TypeFlags.StringLiteral ? TemplateTypePlaceholderPriority.StringLiterals :
type.flags & TypeFlags.Number ? TemplateTypePlaceholderPriority.Number :
type.flags & TypeFlags.Enum ? TemplateTypePlaceholderPriority.Enums :
type.flags & TypeFlags.NumberLiteral ? TemplateTypePlaceholderPriority.NumberLiterals :
type.flags & TypeFlags.BigInt ? TemplateTypePlaceholderPriority.BigInt :
type.flags & TypeFlags.BigIntLiteral ? TemplateTypePlaceholderPriority.BigIntLiterals :
type.flags & TypeFlags.Boolean ? TemplateTypePlaceholderPriority.Boolean :
type.flags & TypeFlags.BooleanLiteral ? TemplateTypePlaceholderPriority.BooleanLiterals :
type.flags & TypeFlags.Undefined ? TemplateTypePlaceholderPriority.Undefined :
type.flags & TypeFlags.Null ? TemplateTypePlaceholderPriority.Null :
type.flags & TypeFlags.BooleanLiteral ? TemplateTypePlaceholderPriority.KeywordLiterals :
type.flags & TypeFlags.Undefined ? TemplateTypePlaceholderPriority.KeywordLiterals :
type.flags & TypeFlags.Null ? TemplateTypePlaceholderPriority.KeywordLiterals :
TemplateTypePlaceholderPriority.Never;
}

Expand Down Expand Up @@ -22797,7 +22800,9 @@ namespace ts {
const matchingType = reduceType(constraint, (matchingType, t) =>
Comment thread
rbuckton marked this conversation as resolved.
Resolved
!(t.flags & allTypeFlags) || getTemplateTypePlaceholderPriority(t) <= getTemplateTypePlaceholderPriority(matchingType) ? matchingType :
t.flags & TypeFlags.String ? source :
t.flags & TypeFlags.Number ? getNumberLiteralType(+str) : // if `str` was not a valid number, TypeFlags.Number would have been excluded above.
t.flags & TypeFlags.TemplateLiteral && isTypeMatchedByTemplateLiteralType(source, t as TemplateLiteralType) ? source :
t.flags & TypeFlags.StringMapping && str === applyStringMapping(t.symbol, str) ? source :
t.flags & (TypeFlags.Number | TypeFlags.Enum) ? getNumberLiteralType(+str) : // if `str` was not a valid number, TypeFlags.Number and TypeFlags.Enum would have been excluded above.
t.flags & TypeFlags.BigInt ? parseBigIntLiteralType(str) : // if `str` was not a valid bigint, TypeFlags.BigInt would have been excluded above.
t.flags & TypeFlags.Boolean ? str === "true" ? trueType : falseType :
t.flags & TypeFlags.StringLiteral && (t as StringLiteralType).value === str ? t :
Expand Down
Loading