Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3845e18

Browse files
sonalluxbradzacher
sonallux
and
bradzacher
committed
feat: remove TSParenthesizedType (typescript-eslint#3340)
fixes typescript-eslint#3136 Co-authored-by: Brad Zacher <[email protected]>
1 parent bcc9505 commit 3845e18

File tree

24 files changed

+169
-299
lines changed

24 files changed

+169
-299
lines changed

‎packages/ast-spec/src/ast-node-types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ export enum AST_NODE_TYPES {
135135
TSObjectKeyword = 'TSObjectKeyword',
136136
TSOptionalType = 'TSOptionalType',
137137
TSParameterProperty = 'TSParameterProperty',
138-
TSParenthesizedType = 'TSParenthesizedType',
139138
TSPrivateKeyword = 'TSPrivateKeyword',
140139
TSPropertySignature = 'TSPropertySignature',
141140
TSProtectedKeyword = 'TSProtectedKeyword',

‎packages/ast-spec/src/type/TSParenthesizedType/spec.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎packages/ast-spec/src/type/spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ export * from './TSNullKeyword/spec';
1717
export * from './TSNumberKeyword/spec';
1818
export * from './TSObjectKeyword/spec';
1919
export * from './TSOptionalType/spec';
20-
export * from './TSParenthesizedType/spec';
2120
export * from './TSQualifiedName/spec';
2221
export * from './TSRestType/spec';
2322
export * from './TSStringKeyword/spec';

‎packages/ast-spec/src/unions/Node.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ import type { TSNullKeyword } from '../type/TSNullKeyword/spec';
142142
import type { TSNumberKeyword } from '../type/TSNumberKeyword/spec';
143143
import type { TSObjectKeyword } from '../type/TSObjectKeyword/spec';
144144
import type { TSOptionalType } from '../type/TSOptionalType/spec';
145-
import type { TSParenthesizedType } from '../type/TSParenthesizedType/spec';
146145
import type { TSQualifiedName } from '../type/TSQualifiedName/spec';
147146
import type { TSRestType } from '../type/TSRestType/spec';
148147
import type { TSStringKeyword } from '../type/TSStringKeyword/spec';
@@ -293,7 +292,6 @@ export type Node =
293292
| TSObjectKeyword
294293
| TSOptionalType
295294
| TSParameterProperty
296-
| TSParenthesizedType
297295
| TSPrivateKeyword
298296
| TSPropertySignature
299297
| TSProtectedKeyword

‎packages/ast-spec/src/unions/TypeNode.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import type { TSNullKeyword } from '../type/TSNullKeyword/spec';
1818
import type { TSNumberKeyword } from '../type/TSNumberKeyword/spec';
1919
import type { TSObjectKeyword } from '../type/TSObjectKeyword/spec';
2020
import type { TSOptionalType } from '../type/TSOptionalType/spec';
21-
import type { TSParenthesizedType } from '../type/TSParenthesizedType/spec';
2221
import type { TSRestType } from '../type/TSRestType/spec';
2322
import type { TSStringKeyword } from '../type/TSStringKeyword/spec';
2423
import type { TSSymbolKeyword } from '../type/TSSymbolKeyword/spec';
@@ -56,7 +55,6 @@ export type TypeNode =
5655
| TSNumberKeyword
5756
| TSObjectKeyword
5857
| TSOptionalType
59-
| TSParenthesizedType
6058
| TSRestType
6159
| TSStringKeyword
6260
| TSSymbolKeyword

‎packages/eslint-plugin/src/rules/array-type.ts

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,8 @@ export default util.createRule<Options, MessageIds>({
132132
* @param node the node to be evaluated.
133133
*/
134134
function getMessageType(node: TSESTree.Node): string {
135-
if (node) {
136-
if (node.type === AST_NODE_TYPES.TSParenthesizedType) {
137-
return getMessageType(node.typeAnnotation);
138-
}
139-
if (isSimpleType(node)) {
140-
return sourceCode.getText(node);
141-
}
135+
if (node && isSimpleType(node)) {
136+
return sourceCode.getText(node);
142137
}
143138
return 'T';
144139
}
@@ -172,11 +167,7 @@ export default util.createRule<Options, MessageIds>({
172167
type: getMessageType(node.elementType),
173168
},
174169
fix(fixer) {
175-
const typeNode =
176-
node.elementType.type === AST_NODE_TYPES.TSParenthesizedType
177-
? node.elementType.typeAnnotation
178-
: node.elementType;
179-
170+
const typeNode = node.elementType;
180171
const arrayType = isReadonly ? 'ReadonlyArray' : 'Array';
181172

182173
return [
@@ -244,9 +235,12 @@ export default util.createRule<Options, MessageIds>({
244235
}
245236

246237
const type = typeParams[0];
247-
const typeParens = typeNeedsParentheses(type);
238+
const typeParens =
239+
!util.isParenthesized(type, sourceCode) && typeNeedsParentheses(type);
248240
const parentParens =
249-
readonlyPrefix && node.parent?.type === AST_NODE_TYPES.TSArrayType;
241+
readonlyPrefix &&
242+
node.parent?.type === AST_NODE_TYPES.TSArrayType &&
243+
!util.isParenthesized(node.parent.elementType, sourceCode);
250244

251245
const start = `${parentParens ? '(' : ''}${readonlyPrefix}${
252246
typeParens ? '(' : ''

‎packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ const KNOWN_NODES = new Set([
161161
AST_NODE_TYPES.TSModuleDeclaration,
162162
AST_NODE_TYPES.TSNonNullExpression,
163163
AST_NODE_TYPES.TSParameterProperty,
164-
AST_NODE_TYPES.TSParenthesizedType,
165164
'TSPlusToken',
166165
AST_NODE_TYPES.TSPropertySignature,
167166
AST_NODE_TYPES.TSQualifiedName,

‎packages/eslint-plugin/src/rules/indent.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ const KNOWN_NODES = new Set([
6767
AST_NODE_TYPES.TSModuleDeclaration,
6868
AST_NODE_TYPES.TSNonNullExpression,
6969
AST_NODE_TYPES.TSParameterProperty,
70-
AST_NODE_TYPES.TSParenthesizedType,
7170
'TSPlusToken',
7271
AST_NODE_TYPES.TSPropertySignature,
7372
AST_NODE_TYPES.TSQualifiedName,

‎packages/eslint-plugin/src/rules/no-extra-parens.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@ export default util.createRule<Options, MessageIds>({
8484
if (
8585
node.arguments.length === 1 &&
8686
node.typeParameters?.params.some(
87-
param =>
88-
param.type === AST_NODE_TYPES.TSParenthesizedType ||
89-
param.type === AST_NODE_TYPES.TSImportType,
87+
param => param.type === AST_NODE_TYPES.TSImportType,
9088
)
9189
) {
9290
return rule({

‎packages/eslint-plugin/src/rules/no-type-alias.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,6 @@ export default util.createRule<Options, MessageIds>({
294294
return acc;
295295
}, []);
296296
}
297-
if (node.type === AST_NODE_TYPES.TSParenthesizedType) {
298-
return getTypes(node.typeAnnotation, compositionType);
299-
}
300297
return [{ node, compositionType }];
301298
}
302299

‎packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ enum Group {
2323

2424
function getGroup(node: TSESTree.TypeNode): Group {
2525
switch (node.type) {
26-
case AST_NODE_TYPES.TSParenthesizedType:
27-
return getGroup(node.typeAnnotation);
28-
2926
case AST_NODE_TYPES.TSConditionalType:
3027
return Group.conditional;
3128

@@ -91,6 +88,10 @@ function getGroup(node: TSESTree.TypeNode): Group {
9188
}
9289
}
9390

91+
function requiresParentheses(node: TSESTree.TypeNode): boolean {
92+
return node.type === AST_NODE_TYPES.TSFunctionType;
93+
}
94+
9495
export type Options = [
9596
{
9697
checkIntersections?: boolean;
@@ -212,7 +213,7 @@ export default util.createRule<Options, MessageIds>({
212213

213214
const fix: TSESLint.ReportFixFunction = fixer => {
214215
const sorted = expectedOrder
215-
.map(t => t.text)
216+
.map(t => (requiresParentheses(t.node) ? `(${t.text})` : t.text))
216217
.join(
217218
node.type === AST_NODE_TYPES.TSIntersectionType ? ' & ' : ' | ',
218219
);

‎packages/eslint-plugin/tests/rules/indent/indent.test.ts

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -451,29 +451,6 @@ class Foo {
451451
`,
452452
],
453453
},
454-
{
455-
node: AST_NODE_TYPES.TSParenthesizedType,
456-
code: [
457-
`
458-
const x: Array<(
459-
| {
460-
__typename: "Foo",
461-
}
462-
| {
463-
__typename: "Baz",
464-
}
465-
| (
466-
| {
467-
__typename: "Baz",
468-
}
469-
| {
470-
__typename: "Buzz",
471-
}
472-
)
473-
)>;
474-
`,
475-
],
476-
},
477454
// TSPlusToken - tested in TSMappedType
478455
{
479456
node: AST_NODE_TYPES.TSPropertySignature,

‎packages/eslint-plugin/tests/rules/no-extra-parens.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ for (a in b, c);
2828
for (a in b);
2929
a<import('')>(1);
3030
new a<import('')>(1);
31-
a<(A)>(1);
31+
a<A>(1);
3232
`,
3333
}),
3434
...batchedSingleLineTests({

‎packages/eslint-plugin/tests/rules/sort-type-union-intersection-members.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ const invalid = (
127127
},
128128
{
129129
code: noFormat`type T = (B) ${operator} (A);`,
130-
output: noFormat`type T = (A) ${operator} (B);`,
130+
output: noFormat`type T = A ${operator} B;`,
131131
errors: [
132132
{
133133
messageId: 'notSortedNamed',

‎packages/experimental-utils/src/ts-eslint/Rule.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ interface RuleListener {
387387
TSObjectKeyword?: RuleFunction<TSESTree.TSObjectKeyword>;
388388
TSOptionalType?: RuleFunction<TSESTree.TSOptionalType>;
389389
TSParameterProperty?: RuleFunction<TSESTree.TSParameterProperty>;
390-
TSParenthesizedType?: RuleFunction<TSESTree.TSParenthesizedType>;
391390
TSPrivateKeyword?: RuleFunction<TSESTree.TSPrivateKeyword>;
392391
TSPropertySignature?: RuleFunction<TSESTree.TSPropertySignature>;
393392
TSProtectedKeyword?: RuleFunction<TSESTree.TSProtectedKeyword>;

‎packages/typescript-estree/src/convert.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2698,10 +2698,7 @@ export class Converter {
26982698

26992699
// TypeScript specific types
27002700
case SyntaxKind.ParenthesizedType: {
2701-
return this.createNode<TSESTree.TSParenthesizedType>(node, {
2702-
type: AST_NODE_TYPES.TSParenthesizedType,
2703-
typeAnnotation: this.convertType(node.type),
2704-
});
2701+
return this.convertType(node.type);
27052702
}
27062703
case SyntaxKind.UnionType: {
27072704
return this.createNode<TSESTree.TSUnionType>(node, {

‎packages/typescript-estree/src/ts-estree/estree-to-ts-node-types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ export interface EstreeToTsNodeTypes {
192192
[AST_NODE_TYPES.TSNonNullExpression]: ts.NonNullExpression;
193193
[AST_NODE_TYPES.TSOptionalType]: ts.OptionalTypeNode;
194194
[AST_NODE_TYPES.TSParameterProperty]: ts.ParameterDeclaration;
195-
[AST_NODE_TYPES.TSParenthesizedType]: ts.ParenthesizedTypeNode;
196195
[AST_NODE_TYPES.TSPropertySignature]: ts.PropertySignature;
197196
[AST_NODE_TYPES.TSQualifiedName]: ts.QualifiedName;
198197
[AST_NODE_TYPES.TSRestType]:

‎packages/typescript-estree/tests/ast-alignment/utils.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,16 @@ export function preprocessBabylonAST(ast: BabelTypes.File): any {
250250
}
251251
}
252252
},
253+
/**
254+
* Remove TSParenthesizedType from babel AST. Babel 8 will stop generating the TSParenthesizedType.
255+
* Once we use babel 8, this can be removed.
256+
* @see https://github.com/babel/babel/pull/12608
257+
*/
258+
TSParenthesizedType(node: any) {
259+
const { typeAnnotation } = node;
260+
Object.keys(node).forEach(key => delete node[key]);
261+
Object.assign(node, typeAnnotation);
262+
},
253263
/**
254264
* Babel adds a `static` property to the StaticBlock when the
255265
* `typescript` plugin and the `classStaticBlock` plugin are enabled.

‎packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-nested.src.ts.shot

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -78,38 +78,33 @@ Object {
7878
"elementType": Object {
7979
"loc": Object {
8080
"end": Object {
81-
"column": 21,
81+
"column": 20,
8282
"line": 2,
8383
},
8484
"start": Object {
85-
"column": 12,
85+
"column": 13,
8686
"line": 2,
8787
},
8888
},
8989
"range": Array [
90-
31,
91-
40,
90+
32,
91+
39,
9292
],
93-
"type": "TSParenthesizedType",
94-
"typeAnnotation": Object {
93+
"type": "TSInferType",
94+
"typeParameter": Object {
95+
"constraint": undefined,
96+
"default": undefined,
9597
"loc": Object {
9698
"end": Object {
9799
"column": 20,
98100
"line": 2,
99101
},
100102
"start": Object {
101-
"column": 13,
103+
"column": 19,
102104
"line": 2,
103105
},
104106
},
105-
"range": Array [
106-
32,
107-
39,
108-
],
109-
"type": "TSInferType",
110-
"typeParameter": Object {
111-
"constraint": undefined,
112-
"default": undefined,
107+
"name": Object {
113108
"loc": Object {
114109
"end": Object {
115110
"column": 20,
@@ -120,30 +115,18 @@ Object {
120115
"line": 2,
121116
},
122117
},
123-
"name": Object {
124-
"loc": Object {
125-
"end": Object {
126-
"column": 20,
127-
"line": 2,
128-
},
129-
"start": Object {
130-
"column": 19,
131-
"line": 2,
132-
},
133-
},
134-
"name": "U",
135-
"range": Array [
136-
38,
137-
39,
138-
],
139-
"type": "Identifier",
140-
},
118+
"name": "U",
141119
"range": Array [
142120
38,
143121
39,
144122
],
145-
"type": "TSTypeParameter",
123+
"type": "Identifier",
146124
},
125+
"range": Array [
126+
38,
127+
39,
128+
],
129+
"type": "TSTypeParameter",
147130
},
148131
},
149132
"loc": Object {

0 commit comments

Comments
 (0)