fix(linter): rule no-restricted-imports allow combination of paths and patterns (#10224)

related #10194

Author: Sysix

crates/oxc_linter/src/rules/eslint/no_restricted_imports.rs

@@ -910,7 +910,9 @@ impl Rule for NoRestrictedImports {
                         Value::Object(obj) => {
                             if let Some(paths_value) = obj.get("paths") {
                                 add_configuration_path_from_object(&mut paths, paths_value);
-                            } else if let Some(patterns_value) = obj.get("patterns") {
+                            }
+
+                            if let Some(patterns_value) = obj.get("patterns") {
                                 add_configuration_patterns_from_object(
                                     &mut patterns,
                                     patterns_value,
@@ -931,7 +933,8 @@ impl Rule for NoRestrictedImports {
             Value::Object(obj) => {
                 if let Some(paths_value) = obj.get("paths") {
                     add_configuration_path_from_object(&mut paths, paths_value);
-                } else if let Some(patterns_value) = obj.get("patterns") {
+                }
+                if let Some(patterns_value) = obj.get("patterns") {
                     add_configuration_patterns_from_object(&mut patterns, patterns_value);
                 } else if let Ok(path) =
                     serde_json::from_value::<RestrictedPath>(serde_json::Value::Object(obj.clone()))
@@ -3017,24 +3020,24 @@ fn test() {
             "export { foo } from 'import1';",
             Some(serde_json::json!([{ "paths": ["import1", "import2"] }])),
         ),
-        // (
-        //     "import foo from 'import1/private/foo';",
-        //     Some(serde_json::json!([
-        //         {
-        //             "paths": ["import1", "import2"],
-        //             "patterns": ["import1/private/*", "import2/*", "!import2/good"],
-        //         },
-        //     ])),
-        // ),
-        // (
-        //     "export { foo } from 'import1/private/foo';",
-        //     Some(serde_json::json!([
-        //         {
-        //             "paths": ["import1", "import2"],
-        //             "patterns": ["import1/private/*", "import2/*", "!import2/good"],
-        //         },
-        //     ])),
-        // ),
+        (
+            "import foo from 'import1/private/foo';",
+            Some(serde_json::json!([
+                {
+                    "paths": ["import1", "import2"],
+                    "patterns": ["import1/private/*", "import2/*", "!import2/good"],
+                },
+            ])),
+        ),
+        (
+            "export { foo } from 'import1/private/foo';",
+            Some(serde_json::json!([
+                {
+                    "paths": ["import1", "import2"],
+                    "patterns": ["import1/private/*", "import2/*", "!import2/good"],
+                },
+            ])),
+        ),
         (
             "import foo from 'import-foo';",
             Some(serde_json::json!([

crates/oxc_linter/src/snapshots/eslint_no_restricted_imports.snap

@@ -817,6 +817,18 @@ source: crates/oxc_linter/src/tester.rs
    · ──────────────────────────────
    ╰────
 
+  ⚠ eslint(no-restricted-imports): 'import1/private/foo' import is restricted from being used by a pattern.
+   ╭─[no_restricted_imports.tsx:1:1]
+ 1 │ import foo from 'import1/private/foo';
+   · ──────────────────────────────────────
+   ╰────
+
+  ⚠ eslint(no-restricted-imports): 'import1/private/foo' import is restricted from being used by a pattern.
+   ╭─[no_restricted_imports.tsx:1:1]
+ 1 │ export { foo } from 'import1/private/foo';
+   · ──────────────────────────────────────────
+   ╰────
+
   ⚠ eslint(no-restricted-imports): 'import-foo' import is restricted from being used.
    ╭─[no_restricted_imports.tsx:1:1]
  1 │ import foo from 'import-foo';