Skip to content
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

Jump to bottom

fix(eslint-plugin): [no-restricted-imports]: report type-only imports properly #3996

Merged
merged 2 commits into from Oct 18, 2021
Merged

fix(eslint-plugin): [no-restricted-imports]: report type-only imports properly #3996

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7682b70
fix(eslint-plugin): [no-restricted-imports]: report type-only imports…
rafaelss95 Oct 12, 2021
6cd6f9c
Merge branch 'master' into fix/no-restricted-imports
bradzacher Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/eslint-plugin/src/rules/no-restricted-imports.ts
View file
Open in desktop
Expand Up @@ -4,13 +4,13 @@ import {
ArrayOfStringOrObjectPatterns,
} from 'eslint/lib/rules/no-restricted-imports';
import ignore, { Ignore } from 'ignore';
import { getESLintCoreRule } from '../util/getESLintCoreRule';
import {
createRule,
deepMerge,
InferMessageIdsTypeFromRule,
InferOptionsTypeFromRule,
} from '../util';
import { getESLintCoreRule } from '../util/getESLintCoreRule';

const baseRule = getESLintCoreRule('no-restricted-imports');

Expand Down Expand Up @@ -150,9 +150,12 @@ export default createRule<Options, MessageIds>({
}
}
function isAllowedTypeImportPattern(importSource: string): boolean {
return allowedImportTypeMatchers.every(matcher => {
return matcher.ignores(importSource);
});
return (
allowedImportTypeMatchers.length > 0 &&
allowedImportTypeMatchers.every(matcher => {
return matcher.ignores(importSource);
})
Comment on lines +154 to +157
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem was that allowedImportTypeMatchers remains empty when you don't specify allowTypeImports: true in options... and every returns true even for an empty array (ref: https://262.ecma-international.org/6.0/#sec-array.prototype.every).

);
}

return {
Expand Down
14 changes: 14 additions & 0 deletions packages/eslint-plugin/tests/rules/no-restricted-imports.test.ts
View file
Open in desktop
Expand Up @@ -535,5 +535,19 @@ ruleTester.run('no-restricted-imports', rule, {
},
],
},
{
code: "import type { InvalidTestCase } from '@typescript-eslint/experimental-utils/dist/ts-eslint';",
options: [
{
patterns: ['@typescript-eslint/experimental-utils/dist/*'],
},
],
errors: [
{
messageId: 'patterns',
type: AST_NODE_TYPES.ImportDeclaration,
},
],
},
],
});