Skip to content

Commit 709541c

Browse files
committed
Accept new baselines
1 parent 73802be commit 709541c

9 files changed

+17
-56
lines changed

tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var r = true ? 1 : 2;
4646
>2 : 2
4747

4848
var r3 = true ? 1 : {};
49-
>r3 : {}
49+
>r3 : number | {}
5050
>true ? 1 : {} : 1 | {}
5151
>true : true
5252
>1 : 1

tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ true ? { a: 1 } : { a: 2, b: 'string' };
6363
>'string' : "string"
6464

6565
var result2 = true ? {} : 1;
66-
>result2 : {}
66+
>result2 : number | {}
6767
>true ? {} : 1 : 1 | {}
6868
>true : true
6969
>{} : {}
@@ -143,7 +143,7 @@ true ? { a: 2, b: 'string' } : { a: 1 };
143143
>1 : 1
144144

145145
var result6 = true ? 1 : {};
146-
>result6 : {}
146+
>result6 : number | {}
147147
>true ? 1 : {} : 1 | {}
148148
>true : true
149149
>1 : 1

tests/baselines/reference/heterogeneousArrayLiterals.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ var c = [1, '', null]; // {}[]
2121
>null : null
2222

2323
var d = [{}, 1]; // {}[]
24-
>d : {}[]
24+
>d : (number | {})[]
2525
>[{}, 1] : (number | {})[]
2626
>{} : {}
2727
>1 : 1
2828

2929
var e = [{}, Object]; // {}[]
30-
>e : {}[]
30+
>e : (ObjectConstructor | {})[]
3131
>[{}, Object] : (ObjectConstructor | {})[]
3232
>{} : {}
3333
>Object : ObjectConstructor

tests/baselines/reference/objectSpread.types

+3-3
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ function conditionalSpreadBoolean(b: boolean) : { x: number, y: number } {
295295
>14 : 14
296296
}
297297
let o2 = { ...b && { x: 21 }}
298-
>o2 : {}
298+
>o2 : {} | { x: number; }
299299
>{ ...b && { x: 21 }} : {} | { x: number; }
300300
>b && { x: 21 } : false | { x: number; }
301301
>b : boolean
@@ -336,7 +336,7 @@ function conditionalSpreadNumber(nt: number): { x: number, y: number } {
336336
>nt : number
337337
}
338338
let o2 = { ...nt && { x: nt }}
339-
>o2 : {}
339+
>o2 : {} | { x: number; }
340340
>{ ...nt && { x: nt }} : {} | { x: number; }
341341
>nt && { x: nt } : 0 | { x: number; }
342342
>nt : number
@@ -377,7 +377,7 @@ function conditionalSpreadString(st: string): { x: string, y: number } {
377377
>st : string
378378
}
379379
let o2 = { ...st && { x: st }}
380-
>o2 : {}
380+
>o2 : {} | { x: string; }
381381
>{ ...st && { x: st }} : {} | { x: string; }
382382
>st && { x: st } : "" | { x: string; }
383383
>st : string

tests/baselines/reference/primitiveMembers.types

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var b: Boolean = true;
7777
>true : true
7878

7979
var n3 = 5 || {};
80-
>n3 : {}
80+
>n3 : number | {}
8181
>5 || {} : 5 | {}
8282
>5 : 5
8383
>{} : {}

tests/baselines/reference/spreadUnion2.errors.txt

-41
This file was deleted.

tests/baselines/reference/spreadUnion3.errors.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ tests/cases/conformance/types/spread/spreadUnion3.ts(2,5): error TS2322: Type '{
22
Type '{ y: number; }' is not assignable to type '{ y: string; }'.
33
Types of property 'y' are incompatible.
44
Type 'number' is not assignable to type 'string'.
5-
tests/cases/conformance/types/spread/spreadUnion3.ts(9,23): error TS2339: Property 'a' does not exist on type '{}'.
5+
tests/cases/conformance/types/spread/spreadUnion3.ts(9,23): error TS2339: Property 'a' does not exist on type '{} | {} | { a: number; }'.
6+
Property 'a' does not exist on type '{}'.
67
tests/cases/conformance/types/spread/spreadUnion3.ts(17,11): error TS2698: Spread types may only be created from object types.
78
tests/cases/conformance/types/spread/spreadUnion3.ts(18,11): error TS2698: Spread types may only be created from object types.
89

@@ -23,7 +24,8 @@ tests/cases/conformance/types/spread/spreadUnion3.ts(18,11): error TS2698: Sprea
2324
let b = { ...t };
2425
let c: number = b.a; // might not have 'a'
2526
~
26-
!!! error TS2339: Property 'a' does not exist on type '{}'.
27+
!!! error TS2339: Property 'a' does not exist on type '{} | {} | { a: number; }'.
28+
!!! error TS2339: Property 'a' does not exist on type '{}'.
2729
}
2830
g()
2931
g(undefined)

tests/baselines/reference/spreadUnion3.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ function g(t?: { a: number } | null): void {
2424
>null : null
2525

2626
let b = { ...t };
27-
>b : {}
27+
>b : {} | {} | { a: number; }
2828
>{ ...t } : {} | {} | { a: number; }
2929
>t : { a: number; } | null | undefined
3030

3131
let c: number = b.a; // might not have 'a'
3232
>c : number
3333
>b.a : any
34-
>b : {}
34+
>b : {} | {} | { a: number; }
3535
>a : any
3636
}
3737
g()

tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -675,14 +675,14 @@ function f21<T extends Number>(x: T) {
675675
>T : T
676676

677677
var r20 = true ? {} : x; // ok
678-
>r20 : {}
678+
>r20 : T | {}
679679
>true ? {} : x : T | {}
680680
>true : true
681681
>{} : {}
682682
>x : T
683683

684684
var r20 = true ? x : {}; // ok
685-
>r20 : {}
685+
>r20 : T | {}
686686
>true ? x : {} : T | {}
687687
>true : true
688688
>x : T

0 commit comments

Comments
 (0)