Skip to content

Commit 78ee4ca

Browse files
TypeScript Botgabrittotypescript-bot
authored
🤖 Pick PR #47927 (Don't error if binding pattern type...) into release-4.6 (#48005)
* Cherry-pick PR #47927 into release-4.6 Component commits: c4aa31b early return if pattern type is never * Update LKG Co-authored-by: Gabriela Araujo Britto <[email protected]> Co-authored-by: typescript-bot <[email protected]>
1 parent f4fe064 commit 78ee4ca

16 files changed

+353
-0
lines changed

‎lib/tsc.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58514,6 +58514,9 @@ var ts;
5851458514
if (parentType && parentType.flags & 1048576 && !(parent.kind === 163 && isSymbolAssigned(symbol))) {
5851558515
var pattern = declaration.parent;
5851658516
var narrowedType = getFlowTypeOfReference(pattern, parentType, parentType, undefined, location.flowNode);
58517+
if (narrowedType.flags & 131072) {
58518+
return neverType;
58519+
}
5851758520
return getBindingElementTypeFromParentType(declaration, narrowedType);
5851858521
}
5851958522
}

‎lib/tsserver.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70031,6 +70031,9 @@ var ts;
7003170031
if (parentType && parentType.flags & 1048576 /* Union */ && !(parent.kind === 163 /* Parameter */ && isSymbolAssigned(symbol))) {
7003270032
var pattern = declaration.parent;
7003370033
var narrowedType = getFlowTypeOfReference(pattern, parentType, parentType, /*flowContainer*/ undefined, location.flowNode);
70034+
if (narrowedType.flags & 131072 /* Never */) {
70035+
return neverType;
70036+
}
7003470037
return getBindingElementTypeFromParentType(declaration, narrowedType);
7003570038
}
7003670039
}

‎lib/tsserverlibrary.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70225,6 +70225,9 @@ var ts;
7022570225
if (parentType && parentType.flags & 1048576 /* Union */ && !(parent.kind === 163 /* Parameter */ && isSymbolAssigned(symbol))) {
7022670226
var pattern = declaration.parent;
7022770227
var narrowedType = getFlowTypeOfReference(pattern, parentType, parentType, /*flowContainer*/ undefined, location.flowNode);
70228+
if (narrowedType.flags & 131072 /* Never */) {
70229+
return neverType;
70230+
}
7022870231
return getBindingElementTypeFromParentType(declaration, narrowedType);
7022970232
}
7023070233
}

‎lib/typescript.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70225,6 +70225,9 @@ var ts;
7022570225
if (parentType && parentType.flags & 1048576 /* Union */ && !(parent.kind === 163 /* Parameter */ && isSymbolAssigned(symbol))) {
7022670226
var pattern = declaration.parent;
7022770227
var narrowedType = getFlowTypeOfReference(pattern, parentType, parentType, /*flowContainer*/ undefined, location.flowNode);
70228+
if (narrowedType.flags & 131072 /* Never */) {
70229+
return neverType;
70230+
}
7022870231
return getBindingElementTypeFromParentType(declaration, narrowedType);
7022970232
}
7023070233
}

‎lib/typescriptServices.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70225,6 +70225,9 @@ var ts;
7022570225
if (parentType && parentType.flags & 1048576 /* Union */ && !(parent.kind === 163 /* Parameter */ && isSymbolAssigned(symbol))) {
7022670226
var pattern = declaration.parent;
7022770227
var narrowedType = getFlowTypeOfReference(pattern, parentType, parentType, /*flowContainer*/ undefined, location.flowNode);
70228+
if (narrowedType.flags & 131072 /* Never */) {
70229+
return neverType;
70230+
}
7022870231
return getBindingElementTypeFromParentType(declaration, narrowedType);
7022970232
}
7023070233
}

‎lib/typingsInstaller.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70020,6 +70020,9 @@ var ts;
7002070020
if (parentType && parentType.flags & 1048576 /* Union */ && !(parent.kind === 163 /* Parameter */ && isSymbolAssigned(symbol))) {
7002170021
var pattern = declaration.parent;
7002270022
var narrowedType = getFlowTypeOfReference(pattern, parentType, parentType, /*flowContainer*/ undefined, location.flowNode);
70023+
if (narrowedType.flags & 131072 /* Never */) {
70024+
return neverType;
70025+
}
7002370026
return getBindingElementTypeFromParentType(declaration, narrowedType);
7002470027
}
7002570028
}

‎src/compiler/checker.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25127,6 +25127,9 @@ namespace ts {
2512725127
if (parentType && parentType.flags & TypeFlags.Union && !(parent.kind === SyntaxKind.Parameter && isSymbolAssigned(symbol))) {
2512825128
const pattern = declaration.parent;
2512925129
const narrowedType = getFlowTypeOfReference(pattern, parentType, parentType, /*flowContainer*/ undefined, location.flowNode);
25130+
if (narrowedType.flags & TypeFlags.Never) {
25131+
return neverType;
25132+
}
2513025133
return getBindingElementTypeFromParentType(declaration, narrowedType);
2513125134
}
2513225135
}

‎tests/baselines/reference/arrayDestructuringInSwitch1.js

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
//// [arrayDestructuringInSwitch1.ts]
2+
export type Expression = BooleanLogicExpression | 'true' | 'false';
3+
export type BooleanLogicExpression = ['and', ...Expression[]] | ['not', Expression];
4+
5+
export function evaluate(expression: Expression): boolean {
6+
if (Array.isArray(expression)) {
7+
const [operator, ...operands] = expression;
8+
switch (operator) {
9+
case 'and': {
10+
return operands.every((child) => evaluate(child));
11+
}
12+
case 'not': {
13+
return !evaluate(operands[0]);
14+
}
15+
default: {
16+
throw new Error(`${operator} is not a supported operator`);
17+
}
18+
}
19+
} else {
20+
return expression === 'true';
21+
}
22+
}
23+
24+
//// [arrayDestructuringInSwitch1.js]
25+
"use strict";
26+
exports.__esModule = true;
27+
exports.evaluate = void 0;
28+
function evaluate(expression) {
29+
if (Array.isArray(expression)) {
30+
var operator = expression[0], operands = expression.slice(1);
31+
switch (operator) {
32+
case 'and': {
33+
return operands.every(function (child) { return evaluate(child); });
34+
}
35+
case 'not': {
36+
return !evaluate(operands[0]);
37+
}
38+
default: {
39+
throw new Error("".concat(operator, " is not a supported operator"));
40+
}
41+
}
42+
}
43+
else {
44+
return expression === 'true';
45+
}
46+
}
47+
exports.evaluate = evaluate;

‎tests/baselines/reference/arrayDestructuringInSwitch1.symbols

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
=== tests/cases/compiler/arrayDestructuringInSwitch1.ts ===
2+
export type Expression = BooleanLogicExpression | 'true' | 'false';
3+
>Expression : Symbol(Expression, Decl(arrayDestructuringInSwitch1.ts, 0, 0))
4+
>BooleanLogicExpression : Symbol(BooleanLogicExpression, Decl(arrayDestructuringInSwitch1.ts, 0, 67))
5+
6+
export type BooleanLogicExpression = ['and', ...Expression[]] | ['not', Expression];
7+
>BooleanLogicExpression : Symbol(BooleanLogicExpression, Decl(arrayDestructuringInSwitch1.ts, 0, 67))
8+
>Expression : Symbol(Expression, Decl(arrayDestructuringInSwitch1.ts, 0, 0))
9+
>Expression : Symbol(Expression, Decl(arrayDestructuringInSwitch1.ts, 0, 0))
10+
11+
export function evaluate(expression: Expression): boolean {
12+
>evaluate : Symbol(evaluate, Decl(arrayDestructuringInSwitch1.ts, 1, 84))
13+
>expression : Symbol(expression, Decl(arrayDestructuringInSwitch1.ts, 3, 25))
14+
>Expression : Symbol(Expression, Decl(arrayDestructuringInSwitch1.ts, 0, 0))
15+
16+
if (Array.isArray(expression)) {
17+
>Array.isArray : Symbol(ArrayConstructor.isArray, Decl(lib.es5.d.ts, --, --))
18+
>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
19+
>isArray : Symbol(ArrayConstructor.isArray, Decl(lib.es5.d.ts, --, --))
20+
>expression : Symbol(expression, Decl(arrayDestructuringInSwitch1.ts, 3, 25))
21+
22+
const [operator, ...operands] = expression;
23+
>operator : Symbol(operator, Decl(arrayDestructuringInSwitch1.ts, 5, 11))
24+
>operands : Symbol(operands, Decl(arrayDestructuringInSwitch1.ts, 5, 20))
25+
>expression : Symbol(expression, Decl(arrayDestructuringInSwitch1.ts, 3, 25))
26+
27+
switch (operator) {
28+
>operator : Symbol(operator, Decl(arrayDestructuringInSwitch1.ts, 5, 11))
29+
30+
case 'and': {
31+
return operands.every((child) => evaluate(child));
32+
>operands.every : Symbol(Array.every, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
33+
>operands : Symbol(operands, Decl(arrayDestructuringInSwitch1.ts, 5, 20))
34+
>every : Symbol(Array.every, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
35+
>child : Symbol(child, Decl(arrayDestructuringInSwitch1.ts, 8, 31))
36+
>evaluate : Symbol(evaluate, Decl(arrayDestructuringInSwitch1.ts, 1, 84))
37+
>child : Symbol(child, Decl(arrayDestructuringInSwitch1.ts, 8, 31))
38+
}
39+
case 'not': {
40+
return !evaluate(operands[0]);
41+
>evaluate : Symbol(evaluate, Decl(arrayDestructuringInSwitch1.ts, 1, 84))
42+
>operands : Symbol(operands, Decl(arrayDestructuringInSwitch1.ts, 5, 20))
43+
>0 : Symbol(0)
44+
}
45+
default: {
46+
throw new Error(`${operator} is not a supported operator`);
47+
>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
48+
>operator : Symbol(operator, Decl(arrayDestructuringInSwitch1.ts, 5, 11))
49+
}
50+
}
51+
} else {
52+
return expression === 'true';
53+
>expression : Symbol(expression, Decl(arrayDestructuringInSwitch1.ts, 3, 25))
54+
}
55+
}

‎tests/baselines/reference/arrayDestructuringInSwitch1.types

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
=== tests/cases/compiler/arrayDestructuringInSwitch1.ts ===
2+
export type Expression = BooleanLogicExpression | 'true' | 'false';
3+
>Expression : Expression
4+
5+
export type BooleanLogicExpression = ['and', ...Expression[]] | ['not', Expression];
6+
>BooleanLogicExpression : BooleanLogicExpression
7+
8+
export function evaluate(expression: Expression): boolean {
9+
>evaluate : (expression: Expression) => boolean
10+
>expression : Expression
11+
12+
if (Array.isArray(expression)) {
13+
>Array.isArray(expression) : boolean
14+
>Array.isArray : (arg: any) => arg is any[]
15+
>Array : ArrayConstructor
16+
>isArray : (arg: any) => arg is any[]
17+
>expression : Expression
18+
19+
const [operator, ...operands] = expression;
20+
>operator : "and" | "not"
21+
>operands : Expression[] | [Expression]
22+
>expression : BooleanLogicExpression
23+
24+
switch (operator) {
25+
>operator : "and" | "not"
26+
27+
case 'and': {
28+
>'and' : "and"
29+
30+
return operands.every((child) => evaluate(child));
31+
>operands.every((child) => evaluate(child)) : boolean
32+
>operands.every : { <S extends Expression>(predicate: (value: Expression, index: number, array: Expression[]) => value is S, thisArg?: any): this is S[]; (predicate: (value: Expression, index: number, array: Expression[]) => unknown, thisArg?: any): boolean; } | { <S extends Expression>(predicate: (value: Expression, index: number, array: Expression[]) => value is S, thisArg?: any): this is S[]; (predicate: (value: Expression, index: number, array: Expression[]) => unknown, thisArg?: any): boolean; }
33+
>operands : Expression[] | [Expression]
34+
>every : { <S extends Expression>(predicate: (value: Expression, index: number, array: Expression[]) => value is S, thisArg?: any): this is S[]; (predicate: (value: Expression, index: number, array: Expression[]) => unknown, thisArg?: any): boolean; } | { <S extends Expression>(predicate: (value: Expression, index: number, array: Expression[]) => value is S, thisArg?: any): this is S[]; (predicate: (value: Expression, index: number, array: Expression[]) => unknown, thisArg?: any): boolean; }
35+
>(child) => evaluate(child) : (child: Expression) => boolean
36+
>child : Expression
37+
>evaluate(child) : boolean
38+
>evaluate : (expression: Expression) => boolean
39+
>child : Expression
40+
}
41+
case 'not': {
42+
>'not' : "not"
43+
44+
return !evaluate(operands[0]);
45+
>!evaluate(operands[0]) : boolean
46+
>evaluate(operands[0]) : boolean
47+
>evaluate : (expression: Expression) => boolean
48+
>operands[0] : Expression
49+
>operands : Expression[] | [Expression]
50+
>0 : 0
51+
}
52+
default: {
53+
throw new Error(`${operator} is not a supported operator`);
54+
>new Error(`${operator} is not a supported operator`) : Error
55+
>Error : ErrorConstructor
56+
>`${operator} is not a supported operator` : string
57+
>operator : never
58+
}
59+
}
60+
} else {
61+
return expression === 'true';
62+
>expression === 'true' : boolean
63+
>expression : "true" | "false"
64+
>'true' : "true"
65+
}
66+
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
tests/cases/compiler/arrayDestructuringInSwitch2.ts(11,13): error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
2+
3+
4+
==== tests/cases/compiler/arrayDestructuringInSwitch2.ts (1 errors) ====
5+
type X = { kind: "a", a: [1] } | { kind: "b", a: [] }
6+
7+
function foo(x: X): 1 {
8+
const { kind, a } = x;
9+
switch (kind) {
10+
case "a":
11+
return a[0];
12+
case "b":
13+
return 1;
14+
default:
15+
const [n] = a;
16+
~~~
17+
!!! error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
18+
return a;
19+
}
20+
}

‎tests/baselines/reference/arrayDestructuringInSwitch2.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
//// [arrayDestructuringInSwitch2.ts]
2+
type X = { kind: "a", a: [1] } | { kind: "b", a: [] }
3+
4+
function foo(x: X): 1 {
5+
const { kind, a } = x;
6+
switch (kind) {
7+
case "a":
8+
return a[0];
9+
case "b":
10+
return 1;
11+
default:
12+
const [n] = a;
13+
return a;
14+
}
15+
}
16+
17+
//// [arrayDestructuringInSwitch2.js]
18+
function foo(x) {
19+
var kind = x.kind, a = x.a;
20+
switch (kind) {
21+
case "a":
22+
return a[0];
23+
case "b":
24+
return 1;
25+
default:
26+
var n = a[0];
27+
return a;
28+
}
29+
}

‎tests/baselines/reference/arrayDestructuringInSwitch2.symbols

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
=== tests/cases/compiler/arrayDestructuringInSwitch2.ts ===
2+
type X = { kind: "a", a: [1] } | { kind: "b", a: [] }
3+
>X : Symbol(X, Decl(arrayDestructuringInSwitch2.ts, 0, 0))
4+
>kind : Symbol(kind, Decl(arrayDestructuringInSwitch2.ts, 0, 10))
5+
>a : Symbol(a, Decl(arrayDestructuringInSwitch2.ts, 0, 21))
6+
>kind : Symbol(kind, Decl(arrayDestructuringInSwitch2.ts, 0, 34))
7+
>a : Symbol(a, Decl(arrayDestructuringInSwitch2.ts, 0, 45))
8+
9+
function foo(x: X): 1 {
10+
>foo : Symbol(foo, Decl(arrayDestructuringInSwitch2.ts, 0, 53))
11+
>x : Symbol(x, Decl(arrayDestructuringInSwitch2.ts, 2, 13))
12+
>X : Symbol(X, Decl(arrayDestructuringInSwitch2.ts, 0, 0))
13+
14+
const { kind, a } = x;
15+
>kind : Symbol(kind, Decl(arrayDestructuringInSwitch2.ts, 3, 9))
16+
>a : Symbol(a, Decl(arrayDestructuringInSwitch2.ts, 3, 15))
17+
>x : Symbol(x, Decl(arrayDestructuringInSwitch2.ts, 2, 13))
18+
19+
switch (kind) {
20+
>kind : Symbol(kind, Decl(arrayDestructuringInSwitch2.ts, 3, 9))
21+
22+
case "a":
23+
return a[0];
24+
>a : Symbol(a, Decl(arrayDestructuringInSwitch2.ts, 3, 15))
25+
>0 : Symbol(0)
26+
27+
case "b":
28+
return 1;
29+
default:
30+
const [n] = a;
31+
>n : Symbol(n, Decl(arrayDestructuringInSwitch2.ts, 10, 13))
32+
>a : Symbol(a, Decl(arrayDestructuringInSwitch2.ts, 3, 15))
33+
34+
return a;
35+
>a : Symbol(a, Decl(arrayDestructuringInSwitch2.ts, 3, 15))
36+
}
37+
}

‎tests/baselines/reference/arrayDestructuringInSwitch2.types

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
=== tests/cases/compiler/arrayDestructuringInSwitch2.ts ===
2+
type X = { kind: "a", a: [1] } | { kind: "b", a: [] }
3+
>X : X
4+
>kind : "a"
5+
>a : [1]
6+
>kind : "b"
7+
>a : []
8+
9+
function foo(x: X): 1 {
10+
>foo : (x: X) => 1
11+
>x : X
12+
13+
const { kind, a } = x;
14+
>kind : "a" | "b"
15+
>a : [1] | []
16+
>x : X
17+
18+
switch (kind) {
19+
>kind : "a" | "b"
20+
21+
case "a":
22+
>"a" : "a"
23+
24+
return a[0];
25+
>a[0] : 1
26+
>a : [1]
27+
>0 : 0
28+
29+
case "b":
30+
>"b" : "b"
31+
32+
return 1;
33+
>1 : 1
34+
35+
default:
36+
const [n] = a;
37+
>n : never
38+
>a : never
39+
40+
return a;
41+
>a : never
42+
}
43+
}

‎tests/cases/compiler/arrayDestructuringInSwitch1.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
export type Expression = BooleanLogicExpression | 'true' | 'false';
2+
export type BooleanLogicExpression = ['and', ...Expression[]] | ['not', Expression];
3+
4+
export function evaluate(expression: Expression): boolean {
5+
if (Array.isArray(expression)) {
6+
const [operator, ...operands] = expression;
7+
switch (operator) {
8+
case 'and': {
9+
return operands.every((child) => evaluate(child));
10+
}
11+
case 'not': {
12+
return !evaluate(operands[0]);
13+
}
14+
default: {
15+
throw new Error(`${operator} is not a supported operator`);
16+
}
17+
}
18+
} else {
19+
return expression === 'true';
20+
}
21+
}

0 commit comments

Comments
 (0)