Skip to content

Revert PR 55371 #58702

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 2 commits into from
May 30, 2024
Merged

Revert PR 55371 #58702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f62cc7a
revert changes in checker
gabritto May 29, 2024
7dedaf2
add test
gabritto May 29, 2024
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
10 changes: 0 additions & 10 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18087,16 +18087,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (contains(types, wildcardType)) {
return wildcardType;
}
if (
texts.length === 2 && texts[0] === "" && texts[1] === ""
// literals (including string enums) are stringified below
&& !(types[0].flags & TypeFlags.Literal)
// infer T extends StringLike can't be unwrapped eagerly
&& !types[0].symbol?.declarations?.some(d => d.parent.kind === SyntaxKind.InferType)
&& isTypeAssignableTo(types[0], stringType)
) {
return types[0];
}
const newTypes: Type[] = [];
const newTexts: string[] = [];
let text = texts[0];
Expand Down
8 changes: 4 additions & 4 deletions tests/baselines/reference/numericStringLiteralTypes.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ type T2 = string & `${bigint}`; // `${bigint}
> : ^^^^^^^^^^^

type T3<T extends string> = string & `${T}`; // `${T}
>T3 : T
> : ^
>T3 : `${T}`
> : ^^^^^^

type T4<T extends string> = string & `${Capitalize<`${T}`>}`; // `${Capitalize<T>}`
>T4 : Capitalize<T>
> : ^^^^^^^^^^^^^
>T4 : `${Capitalize<T>}`
> : ^^^^^^^^^^^^^^^^^^

function f1(a: boolean[], x: `${number}`) {
>f1 : (a: boolean[], x: `${number}`) => void
Expand Down
8 changes: 4 additions & 4 deletions tests/baselines/reference/recursiveConditionalCrash3.types
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions tests/baselines/reference/recursiveConditionalCrash4.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
//// [tests/cases/compiler/recursiveConditionalCrash4.ts] ////

=== Performance Stats ===
Instantiation count: 2,500

=== recursiveConditionalCrash4.ts ===
// Repros from #53783

Expand Down
20 changes: 10 additions & 10 deletions tests/baselines/reference/templateLiteralIntersection.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ type OriginA1 = `${A}`
> : ^^^

type OriginA2 = `${MixA}`
>OriginA2 : MixA
> : ^^^^
>OriginA2 : `${MixA}`
> : ^^^^^^^^^

type B = `${typeof a}`
>B : "a"
Expand All @@ -45,8 +45,8 @@ type OriginB1 = `${B}`
> : ^^^

type OriginB2 = `${MixB}`
>OriginB2 : MixB
> : ^^^^
>OriginB2 : `${MixB}`
> : ^^^^^^^^^

type MixC = { foo: string } & A
>MixC : MixC
Expand All @@ -55,20 +55,20 @@ type MixC = { foo: string } & A
> : ^^^^^^

type OriginC = `${MixC}`
>OriginC : MixC
> : ^^^^
>OriginC : `${MixC}`
> : ^^^^^^^^^

type MixD<T extends string> =
>MixD : T & { foo: string; }
> : ^^^^^^^^^^^ ^^^
>MixD : `${T & { foo: string; }}`
> : ^^^^^^^^^^^^^^ ^^^^^

`${T & { foo: string }}`
>foo : string
> : ^^^^^^

type OriginD = `${MixD<A & { foo: string }> & { foo: string }}`;
>OriginD : "a" & { foo: string; } & { foo: string; } & { foo: string; }
> : ^^^^^^^^^^^^^ ^^^^^^^^^^^^^ ^^^^^^^^^^^^^ ^^^
>OriginD : `${`${"a" & { foo: string; } & { foo: string; }}` & { foo: string; }}`
> : ^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^ ^^^^^
>foo : string
> : ^^^^^^
>foo : string
Expand Down
8 changes: 4 additions & 4 deletions tests/baselines/reference/templateLiteralIntersection3.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ options1[`foo/${path}`] = false;

// Lowercase<`foo/${Path}`> => `foo/${Lowercase<Path>}`
declare const lowercasePath: Lowercase<`foo/${Path}`>;
>lowercasePath : `foo/${Lowercase<Path>}`
> : ^^^^^^^^^^^^^^^^^^^^^^^^
>lowercasePath : `foo/${Lowercase<`${Path}`>}`
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

options1[lowercasePath] = false;
>options1[lowercasePath] = false : false
Expand All @@ -57,8 +57,8 @@ options1[lowercasePath] = false;
> : ^^^^^^^
>options1 : { prop: number; } & { [k: string]: boolean; }
> : ^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>lowercasePath : `foo/${Lowercase<Path>}`
> : ^^^^^^^^^^^^^^^^^^^^^^^^
>lowercasePath : `foo/${Lowercase<`${Path}`>}`
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>false : false
> : ^^^^^

50 changes: 50 additions & 0 deletions tests/baselines/reference/templateLiteralTypes5.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
templateLiteralTypes5.ts(10,7): error TS2322: Type '<T0 extends "a" | "b">(x: `${T0}`) => TypeMap[T0]' is not assignable to type 'F2'.
Type 'TypeMap[T2]' is not assignable to type 'TypeMap[`${T2}`]'.
Type 'T2' is not assignable to type '`${T2}`'.
Type '"a" | "b"' is not assignable to type '`${T2}`'.
Type '"a"' is not assignable to type '`${T2}`'.
templateLiteralTypes5.ts(13,11): error TS2322: Type 'T3' is not assignable to type '`${T3}`'.
Type '"a" | "b"' is not assignable to type '`${T3}`'.
Type '"a"' is not assignable to type '`${T3}`'.
templateLiteralTypes5.ts(14,11): error TS2322: Type '`${T3}`' is not assignable to type 'T3'.
'`${T3}`' is assignable to the constraint of type 'T3', but 'T3' could be instantiated with a different subtype of constraint '"a" | "b"'.
Type '"a" | "b"' is not assignable to type 'T3'.
'"a" | "b"' is assignable to the constraint of type 'T3', but 'T3' could be instantiated with a different subtype of constraint '"a" | "b"'.
Type '"a"' is not assignable to type 'T3'.
'"a"' is assignable to the constraint of type 'T3', but 'T3' could be instantiated with a different subtype of constraint '"a" | "b"'.


==== templateLiteralTypes5.ts (3 errors) ====
// https://github.com/microsoft/TypeScript/issues/55364
interface TypeMap {
a: "A";
b: "B";
}
declare const f: <T0 extends "a" | "b">(x: `${T0}`) => TypeMap[T0];
type F1 = <T1 extends "a" | "b">(x: `${T1}`) => TypeMap[T1];
const f1: F1 = f;
type F2 = <T2 extends 'a' | 'b'>(x: `${T2}`) => TypeMap[`${T2}`]
const f2: F2 = f
~~
!!! error TS2322: Type '<T0 extends "a" | "b">(x: `${T0}`) => TypeMap[T0]' is not assignable to type 'F2'.
!!! error TS2322: Type 'TypeMap[T2]' is not assignable to type 'TypeMap[`${T2}`]'.
!!! error TS2322: Type 'T2' is not assignable to type '`${T2}`'.
!!! error TS2322: Type '"a" | "b"' is not assignable to type '`${T2}`'.
!!! error TS2322: Type '"a"' is not assignable to type '`${T2}`'.

function f3<T3 extends "a" | "b">(x: T3) {
const test1: `${T3}` = x
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it could be nice to add comments to both of those assignments to explain the error, like:

Suggested change
const test1: `${T3}` = x
const test1: `${T3}` = x; // error, T3 could be instantiated with a string enum

~~~~~
!!! error TS2322: Type 'T3' is not assignable to type '`${T3}`'.
!!! error TS2322: Type '"a" | "b"' is not assignable to type '`${T3}`'.
!!! error TS2322: Type '"a"' is not assignable to type '`${T3}`'.
const test2: T3 = "" as `${T3}`;
~~~~~
!!! error TS2322: Type '`${T3}`' is not assignable to type 'T3'.
!!! error TS2322: '`${T3}`' is assignable to the constraint of type 'T3', but 'T3' could be instantiated with a different subtype of constraint '"a" | "b"'.
!!! error TS2322: Type '"a" | "b"' is not assignable to type 'T3'.
!!! error TS2322: '"a" | "b"' is assignable to the constraint of type 'T3', but 'T3' could be instantiated with a different subtype of constraint '"a" | "b"'.
!!! error TS2322: Type '"a"' is not assignable to type 'T3'.
!!! error TS2322: '"a"' is assignable to the constraint of type 'T3', but 'T3' could be instantiated with a different subtype of constraint '"a" | "b"'.
}

20 changes: 10 additions & 10 deletions tests/baselines/reference/templateLiteralTypes5.types
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add an extra test case to the original test file here based on Anders' comment in the other PR:

declare function bar<T extends string>(x: `${T}`): T;

function baz<U extends string>(x: `${U}`) {
  return bar(x);
}

Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ interface TypeMap {
declare const f: <T0 extends "a" | "b">(x: `${T0}`) => TypeMap[T0];
>f : <T0 extends "a" | "b">(x: `${T0}`) => TypeMap[T0]
> : ^ ^^^^^^^^^ ^^ ^^ ^^^^^
>x : T0
> : ^^
>x : `${T0}`
> : ^^^^^^^

type F1 = <T1 extends "a" | "b">(x: `${T1}`) => TypeMap[T1];
>F1 : F1
> : ^^
>x : T1
> : ^^
>x : `${T1}`
> : ^^^^^^^

const f1: F1 = f;
>f1 : F1
Expand All @@ -32,8 +32,8 @@ const f1: F1 = f;
type F2 = <T2 extends 'a' | 'b'>(x: `${T2}`) => TypeMap[`${T2}`]
>F2 : F2
> : ^^
>x : T2
> : ^^
>x : `${T2}`
> : ^^^^^^^

const f2: F2 = f
>f2 : F2
Expand All @@ -48,16 +48,16 @@ function f3<T3 extends "a" | "b">(x: T3) {
> : ^^

const test1: `${T3}` = x
>test1 : T3
> : ^^
>test1 : `${T3}`
> : ^^^^^^^
>x : T3
> : ^^

const test2: T3 = "" as `${T3}`;
>test2 : T3
> : ^^
>"" as `${T3}` : T3
> : ^^
>"" as `${T3}` : `${T3}`
> : ^^^^^^^
>"" : ""
> : ^^
}
Expand Down
27 changes: 27 additions & 0 deletions tests/baselines/reference/templateLiteralTypes8.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//// [tests/cases/conformance/types/literal/templateLiteralTypes8.ts] ////

=== templateLiteralTypes8.ts ===
const enum E {
>E : Symbol(E, Decl(templateLiteralTypes8.ts, 0, 0))

a = "a",
>a : Symbol(E.a, Decl(templateLiteralTypes8.ts, 0, 14))

b = "b",
>b : Symbol(E.b, Decl(templateLiteralTypes8.ts, 1, 10))
}

type Stringify<T extends string> = `${T}`;
>Stringify : Symbol(Stringify, Decl(templateLiteralTypes8.ts, 3, 1))
>T : Symbol(T, Decl(templateLiteralTypes8.ts, 5, 15))
>T : Symbol(T, Decl(templateLiteralTypes8.ts, 5, 15))

let z1: `${E}` = "a";
>z1 : Symbol(z1, Decl(templateLiteralTypes8.ts, 7, 3))
>E : Symbol(E, Decl(templateLiteralTypes8.ts, 0, 0))

let z2: Stringify<E> = "a";
>z2 : Symbol(z2, Decl(templateLiteralTypes8.ts, 8, 3))
>Stringify : Symbol(Stringify, Decl(templateLiteralTypes8.ts, 3, 1))
>E : Symbol(E, Decl(templateLiteralTypes8.ts, 0, 0))

36 changes: 36 additions & 0 deletions tests/baselines/reference/templateLiteralTypes8.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//// [tests/cases/conformance/types/literal/templateLiteralTypes8.ts] ////

=== templateLiteralTypes8.ts ===
const enum E {
>E : E
> : ^

a = "a",
>a : E.a
> : ^^^
>"a" : "a"
> : ^^^

b = "b",
>b : E.b
> : ^^^
>"b" : "b"
> : ^^^
}

type Stringify<T extends string> = `${T}`;
>Stringify : `${T}`
> : ^^^^^^

let z1: `${E}` = "a";
>z1 : "a" | "b"
> : ^^^^^^^^^
>"a" : "a"
> : ^^^

let z2: Stringify<E> = "a";
>z2 : "a" | "b"
> : ^^^^^^^^^
>"a" : "a"
> : ^^^

12 changes: 12 additions & 0 deletions tests/cases/conformance/types/literal/templateLiteralTypes8.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// @strict: true
// @noEmit: true

const enum E {
a = "a",
b = "b",
}

type Stringify<T extends string> = `${T}`;

let z1: `${E}` = "a";
let z2: Stringify<E> = "a";