Skip to content

Commit 39326d7

Browse files
ahejlsbergahejlsberg
committed
Accept new baselines
1 parent 29edef1 commit 39326d7

17 files changed

+128
-54
lines changed

‎tests/baselines/reference/assertionTypePredicates1.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ function f01(x: unknown) {
150150
>undefined : undefined
151151
>typeof x === "string" : boolean
152152
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
153-
>x : unknown
153+
>x : {} | null
154154
>"string" : "string"
155155

156156
x; // string | undefined

‎tests/baselines/reference/controlFlowGenericTypes.types

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function f1<T extends string | undefined>(x: T, y: { a: T }, z: [T]): string {
1010
>x : T
1111

1212
x;
13-
>x : T
13+
>x : T & {}
1414

1515
x.length;
1616
>x.length : number
@@ -44,13 +44,13 @@ function f1<T extends string | undefined>(x: T, y: { a: T }, z: [T]): string {
4444

4545
z[0].length;
4646
>z[0].length : number
47-
>z[0] : string
47+
>z[0] : T & {}
4848
>z : [T]
4949
>0 : 0
5050
>length : number
5151

5252
return z[0];
53-
>z[0] : string
53+
>z[0] : T & {}
5454
>z : [T]
5555
>0 : 0
5656
}
@@ -67,7 +67,7 @@ function f2<T>(x: Extract<T, string | undefined> | null): string {
6767
>x : Extract<T, string | undefined> | null
6868

6969
x;
70-
>x : Extract<T, string | undefined>
70+
>x : Extract<T, string | undefined> & {}
7171

7272
x.length;
7373
>x.length : number
@@ -404,11 +404,11 @@ function fx1<T, K extends keyof T>(obj: T, key: K) {
404404
>key : K
405405

406406
const x2 = obj && obj[key];
407-
>x2 : T[K]
408-
>obj && obj[key] : T[K]
409-
>obj : T
410-
>obj[key] : T[K]
407+
>x2 : (T & {})[K]
408+
>obj && obj[key] : (T & {})[K]
411409
>obj : T
410+
>obj[key] : (T & {})[K]
411+
>obj : T & {}
412412
>key : K
413413
}
414414

‎tests/baselines/reference/controlFlowTruthiness.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ function f8<T>(x: T) {
181181
>x : T
182182

183183
x; // {}
184-
>x : T
184+
>x : T & {}
185185
}
186186
else {
187187
x; // {}

‎tests/baselines/reference/controlFlowTypeofObject.types

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function f1(x: unknown) {
1616
if (typeof x === 'object') {
1717
>typeof x === 'object' : boolean
1818
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
19-
>x : unknown
19+
>x : {}
2020
>'object' : "object"
2121

2222
obj(x);
@@ -40,7 +40,7 @@ function f2(x: unknown) {
4040
if (typeof x === 'object') {
4141
>typeof x === 'object' : boolean
4242
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
43-
>x : unknown
43+
>x : {} | undefined
4444
>'object' : "object"
4545

4646
obj(x);
@@ -64,7 +64,7 @@ function f3(x: unknown) {
6464
if (typeof x === 'object') {
6565
>typeof x === 'object' : boolean
6666
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
67-
>x : unknown
67+
>x : {}
6868
>'object' : "object"
6969

7070
obj(x);
@@ -88,7 +88,7 @@ function f4(x: unknown) {
8888
if (typeof x === 'object') {
8989
>typeof x === 'object' : boolean
9090
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
91-
>x : unknown
91+
>x : {}
9292
>'object' : "object"
9393

9494
obj(x);
@@ -126,7 +126,7 @@ function f5(x: unknown) {
126126
if (typeof x === 'object') {
127127
>typeof x === 'object' : boolean
128128
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
129-
>x : unknown
129+
>x : {} | undefined
130130
>'object' : "object"
131131

132132
obj(x);
@@ -150,12 +150,12 @@ function f6(x: unknown) {
150150
}
151151
else {
152152
x;
153-
>x : unknown
153+
>x : {} | undefined
154154

155155
if (typeof x === 'object') {
156156
>typeof x === 'object' : boolean
157157
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
158-
>x : unknown
158+
>x : {} | undefined
159159
>'object' : "object"
160160

161161
obj(x);

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts(23,12): error TS2361: T
33
tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts(27,12): error TS2361: The right-hand side of an 'in' expression must not be a primitive.
44
tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts(34,12): error TS2361: The right-hand side of an 'in' expression must not be a primitive.
55
tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts(53,14): error TS2361: The right-hand side of an 'in' expression must not be a primitive.
6-
tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts(55,18): error TS2361: The right-hand side of an 'in' expression must not be a primitive.
76
tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts(60,12): error TS2361: The right-hand side of an 'in' expression must not be a primitive.
87
tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts(64,12): error TS2361: The right-hand side of an 'in' expression must not be a primitive.
98

109

11-
==== tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts (8 errors) ====
10+
==== tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts (7 errors) ====
1211
const validHasKey = <T extends object>(
1312
thing: T,
1413
key: string,
@@ -74,8 +73,6 @@ tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts(64,12): error TS2361: T
7473
!!! error TS2361: The right-hand side of an 'in' expression must not be a primitive.
7574
if (typeof p === "object") {
7675
"key" in p;
77-
~
78-
!!! error TS2361: The right-hand side of an 'in' expression must not be a primitive.
7976
}
8077
}
8178

‎tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ function union5<T extends object | string, U extends object | number>(p: T | U)
146146
"key" in p;
147147
>"key" in p : boolean
148148
>"key" : "key"
149-
>p : T | U
149+
>p : (T & object) | (U & object)
150150
}
151151
}
152152

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

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
tests/cases/conformance/types/mapped/mappedTypes4.ts(11,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type '(T & null) | (T & object)'.
2+
3+
4+
==== tests/cases/conformance/types/mapped/mappedTypes4.ts (1 errors) ====
5+
type Box<T> = {
6+
};
7+
8+
type Boxified<T> = {
9+
[P in keyof T]: Box<T[P]>;
10+
};
11+
12+
function boxify<T>(obj: T): Boxified<T> {
13+
if (typeof obj === "object") {
14+
let result = {} as Boxified<T>;
15+
for (let k in obj) {
16+
~~~
17+
!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type '(T & null) | (T & object)'.
18+
result[k] = { value: obj[k] };
19+
}
20+
return result;
21+
}
22+
return <any>obj;
23+
}
24+
25+
type A = { a: string };
26+
type B = { b: string };
27+
type C = { c: string };
28+
29+
function f1(x: A | B | C | undefined) {
30+
return boxify(x);
31+
}
32+
33+
type T00 = Partial<A | B | C>;
34+
type T01 = Readonly<A | B | C | null | undefined>;
35+
type T02 = Boxified<A | B[] | C | string>
36+
type T03 = Readonly<string | number | boolean | null | undefined | void>;
37+
type T04 = Boxified<string | number | boolean | null | undefined | void>;
38+
type T05 = Partial<"hello" | "world" | 42>;
39+
40+
type BoxifiedWithSentinel<T, U> = {
41+
[P in keyof T]: Box<T[P]> | U;
42+
}
43+
44+
type T10 = BoxifiedWithSentinel<A | B | C, null>;
45+
type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
46+
type T12 = BoxifiedWithSentinel<string, undefined>;
47+
48+
type DeepReadonly<T> = {
49+
readonly [P in keyof T]: DeepReadonly<T[P]>;
50+
};
51+
52+
type Foo = {
53+
x: number;
54+
y: { a: string, b: number };
55+
z: boolean;
56+
};
57+
58+
type DeepReadonlyFoo = {
59+
readonly x: number;
60+
readonly y: { readonly a: string, readonly b: number };
61+
readonly z: boolean;
62+
};
63+
64+
var x1: DeepReadonly<Foo>;
65+
var x1: DeepReadonlyFoo;
66+
67+
// Repro from #13232
68+
69+
type Z = { a: number };
70+
type Clone<T> = {
71+
[P in keyof (T & {})]: T[P];
72+
};
73+
type M = Clone<Z>; // M should be { a: number }
74+
75+
var z1: Z;
76+
var z1: Clone<Z>;
77+

‎tests/baselines/reference/mappedTypes4.types

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ function boxify<T>(obj: T): Boxified<T> {
2727

2828
for (let k in obj) {
2929
>k : Extract<keyof T, string>
30-
>obj : T
30+
>obj : (T & null) | (T & object)
3131

3232
result[k] = { value: obj[k] };
33-
>result[k] = { value: obj[k] } : { value: T[Extract<keyof T, string>]; }
33+
>result[k] = { value: obj[k] } : { value: ((T & null) | (T & object))[Extract<keyof T, string>]; }
3434
>result[k] : Boxified<T>[Extract<keyof T, string>]
3535
>result : Boxified<T>
3636
>k : Extract<keyof T, string>
37-
>{ value: obj[k] } : { value: T[Extract<keyof T, string>]; }
38-
>value : T[Extract<keyof T, string>]
39-
>obj[k] : T[Extract<keyof T, string>]
40-
>obj : T
37+
>{ value: obj[k] } : { value: ((T & null) | (T & object))[Extract<keyof T, string>]; }
38+
>value : ((T & null) | (T & object))[Extract<keyof T, string>]
39+
>obj[k] : ((T & null) | (T & object))[Extract<keyof T, string>]
40+
>obj : (T & null) | (T & object)
4141
>k : Extract<keyof T, string>
4242
}
4343
return result;

‎tests/baselines/reference/narrowByEquality.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ if (xUnknown == null) {
144144

145145
} else {
146146
xUnknown
147-
>xUnknown : unknown
147+
>xUnknown : {}
148148
}
149149

150150
if (xUnknown != null) {
@@ -153,7 +153,7 @@ if (xUnknown != null) {
153153
>null : null
154154

155155
xUnknown;
156-
>xUnknown : unknown
156+
>xUnknown : {}
157157

158158
} else {
159159
xUnknown;

‎tests/baselines/reference/narrowingByTypeofInSwitch.types

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -552,14 +552,14 @@ function multipleGenericFuse<X extends L | number, Y extends R | number>(xy: X |
552552

553553
case 'function': return [xy, 1];
554554
>'function' : "function"
555-
>[xy, 1] : [X, 1]
556-
>xy : X
555+
>[xy, 1] : [X & Function, 1]
556+
>xy : X & Function
557557
>1 : 1
558558

559559
case 'object': return [xy, 'two'];
560560
>'object' : "object"
561-
>[xy, 'two'] : [Y, string]
562-
>xy : Y
561+
>[xy, 'two'] : [Y & object, string]
562+
>xy : Y & object
563563
>'two' : "two"
564564

565565
case 'number': return [xy]
@@ -843,7 +843,7 @@ function narrowingNarrows(x: {} | undefined) {
843843
case 'object': const _: {} = x; return;
844844
>'object' : "object"
845845
>_ : {}
846-
>x : {}
846+
>x : object
847847

848848
case 'string': assertString(x); return;
849849
>'string' : "string"
@@ -1092,14 +1092,14 @@ function multipleGenericFuseWithBoth<X extends L | number, Y extends R | number>
10921092

10931093
case `function`: return [xy, 1];
10941094
>`function` : "function"
1095-
>[xy, 1] : [X, 1]
1096-
>xy : X
1095+
>[xy, 1] : [X & Function, 1]
1096+
>xy : X & Function
10971097
>1 : 1
10981098

10991099
case 'object': return [xy, 'two'];
11001100
>'object' : "object"
1101-
>[xy, 'two'] : [Y, string]
1102-
>xy : Y
1101+
>[xy, 'two'] : [Y & object, string]
1102+
>xy : Y & object
11031103
>'two' : "two"
11041104

11051105
case `number`: return [xy]

‎tests/baselines/reference/narrowingTruthyObject.types

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function foo(x: unknown, b: boolean) {
3535
>x : unknown
3636
>typeof x === 'object' : boolean
3737
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
38-
>x : unknown
38+
>x : {}
3939
>'object' : "object"
4040

4141
x.toString();
@@ -51,7 +51,7 @@ function foo(x: unknown, b: boolean) {
5151
>x : unknown
5252
>typeof x === 'object' : boolean
5353
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
54-
>x : unknown
54+
>x : {}
5555
>'object' : "object"
5656

5757
x.toString();
@@ -67,7 +67,7 @@ function foo(x: unknown, b: boolean) {
6767
>b : boolean
6868
>typeof x === 'object' : boolean
6969
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
70-
>x : unknown
70+
>x : {}
7171
>'object' : "object"
7272

7373
x.toString();
@@ -85,7 +85,7 @@ function foo(x: unknown, b: boolean) {
8585
>b : true
8686
>typeof x === 'object' : boolean
8787
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
88-
>x : unknown
88+
>x : {}
8989
>'object' : "object"
9090

9191
x.toString();
@@ -107,7 +107,7 @@ function foo(x: unknown, b: boolean) {
107107
>b : true
108108
>typeof x === 'object' : boolean
109109
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
110-
>x : unknown
110+
>x : {}
111111
>'object' : "object"
112112

113113
x.toString();
@@ -130,7 +130,7 @@ function f1(x: unknown): any {
130130
>x : unknown
131131
>typeof x === 'object' : boolean
132132
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
133-
>x : unknown
133+
>x : {}
134134
>'object' : "object"
135135
>x.hasOwnProperty('x') : boolean
136136
>x.hasOwnProperty : (v: PropertyKey) => boolean

‎tests/baselines/reference/narrowingTypeofFunction.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function f2<T>(x: (T & F) | T & string) {
3535
>"function" : "function"
3636

3737
x;
38-
>x : (T & F) | (T & string)
38+
>x : T & F
3939
}
4040
else {
4141
x;

‎tests/baselines/reference/strictOptionalProperties1.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ function expectNotUndefined<T>(value: Undefinable<T>): T {
653653
>'value is undefined' : "value is undefined"
654654
}
655655
return value;
656-
>value : T
656+
>value : T & ({} | null)
657657
}
658658

659659
interface Bar {

0 commit comments

Comments
 (0)