Skip to content

Commit 60d0c08

Browse files
authored
Update submodule with type ordering changes (#1236)
1 parent 69e6378 commit 60d0c08

14 files changed

+17
-147
lines changed

testdata/baselines/reference/submodule/compiler/correlatedUnions.types.diff

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -141,23 +141,4 @@
141141
+>< K extends KeyOfOriginal, N extends NestedKeyOfOriginalFor<K>>( original: Original, mappedFromOriginal: MappedFromOriginal, key: K, nestedKey: N): [Original[K][N], MappedFromOriginal[K][N]] => { return [original[key][nestedKey], mappedFromOriginal[key][nestedKey]];} : <K extends keyof Original, N extends keyof Original[K]>(original: Original, mappedFromOriginal: SameKeys<Original>, key: K, nestedKey: N) => [Original[K][N], SameKeys<Original>[K][N]]
142142

143143
K extends KeyOfOriginal,
144-
N extends NestedKeyOfOriginalFor<K>
145-
@@= skipped -63, +63 lines =@@
146-
>key : T
147-
148-
const assertedCheck = userValue ? userValue! : defaultValue;
149-
->assertedCheck : NonNullable<Partial<Config>[T]>
150-
->userValue ? userValue! : defaultValue : NonNullable<Partial<Config>[T]>
151-
+>assertedCheck : Config[T]
152-
+>userValue ? userValue! : defaultValue : Config[T]
153-
>userValue : Partial<Config>[T]
154-
>userValue! : NonNullable<Partial<Config>[T]>
155-
>userValue : NonNullable<Partial<Config>[T]>
156-
>defaultValue : Config[T]
157-
158-
return assertedCheck;
159-
->assertedCheck : NonNullable<Partial<Config>[T]>
160-
+>assertedCheck : Config[T]
161-
}
162-
163-
// repro from #47523
144+
N extends NestedKeyOfOriginalFor<K>

testdata/baselines/reference/submodule/compiler/objectLiteralExcessProperties.types.diff

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,4 @@
1717
+>obj4 : { name: string; } | T & { prop: boolean; }
1818
>prop : boolean
1919
>name : string
20-
>{ name: "test", prop: true } : { name: string; prop: boolean; }
21-
@@= skipped -11, +11 lines =@@
22-
23-
// No excess property checks when union includes 'object' type
24-
const obj5: object | { x: string } = { z: 'abc' }
25-
->obj5 : { x: string; } | object
26-
+>obj5 : object | { x: string; }
27-
>x : string
28-
>{ z: 'abc' } : { z: string; }
29-
>z : string
20+
>{ name: "test", prop: true } : { name: string; prop: boolean; }

testdata/baselines/reference/submodule/compiler/typeGuardConstructorClassAndNumber.types.diff

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,7 @@
55

66
function foo(instance: Function | object) {
77
->foo : (instance: Function | object) => number
8-
->instance : Function | object
98
+>foo : (instance: object | Function) => number
10-
+>instance : object | Function
9+
>instance : object | Function
1110

12-
if (typeof instance === 'function') {
13-
>typeof instance === 'function' : boolean
14-
>typeof instance : "bigint" | "boolean" | "function" | "number" | "object" | "string" | "symbol" | "undefined"
15-
->instance : Function | object
16-
+>instance : object | Function
17-
>'function' : "function"
18-
19-
if (instance.prototype == null || instance.prototype.constructor == null) {
11+
if (typeof instance === 'function') {

testdata/baselines/reference/submodule/compiler/unionOfFunctionAndSignatureIsCallable.types.diff

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
>callable : Function | (() => object)
2121
}
2222

23-
function f2(fetcherParams: object | (() => object)) {
24-
>f2 : (fetcherParams: object | (() => object)) => void
25-
->fetcherParams : (() => object) | object
26-
+>fetcherParams : object | (() => object)
23+
@@= skipped -10, +10 lines =@@
24+
>fetcherParams : object | (() => object)
2725

2826
const data = typeof fetcherParams === 'function'
2927
->data : error
@@ -32,8 +30,7 @@
3230
+>typeof fetcherParams === 'function' ? fetcherParams() : fetcherParams : any
3331
>typeof fetcherParams === 'function' : boolean
3432
>typeof fetcherParams : "bigint" | "boolean" | "function" | "number" | "object" | "string" | "symbol" | "undefined"
35-
->fetcherParams : (() => object) | object
36-
+>fetcherParams : object | (() => object)
33+
>fetcherParams : object | (() => object)
3734
>'function' : "function"
3835

3936
? fetcherParams()

testdata/baselines/reference/submodule/compiler/vueLikeDataAndPropsInference2.types.diff

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010

1111
declare function test(fn: Options): void;
1212
->test : { <Data, Props>(fn: ThisTypedOptions<Data, Props>): void; (fn: Options): void; }
13-
->fn : Options<((this: Instance) => object) | object, PropsDefinition<Record<string, any>>>
1413
+>test : { <Data, Props>(fn: ThisTypedOptions<Data, Props>): void; (fn: Options<object | ((this: Instance) => object), PropsDefinition<Record<string, any>>>): void; }
15-
+>fn : Options<object | ((this: Instance) => object), PropsDefinition<Record<string, any>>>
14+
>fn : Options<object | ((this: Instance) => object), PropsDefinition<Record<string, any>>>
1615

1716
test({
1817
>test({ props: { foo: '' }, data(): { bar: boolean } { return { bar: true } }, watch: { foo(newVal: string, oldVal: string): void { this.bar = false } }}) : void

testdata/baselines/reference/submodule/conformance/conditionalTypes2.types.diff

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,7 @@
99
>predicate : (v: T) => boolean
1010
>v : T
1111

12-
@@= skipped -29, +29 lines =@@
13-
14-
declare function toString1(value: object | Function): string ;
15-
>toString1 : (value: object | Function) => string
16-
->value : Function | object
17-
+>value : object | Function
18-
19-
declare function toString2(value: Function): string ;
20-
>toString2 : (value: Function) => string
21-
@@= skipped -173, +173 lines =@@
12+
@@= skipped -202, +202 lines =@@
2213
// Repro from #33568
2314

2415
declare function save(_response: IRootResponse<string>): void;

testdata/baselines/reference/submodule/conformance/generatorYieldContextualType.types.diff

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,7 @@
4646

4747
_step: T,
4848
>_step : T
49-
@@= skipped -9, +9 lines =@@
50-
>_state : PartialStepState<unknown>
51-
52-
_selection: StepItemType<T> | Directive
53-
->_selection : Directive | StepItemType<T>
54-
+>_selection : StepItemType<T> | Directive
55-
56-
): _selection is StepItemType<T> {
57-
return false;
58-
@@= skipped -19, +19 lines =@@
49+
@@= skipped -28, +28 lines =@@
5950
}
6051

6152
function* showStep<

testdata/baselines/reference/submodule/conformance/inOperatorWithValidOperands.errors.txt.diff

Lines changed: 0 additions & 20 deletions
This file was deleted.

testdata/baselines/reference/submodule/conformance/inOperatorWithValidOperands.types.diff

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@
55

66
function unionCase2<T>(t: T | object) {
77
->unionCase2 : <T>(t: T | object) => void
8-
->t : T | object
98
+>unionCase2 : <T>(t: object | T) => void
10-
+>t : object | T
9+
>t : object | T
1110

12-
var rb5 = x in t;
13-
>rb5 : boolean
14-
>x in t : boolean
15-
>x : any
16-
->t : T | object
17-
+>t : object | T
18-
}
19-
20-
interface X { x: number }
11+
var rb5 = x in t;

testdata/baselines/reference/submodule/conformance/nonPrimitiveAndTypeVariables.errors.txt.diff

Lines changed: 0 additions & 19 deletions
This file was deleted.

testdata/baselines/reference/submodule/conformance/nonPrimitiveAndTypeVariables.types.diff

Lines changed: 0 additions & 10 deletions
This file was deleted.

testdata/baselines/reference/submodule/conformance/spreadObjectOrFalsy.types.diff

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,7 @@
1717
}
1818

1919
function f3<T extends undefined>(a: T) {
20-
@@= skipped -19, +19 lines =@@
21-
22-
function f4<T extends undefined>(a: object | T) {
23-
>f4 : <T extends undefined>(a: object | T) => {}
24-
->a : T | object
25-
+>a : object | T
26-
27-
return { ...a };
28-
>{ ...a } : {}
29-
->a : T | object
30-
+>a : object | T
31-
}
32-
33-
function f5<S, T extends undefined>(a: S | T) {
34-
@@= skipped -28, +28 lines =@@
20+
@@= skipped -47, +47 lines =@@
3521
// Repro from #46976
3622

3723
function g1<T extends {}, A extends { z: (T | undefined) & T }>(a: A) {

testdata/baselines/reference/submodule/conformance/templateLiteralTypes3.types.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,18 @@
111111
>id : string
112112

113113
let x: keyof T & string | `-${keyof T & string}`;
114-
->x : (keyof T & string) | `-${keyof T & string}`
114+
->x : `-${keyof T & string}` | (keyof T & string)
115115
+>x : `-${keyof T & string}` | keyof T & string
116116

117117
x = "id";
118118
>x = "id" : "id"
119-
->x : (keyof T & string) | `-${keyof T & string}`
119+
->x : `-${keyof T & string}` | (keyof T & string)
120120
+>x : `-${keyof T & string}` | keyof T & string
121121
>"id" : "id"
122122

123123
x = "-id";
124124
>x = "-id" : "-id"
125-
->x : (keyof T & string) | `-${keyof T & string}`
125+
->x : `-${keyof T & string}` | (keyof T & string)
126126
+>x : `-${keyof T & string}` | keyof T & string
127127
>"-id" : "-id"
128128
}

0 commit comments

Comments
 (0)