Skip to content

Commit 4256be1

Browse files
ahejlsbergahejlsberg
committed
Accept new baselines
1 parent fe075f2 commit 4256be1

File tree

4 files changed

+31
-29
lines changed

4 files changed

+31
-29
lines changed

‎tests/baselines/reference/indexedAccessRelation.types‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ class Comp<T extends Foo, S> extends Component<S & State<T>>
4444

4545
this.setState({ a: a });
4646
>this.setState({ a: a }) : void
47-
>this.setState : <K extends keyof (S & State<T>)>(state: Pick<S & State<T>, K>) => void
47+
>this.setState : <K extends keyof S | "a">(state: Pick<S & State<T>, K>) => void
4848
>this : this
49-
>setState : <K extends keyof (S & State<T>)>(state: Pick<S & State<T>, K>) => void
49+
>setState : <K extends keyof S | "a">(state: Pick<S & State<T>, K>) => void
5050
>{ a: a } : { a: T; }
5151
>a : T
5252
>a : T

‎tests/baselines/reference/keyofAndIndexedAccess.types‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -888,20 +888,20 @@ function f60<T>(source: T, target: T) {
888888
}
889889

890890
function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
891-
>f70 : (func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) => void
892-
>func : <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void
891+
>f70 : (func: <T, U>(k1: keyof (T | U), k2: keyof T | keyof U) => void) => void
892+
>func : <T, U>(k1: keyof (T | U), k2: keyof T | keyof U) => void
893893
>T : T
894894
>U : U
895895
>k1 : keyof (T | U)
896896
>T : T
897897
>U : U
898-
>k2 : keyof (T & U)
898+
>k2 : keyof T | keyof U
899899
>T : T
900900
>U : U
901901

902902
func<{ a: any, b: any }, { a: any, c: any }>('a', 'a');
903903
>func<{ a: any, b: any }, { a: any, c: any }>('a', 'a') : void
904-
>func : <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void
904+
>func : <T, U>(k1: keyof (T | U), k2: keyof T | keyof U) => void
905905
>a : any
906906
>b : any
907907
>a : any
@@ -911,7 +911,7 @@ function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
911911

912912
func<{ a: any, b: any }, { a: any, c: any }>('a', 'b');
913913
>func<{ a: any, b: any }, { a: any, c: any }>('a', 'b') : void
914-
>func : <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void
914+
>func : <T, U>(k1: keyof (T | U), k2: keyof T | keyof U) => void
915915
>a : any
916916
>b : any
917917
>a : any
@@ -921,7 +921,7 @@ function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
921921

922922
func<{ a: any, b: any }, { a: any, c: any }>('a', 'c');
923923
>func<{ a: any, b: any }, { a: any, c: any }>('a', 'c') : void
924-
>func : <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void
924+
>func : <T, U>(k1: keyof (T | U), k2: keyof T | keyof U) => void
925925
>a : any
926926
>b : any
927927
>a : any
@@ -1034,8 +1034,8 @@ function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T &
10341034
}
10351035

10361036
function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]) {
1037-
>f73 : (func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]) => void
1038-
>func : <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]
1037+
>f73 : (func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]) => void
1038+
>func : <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]
10391039
>T : T
10401040
>U : U
10411041
>K : K
@@ -1054,7 +1054,7 @@ function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[
10541054
let a = func({ a: 1, b: "hello" }, { c: true }, 'a'); // number
10551055
>a : number
10561056
>func({ a: 1, b: "hello" }, { c: true }, 'a') : number
1057-
>func : <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]
1057+
>func : <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]
10581058
>{ a: 1, b: "hello" } : { a: number; b: string; }
10591059
>a : number
10601060
>1 : 1
@@ -1068,7 +1068,7 @@ function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[
10681068
let b = func({ a: 1, b: "hello" }, { c: true }, 'b'); // string
10691069
>b : string
10701070
>func({ a: 1, b: "hello" }, { c: true }, 'b') : string
1071-
>func : <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]
1071+
>func : <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]
10721072
>{ a: 1, b: "hello" } : { a: number; b: string; }
10731073
>a : number
10741074
>1 : 1
@@ -1082,7 +1082,7 @@ function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[
10821082
let c = func({ a: 1, b: "hello" }, { c: true }, 'c'); // boolean
10831083
>c : boolean
10841084
>func({ a: 1, b: "hello" }, { c: true }, 'c') : boolean
1085-
>func : <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]
1085+
>func : <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]
10861086
>{ a: 1, b: "hello" } : { a: number; b: string; }
10871087
>a : number
10881088
>1 : 1
@@ -1837,7 +1837,7 @@ declare class Component1<Data, Computed> {
18371837
>Computed : Computed
18381838

18391839
get<K extends keyof (Data & Computed)>(key: K): (Data & Computed)[K];
1840-
>get : <K extends keyof (Data & Computed)>(key: K) => (Data & Computed)[K]
1840+
>get : <K extends keyof Data | keyof Computed>(key: K) => (Data & Computed)[K]
18411841
>K : K
18421842
>Data : Data
18431843
>Computed : Computed
@@ -2035,9 +2035,9 @@ function onChangeGenericFunction<T>(handler: Handler<T & {preset: number}>) {
20352035

20362036
handler.onChange('preset')
20372037
>handler.onChange('preset') : void
2038-
>handler.onChange : (name: keyof (T & { preset: number; })) => void
2038+
>handler.onChange : (name: keyof T | "preset") => void
20392039
>handler : Handler<T & { preset: number; }>
2040-
>onChange : (name: keyof (T & { preset: number; })) => void
2040+
>onChange : (name: keyof T | "preset") => void
20412041
>'preset' : "preset"
20422042
}
20432043

‎tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(64,33): error
2222
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(66,24): error TS2345: Argument of type '"size"' is not assignable to parameter of type '"name" | "width" | "height" | "visible"'.
2323
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(67,24): error TS2345: Argument of type '"name" | "size"' is not assignable to parameter of type '"name" | "width" | "height" | "visible"'.
2424
Type '"size"' is not assignable to type '"name" | "width" | "height" | "visible"'.
25-
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(72,5): error TS2536: Type 'keyof (T & U)' cannot be used to index type 'T | U'.
25+
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(72,5): error TS2536: Type 'keyof T | keyof U' cannot be used to index type 'T | U'.
2626
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(76,5): error TS2322: Type 'T | U' is not assignable to type 'T & U'.
2727
Type 'T' is not assignable to type 'T & U'.
2828
Type 'T' is not assignable to type 'U'.
29-
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(77,5): error TS2322: Type 'keyof (T & U)' is not assignable to type 'keyof (T | U)'.
29+
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(77,5): error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof (T | U)'.
30+
Type 'keyof T' is not assignable to type 'keyof (T | U)'.
3031
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(86,9): error TS2322: Type 'keyof T' is not assignable to type 'K'.
3132
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(88,9): error TS2322: Type 'T[keyof T]' is not assignable to type 'T[K]'.
3233
Type 'keyof T' is not assignable to type 'K'.
@@ -161,7 +162,7 @@ tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(100,5): error
161162
o1[k1];
162163
o1[k2]; // Error
163164
~~~~~~
164-
!!! error TS2536: Type 'keyof (T & U)' cannot be used to index type 'T | U'.
165+
!!! error TS2536: Type 'keyof T | keyof U' cannot be used to index type 'T | U'.
165166
o2[k1];
166167
o2[k2];
167168
o1 = o2;
@@ -172,7 +173,8 @@ tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(100,5): error
172173
!!! error TS2322: Type 'T' is not assignable to type 'U'.
173174
k1 = k2; // Error
174175
~~
175-
!!! error TS2322: Type 'keyof (T & U)' is not assignable to type 'keyof (T | U)'.
176+
!!! error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof (T | U)'.
177+
!!! error TS2322: Type 'keyof T' is not assignable to type 'keyof (T | U)'.
176178
k2 = k1;
177179
}
178180

‎tests/baselines/reference/keyofAndIndexedAccessErrors.types‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,13 @@ function f10(shape: Shape) {
243243
}
244244

245245
function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
246-
>f20 : <T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) => void
246+
>f20 : <T, U>(k1: keyof (T | U), k2: keyof T | keyof U, o1: T | U, o2: T & U) => void
247247
>T : T
248248
>U : U
249249
>k1 : keyof (T | U)
250250
>T : T
251251
>U : U
252-
>k2 : keyof (T & U)
252+
>k2 : keyof T | keyof U
253253
>T : T
254254
>U : U
255255
>o1 : T | U
@@ -265,19 +265,19 @@ function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
265265
>k1 : keyof (T | U)
266266

267267
o1[k2]; // Error
268-
>o1[k2] : (T | U)[keyof (T & U)]
268+
>o1[k2] : (T | U)[keyof T | keyof U]
269269
>o1 : T | U
270-
>k2 : keyof (T & U)
270+
>k2 : keyof T | keyof U
271271

272272
o2[k1];
273273
>o2[k1] : (T & U)[keyof (T | U)]
274274
>o2 : T & U
275275
>k1 : keyof (T | U)
276276

277277
o2[k2];
278-
>o2[k2] : (T & U)[keyof (T & U)]
278+
>o2[k2] : (T & U)[keyof T | keyof U]
279279
>o2 : T & U
280-
>k2 : keyof (T & U)
280+
>k2 : keyof T | keyof U
281281

282282
o1 = o2;
283283
>o1 = o2 : T & U
@@ -290,13 +290,13 @@ function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
290290
>o1 : T | U
291291

292292
k1 = k2; // Error
293-
>k1 = k2 : keyof (T & U)
293+
>k1 = k2 : keyof T | keyof U
294294
>k1 : keyof (T | U)
295-
>k2 : keyof (T & U)
295+
>k2 : keyof T | keyof U
296296

297297
k2 = k1;
298298
>k2 = k1 : keyof (T | U)
299-
>k2 : keyof (T & U)
299+
>k2 : keyof T | keyof U
300300
>k1 : keyof (T | U)
301301
}
302302

0 commit comments

Comments
 (0)