Skip to content

fix(eslint-plugin): [no-unnecessary-type-constraint] correctly fix in cts/mts files #6795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 17, 2023
Merged

fix(eslint-plugin): [no-unnecessary-type-constraint] correctly fix in cts/mts files #6795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
af6784e
fix: correctly resolve file type
WoodyWoodsta Mar 30, 2023
815b248
fix: detect new module syntax
WoodyWoodsta Mar 30, 2023
5a5bc87
chore: refactor to `isNodeNextModuleExtension`
WoodyWoodsta Mar 30, 2023
58e2505
revert changes
WoodyWoodsta Apr 2, 2023
6bfccc6
feat: widen comma fix filetypes
WoodyWoodsta Apr 3, 2023
cc21d45
Merge branch 'main' into 5449/fix-esm-extensions
WoodyWoodsta Apr 21, 2023
ff2a403
chore: refactor 'node:path' to 'path'
WoodyWoodsta Apr 21, 2023
3a04d71
fix: linting
WoodyWoodsta Apr 21, 2023
1ab20aa
Merge branch 'main' into 5449/fix-esm-extensions
bradzacher Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/eslint-plugin/src/rules/no-unnecessary-type-constraint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
import { AST_NODE_TYPES } from '@typescript-eslint/utils';
import { extname } from 'path';
import * as ts from 'typescript';

import * as util from '../util';

Expand Down Expand Up @@ -38,7 +40,24 @@ export default util.createRule({
[AST_NODE_TYPES.TSUnknownKeyword, 'unknown'],
]);

const inJsx = context.getFilename().toLowerCase().endsWith('tsx');
function checkRequiresGenericDeclarationDisambiguation(
filename: string,
): boolean {
const pathExt = extname(filename).toLocaleLowerCase();
switch (pathExt) {
case ts.Extension.Cts:
case ts.Extension.Mts:
case ts.Extension.Tsx:
return true;

default:
return false;
}
}

const requiresGenericDeclarationDisambiguation =
checkRequiresGenericDeclarationDisambiguation(context.getFilename());

const source = context.getSourceCode();

const checkNode = (
Expand All @@ -47,7 +66,7 @@ export default util.createRule({
): void => {
const constraint = unnecessaryConstraints.get(node.constraint.type);
function shouldAddTrailingComma(): boolean {
if (!inArrowFunction || !inJsx) {
if (!inArrowFunction || !requiresGenericDeclarationDisambiguation) {
return false;
}
// Only <T>() => {} would need trailing comma
Expand Down
40 changes: 40 additions & 0 deletions packages/eslint-plugin/tests/rules/no-unnecessary-type-constraint.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,46 @@ function data<T extends TODO>() {}
},
},
},
{
code: 'const data = <T extends any>() => {};',
errors: [
{
data: { constraint: 'any', name: 'T' },
messageId: 'unnecessaryConstraint',
endColumn: 28,
column: 15,
line: 1,
suggestions: [
{
messageId: 'removeUnnecessaryConstraint',
data: { constraint: 'any' },
output: `const data = <T,>() => {};`,
},
],
},
],
filename: 'file.mts',
},
{
code: 'const data = <T extends any>() => {};',
errors: [
{
data: { constraint: 'any', name: 'T' },
messageId: 'unnecessaryConstraint',
endColumn: 28,
column: 15,
line: 1,
suggestions: [
{
messageId: 'removeUnnecessaryConstraint',
data: { constraint: 'any' },
output: `const data = <T,>() => {};`,
},
],
},
],
filename: 'file.cts',
},
{
code: noFormat`const data = <T extends any,>() => {};`,
errors: [
Expand Down