fix: gritql mismatch import pattern (#6248)

fireairforce · web-flow · commit ec7126ca3d67 · 2025-06-22T18:55:56.000+02:00
diff --git a/.changeset/modern-meals-end.md b/.changeset/modern-meals-end.md
@@ -0,0 +1,15 @@
+---
+"@biomejs/biome": patch
+---
+
+Fixed grit pattern matching for different kinds of import statements.
+
+The grit pattern `import $imports from "foo"` will match the following code:
+
+```ts
+import bar from "foo"
+import { bar } from "foo"
+import { bar, baz } from "foo"
+```
+
+
diff --git a/crates/biome_grit_patterns/src/grit_context.rs b/crates/biome_grit_patterns/src/grit_context.rs
@@ -20,6 +20,7 @@ use grit_pattern_matcher::pattern::{
 use grit_util::error::GritPatternError;
 use grit_util::{AnalysisLogs, FileOrigin, InputRanges, MatchRanges, error::GritResult};
 use path_absolutize::Absolutize;
+use std::collections::BTreeSet;
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 
@@ -163,8 +164,15 @@ impl<'a> ExecContext<'a, GritQueryContext> for GritExecContext<'a> {
         let (variables, ranges, suppressed) =
             state.bindings_history_to_ranges(&self.lang, self.name());
 
+        // Deduplicate ranges to avoid duplicate matches
+        let unique_ranges: Vec<_> = ranges
+            .into_iter()
+            .collect::<BTreeSet<_>>()
+            .into_iter()
+            .collect();
+
         let input_ranges = InputRanges {
-            ranges,
+            ranges: unique_ranges,
             variables,
             suppressed,
         };
diff --git a/crates/biome_grit_patterns/src/grit_node_patterns.rs b/crates/biome_grit_patterns/src/grit_node_patterns.rs
@@ -12,6 +12,33 @@ use grit_pattern_matcher::pattern::{
 use grit_util::error::GritResult;
 use grit_util::{AnalysisLogs, Language};
 
+/// Check if two syntax kinds are compatible for import pattern matching
+fn are_import_kinds_compatible(
+    pattern_kind: GritTargetSyntaxKind,
+    node_kind: GritTargetSyntaxKind,
+) -> bool {
+    let Some(pattern_js_kind) = pattern_kind.as_js_kind() else {
+        return false;
+    };
+    let Some(node_js_kind) = node_kind.as_js_kind() else {
+        return false;
+    };
+
+    use biome_js_syntax::JsSyntaxKind::*;
+
+    // Only allow specific import transformations to avoid over-matching
+    match (pattern_js_kind, node_js_kind) {
+        // Default import pattern can match named import
+        (JS_IMPORT_DEFAULT_CLAUSE, JS_IMPORT_NAMED_CLAUSE) => true,
+        // Named import pattern can match default import
+        (JS_IMPORT_NAMED_CLAUSE, JS_IMPORT_DEFAULT_CLAUSE) => true,
+        // Default import specifier can match named import specifiers
+        (JS_DEFAULT_IMPORT_SPECIFIER, JS_NAMED_IMPORT_SPECIFIERS) => true,
+        (JS_NAMED_IMPORT_SPECIFIERS, JS_DEFAULT_IMPORT_SPECIFIER) => true,
+        _ => false,
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct GritNodePattern {
     pub kind: GritTargetSyntaxKind,
@@ -59,7 +86,7 @@ impl Matcher<GritQueryContext> for GritNodePattern {
             );
         }
 
-        if node.kind() != self.kind {
+        if node.kind() != self.kind && !are_import_kinds_compatible(self.kind, node.kind()) {
             return Ok(false);
         }
         if self.args.is_empty() {
diff --git a/crates/biome_grit_patterns/tests/quick_test.rs b/crates/biome_grit_patterns/tests/quick_test.rs
@@ -10,10 +10,9 @@ use biome_js_syntax::JsFileSource;
 #[test]
 fn test_query() {
     let parse_grit_result = parse_grit(
-        "`console.log($arg)` => . where {
-  log(message=\"This is a debug log\", variable=$arg),
-}
-",
+        "
+        `import $what from $where`
+        ",
     );
     if !parse_grit_result.diagnostics().is_empty() {
         panic!("Cannot parse query:\n{:?}", parse_grit_result.diagnostics());
@@ -31,12 +30,11 @@ fn test_query() {
         println!("Diagnostics from compiling query:\n{:?}", query.diagnostics);
     }
 
-    let body = r#"console.log("grape");"#;
+    let body = r#"import { PrismaClient } from "@prisma/client/runtime";"#;
 
-    let file = GritTargetFile::new(
-        "test.js",
-        parse(body, JsFileSource::tsx(), JsParserOptions::default()).into(),
-    );
+    let parsed = parse(body, JsFileSource::js_module(), JsParserOptions::default());
+
+    let file = GritTargetFile::new("test.js", parsed.into());
     let GritQueryResult { effects, logs, .. } =
         query.execute(file).expect("could not execute query");
 
diff --git a/crates/biome_grit_patterns/tests/specs/ts/import_patterns.grit b/crates/biome_grit_patterns/tests/specs/ts/import_patterns.grit
@@ -0,0 +1 @@
+`import $import from "foo"`
diff --git a/crates/biome_grit_patterns/tests/specs/ts/import_patterns.snap b/crates/biome_grit_patterns/tests/specs/ts/import_patterns.snap
@@ -0,0 +1,12 @@
+---
+source: crates/biome_grit_patterns/tests/spec_tests.rs
+expression: import_patterns
+---
+SnapshotResult {
+    messages: [],
+    matched_ranges: [
+        "2:1-2:27",
+    ],
+    rewritten_files: [],
+    created_files: [],
+}
diff --git a/crates/biome_grit_patterns/tests/specs/ts/import_patterns.ts b/crates/biome_grit_patterns/tests/specs/ts/import_patterns.ts
@@ -0,0 +1,2 @@
+// Named import
+import { baz } from "foo";
diff --git a/crates/biome_grit_patterns/tests/specs/ts/withinUntilClause.snap b/crates/biome_grit_patterns/tests/specs/ts/withinUntilClause.snap
@@ -6,7 +6,6 @@ SnapshotResult {
     messages: [],
     matched_ranges: [
         "8:5-10:8",
-        "8:5-10:8",
     ],
     rewritten_files: [],
     created_files: [],

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// Named import`
	`2`	`+import { baz } from "foo";`