Accept new baselines

Author: ahejlsberg

tests/baselines/reference/conditionalTypes1.errors.txt

@@ -13,14 +13,24 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(29,5): error TS23
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(30,9): error TS2322: Type 'T["x"]' is not assignable to type 'string'.
   Type 'string | undefined' is not assignable to type 'string'.
     Type 'undefined' is not assignable to type 'string'.
-tests/cases/conformance/types/conditional/conditionalTypes1.ts(103,5): error TS2322: Type 'Pick<T, FunctionPropertyNames<T>>' is not assignable to type 'T'.
-  'T' could be instantiated with an arbitrary type which could be unrelated to 'Pick<T, FunctionPropertyNames<T>>'.
-tests/cases/conformance/types/conditional/conditionalTypes1.ts(104,5): error TS2322: Type 'Pick<T, NonFunctionPropertyNames<T>>' is not assignable to type 'T'.
-  'T' could be instantiated with an arbitrary type which could be unrelated to 'Pick<T, NonFunctionPropertyNames<T>>'.
-tests/cases/conformance/types/conditional/conditionalTypes1.ts(106,5): error TS2322: Type 'Pick<T, NonFunctionPropertyNames<T>>' is not assignable to type 'Pick<T, FunctionPropertyNames<T>>'.
+tests/cases/conformance/types/conditional/conditionalTypes1.ts(103,5): error TS2322: Type 'FunctionProperties<T>' is not assignable to type 'T'.
+  'T' could be instantiated with an arbitrary type which could be unrelated to 'FunctionProperties<T>'.
+tests/cases/conformance/types/conditional/conditionalTypes1.ts(104,5): error TS2322: Type 'NonFunctionProperties<T>' is not assignable to type 'T'.
+  'T' could be instantiated with an arbitrary type which could be unrelated to 'NonFunctionProperties<T>'.
+tests/cases/conformance/types/conditional/conditionalTypes1.ts(106,5): error TS2322: Type 'NonFunctionProperties<T>' is not assignable to type 'FunctionProperties<T>'.
   Type 'FunctionPropertyNames<T>' is not assignable to type 'NonFunctionPropertyNames<T>'.
-tests/cases/conformance/types/conditional/conditionalTypes1.ts(108,5): error TS2322: Type 'Pick<T, FunctionPropertyNames<T>>' is not assignable to type 'Pick<T, NonFunctionPropertyNames<T>>'.
+    Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+      Type 'string | number | symbol' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+        Type 'string' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+          Type 'keyof T' is not assignable to type 'never'.
+            Type 'string | number | symbol' is not assignable to type 'never'.
+              Type 'string' is not assignable to type 'never'.
+tests/cases/conformance/types/conditional/conditionalTypes1.ts(108,5): error TS2322: Type 'FunctionProperties<T>' is not assignable to type 'NonFunctionProperties<T>'.
   Type 'NonFunctionPropertyNames<T>' is not assignable to type 'FunctionPropertyNames<T>'.
+    Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+      Type 'string | number | symbol' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+        Type 'string' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+          Type 'keyof T' is not assignable to type 'never'.
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(114,5): error TS2322: Type 'keyof T' is not assignable to type 'FunctionPropertyNames<T>'.
   Type 'string | number | symbol' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
     Type 'string' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
@@ -185,22 +195,32 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(288,43): error TS
     function f7<T>(x: T, y: FunctionProperties<T>, z: NonFunctionProperties<T>) {
         x = y;  // Error
         ~
-!!! error TS2322: Type 'Pick<T, FunctionPropertyNames<T>>' is not assignable to type 'T'.
-!!! error TS2322:   'T' could be instantiated with an arbitrary type which could be unrelated to 'Pick<T, FunctionPropertyNames<T>>'.
+!!! error TS2322: Type 'FunctionProperties<T>' is not assignable to type 'T'.
+!!! error TS2322:   'T' could be instantiated with an arbitrary type which could be unrelated to 'FunctionProperties<T>'.
         x = z;  // Error
         ~
-!!! error TS2322: Type 'Pick<T, NonFunctionPropertyNames<T>>' is not assignable to type 'T'.
-!!! error TS2322:   'T' could be instantiated with an arbitrary type which could be unrelated to 'Pick<T, NonFunctionPropertyNames<T>>'.
+!!! error TS2322: Type 'NonFunctionProperties<T>' is not assignable to type 'T'.
+!!! error TS2322:   'T' could be instantiated with an arbitrary type which could be unrelated to 'NonFunctionProperties<T>'.
         y = x;
         y = z;  // Error
         ~
-!!! error TS2322: Type 'Pick<T, NonFunctionPropertyNames<T>>' is not assignable to type 'Pick<T, FunctionPropertyNames<T>>'.
+!!! error TS2322: Type 'NonFunctionProperties<T>' is not assignable to type 'FunctionProperties<T>'.
 !!! error TS2322:   Type 'FunctionPropertyNames<T>' is not assignable to type 'NonFunctionPropertyNames<T>'.
+!!! error TS2322:     Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+!!! error TS2322:       Type 'string | number | symbol' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+!!! error TS2322:         Type 'string' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+!!! error TS2322:           Type 'keyof T' is not assignable to type 'never'.
+!!! error TS2322:             Type 'string | number | symbol' is not assignable to type 'never'.
+!!! error TS2322:               Type 'string' is not assignable to type 'never'.
         z = x;
         z = y;  // Error
         ~
-!!! error TS2322: Type 'Pick<T, FunctionPropertyNames<T>>' is not assignable to type 'Pick<T, NonFunctionPropertyNames<T>>'.
+!!! error TS2322: Type 'FunctionProperties<T>' is not assignable to type 'NonFunctionProperties<T>'.
 !!! error TS2322:   Type 'NonFunctionPropertyNames<T>' is not assignable to type 'FunctionPropertyNames<T>'.
+!!! error TS2322:     Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+!!! error TS2322:       Type 'string | number | symbol' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+!!! error TS2322:         Type 'string' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+!!! error TS2322:           Type 'keyof T' is not assignable to type 'never'.
     }
 
     function f8<T>(x: keyof T, y: FunctionPropertyNames<T>, z: NonFunctionPropertyNames<T>) {

tests/baselines/reference/conditionalTypes1.types

@@ -247,38 +247,38 @@ type T31 = NonFunctionProperties<Part>;
 function f7<T>(x: T, y: FunctionProperties<T>, z: NonFunctionProperties<T>) {
 >f7 : <T>(x: T, y: FunctionProperties<T>, z: NonFunctionProperties<T>) => void
 >x : T
->y : Pick<T, FunctionPropertyNames<T>>
->z : Pick<T, NonFunctionPropertyNames<T>>
+>y : FunctionProperties<T>
+>z : NonFunctionProperties<T>
 
     x = y;  // Error
->x = y : Pick<T, FunctionPropertyNames<T>>
+>x = y : FunctionProperties<T>
 >x : T
->y : Pick<T, FunctionPropertyNames<T>>
+>y : FunctionProperties<T>
 
     x = z;  // Error
->x = z : Pick<T, NonFunctionPropertyNames<T>>
+>x = z : NonFunctionProperties<T>
 >x : T
->z : Pick<T, NonFunctionPropertyNames<T>>
+>z : NonFunctionProperties<T>
 
     y = x;
 >y = x : T
->y : Pick<T, FunctionPropertyNames<T>>
+>y : FunctionProperties<T>
 >x : T
 
     y = z;  // Error
->y = z : Pick<T, NonFunctionPropertyNames<T>>
->y : Pick<T, FunctionPropertyNames<T>>
->z : Pick<T, NonFunctionPropertyNames<T>>
+>y = z : NonFunctionProperties<T>
+>y : FunctionProperties<T>
+>z : NonFunctionProperties<T>
 
     z = x;
 >z = x : T
->z : Pick<T, NonFunctionPropertyNames<T>>
+>z : NonFunctionProperties<T>
 >x : T
 
     z = y;  // Error
->z = y : Pick<T, FunctionPropertyNames<T>>
->z : Pick<T, NonFunctionPropertyNames<T>>
->y : Pick<T, FunctionPropertyNames<T>>
+>z = y : FunctionProperties<T>
+>z : NonFunctionProperties<T>
+>y : FunctionProperties<T>
 }
 
 function f8<T>(x: keyof T, y: FunctionPropertyNames<T>, z: NonFunctionPropertyNames<T>) {

tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.types

@@ -8,6 +8,6 @@ export type Foo<Y> = Bar<any, Y>;
 export const y = (x: Foo<string>) => 1
 >y : (x: Foo<string>) => number
 >(x: Foo<string>) => 1 : (x: Foo<string>) => number
->x : Bar<any, string>
+>x : Foo<string>
 >1 : 1
 

tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.types

@@ -11,6 +11,6 @@ export type Baa<Y> = Baz<boolean, Y>;
 export const y = (x: Baa<number>) => 1
 >y : (x: Baa<number>) => number
 >(x: Baa<number>) => 1 : (x: Baa<number>) => number
->x : Bar<boolean, string, number>
+>x : Baa<number>
 >1 : 1
 

tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.js

@@ -20,4 +20,4 @@ declare type Foo<T, Y> = {
     foo<U, J>(): Foo<U, J>;
 };
 declare type SubFoo<R> = Foo<string, R>;
-declare function foo(): Foo<string, number>;
+declare function foo(): SubFoo<number>;

tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.types

@@ -10,10 +10,10 @@ type SubFoo<R> = Foo<string, R>;
 >SubFoo : SubFoo<R>
 
 function foo() {
->foo : () => Foo<string, number>
+>foo : () => SubFoo<number>
 
     return {} as SubFoo<number>;
->{} as SubFoo<number> : Foo<string, number>
+>{} as SubFoo<number> : SubFoo<number>
 >{} : {}
 }
 

tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.types

@@ -10,10 +10,10 @@ export type SubFoo<R> = Foo<string, R>;
 >SubFoo : SubFoo<R>
 
 function foo() {
->foo : () => Foo<string, number>
+>foo : () => SubFoo<number>
 
     return {} as SubFoo<number>;
->{} as SubFoo<number> : Foo<string, number>
+>{} as SubFoo<number> : SubFoo<number>
 >{} : {}
 }
 

tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.js

@@ -20,4 +20,4 @@ declare type Foo<T, Y> = {
     foo<U, J>(): Foo<U, J>;
 };
 declare type SubFoo<R, S> = Foo<S, R>;
-declare function foo(): Foo<string, number>;
+declare function foo(): SubFoo<number, string>;

tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.types

@@ -10,10 +10,10 @@ type SubFoo<R, S> = Foo<S, R>;
 >SubFoo : SubFoo<R, S>
 
 function foo() {
->foo : () => Foo<string, number>
+>foo : () => SubFoo<number, string>
 
     return {} as SubFoo<number, string>;
->{} as SubFoo<number, string> : Foo<string, number>
+>{} as SubFoo<number, string> : SubFoo<number, string>
 >{} : {}
 }
 

tests/baselines/reference/discriminantPropertyCheck.types

@@ -464,18 +464,18 @@ type TypeBar2 = { type: BarEnum.bar2 };
 
 function func3(value: Partial<UnionOfBar>) {
 >func3 : (value: Partial<UnionOfBar>) => void
->value : Partial<TypeBar1> | Partial<TypeBar2>
+>value : Partial<UnionOfBar>
 
     if (value.type !== undefined) {
 >value.type !== undefined : boolean
 >value.type : BarEnum | undefined
->value : Partial<TypeBar1> | Partial<TypeBar2>
+>value : Partial<UnionOfBar>
 >type : BarEnum | undefined
 >undefined : undefined
 
         switch (value.type) {
 >value.type : BarEnum
->value : Partial<TypeBar1> | Partial<TypeBar2>
+>value : Partial<UnionOfBar>
 >type : BarEnum
 
             case BarEnum.bar1:
@@ -495,7 +495,7 @@ function func3(value: Partial<UnionOfBar>) {
 >never(value.type) : never
 >never : (value: never) => never
 >value.type : never
->value : Partial<TypeBar1> | Partial<TypeBar2>
+>value : Partial<UnionOfBar>
 >type : never
         }
     }