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] allow type import as long as there's one matching pattern #4898

Merged
merged 2 commits into from May 3, 2022
Merged

fix(eslint-plugin): [no-restricted-imports] allow type import as long as there's one matching pattern #4898

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
5bacf39
fix(eslint-plugin): [no-restricted-imports] allow type import as long…
Josh-Cena May 3, 2022
6e60c92
chore: simplify .some expression
JoshuaKGoldberg May 3, 2022
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
5 changes: 2 additions & 3 deletions packages/eslint-plugin/src/rules/no-restricted-imports.ts
View file
Open in desktop
Expand Up @@ -158,9 +158,8 @@ export default createRule<Options, MessageIds>({
function isAllowedTypeImportPattern(importSource: string): boolean {
return (
allowedImportTypeMatchers.length > 0 &&
allowedImportTypeMatchers.every(matcher => {
return matcher.ignores(importSource);
})
// As long as there's one matching pattern that allows type import
allowedImportTypeMatchers.some(matcher => matcher.ignores(importSource))
JoshuaKGoldberg marked this conversation as resolved.
Show resolved Hide resolved
);
}

Expand Down
22 changes: 22 additions & 0 deletions packages/eslint-plugin/tests/rules/no-restricted-imports.test.ts
View file
Open in desktop
Expand Up @@ -231,6 +231,28 @@ ruleTester.run('no-restricted-imports', rule, {
},
],
},
{
code: `
import type { foo } from 'import1/private/bar';
import type { foo } from 'import2/private/bar';
`,
options: [
{
patterns: [
{
group: ['import1/private/*'],
message: 'usage of import1 private modules not allowed.',
allowTypeImports: true,
},
{
group: ['import2/private/*'],
message: 'usage of import2 private modules not allowed.',
allowTypeImports: true,
},
],
},
],
},
],
invalid: [
{
Expand Down