Skip to content

Template literal types for template literal expressions #41891

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
ahejlsberg merged 11 commits into from
Dec 12, 2020
Merged

Template literal types for template literal expressions #41891

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eda291d
Infer template literal types for template literal expressions
ahejlsberg Dec 8, 2020
4acf495
Update test
ahejlsberg Dec 8, 2020
537fd37
Update another test
ahejlsberg Dec 9, 2020
e88ceca
Accept new baselines
ahejlsberg Dec 9, 2020
e35c42e
Minor fixes
ahejlsberg Dec 9, 2020
dfd760d
Add tests
ahejlsberg Dec 9, 2020
54c3be9
Accept new baselines
ahejlsberg Dec 9, 2020
afcfd9c
Make new TypeFlags internal
ahejlsberg Dec 9, 2020
96885c3
Accept new API baselines
ahejlsberg Dec 9, 2020
b3cdbf3
Ensure template literals assignable to String, Object, {}, etc.
ahejlsberg Dec 9, 2020
5cf670b
Add tests
ahejlsberg Dec 9, 2020
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
Ensure template literals assignable to String, Object, {}, etc.
  • Loading branch information
@ahejlsberg
ahejlsberg committed Dec 9, 2020
commit b3cdbf31c8bdd509f2d5b3bc3a6614e0604cfb6e
23 changes: 13 additions & 10 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17616,17 +17616,20 @@ namespace ts {
}
}
else if (source.flags & TypeFlags.TemplateLiteral) {
if (target.flags & TypeFlags.TemplateLiteral &&
(source as TemplateLiteralType).texts.length === (target as TemplateLiteralType).texts.length &&
(source as TemplateLiteralType).types.length === (target as TemplateLiteralType).types.length &&
every((source as TemplateLiteralType).texts, (t, i) => t === (target as TemplateLiteralType).texts[i]) &&
every((instantiateType(source, makeFunctionTypeMapper(reportUnreliableMarkers)) as TemplateLiteralType).types, (t, i) => !!((target as TemplateLiteralType).types[i].flags & (TypeFlags.Any | TypeFlags.String)) || !!isRelatedTo(t, (target as TemplateLiteralType).types[i], /*reportErrors*/ false))) {
return Ternary.True;
if (target.flags & TypeFlags.TemplateLiteral) {
if ((source as TemplateLiteralType).texts.length === (target as TemplateLiteralType).texts.length &&
(source as TemplateLiteralType).types.length === (target as TemplateLiteralType).types.length &&
every((source as TemplateLiteralType).texts, (t, i) => t === (target as TemplateLiteralType).texts[i]) &&
every((instantiateType(source, makeFunctionTypeMapper(reportUnreliableMarkers)) as TemplateLiteralType).types, (t, i) => !!((target as TemplateLiteralType).types[i].flags & (TypeFlags.Any | TypeFlags.String)) || !!isRelatedTo(t, (target as TemplateLiteralType).types[i], /*reportErrors*/ false))) {
return Ternary.True;
}
}
const constraint = getBaseConstraintOfType(source);
if (constraint && constraint !== source && (result = isRelatedTo(constraint, target, reportErrors))) {
resetErrorInfo(saveErrorInfo);
return result;
else {
const constraint = getBaseConstraintOfType(source);
if (result = isRelatedTo(constraint && constraint !== source ? constraint : stringType, target, reportErrors)) {
resetErrorInfo(saveErrorInfo);
return result;
}
}
}
else if (source.flags & TypeFlags.StringMapping) {
Expand Down