Fix regression of generic T assignability to Partial<T> (microsoft#32354)

andrewbranch · web-flow · commit 8516127a0599 · 2019-07-12T07:57:55.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -13450,7 +13450,8 @@ namespace ts {
                             if (includeOptional
                                     ? !(filteredByApplicability!.flags & TypeFlags.Never)
                                     : isRelatedTo(targetConstraint, sourceKeys)) {
-                                const indexingType = filteredByApplicability || getTypeParameterFromMappedType(target);
+                                const typeParameter = getTypeParameterFromMappedType(target);
+                                const indexingType = filteredByApplicability ? getIntersectionType([filteredByApplicability, typeParameter]) : typeParameter;
                                 const indexedAccessType = getIndexedAccessType(source, indexingType);
                                 const templateType = getTemplateTypeFromMappedType(target);
                                 if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
diff --git a/tests/baselines/reference/mappedTypeRelationships.errors.txt b/tests/baselines/reference/mappedTypeRelationships.errors.txt
@@ -392,4 +392,8 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS
     function f90<T extends { x: number }>() {
         const n: Numeric<T> = { x: 1 };
     }
+    
+    function f<T extends { x: {} }>(): Partial<T> {
+        return undefined! as T;
+    }
     
diff --git a/tests/baselines/reference/mappedTypeRelationships.js b/tests/baselines/reference/mappedTypeRelationships.js
@@ -186,6 +186,10 @@ type Numeric<T> = { [K in keyof T]?: number };
 function f90<T extends { x: number }>() {
     const n: Numeric<T> = { x: 1 };
 }
+
+function f<T extends { x: {} }>(): Partial<T> {
+    return undefined! as T;
+}
 
 
 //// [mappedTypeRelationships.js]
@@ -319,6 +323,9 @@ function f82(t, k1, k2) {
 function f90() {
     var n = { x: 1 };
 }
+function f() {
+    return undefined;
+}
 
 
 //// [mappedTypeRelationships.d.ts]
@@ -408,3 +415,6 @@ declare type Numeric<T> = {
 declare function f90<T extends {
     x: number;
 }>(): void;
+declare function f<T extends {
+    x: {};
+}>(): Partial<T>;
diff --git a/tests/baselines/reference/mappedTypeRelationships.symbols b/tests/baselines/reference/mappedTypeRelationships.symbols
@@ -824,3 +824,15 @@ function f90<T extends { x: number }>() {
 >x : Symbol(x, Decl(mappedTypeRelationships.ts, 185, 27))
 }
 
+function f<T extends { x: {} }>(): Partial<T> {
+>f : Symbol(f, Decl(mappedTypeRelationships.ts, 186, 1))
+>T : Symbol(T, Decl(mappedTypeRelationships.ts, 188, 11))
+>x : Symbol(x, Decl(mappedTypeRelationships.ts, 188, 22))
+>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeRelationships.ts, 188, 11))
+
+    return undefined! as T;
+>undefined : Symbol(undefined)
+>T : Symbol(T, Decl(mappedTypeRelationships.ts, 188, 11))
+}
+
diff --git a/tests/baselines/reference/mappedTypeRelationships.types b/tests/baselines/reference/mappedTypeRelationships.types
@@ -668,3 +668,13 @@ function f90<T extends { x: number }>() {
 >1 : 1
 }
 
+function f<T extends { x: {} }>(): Partial<T> {
+>f : <T extends { x: {}; }>() => Partial<T>
+>x : {}
+
+    return undefined! as T;
+>undefined! as T : T
+>undefined! : never
+>undefined : undefined
+}
+
diff --git a/tests/cases/conformance/types/mapped/mappedTypeRelationships.ts b/tests/cases/conformance/types/mapped/mappedTypeRelationships.ts
@@ -188,3 +188,7 @@ type Numeric<T> = { [K in keyof T]?: number };
 function f90<T extends { x: number }>() {
     const n: Numeric<T> = { x: 1 };
 }
+
+function f<T extends { x: {} }>(): Partial<T> {
+    return undefined! as T;
+}

Original file line number	Diff line number	Diff line change
`@@ -392,4 +392,8 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS`
`392`	`392`	`function f90<T extends { x: number }>() {`
`393`	`393`	`const n: Numeric<T> = { x: 1 };`
`394`	`394`	`}`
	`395`	`+`
	`396`	`+ function f<T extends { x: {} }>(): Partial<T> {`
	`397`	`+ return undefined! as T;`
	`398`	`+ }`
`395`	`399`
Original file line number	Diff line number	Diff line change
`@@ -188,3 +188,7 @@ type Numeric<T> = { [K in keyof T]?: number };`
`188`	`188`	`function f90<T extends { x: number }>() {`
`189`	`189`	`const n: Numeric<T> = { x: 1 };`
`190`	`190`	`}`
	`191`	`+`
	`192`	`+function f<T extends { x: {} }>(): Partial<T> {`
	`193`	`+ return undefined! as T;`
	`194`	`+}`