Skip to content

Commit a812a74

Browse files
DanielRosenwasserDanielRosenwasser
authored
Merge pull request microsoft#38792 from microsoft/reportBaseAgainstBooleans
2 parents 1bbd5ef + 40c3ffe commit a812a74

15 files changed

+72
-64
lines changed

‎src/compiler/checker.ts

+8
Original file line numberDiff line numberDiff line change
@@ -16130,6 +16130,7 @@ namespace ts {
1613016130

1613116131
if (isLiteralType(source) && !typeCouldHaveTopLevelSingletonTypes(target)) {
1613216132
generalizedSource = getBaseTypeOfLiteralType(source);
16133+
Debug.assert(!isTypeAssignableTo(generalizedSource, target), "generalized source shouldn't be assignable");
1613316134
generalizedSourceType = getTypeNameForErrorDisplay(generalizedSource);
1613416135
}
1613516136

@@ -17833,6 +17834,13 @@ namespace ts {
1783317834
}
1783417835

1783517836
function typeCouldHaveTopLevelSingletonTypes(type: Type): boolean {
17837+
// Okay, yes, 'boolean' is a union of 'true | false', but that's not useful
17838+
// in error reporting scenarios. If you need to use this function but that detail matters,
17839+
// feel free to add a flag.
17840+
if (type.flags & TypeFlags.Boolean) {
17841+
return false;
17842+
}
17843+
1783617844
if (type.flags & TypeFlags.UnionOrIntersection) {
1783717845
return !!forEach((type as IntersectionType).types, typeCouldHaveTopLevelSingletonTypes);
1783817846
}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tests/cases/compiler/conditionalExpression1.ts(1,5): error TS2322: Type '1 | ""' is not assignable to type 'boolean'.
2-
Type '1' is not assignable to type 'boolean'.
1+
tests/cases/compiler/conditionalExpression1.ts(1,5): error TS2322: Type 'string | number' is not assignable to type 'boolean'.
2+
Type 'number' is not assignable to type 'boolean'.
33

44

55
==== tests/cases/compiler/conditionalExpression1.ts (1 errors) ====
66
var x: boolean = (true ? 1 : ""); // should be an error
77
~
8-
!!! error TS2322: Type '1 | ""' is not assignable to type 'boolean'.
9-
!!! error TS2322: Type '1' is not assignable to type 'boolean'.
8+
!!! error TS2322: Type 'string | number' is not assignable to type 'boolean'.
9+
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.

‎tests/baselines/reference/for-of46.errors.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/conformance/es6/for-ofStatements/for-of46.ts(3,7): error TS2322: Type 'boolean' is not assignable to type 'string'.
2-
tests/cases/conformance/es6/for-ofStatements/for-of46.ts(3,18): error TS2322: Type '""' is not assignable to type 'boolean'.
2+
tests/cases/conformance/es6/for-ofStatements/for-of46.ts(3,18): error TS2322: Type 'string' is not assignable to type 'boolean'.
33

44

55
==== tests/cases/conformance/es6/for-ofStatements/for-of46.ts (2 errors) ====
@@ -9,7 +9,7 @@ tests/cases/conformance/es6/for-ofStatements/for-of46.ts(3,18): error TS2322: Ty
99
~
1010
!!! error TS2322: Type 'boolean' is not assignable to type 'string'.
1111
~
12-
!!! error TS2322: Type '""' is not assignable to type 'boolean'.
12+
!!! error TS2322: Type 'string' is not assignable to type 'boolean'.
1313
k;
1414
v;
1515
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests/cases/conformance/generators/generatorExplicitReturnType.ts(2,5): error TS2322: Type 'undefined' is not assignable to type 'number'.
22
tests/cases/conformance/generators/generatorExplicitReturnType.ts(3,11): error TS2322: Type 'string' is not assignable to type 'number'.
33
tests/cases/conformance/generators/generatorExplicitReturnType.ts(4,11): error TS2322: Type 'string' is not assignable to type 'number'.
4-
tests/cases/conformance/generators/generatorExplicitReturnType.ts(5,5): error TS2322: Type '10' is not assignable to type 'boolean'.
4+
tests/cases/conformance/generators/generatorExplicitReturnType.ts(5,5): error TS2322: Type 'number' is not assignable to type 'boolean'.
55
tests/cases/conformance/generators/generatorExplicitReturnType.ts(16,11): error TS2322: Type 'symbol' is not assignable to type 'number'.
66

77

@@ -18,7 +18,7 @@ tests/cases/conformance/generators/generatorExplicitReturnType.ts(16,11): error
1818
!!! error TS2322: Type 'string' is not assignable to type 'number'.
1919
return 10; // error
2020
~~~~~~~~~~
21-
!!! error TS2322: Type '10' is not assignable to type 'boolean'.
21+
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.
2222
}
2323

2424
function* g2(): Generator<number, boolean, string> {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
tests/cases/compiler/jsdocInTypeScript.ts(16,23): error TS2304: Cannot find name 'MyType'.
22
tests/cases/compiler/jsdocInTypeScript.ts(23,33): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
3-
tests/cases/compiler/jsdocInTypeScript.ts(25,3): error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
3+
tests/cases/compiler/jsdocInTypeScript.ts(25,3): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
44
tests/cases/compiler/jsdocInTypeScript.ts(25,15): error TS2339: Property 'length' does not exist on type 'number'.
55
tests/cases/compiler/jsdocInTypeScript.ts(30,3): error TS2339: Property 'x' does not exist on type '{}'.
66
tests/cases/compiler/jsdocInTypeScript.ts(42,12): error TS2503: Cannot find namespace 'N'.
@@ -37,7 +37,7 @@ tests/cases/compiler/jsdocInTypeScript.ts(42,12): error TS2503: Cannot find name
3737
// Should fail, because it takes a boolean and returns a number
3838
f(1); f(true).length;
3939
~
40-
!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
40+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
4141
~~~~~~
4242
!!! error TS2339: Property 'length' does not exist on type 'number'.
4343

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/jsdoc/indices.js(9,5): error TS2322: Type '1' is not assignable to type 'boolean'.
1+
tests/cases/conformance/jsdoc/indices.js(9,5): error TS2322: Type 'number' is not assignable to type 'boolean'.
22

33

44
==== tests/cases/conformance/jsdoc/indices.js (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/conformance/jsdoc/indices.js(9,5): error TS2322: Type '1' is not ass
1212
function f(o) {
1313
o.foo = 1; // error
1414
~~~~~
15-
!!! error TS2322: Type '1' is not assignable to type 'boolean'.
15+
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.
1616
o.bar = false; // ok
1717
}
1818

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
tests/cases/conformance/jsdoc/jsdocPrivateName1.js(3,5): error TS2322: Type '3' is not assignable to type 'boolean'.
1+
tests/cases/conformance/jsdoc/jsdocPrivateName1.js(3,5): error TS2322: Type 'number' is not assignable to type 'boolean'.
22

33

44
==== tests/cases/conformance/jsdoc/jsdocPrivateName1.js (1 errors) ====
55
class A {
66
/** @type {boolean} some number value */
77
#foo = 3 // Error because not assignable to boolean
88
~~~~
9-
!!! error TS2322: Type '3' is not assignable to type 'boolean'.
9+
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.
1010
}
1111

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/compiler/matchReturnTypeInAllBranches.ts(30,13): error TS2322: Type '12345' is not assignable to type 'boolean'.
1+
tests/cases/compiler/matchReturnTypeInAllBranches.ts(30,13): error TS2322: Type 'number' is not assignable to type 'boolean'.
22

33

44
==== tests/cases/compiler/matchReturnTypeInAllBranches.ts (1 errors) ====
@@ -33,7 +33,7 @@ tests/cases/compiler/matchReturnTypeInAllBranches.ts(30,13): error TS2322: Type
3333
{
3434
return 12345;
3535
~~~~~~~~~~~~~
36-
!!! error TS2322: Type '12345' is not assignable to type 'boolean'.
36+
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.
3737
}
3838
}
3939
}

‎tests/baselines/reference/parser15.4.4.14-9-2.errors.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(16,42): error TS2345: Argument of type '"0"' is not assignable to parameter of type 'boolean'.
1+
tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(16,42): error TS2345: Argument of type 'string' is not assignable to parameter of type 'boolean'.
22
tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(17,17): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
3-
tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(18,17): error TS2345: Argument of type '0' is not assignable to parameter of type 'boolean'.
4-
tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(19,17): error TS2345: Argument of type '0' is not assignable to parameter of type 'boolean'.
5-
tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(20,17): error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
3+
tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(18,17): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
4+
tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(19,17): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
5+
tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(20,17): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
66
tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(25,1): error TS2304: Cannot find name 'runTestCase'.
77

88

@@ -24,19 +24,19 @@ tests/cases/conformance/parser/ecmascript5/parser15.4.4.14-9-2.ts(25,1): error T
2424
var _float = -(4/3);
2525
var a = new Array(false,undefined,null,"0",obj,-1.3333333333333, "str",-0,true,+0, one, 1,0, false, _float, -(4/3));
2626
~~~
27-
!!! error TS2345: Argument of type '"0"' is not assignable to parameter of type 'boolean'.
27+
!!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'boolean'.
2828
if (a.indexOf(-(4/3)) === 14 && // a[14]=_float===-(4/3)
2929
~~~~~~
3030
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
3131
a.indexOf(0) === 7 && // a[7] = +0, 0===+0
3232
~
33-
!!! error TS2345: Argument of type '0' is not assignable to parameter of type 'boolean'.
33+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
3434
a.indexOf(-0) === 7 && // a[7] = +0, -0===+0
3535
~~
36-
!!! error TS2345: Argument of type '0' is not assignable to parameter of type 'boolean'.
36+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
3737
a.indexOf(1) === 10 ) // a[10] =one=== 1
3838
~
39-
!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
39+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
4040
{
4141
return true;
4242
}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ tests/cases/compiler/readonlyTupleAndArrayElaboration.ts(45,7): error TS2322: Ty
2525
tests/cases/compiler/readonlyTupleAndArrayElaboration.ts(48,7): error TS2322: Type 'number[]' is not assignable to type 'boolean[]'.
2626
Type 'number' is not assignable to type 'boolean'.
2727
tests/cases/compiler/readonlyTupleAndArrayElaboration.ts(51,7): error TS2322: Type 'readonly [1]' is not assignable to type 'readonly boolean[]'.
28-
Type '1' is not assignable to type 'boolean'.
28+
Type 'number' is not assignable to type 'boolean'.
2929
tests/cases/compiler/readonlyTupleAndArrayElaboration.ts(54,7): error TS4104: The type 'readonly [1]' is 'readonly' and cannot be assigned to the mutable type 'number[]'.
3030
tests/cases/compiler/readonlyTupleAndArrayElaboration.ts(57,7): error TS2322: Type '[1]' is not assignable to type 'readonly boolean[]'.
31-
Type '1' is not assignable to type 'boolean'.
31+
Type 'number' is not assignable to type 'boolean'.
3232
tests/cases/compiler/readonlyTupleAndArrayElaboration.ts(60,7): error TS2322: Type '[1]' is not assignable to type 'boolean[]'.
33-
Type '1' is not assignable to type 'boolean'.
33+
Type 'number' is not assignable to type 'boolean'.
3434
tests/cases/compiler/readonlyTupleAndArrayElaboration.ts(63,7): error TS2322: Type 'readonly number[]' is not assignable to type 'readonly [1]'.
3535
Target requires 1 element(s) but source may have fewer.
3636
tests/cases/compiler/readonlyTupleAndArrayElaboration.ts(66,7): error TS4104: The type 'readonly number[]' is 'readonly' and cannot be assigned to the mutable type '[1]'.
@@ -134,7 +134,7 @@ tests/cases/compiler/readonlyTupleAndArrayElaboration.ts(72,7): error TS2322: Ty
134134
const ta2: readonly boolean[] = ta1;
135135
~~~
136136
!!! error TS2322: Type 'readonly [1]' is not assignable to type 'readonly boolean[]'.
137-
!!! error TS2322: Type '1' is not assignable to type 'boolean'.
137+
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.
138138

139139
const ta3: readonly [1] = [1];
140140
const ta4: number[] = ta3;
@@ -145,13 +145,13 @@ tests/cases/compiler/readonlyTupleAndArrayElaboration.ts(72,7): error TS2322: Ty
145145
const ta6: readonly boolean[] = ta5;
146146
~~~
147147
!!! error TS2322: Type '[1]' is not assignable to type 'readonly boolean[]'.
148-
!!! error TS2322: Type '1' is not assignable to type 'boolean'.
148+
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.
149149

150150
const ta7: [1] = [1];
151151
const ta8: boolean[] = ta7;
152152
~~~
153153
!!! error TS2322: Type '[1]' is not assignable to type 'boolean[]'.
154-
!!! error TS2322: Type '1' is not assignable to type 'boolean'.
154+
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.
155155

156156
const at1: readonly number[] = [1];
157157
const at2: readonly [1] = at1;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tests/cases/compiler/restParameterWithBindingPattern3.ts(1,23): error TS2322: Ty
33
tests/cases/compiler/restParameterWithBindingPattern3.ts(3,23): error TS1186: A rest element cannot have an initializer.
44
tests/cases/compiler/restParameterWithBindingPattern3.ts(5,30): error TS2493: Tuple type '[boolean, string, number]' of length '3' has no element at index '3'.
55
tests/cases/compiler/restParameterWithBindingPattern3.ts(7,23): error TS2493: Tuple type '[boolean, string, number]' of length '3' has no element at index '3'.
6-
tests/cases/compiler/restParameterWithBindingPattern3.ts(9,19): error TS2322: Type '1' is not assignable to type 'boolean'.
6+
tests/cases/compiler/restParameterWithBindingPattern3.ts(9,19): error TS2322: Type 'number' is not assignable to type 'boolean'.
77
tests/cases/compiler/restParameterWithBindingPattern3.ts(9,29): error TS2322: Type 'boolean' is not assignable to type 'string'.
88
tests/cases/compiler/restParameterWithBindingPattern3.ts(9,48): error TS2566: A rest element cannot have a property name.
99

@@ -29,7 +29,7 @@ tests/cases/compiler/restParameterWithBindingPattern3.ts(9,48): error TS2566: A
2929

3030
function e(...{0: a = 1, 1: b = true, ...rest: rest}: [boolean, string, number]) { }
3131
~
32-
!!! error TS2322: Type '1' is not assignable to type 'boolean'.
32+
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.
3333
~
3434
!!! error TS2322: Type 'boolean' is not assignable to type 'string'.
3535
~~~~

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(14,9): error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
2-
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(18,9): error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
3-
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(22,9): error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
4-
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(24,25): error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
5-
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(26,9): error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
6-
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(26,46): error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
7-
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(28,57): error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
1+
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(14,9): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
2+
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(18,9): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
3+
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(22,9): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
4+
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(24,25): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
5+
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(26,9): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
6+
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(26,46): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
7+
tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts(28,57): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
88

99

1010
==== tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts (7 errors) ====
@@ -23,33 +23,33 @@ tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTyped
2323

2424
f `abc${1}def${2}ghi`;
2525
~
26-
!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
26+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
2727

2828
f `abc`.member
2929

3030
f `abc${1}def${2}ghi`.member;
3131
~
32-
!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
32+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
3333

3434
f `abc`["member"];
3535

3636
f `abc${1}def${2}ghi`["member"];
3737
~
38-
!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
38+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
3939

4040
f `abc`[0].member `abc${1}def${2}ghi`;
4141
~
42-
!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
42+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
4343

4444
f `abc${1}def${2}ghi`["member"].member `abc${1}def${2}ghi`;
4545
~
46-
!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
46+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
4747
~
48-
!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
48+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
4949

5050
f `abc${ true }def${ true }ghi`["member"].member `abc${ 1 }def${ 2 }ghi`;
5151
~
52-
!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'boolean'.
52+
!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
5353

5454
f.thisIsNotATag(`abc`);
5555

0 commit comments

Comments
 (0)