Skip to content

Commit 8957dfe

Browse files
committed
Actually accept remainder of baselines
1 parent 25da0a9 commit 8957dfe

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

tests/baselines/reference/objectSpread.types

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ function from16326(this: { header: Header }, header: Header, authToken: string):
244244
>authToken : string
245245

246246
return {
247-
>{ ...this.header, ...header, ...authToken && { authToken } } : { head: string; body: string; authToken: string; } | { authToken: string; head: string; body: string; }
247+
>{ ...this.header, ...header, ...authToken && { authToken } } : { authToken: string; head: string; body: string; }
248248

249249
...this.header,
250250
>this.header : Header
@@ -277,9 +277,9 @@ function conditionalSpreadBoolean(b: boolean) : { x: number, y: number } {
277277
>13 : 13
278278

279279
o = {
280-
>o = { ...o, ...b && { x: 14 } } : { x: number; y: number; } | { x: number; y: number; }
280+
>o = { ...o, ...b && { x: 14 } } : { x: number; y: number; }
281281
>o : { x: number; y: number; }
282-
>{ ...o, ...b && { x: 14 } } : { x: number; y: number; } | { x: number; y: number; }
282+
>{ ...o, ...b && { x: 14 } } : { x: number; y: number; }
283283

284284
...o,
285285
>o : { x: number; y: number; }
@@ -292,8 +292,8 @@ function conditionalSpreadBoolean(b: boolean) : { x: number, y: number } {
292292
>14 : 14
293293
}
294294
let o2 = { ...b && { x: 21 }}
295-
>o2 : {}
296-
>{ ...b && { x: 21 }} : {} | { x: number; }
295+
>o2 : { x?: number; }
296+
>{ ...b && { x: 21 }} : { x?: number; }
297297
>b && { x: 21 } : false | { x: number; }
298298
>b : boolean
299299
>{ x: 21 } : { x: number; }
@@ -318,9 +318,9 @@ function conditionalSpreadNumber(nt: number): { x: number, y: number } {
318318
>16 : 16
319319

320320
o = {
321-
>o = { ...o, ...nt && { x: nt } } : { x: number; y: number; } | { x: number; y: number; }
321+
>o = { ...o, ...nt && { x: nt } } : { x: number; y: number; }
322322
>o : { x: number; y: number; }
323-
>{ ...o, ...nt && { x: nt } } : { x: number; y: number; } | { x: number; y: number; }
323+
>{ ...o, ...nt && { x: nt } } : { x: number; y: number; }
324324

325325
...o,
326326
>o : { x: number; y: number; }
@@ -333,8 +333,8 @@ function conditionalSpreadNumber(nt: number): { x: number, y: number } {
333333
>nt : number
334334
}
335335
let o2 = { ...nt && { x: nt }}
336-
>o2 : {}
337-
>{ ...nt && { x: nt }} : {} | { x: number; }
336+
>o2 : { x?: number; }
337+
>{ ...nt && { x: nt }} : { x?: number; }
338338
>nt && { x: nt } : 0 | { x: number; }
339339
>nt : number
340340
>{ x: nt } : { x: number; }
@@ -359,9 +359,9 @@ function conditionalSpreadString(st: string): { x: string, y: number } {
359359
>17 : 17
360360

361361
o = {
362-
>o = { ...o, ...st && { x: st } } : { x: string; y: number; } | { x: string; y: number; }
362+
>o = { ...o, ...st && { x: st } } : { x: string; y: number; }
363363
>o : { x: string; y: number; }
364-
>{ ...o, ...st && { x: st } } : { x: string; y: number; } | { x: string; y: number; }
364+
>{ ...o, ...st && { x: st } } : { x: string; y: number; }
365365

366366
...o,
367367
>o : { x: string; y: number; }
@@ -374,8 +374,8 @@ function conditionalSpreadString(st: string): { x: string, y: number } {
374374
>st : string
375375
}
376376
let o2 = { ...st && { x: st }}
377-
>o2 : {}
378-
>{ ...st && { x: st }} : {} | { x: string; }
377+
>o2 : { x?: string; }
378+
>{ ...st && { x: st }} : { x?: string; }
379379
>st && { x: st } : "" | { x: string; }
380380
>st : string
381381
>{ x: st } : { x: string; }

tests/baselines/reference/objectSpreadIndexSignature.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ declare const b: boolean;
4242
>b : boolean
4343

4444
indexed3 = { ...b ? indexed3 : undefined };
45-
>indexed3 = { ...b ? indexed3 : undefined } : {} | { [n: string]: number; }
45+
>indexed3 = { ...b ? indexed3 : undefined } : { [n: string]: number; }
4646
>indexed3 : { [n: string]: number; }
47-
>{ ...b ? indexed3 : undefined } : {} | { [n: string]: number; }
47+
>{ ...b ? indexed3 : undefined } : { [n: string]: number; }
4848
>b ? indexed3 : undefined : { [n: string]: number; } | undefined
4949
>b : boolean
5050
>indexed3 : { [n: string]: number; }

tests/baselines/reference/spreadUnion3.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function f(x: { y: string } | undefined): { y: string } {
66
>y : string
77

88
return { y: 123, ...x } // y: string | number
9-
>{ y: 123, ...x } : { y: number; } | { y: string; }
9+
>{ y: 123, ...x } : { y: string | number; }
1010
>y : number
1111
>123 : 123
1212
>x : { y: string; } | undefined

0 commit comments

Comments
 (0)