Skip to content

Commit a8b4bd4

Browse files
authored
fix: replace deprecated typeParameters with typeArguments (#623)
1 parent e6d6c46 commit a8b4bd4

File tree

4 files changed

+27
-20
lines changed

4 files changed

+27
-20
lines changed

.changeset/small-fishes-sin.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"eslint-plugin-svelte": patch
3+
---
4+
5+
fix: replace deprecated typeParameters with typeArguments

src/rules/indent-helpers/es.ts

+9-11
Original file line numberDiff line numberDiff line change
@@ -183,19 +183,20 @@ export function defineVisitor(context: IndentContext): NodeListener {
183183
visitor.BreakStatement(node);
184184
},
185185
CallExpression(node: TSESTree.CallExpression) {
186+
const typeArguments = node.typeArguments ?? node.typeParameters;
186187
const firstToken = sourceCode.getFirstToken(node);
187-
const leftParenToken = sourceCode.getTokenAfter(node.typeParameters || node.callee, {
188+
const leftParenToken = sourceCode.getTokenAfter(typeArguments || node.callee, {
188189
filter: isOpeningParenToken,
189190
includeComments: false
190191
})!;
191192
const rightParenToken = sourceCode.getLastToken(node);
192193

193-
if (node.typeParameters) {
194-
offsets.setOffsetToken(sourceCode.getFirstToken(node.typeParameters), 1, firstToken);
194+
if (typeArguments) {
195+
offsets.setOffsetToken(sourceCode.getFirstToken(typeArguments), 1, firstToken);
195196
}
196197

197198
for (const optionalToken of sourceCode.getTokensBetween(
198-
sourceCode.getLastToken(node.typeParameters || node.callee),
199+
sourceCode.getLastToken(typeArguments || node.callee),
199200
leftParenToken,
200201
{ filter: isOptionalToken, includeComments: false }
201202
)) {
@@ -693,18 +694,15 @@ export function defineVisitor(context: IndentContext): NodeListener {
693694
visitor.MethodDefinition(node);
694695
},
695696
NewExpression(node: TSESTree.NewExpression) {
697+
const typeArguments = node.typeArguments ?? node.typeParameters;
696698
const newToken = sourceCode.getFirstToken(node);
697699
const calleeTokens = getFirstAndLastTokens(sourceCode, node.callee);
698700
offsets.setOffsetToken(calleeTokens.firstToken, 1, newToken);
699701

700-
if (node.typeParameters) {
701-
offsets.setOffsetToken(
702-
sourceCode.getFirstToken(node.typeParameters),
703-
1,
704-
calleeTokens.firstToken
705-
);
702+
if (typeArguments) {
703+
offsets.setOffsetToken(sourceCode.getFirstToken(typeArguments), 1, calleeTokens.firstToken);
706704
}
707-
const leftParenBefore = node.typeParameters || calleeTokens.lastToken;
705+
const leftParenBefore = typeArguments || calleeTokens.lastToken;
708706
if (node.arguments.length || leftParenBefore.range[1] < node.range[1]) {
709707
const rightParenToken = sourceCode.getLastToken(node);
710708
const leftParenToken = sourceCode.getTokenAfter(leftParenBefore)!;

src/rules/indent-helpers/ts.ts

+12-8
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
6262
// or
6363
// const ErrorMap = Map<string, Error>
6464
// ^^^^^^^^^^^^^^^^^^
65-
if (node.typeParameters) {
65+
const typeArguments = node.typeArguments ?? node.typeParameters;
66+
if (typeArguments) {
6667
const firstToken = sourceCode.getFirstToken(node);
67-
offsets.setOffsetToken(sourceCode.getFirstToken(node.typeParameters), 1, firstToken);
68+
offsets.setOffsetToken(sourceCode.getFirstToken(typeArguments), 1, firstToken);
6869
}
6970
},
7071
TSInstantiationExpression(node: TSESTree.TSInstantiationExpression) {
@@ -401,9 +402,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
401402
TSClassImplements(node: TSESTree.TSClassImplements | TSESTree.TSInterfaceHeritage) {
402403
// class C implements T {}
403404
// ^
404-
if (node.typeParameters) {
405+
const typeArguments = node.typeArguments ?? node.typeParameters;
406+
if (typeArguments) {
405407
offsets.setOffsetToken(
406-
sourceCode.getFirstToken(node.typeParameters),
408+
sourceCode.getFirstToken(typeArguments),
407409
1,
408410
sourceCode.getFirstToken(node)
409411
);
@@ -675,6 +677,7 @@ export function defineVisitor(context: IndentContext): NodeListener {
675677
},
676678
TSImportType(node: TSESTree.TSImportType) {
677679
// import('foo').B
680+
const typeArguments = node.typeArguments ?? node.typeParameters;
678681
const firstToken = sourceCode.getFirstToken(node);
679682
const leftParenToken = sourceCode.getTokenAfter(firstToken, {
680683
filter: isOpeningParenToken,
@@ -695,8 +698,8 @@ export function defineVisitor(context: IndentContext): NodeListener {
695698
const propertyToken = sourceCode.getTokenAfter(dotToken);
696699
offsets.setOffsetToken([dotToken, propertyToken], 1, firstToken);
697700
}
698-
if (node.typeParameters) {
699-
offsets.setOffsetToken(sourceCode.getFirstToken(node.typeParameters), 1, firstToken);
701+
if (typeArguments) {
702+
offsets.setOffsetToken(sourceCode.getFirstToken(typeArguments), 1, firstToken);
700703
}
701704
},
702705
TSParameterProperty(node: TSESTree.TSParameterProperty) {
@@ -1055,9 +1058,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
10551058
sourceCode.getFirstToken(node.id || node)
10561059
);
10571060
}
1058-
if (node.superTypeParameters != null && node.superClass != null) {
1061+
const superTypeArguments = node.superTypeArguments ?? node.superTypeParameters;
1062+
if (superTypeArguments != null && node.superClass != null) {
10591063
offsets.setOffsetToken(
1060-
sourceCode.getFirstToken(node.superTypeParameters),
1064+
sourceCode.getFirstToken(superTypeArguments),
10611065
1,
10621066
sourceCode.getFirstToken(node.superClass)
10631067
);

src/rules/require-event-dispatcher-types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default createRule('require-event-dispatcher-types', {
4242
}
4343
})) {
4444
const node = n as TSESTree.CallExpression;
45-
if (node.typeParameters === undefined) {
45+
if ((node.typeArguments ?? node.typeParameters) === undefined) {
4646
context.report({ node, messageId: 'missingTypeParameter' });
4747
}
4848
}

0 commit comments

Comments
 (0)