microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-11 19:27:35 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Port PR #30877 (#30904)

Browse Source 
Ports #30877 to release-3.4
This commit is contained in:
Ryan Cavanaugh 2019-04-16 11:02:46 -07:00 committed by GitHub
parent 95e649a15a
commit 4c6ac3e211
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 99 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/checker.ts
View File

@ -10163,7 +10163,7 @@ namespace ts {
function getConditionalTypeWorker(root: ConditionalRoot, mapper: TypeMapper | undefined, checkType: Type, extendsType: Type, trueType: Type, falseType: Type) {
// Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
if (falseType.flags & TypeFlags.Never && isTypeIdenticalTo(getActualTypeVariable(trueType), getActualTypeVariable(checkType))) {
if (falseType.flags & TypeFlags.Never && getActualTypeVariable(trueType) === getActualTypeVariable(checkType)) {
if (checkType.flags & TypeFlags.Any || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
return trueType;
}
@ -10171,7 +10171,7 @@ namespace ts {
return neverType;
}
}
else if (trueType.flags & TypeFlags.Never && isTypeIdenticalTo(getActualTypeVariable(falseType), getActualTypeVariable(checkType))) {
else if (trueType.flags & TypeFlags.Never && getActualTypeVariable(falseType) === getActualTypeVariable(checkType)) {
if (!(checkType.flags & TypeFlags.Any) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
return neverType;
}

15
tests/baselines/reference/conditionalTypeSimplification.js Normal file
View File

@ -0,0 +1,15 @@
//// [conditionalTypeSimplification.ts]
// Repro from #30794
interface AbstractSchema<S, V> {
m1<T> (v: T): SchemaType<S, Exclude<V, T>>;
m2<T> (v: T): SchemaType<S, T>;
}
type SchemaType<S, V> = S extends object ? AnySchema<V> : never;
interface AnySchema<V> extends AnySchemaType<AnySchema<undefined>, V> { }
interface AnySchemaType<S extends AbstractSchema<any, any>, V> extends AbstractSchema<S, V> { }
//// [conditionalTypeSimplification.js]
// Repro from #30794

53
tests/baselines/reference/conditionalTypeSimplification.symbols Normal file
View File

@ -0,0 +1,53 @@
=== tests/cases/compiler/conditionalTypeSimplification.ts ===
// Repro from #30794
interface AbstractSchema<S, V> {
>AbstractSchema : Symbol(AbstractSchema, Decl(conditionalTypeSimplification.ts, 0, 0))
>S : Symbol(S, Decl(conditionalTypeSimplification.ts, 2, 25))
>V : Symbol(V, Decl(conditionalTypeSimplification.ts, 2, 27))
m1<T> (v: T): SchemaType<S, Exclude<V, T>>;
>m1 : Symbol(AbstractSchema.m1, Decl(conditionalTypeSimplification.ts, 2, 32))
>T : Symbol(T, Decl(conditionalTypeSimplification.ts, 3, 5))
>v : Symbol(v, Decl(conditionalTypeSimplification.ts, 3, 9))
>T : Symbol(T, Decl(conditionalTypeSimplification.ts, 3, 5))
>SchemaType : Symbol(SchemaType, Decl(conditionalTypeSimplification.ts, 5, 1))
>S : Symbol(S, Decl(conditionalTypeSimplification.ts, 2, 25))
>Exclude : Symbol(Exclude, Decl(lib.es5.d.ts, --, --))
>V : Symbol(V, Decl(conditionalTypeSimplification.ts, 2, 27))
>T : Symbol(T, Decl(conditionalTypeSimplification.ts, 3, 5))
m2<T> (v: T): SchemaType<S, T>;
>m2 : Symbol(AbstractSchema.m2, Decl(conditionalTypeSimplification.ts, 3, 45))
>T : Symbol(T, Decl(conditionalTypeSimplification.ts, 4, 5))
>v : Symbol(v, Decl(conditionalTypeSimplification.ts, 4, 9))
>T : Symbol(T, Decl(conditionalTypeSimplification.ts, 4, 5))
>SchemaType : Symbol(SchemaType, Decl(conditionalTypeSimplification.ts, 5, 1))
>S : Symbol(S, Decl(conditionalTypeSimplification.ts, 2, 25))
>T : Symbol(T, Decl(conditionalTypeSimplification.ts, 4, 5))
}
type SchemaType<S, V> = S extends object ? AnySchema<V> : never;
>SchemaType : Symbol(SchemaType, Decl(conditionalTypeSimplification.ts, 5, 1))
>S : Symbol(S, Decl(conditionalTypeSimplification.ts, 7, 16))
>V : Symbol(V, Decl(conditionalTypeSimplification.ts, 7, 18))
>S : Symbol(S, Decl(conditionalTypeSimplification.ts, 7, 16))
>AnySchema : Symbol(AnySchema, Decl(conditionalTypeSimplification.ts, 7, 64))
>V : Symbol(V, Decl(conditionalTypeSimplification.ts, 7, 18))
interface AnySchema<V> extends AnySchemaType<AnySchema<undefined>, V> { }
>AnySchema : Symbol(AnySchema, Decl(conditionalTypeSimplification.ts, 7, 64))
>V : Symbol(V, Decl(conditionalTypeSimplification.ts, 8, 20))
>AnySchemaType : Symbol(AnySchemaType, Decl(conditionalTypeSimplification.ts, 8, 73))
>AnySchema : Symbol(AnySchema, Decl(conditionalTypeSimplification.ts, 7, 64))
>V : Symbol(V, Decl(conditionalTypeSimplification.ts, 8, 20))
interface AnySchemaType<S extends AbstractSchema<any, any>, V> extends AbstractSchema<S, V> { }
>AnySchemaType : Symbol(AnySchemaType, Decl(conditionalTypeSimplification.ts, 8, 73))
>S : Symbol(S, Decl(conditionalTypeSimplification.ts, 9, 24))
>AbstractSchema : Symbol(AbstractSchema, Decl(conditionalTypeSimplification.ts, 0, 0))
>V : Symbol(V, Decl(conditionalTypeSimplification.ts, 9, 59))
>AbstractSchema : Symbol(AbstractSchema, Decl(conditionalTypeSimplification.ts, 0, 0))
>S : Symbol(S, Decl(conditionalTypeSimplification.ts, 9, 24))
>V : Symbol(V, Decl(conditionalTypeSimplification.ts, 9, 59))

19
tests/baselines/reference/conditionalTypeSimplification.types Normal file
View File

@ -0,0 +1,19 @@
=== tests/cases/compiler/conditionalTypeSimplification.ts ===
// Repro from #30794
interface AbstractSchema<S, V> {
m1<T> (v: T): SchemaType<S, Exclude<V, T>>;
>m1 : <T>(v: T) => SchemaType<S, Exclude<V, T>>
>v : T
m2<T> (v: T): SchemaType<S, T>;
>m2 : <T>(v: T) => SchemaType<S, T>
>v : T
}
type SchemaType<S, V> = S extends object ? AnySchema<V> : never;
>SchemaType : SchemaType<S, V>
interface AnySchema<V> extends AnySchemaType<AnySchema<undefined>, V> { }
interface AnySchemaType<S extends AbstractSchema<any, any>, V> extends AbstractSchema<S, V> { }

10
tests/cases/compiler/conditionalTypeSimplification.ts Normal file
View File

@ -0,0 +1,10 @@
// Repro from #30794
interface AbstractSchema<S, V> {
m1<T> (v: T): SchemaType<S, Exclude<V, T>>;
m2<T> (v: T): SchemaType<S, T>;
}
type SchemaType<S, V> = S extends object ? AnySchema<V> : never;
interface AnySchema<V> extends AnySchemaType<AnySchema<undefined>, V> { }
interface AnySchemaType<S extends AbstractSchema<any, any>, V> extends AbstractSchema<S, V> { }