Skip to content

Commit 6e4b381

Browse files
KingwlKingwl
committed
Add check for delete expression must be optional
1 parent eb105ef commit 6e4b381

14 files changed

+618
-4
lines changed

‎src/compiler/checker.ts

+13-2
Original file line numberDiff line numberDiff line change
@@ -27566,12 +27566,23 @@ namespace ts {
2756627566
}
2756727567
const links = getNodeLinks(expr);
2756827568
const symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
27569-
if (symbol && isReadonlySymbol(symbol)) {
27570-
error(expr, Diagnostics.The_operand_of_a_delete_operator_cannot_be_a_read_only_property);
27569+
if (symbol) {
27570+
if (isReadonlySymbol(symbol)) {
27571+
error(expr, Diagnostics.The_operand_of_a_delete_operator_cannot_be_a_read_only_property);
27572+
}
27573+
27574+
checkDeleteExpressionMustBeOptional(expr, getTypeOfSymbol(symbol));
2757127575
}
2757227576
return booleanType;
2757327577
}
2757427578

27579+
function checkDeleteExpressionMustBeOptional(expr: AccessExpression, type: Type) {
27580+
const AnyOrUnknownOrNeverFlags = TypeFlags.AnyOrUnknown | TypeFlags.Never;
27581+
if (strictNullChecks && !(type.flags & AnyOrUnknownOrNeverFlags) && !(getFalsyFlags(type) & TypeFlags.Undefined)) {
27582+
error(expr, Diagnostics.The_operand_of_a_delete_operator_must_be_optional);
27583+
}
27584+
}
27585+
2757527586
function checkTypeOfExpression(node: TypeOfExpression): Type {
2757627587
checkExpression(node.expression);
2757727588
return typeofType;

‎src/compiler/diagnosticMessages.json

+4
Original file line numberDiff line numberDiff line change
@@ -2963,6 +2963,10 @@
29632963
"category": "Error",
29642964
"code": 2789
29652965
},
2966+
"The operand of a 'delete' operator must be optional.": {
2967+
"category": "Error",
2968+
"code": 2790
2969+
},
29662970

29672971
"Import declaration '{0}' is using private name '{1}'.": {
29682972
"category": "Error",

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
tests/cases/conformance/controlFlow/controlFlowDeleteOperator.ts(10,12): error TS2790: The operand of a 'delete' operator must be optional.
12
tests/cases/conformance/controlFlow/controlFlowDeleteOperator.ts(14,12): error TS2703: The operand of a 'delete' operator must be a property reference.
23

34

4-
==== tests/cases/conformance/controlFlow/controlFlowDeleteOperator.ts (1 errors) ====
5+
==== tests/cases/conformance/controlFlow/controlFlowDeleteOperator.ts (2 errors) ====
56
function f() {
67
let x: { a?: number | string, b: number | string } = { b: 1 };
78
x.a;
@@ -12,6 +13,8 @@ tests/cases/conformance/controlFlow/controlFlowDeleteOperator.ts(14,12): error T
1213
x.b;
1314
delete x.a;
1415
delete x.b;
16+
~~~
17+
!!! error TS2790: The operand of a 'delete' operator must be optional.
1518
x.a;
1619
x.b;
1720
x;

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

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(2,8): error TS2790: The operand of a 'delete' operator must be optional.
2+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(3,9): error TS2790: The operand of a 'delete' operator must be optional.
3+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(6,8): error TS2790: The operand of a 'delete' operator must be optional.
4+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(7,9): error TS2790: The operand of a 'delete' operator must be optional.
5+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(10,8): error TS2790: The operand of a 'delete' operator must be optional.
6+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(11,9): error TS2790: The operand of a 'delete' operator must be optional.
7+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(14,8): error TS2790: The operand of a 'delete' operator must be optional.
8+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(15,8): error TS2790: The operand of a 'delete' operator must be optional.
9+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(16,9): error TS2790: The operand of a 'delete' operator must be optional.
10+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(19,8): error TS2790: The operand of a 'delete' operator must be optional.
11+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(20,9): error TS2790: The operand of a 'delete' operator must be optional.
12+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(23,8): error TS2790: The operand of a 'delete' operator must be optional.
13+
tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts(24,9): error TS2790: The operand of a 'delete' operator must be optional.
14+
15+
16+
==== tests/cases/conformance/expressions/optionalChaining/delete/deleteChain.ts (13 errors) ====
17+
declare const o1: undefined | { b: string };
18+
delete o1?.b;
19+
~~~~~
20+
!!! error TS2790: The operand of a 'delete' operator must be optional.
21+
delete (o1?.b);
22+
~~~~~
23+
!!! error TS2790: The operand of a 'delete' operator must be optional.
24+
25+
declare const o2: undefined | { b: { c: string } };
26+
delete o2?.b.c;
27+
~~~~~~~
28+
!!! error TS2790: The operand of a 'delete' operator must be optional.
29+
delete (o2?.b.c);
30+
~~~~~~~
31+
!!! error TS2790: The operand of a 'delete' operator must be optional.
32+
33+
declare const o3: { b: undefined | { c: string } };
34+
delete o3.b?.c;
35+
~~~~~~~
36+
!!! error TS2790: The operand of a 'delete' operator must be optional.
37+
delete (o3.b?.c);
38+
~~~~~~~
39+
!!! error TS2790: The operand of a 'delete' operator must be optional.
40+
41+
declare const o4: { b?: { c: { d?: { e: string } } } };
42+
delete o4.b?.c.d?.e;
43+
~~~~~~~~~~~~
44+
!!! error TS2790: The operand of a 'delete' operator must be optional.
45+
delete (o4.b?.c.d)?.e;
46+
~~~~~~~~~~~~~~
47+
!!! error TS2790: The operand of a 'delete' operator must be optional.
48+
delete (o4.b?.c.d?.e);
49+
~~~~~~~~~~~~
50+
!!! error TS2790: The operand of a 'delete' operator must be optional.
51+
52+
declare const o5: { b?(): { c: { d?: { e: string } } } };
53+
delete o5.b?.().c.d?.e;
54+
~~~~~~~~~~~~~~~
55+
!!! error TS2790: The operand of a 'delete' operator must be optional.
56+
delete (o5.b?.().c.d?.e);
57+
~~~~~~~~~~~~~~~
58+
!!! error TS2790: The operand of a 'delete' operator must be optional.
59+
60+
declare const o6: { b?: { c: { d?: { e: string } } } };
61+
delete o6.b?.['c'].d?.['e'];
62+
~~~~~~~~~~~~~~~~~~~~
63+
!!! error TS2790: The operand of a 'delete' operator must be optional.
64+
delete (o6.b?.['c'].d?.['e']);
65+
~~~~~~~~~~~~~~~~~~~~
66+
!!! error TS2790: The operand of a 'delete' operator must be optional.

‎tests/baselines/reference/deleteExpressionMustBeOptional(strict=false).errors.txt

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
tests/cases/compiler/deleteExpressionMustBeOptional.ts(24,10): error TS2339: Property 'j' does not exist on type 'Foo'.
2+
3+
4+
==== tests/cases/compiler/deleteExpressionMustBeOptional.ts (1 errors) ====
5+
interface Foo {
6+
a: number
7+
b: number | undefined
8+
c: number | null
9+
d?: number
10+
e: number | undefined | null
11+
f?: number | undefined | null
12+
g: unknown
13+
h: any
14+
i: never
15+
}
16+
17+
declare const f: Foo
18+
19+
delete f.a
20+
delete f.b
21+
delete f.c
22+
delete f.d
23+
delete f.e
24+
delete f.f
25+
delete f.g
26+
delete f.h
27+
delete f.i
28+
delete f.j
29+
~
30+
!!! error TS2339: Property 'j' does not exist on type 'Foo'.

‎tests/baselines/reference/deleteExpressionMustBeOptional(strict=false).js

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
//// [deleteExpressionMustBeOptional.ts]
2+
interface Foo {
3+
a: number
4+
b: number | undefined
5+
c: number | null
6+
d?: number
7+
e: number | undefined | null
8+
f?: number | undefined | null
9+
g: unknown
10+
h: any
11+
i: never
12+
}
13+
14+
declare const f: Foo
15+
16+
delete f.a
17+
delete f.b
18+
delete f.c
19+
delete f.d
20+
delete f.e
21+
delete f.f
22+
delete f.g
23+
delete f.h
24+
delete f.i
25+
delete f.j
26+
27+
//// [deleteExpressionMustBeOptional.js]
28+
delete f.a;
29+
delete f.b;
30+
delete f.c;
31+
delete f.d;
32+
delete f.e;
33+
delete f.f;
34+
delete f.g;
35+
delete f.h;
36+
delete f.i;
37+
delete f.j;

‎tests/baselines/reference/deleteExpressionMustBeOptional(strict=false).symbols

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
=== tests/cases/compiler/deleteExpressionMustBeOptional.ts ===
2+
interface Foo {
3+
>Foo : Symbol(Foo, Decl(deleteExpressionMustBeOptional.ts, 0, 0))
4+
5+
a: number
6+
>a : Symbol(Foo.a, Decl(deleteExpressionMustBeOptional.ts, 0, 15))
7+
8+
b: number | undefined
9+
>b : Symbol(Foo.b, Decl(deleteExpressionMustBeOptional.ts, 1, 13))
10+
11+
c: number | null
12+
>c : Symbol(Foo.c, Decl(deleteExpressionMustBeOptional.ts, 2, 25))
13+
14+
d?: number
15+
>d : Symbol(Foo.d, Decl(deleteExpressionMustBeOptional.ts, 3, 20))
16+
17+
e: number | undefined | null
18+
>e : Symbol(Foo.e, Decl(deleteExpressionMustBeOptional.ts, 4, 14))
19+
20+
f?: number | undefined | null
21+
>f : Symbol(Foo.f, Decl(deleteExpressionMustBeOptional.ts, 5, 32))
22+
23+
g: unknown
24+
>g : Symbol(Foo.g, Decl(deleteExpressionMustBeOptional.ts, 6, 33))
25+
26+
h: any
27+
>h : Symbol(Foo.h, Decl(deleteExpressionMustBeOptional.ts, 7, 14))
28+
29+
i: never
30+
>i : Symbol(Foo.i, Decl(deleteExpressionMustBeOptional.ts, 8, 10))
31+
}
32+
33+
declare const f: Foo
34+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
35+
>Foo : Symbol(Foo, Decl(deleteExpressionMustBeOptional.ts, 0, 0))
36+
37+
delete f.a
38+
>f.a : Symbol(Foo.a, Decl(deleteExpressionMustBeOptional.ts, 0, 15))
39+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
40+
>a : Symbol(Foo.a, Decl(deleteExpressionMustBeOptional.ts, 0, 15))
41+
42+
delete f.b
43+
>f.b : Symbol(Foo.b, Decl(deleteExpressionMustBeOptional.ts, 1, 13))
44+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
45+
>b : Symbol(Foo.b, Decl(deleteExpressionMustBeOptional.ts, 1, 13))
46+
47+
delete f.c
48+
>f.c : Symbol(Foo.c, Decl(deleteExpressionMustBeOptional.ts, 2, 25))
49+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
50+
>c : Symbol(Foo.c, Decl(deleteExpressionMustBeOptional.ts, 2, 25))
51+
52+
delete f.d
53+
>f.d : Symbol(Foo.d, Decl(deleteExpressionMustBeOptional.ts, 3, 20))
54+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
55+
>d : Symbol(Foo.d, Decl(deleteExpressionMustBeOptional.ts, 3, 20))
56+
57+
delete f.e
58+
>f.e : Symbol(Foo.e, Decl(deleteExpressionMustBeOptional.ts, 4, 14))
59+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
60+
>e : Symbol(Foo.e, Decl(deleteExpressionMustBeOptional.ts, 4, 14))
61+
62+
delete f.f
63+
>f.f : Symbol(Foo.f, Decl(deleteExpressionMustBeOptional.ts, 5, 32))
64+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
65+
>f : Symbol(Foo.f, Decl(deleteExpressionMustBeOptional.ts, 5, 32))
66+
67+
delete f.g
68+
>f.g : Symbol(Foo.g, Decl(deleteExpressionMustBeOptional.ts, 6, 33))
69+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
70+
>g : Symbol(Foo.g, Decl(deleteExpressionMustBeOptional.ts, 6, 33))
71+
72+
delete f.h
73+
>f.h : Symbol(Foo.h, Decl(deleteExpressionMustBeOptional.ts, 7, 14))
74+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
75+
>h : Symbol(Foo.h, Decl(deleteExpressionMustBeOptional.ts, 7, 14))
76+
77+
delete f.i
78+
>f.i : Symbol(Foo.i, Decl(deleteExpressionMustBeOptional.ts, 8, 10))
79+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
80+
>i : Symbol(Foo.i, Decl(deleteExpressionMustBeOptional.ts, 8, 10))
81+
82+
delete f.j
83+
>f : Symbol(f, Decl(deleteExpressionMustBeOptional.ts, 12, 13))
84+

‎tests/baselines/reference/deleteExpressionMustBeOptional(strict=false).types

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
=== tests/cases/compiler/deleteExpressionMustBeOptional.ts ===
2+
interface Foo {
3+
a: number
4+
>a : number
5+
6+
b: number | undefined
7+
>b : number
8+
9+
c: number | null
10+
>c : number
11+
>null : null
12+
13+
d?: number
14+
>d : number
15+
16+
e: number | undefined | null
17+
>e : number
18+
>null : null
19+
20+
f?: number | undefined | null
21+
>f : number
22+
>null : null
23+
24+
g: unknown
25+
>g : unknown
26+
27+
h: any
28+
>h : any
29+
30+
i: never
31+
>i : never
32+
}
33+
34+
declare const f: Foo
35+
>f : Foo
36+
37+
delete f.a
38+
>delete f.a : boolean
39+
>f.a : number
40+
>f : Foo
41+
>a : number
42+
43+
delete f.b
44+
>delete f.b : boolean
45+
>f.b : number
46+
>f : Foo
47+
>b : number
48+
49+
delete f.c
50+
>delete f.c : boolean
51+
>f.c : number
52+
>f : Foo
53+
>c : number
54+
55+
delete f.d
56+
>delete f.d : boolean
57+
>f.d : number
58+
>f : Foo
59+
>d : number
60+
61+
delete f.e
62+
>delete f.e : boolean
63+
>f.e : number
64+
>f : Foo
65+
>e : number
66+
67+
delete f.f
68+
>delete f.f : boolean
69+
>f.f : number
70+
>f : Foo
71+
>f : number
72+
73+
delete f.g
74+
>delete f.g : boolean
75+
>f.g : unknown
76+
>f : Foo
77+
>g : unknown
78+
79+
delete f.h
80+
>delete f.h : boolean
81+
>f.h : any
82+
>f : Foo
83+
>h : any
84+
85+
delete f.i
86+
>delete f.i : boolean
87+
>f.i : never
88+
>f : Foo
89+
>i : never
90+
91+
delete f.j
92+
>delete f.j : boolean
93+
>f.j : any
94+
>f : Foo
95+
>j : any
96+

0 commit comments

Comments
 (0)