Skip to content

Commit 3e4b83e

Browse files
ahejlsbergahejlsberg
committed
Accept new baselines
1 parent 2100e40 commit 3e4b83e

16 files changed

Lines changed: 83 additions & 143 deletions

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

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(33,5): error TS2322: Type 'D' is not assignable to type 'C'.
2-
Weak type 'C' has no properties in common with 'D'.
3-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(34,5): error TS2322: Type 'E' is not assignable to type 'C'.
4-
Weak type 'C' has no properties in common with 'E'.
5-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(35,5): error TS2322: Type 'F' is not assignable to type 'C'.
6-
Weak type 'C' has no properties in common with 'F'.
7-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(36,5): error TS2322: Type 'D' is not assignable to type '{ opt?: Base; }'.
8-
Weak type '{ opt?: Base; }' has no properties in common with 'D'.
9-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(37,5): error TS2322: Type 'E' is not assignable to type '{ opt?: Base; }'.
10-
Weak type '{ opt?: Base; }' has no properties in common with 'E'.
11-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(38,5): error TS2322: Type 'F' is not assignable to type '{ opt?: Base; }'.
12-
Weak type '{ opt?: Base; }' has no properties in common with 'F'.
13-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(39,5): error TS2322: Type 'D' is not assignable to type '{ opt?: Base; }'.
14-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(40,5): error TS2322: Type 'E' is not assignable to type '{ opt?: Base; }'.
15-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(41,5): error TS2322: Type 'F' is not assignable to type '{ opt?: Base; }'.
1+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(33,5): error TS2559: Type 'D' has no properties in common with type 'C'.
2+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(34,5): error TS2559: Type 'E' has no properties in common with type 'C'.
3+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(35,5): error TS2559: Type 'F' has no properties in common with type 'C'.
4+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(36,5): error TS2559: Type 'D' has no properties in common with type '{ opt?: Base; }'.
5+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(37,5): error TS2559: Type 'E' has no properties in common with type '{ opt?: Base; }'.
6+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(38,5): error TS2559: Type 'F' has no properties in common with type '{ opt?: Base; }'.
7+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(39,5): error TS2559: Type 'D' has no properties in common with type '{ opt?: Base; }'.
8+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(40,5): error TS2559: Type 'E' has no properties in common with type '{ opt?: Base; }'.
9+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(41,5): error TS2559: Type 'F' has no properties in common with type '{ opt?: Base; }'.
1610
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(74,5): error TS2322: Type 'D' is not assignable to type 'C'.
1711
Property 'opt' is missing in type 'D'.
1812
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(75,5): error TS2322: Type 'E' is not assignable to type 'C'.
@@ -68,37 +62,31 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
6862
// disallowed by weak type checking
6963
c = d;
7064
~
71-
!!! error TS2322: Type 'D' is not assignable to type 'C'.
72-
!!! error TS2322: Weak type 'C' has no properties in common with 'D'.
65+
!!! error TS2559: Type 'D' has no properties in common with type 'C'.
7366
c = e;
7467
~
75-
!!! error TS2322: Type 'E' is not assignable to type 'C'.
76-
!!! error TS2322: Weak type 'C' has no properties in common with 'E'.
68+
!!! error TS2559: Type 'E' has no properties in common with type 'C'.
7769
c = f;
7870
~
79-
!!! error TS2322: Type 'F' is not assignable to type 'C'.
80-
!!! error TS2322: Weak type 'C' has no properties in common with 'F'.
71+
!!! error TS2559: Type 'F' has no properties in common with type 'C'.
8172
a = d;
8273
~
83-
!!! error TS2322: Type 'D' is not assignable to type '{ opt?: Base; }'.
84-
!!! error TS2322: Weak type '{ opt?: Base; }' has no properties in common with 'D'.
74+
!!! error TS2559: Type 'D' has no properties in common with type '{ opt?: Base; }'.
8575
a = e;
8676
~
87-
!!! error TS2322: Type 'E' is not assignable to type '{ opt?: Base; }'.
88-
!!! error TS2322: Weak type '{ opt?: Base; }' has no properties in common with 'E'.
77+
!!! error TS2559: Type 'E' has no properties in common with type '{ opt?: Base; }'.
8978
a = f;
9079
~
91-
!!! error TS2322: Type 'F' is not assignable to type '{ opt?: Base; }'.
92-
!!! error TS2322: Weak type '{ opt?: Base; }' has no properties in common with 'F'.
80+
!!! error TS2559: Type 'F' has no properties in common with type '{ opt?: Base; }'.
9381
b = d;
9482
~
95-
!!! error TS2322: Type 'D' is not assignable to type '{ opt?: Base; }'.
83+
!!! error TS2559: Type 'D' has no properties in common with type '{ opt?: Base; }'.
9684
b = e;
9785
~
98-
!!! error TS2322: Type 'E' is not assignable to type '{ opt?: Base; }'.
86+
!!! error TS2559: Type 'E' has no properties in common with type '{ opt?: Base; }'.
9987
b = f;
10088
~
101-
!!! error TS2322: Type 'F' is not assignable to type '{ opt?: Base; }'.
89+
!!! error TS2559: Type 'F' has no properties in common with type '{ opt?: Base; }'.
10290

10391
// ok
10492
c = a;

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(24,61): error TS2345: Argument of type '(state: State) => IterableIterator<State | 1>' is not assignable to parameter of type '(a: StrategicState) => IterableIterator<StrategicState>'.
2-
Type 'IterableIterator<State | 1>' is not assignable to type 'IterableIterator<StrategicState>'.
3-
Type 'State | 1' is not assignable to type 'StrategicState'.
4-
Type '1' is not assignable to type 'StrategicState'.
1+
tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(24,14): error TS2322: Type '(a: State | 1) => IterableIterator<State | 1>' is not assignable to type 'Strategy<State>'.
2+
Type 'IterableIterator<State | 1>' is not assignable to type 'IterableIterator<State>'.
3+
Type 'State | 1' is not assignable to type 'State'.
4+
Type '1' is not assignable to type 'State'.
55
tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(29,70): error TS7025: Generator implicitly has type 'IterableIterator<any>' because it does not yield any values. Consider supplying a return type.
66
tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(32,42): error TS2453: The type argument for type parameter 'T' cannot be inferred from the usage. Consider specifying the type arguments explicitly.
77
Type argument candidate 'State' is not a valid type argument because it is not a supertype of candidate '1'.
8-
tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(36,62): error TS2345: Argument of type '(state: State) => IterableIterator<State | 1>' is not assignable to parameter of type '(a: StrategicState) => IterableIterator<StrategicState>'.
9-
Type 'IterableIterator<State | 1>' is not assignable to type 'IterableIterator<StrategicState>'.
8+
tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(36,14): error TS2322: Type '(a: State | 1) => IterableIterator<State | 1>' is not assignable to type 'Strategy<State>'.
109

1110

1211
==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts (4 errors) ====
@@ -34,11 +33,11 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(36,62): err
3433
}
3534

3635
export const Nothing: Strategy<State> = strategy("Nothing", function* (state: State) {
37-
~~~~~~~~
38-
!!! error TS2345: Argument of type '(state: State) => IterableIterator<State | 1>' is not assignable to parameter of type '(a: StrategicState) => IterableIterator<StrategicState>'.
39-
!!! error TS2345: Type 'IterableIterator<State | 1>' is not assignable to type 'IterableIterator<StrategicState>'.
40-
!!! error TS2345: Type 'State | 1' is not assignable to type 'StrategicState'.
41-
!!! error TS2345: Type '1' is not assignable to type 'StrategicState'.
36+
~~~~~~~
37+
!!! error TS2322: Type '(a: State | 1) => IterableIterator<State | 1>' is not assignable to type 'Strategy<State>'.
38+
!!! error TS2322: Type 'IterableIterator<State | 1>' is not assignable to type 'IterableIterator<State>'.
39+
!!! error TS2322: Type 'State | 1' is not assignable to type 'State'.
40+
!!! error TS2322: Type '1' is not assignable to type 'State'.
4241
yield 1;
4342
return state;
4443
});
@@ -56,9 +55,8 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(36,62): err
5655
});
5756

5857
export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: State) {
59-
~~~~~~~~
60-
!!! error TS2345: Argument of type '(state: State) => IterableIterator<State | 1>' is not assignable to parameter of type '(a: StrategicState) => IterableIterator<StrategicState>'.
61-
!!! error TS2345: Type 'IterableIterator<State | 1>' is not assignable to type 'IterableIterator<StrategicState>'.
58+
~~~~~~~~
59+
!!! error TS2322: Type '(a: State | 1) => IterableIterator<State | 1>' is not assignable to type 'Strategy<State>'.
6260
yield state;
6361
return 1;
6462
});

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
44
Property '1' is missing in type 'B2'.
55
tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(32,11): error TS2420: Class 'B3' incorrectly implements interface 'A3'.
66
Property ''1'' is missing in type 'B3'.
7-
tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(43,11): error TS2420: Class 'B' incorrectly implements interface 'A'.
8-
Weak type 'A' has no properties in common with 'B'.
9-
tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(51,11): error TS2420: Class 'B2' incorrectly implements interface 'A2'.
10-
Weak type 'A2' has no properties in common with 'B2'.
11-
tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(59,11): error TS2420: Class 'B3' incorrectly implements interface 'A3'.
12-
Weak type 'A3' has no properties in common with 'B3'.
7+
tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(43,11): error TS2559: Type 'B' has no properties in common with type 'A'.
8+
tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(51,11): error TS2559: Type 'B2' has no properties in common with type 'A2'.
9+
tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(59,11): error TS2559: Type 'B3' has no properties in common with type 'A3'.
1310

1411

1512
==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts (6 errors) ====
@@ -66,8 +63,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
6663

6764
class B implements A {
6865
~
69-
!!! error TS2420: Class 'B' incorrectly implements interface 'A'.
70-
!!! error TS2420: Weak type 'A' has no properties in common with 'B'.
66+
!!! error TS2559: Type 'B' has no properties in common with type 'A'.
7167
fooo: Derived; // weak type error
7268
}
7369

@@ -77,8 +73,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
7773

7874
class B2 implements A2 {
7975
~~
80-
!!! error TS2420: Class 'B2' incorrectly implements interface 'A2'.
81-
!!! error TS2420: Weak type 'A2' has no properties in common with 'B2'.
76+
!!! error TS2559: Type 'B2' has no properties in common with type 'A2'.
8277
2: Derived; // weak type error
8378
}
8479

@@ -88,8 +83,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
8883

8984
class B3 implements A3 {
9085
~~
91-
!!! error TS2420: Class 'B3' incorrectly implements interface 'A3'.
92-
!!! error TS2420: Weak type 'A3' has no properties in common with 'B3'.
86+
!!! error TS2559: Type 'B3' has no properties in common with type 'A3'.
9387
'1.0': Derived; // weak type error
9488
}
9589
}

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
tests/cases/conformance/jsx/file.tsx(23,8): error TS2322: Type '{ x: "0"; }' is not assignable to type 'Attribs1'.
22
Types of property 'x' are incompatible.
33
Type '"0"' is not assignable to type 'number'.
4-
tests/cases/conformance/jsx/file.tsx(24,8): error TS2322: Type '{ y: 0; }' is not assignable to type 'Attribs1'.
5-
Weak type 'Attribs1' has no properties in common with '{ y: 0; }'.
6-
tests/cases/conformance/jsx/file.tsx(25,8): error TS2322: Type '{ y: "foo"; }' is not assignable to type 'Attribs1'.
7-
Weak type 'Attribs1' has no properties in common with '{ y: "foo"; }'.
4+
tests/cases/conformance/jsx/file.tsx(24,8): error TS2559: Type '{ y: 0; }' has no properties in common with type 'Attribs1'.
5+
tests/cases/conformance/jsx/file.tsx(25,8): error TS2559: Type '{ y: "foo"; }' has no properties in common with type 'Attribs1'.
86
tests/cases/conformance/jsx/file.tsx(26,8): error TS2322: Type '{ x: "32"; }' is not assignable to type 'Attribs1'.
97
Types of property 'x' are incompatible.
108
Type '"32"' is not assignable to type 'number'.
11-
tests/cases/conformance/jsx/file.tsx(27,8): error TS2322: Type '{ var: "10"; }' is not assignable to type 'Attribs1'.
12-
Weak type 'Attribs1' has no properties in common with '{ var: "10"; }'.
9+
tests/cases/conformance/jsx/file.tsx(27,8): error TS2559: Type '{ var: "10"; }' has no properties in common with type 'Attribs1'.
1310
tests/cases/conformance/jsx/file.tsx(29,1): error TS2322: Type '{}' is not assignable to type '{ reqd: string; }'.
1411
Property 'reqd' is missing in type '{}'.
1512
tests/cases/conformance/jsx/file.tsx(30,8): error TS2322: Type '{ reqd: 10; }' is not assignable to type '{ reqd: string; }'.
@@ -47,21 +44,18 @@ tests/cases/conformance/jsx/file.tsx(30,8): error TS2322: Type '{ reqd: 10; }' i
4744
!!! error TS2322: Type '"0"' is not assignable to type 'number'.
4845
<test1 y={0} />; // Error, no property "y"
4946
~~~~~
50-
!!! error TS2322: Type '{ y: 0; }' is not assignable to type 'Attribs1'.
51-
!!! error TS2322: Weak type 'Attribs1' has no properties in common with '{ y: 0; }'.
47+
!!! error TS2559: Type '{ y: 0; }' has no properties in common with type 'Attribs1'.
5248
<test1 y="foo" />; // Error, no property "y"
5349
~~~~~~~
54-
!!! error TS2322: Type '{ y: "foo"; }' is not assignable to type 'Attribs1'.
55-
!!! error TS2322: Weak type 'Attribs1' has no properties in common with '{ y: "foo"; }'.
50+
!!! error TS2559: Type '{ y: "foo"; }' has no properties in common with type 'Attribs1'.
5651
<test1 x="32" />; // Error, "32" is not number
5752
~~~~~~
5853
!!! error TS2322: Type '{ x: "32"; }' is not assignable to type 'Attribs1'.
5954
!!! error TS2322: Types of property 'x' are incompatible.
6055
!!! error TS2322: Type '"32"' is not assignable to type 'number'.
6156
<test1 var="10" />; // Error, no 'var' property
6257
~~~~~~~~
63-
!!! error TS2322: Type '{ var: "10"; }' is not assignable to type 'Attribs1'.
64-
!!! error TS2322: Weak type 'Attribs1' has no properties in common with '{ var: "10"; }'.
58+
!!! error TS2559: Type '{ var: "10"; }' has no properties in common with type 'Attribs1'.
6559

6660
<test2 />; // Error, missing reqd
6761
~~~~~~~~~

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
tests/cases/conformance/jsx/file.tsx(11,22): error TS2322: Type '{ bar: "world"; }' is not assignable to type 'IntrinsicAttributes & { ref?: string; }'.
2-
Weak type 'IntrinsicAttributes & { ref?: string; }' has no properties in common with '{ bar: "world"; }'.
1+
tests/cases/conformance/jsx/file.tsx(11,22): error TS2559: Type '{ bar: "world"; }' has no properties in common with type 'IntrinsicAttributes & { ref?: string; }'.
32

43

54
==== tests/cases/conformance/jsx/react.d.ts (0 errors) ====
@@ -28,7 +27,6 @@ tests/cases/conformance/jsx/file.tsx(11,22): error TS2322: Type '{ bar: "world";
2827
// Should be an OK
2928
var x = <MyComponent bar='world' />;
3029
~~~~~~~~~~~
31-
!!! error TS2322: Type '{ bar: "world"; }' is not assignable to type 'IntrinsicAttributes & { ref?: string; }'.
32-
!!! error TS2322: Weak type 'IntrinsicAttributes & { ref?: string; }' has no properties in common with '{ bar: "world"; }'.
30+
!!! error TS2559: Type '{ bar: "world"; }' has no properties in common with type 'IntrinsicAttributes & { ref?: string; }'.
3331

3432

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
tests/cases/conformance/jsx/file.tsx(11,21): error TS2322: Type '{ prop1: "hello"; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<BigGreeter> & { children?: ReactNode; }'.
2-
Weak type 'IntrinsicAttributes & IntrinsicClassAttributes<BigGreeter> & { children?: ReactNode; }' has no properties in common with '{ prop1: "hello"; }'.
1+
tests/cases/conformance/jsx/file.tsx(11,21): error TS2559: Type '{ prop1: "hello"; }' has no properties in common with type 'IntrinsicAttributes & IntrinsicClassAttributes<BigGreeter> & { children?: ReactNode; }'.
32

43

54
==== tests/cases/conformance/jsx/file.tsx (1 errors) ====
@@ -15,8 +14,7 @@ tests/cases/conformance/jsx/file.tsx(11,21): error TS2322: Type '{ prop1: "hello
1514
// Error
1615
let a = <BigGreeter prop1="hello" />
1716
~~~~~~~~~~~~~
18-
!!! error TS2322: Type '{ prop1: "hello"; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<BigGreeter> & { children?: ReactNode; }'.
19-
!!! error TS2322: Weak type 'IntrinsicAttributes & IntrinsicClassAttributes<BigGreeter> & { children?: ReactNode; }' has no properties in common with '{ prop1: "hello"; }'.
17+
!!! error TS2559: Type '{ prop1: "hello"; }' has no properties in common with type 'IntrinsicAttributes & IntrinsicClassAttributes<BigGreeter> & { children?: ReactNode; }'.
2018

2119
// OK
2220
let b = <BigGreeter ref={(input) => { this.textInput = input; }} />

0 commit comments

Comments
 (0)