Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions crates/oxc_linter/src/rules/eslint/no_restricted_imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,33 @@ impl NoRestrictedImports {
}
}
}

for (source, spans) in &side_effect_import_map {
let mut whitelist_found = false;
let mut err = None;
for pattern in &self.patterns {
match pattern.get_group_glob_result(source) {
GlobResult::Whitelist => {
whitelist_found = true;
break;
}
GlobResult::Found => {
err = Some(get_diagnostic_from_import_name_result_pattern(
spans[0],
source,
&ImportNameResult::GeneralDisallowed,
pattern,
));
}
GlobResult::None => {}
}
}
if !whitelist_found {
if let Some(err) = err {
ctx.diagnostic(err);
}
}
}
}

fn report_import_name_allowed(&self, ctx: &LintContext<'_>, entry: &ImportEntry) {
Expand Down Expand Up @@ -3038,6 +3065,13 @@ fn test() {
serde_json::json!([{ "paths": [{ "name": "foo", "message": "foo is forbidden, use bar instead" }] }]),
),
),
// https://github.com/oxc-project/oxc/issues/10984
(
r"import 'foo'",
Some(
serde_json::json!([{ "patterns": [{ "group": ["foo"], "message": "foo is forbidden, use bar instead" }] }]),
),
),
];

let fail_typescript = vec![
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,13 @@ source: crates/oxc_linter/src/tester.rs
╰────
help: foo is forbidden, use bar instead

⚠ eslint(no-restricted-imports): 'foo' import is restricted from being used by a pattern.
╭─[no_restricted_imports.tsx:1:1]
1 │ import 'foo'
· ────────────
╰────
help: foo is forbidden, use bar instead

⚠ eslint(no-restricted-imports): 'import1' import is restricted from being used.
╭─[no_restricted_imports.tsx:1:1]
1 │ import foo from 'import1';
Expand Down
Loading