ast-grep-cli 0.27.2__tar.gz → 0.27.3__tar.gz

{ast_grep_cli-0.27.2 → ast_grep_cli-0.27.3}/Cargo.lock

@@ -92,9 +92,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "assert_cmd"
@@ -114,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -145,7 +145,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "anyhow",
  "ast-grep-core",
@@ -161,7 +161,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-core"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "bit-set",
  "regex",
@@ -172,7 +172,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -184,7 +184,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-language"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -217,12 +217,12 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
  "ast-grep-language",
- "dashmap 6.0.1",
+ "dashmap 6.1.0",
  "serde",
  "serde_json",
  "tokio",
@@ -231,7 +231,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -250,7 +250,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-py"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -318,7 +318,7 @@ dependencies = [
 
 [[package]]
 name = "benches"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -429,9 +429,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -439,9 +439,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
 dependencies = [
  "anstream",
  "anstyle",
@@ -451,18 +451,18 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.23"
+version = "4.5.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531d7959c5bbb6e266cecdd0f20213639c3a5c3e4d615f97db87661745f781ff"
+checksum = "8937760c3f4c60871870b8c3ee5f9b30771f792a7045c48bcbba999d7d6b3b8e"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -634,9 +634,9 @@ dependencies = [
 
 [[package]]
 name = "dashmap"
-version = "6.0.1"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -813,9 +813,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "globset"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -879,9 +879,9 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -895,9 +895,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1069,9 +1069,9 @@ dependencies = [
 
 [[package]]
 name = "napi"
-version = "2.16.9"
+version = "2.16.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1277600d452e570cc83cf5f4e8efb389cc21e5cbefadcfba7239f4551e2e3e99"
+checksum = "53575dfa17f208dd1ce3a2da2da4659aae393b256a472f2738a8586a6c4107fd"
 dependencies = [
  "anyhow",
  "bitflags 2.5.0",
@@ -1091,9 +1091,9 @@ checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a"
 
 [[package]]
 name = "napi-derive"
-version = "2.16.11"
+version = "2.16.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "150d87c4440b9f4815cb454918db498b5aae9a57aa743d20783fe75381181d01"
+checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1"
 dependencies = [
  "cfg-if",
  "convert_case",
@@ -1105,9 +1105,9 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "1.0.73"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cd81b794fc1d6051acf8c4f3cb4f82833b0621272a232b4ff0cf3df1dbddb61"
+checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe"
 dependencies = [
  "convert_case",
  "once_cell",
@@ -1318,9 +1318,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433"
+checksum = "15ee168e30649f7f234c3d49ef5a7a6cbf5134289bc46c29ff3155fa3221c225"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -1337,9 +1337,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8"
+checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -1347,9 +1347,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6"
+checksum = "67ce096073ec5405f5ee2b8b31f03a68e02aa10d5d4f565eca04acc41931fa1c"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1357,9 +1357,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206"
+checksum = "2440c6d12bc8f3ae39f1e775266fa5122fd0c8891ce7520fa6048e683ad3de28"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1369,9 +1369,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372"
+checksum = "1be962f0e06da8f8465729ea2cb71a416d2257dff56cbe40a70d3e62a93ae5d1"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1529,18 +1529,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1560,9 +1560,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1755,9 +1755,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.3"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
@@ -1785,9 +1785,9 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
 dependencies = [
  "indexmap",
  "toml_datetime",

{ast_grep_cli-0.27.2 → ast_grep_cli-0.27.3}/Cargo.toml

@@ -7,7 +7,7 @@ resolver = "2"
 lto = true
 
 [workspace.package]
-version = "0.27.2"
+version = "0.27.3"
 authors = ["Herrington Darkholme <2883231+HerringtonDarkholme@users.noreply.github.com>"]
 edition = "2021"
 license = "MIT"
@@ -18,11 +18,11 @@ rust-version = "1.67"
 readme = "README.md"
 
 [workspace.dependencies]
-ast-grep-core = { path = "crates/core", version = "0.27.2" }
-ast-grep-config = { path = "crates/config", version = "0.27.2" }
-ast-grep-dynamic = { path = "crates/dynamic", version = "0.27.2" }
-ast-grep-language = { path = "crates/language", version = "0.27.2" }
-ast-grep-lsp = { path = "crates/lsp", version = "0.27.2" }
+ast-grep-core = { path = "crates/core", version = "0.27.3" }
+ast-grep-config = { path = "crates/config", version = "0.27.3" }
+ast-grep-dynamic = { path = "crates/dynamic", version = "0.27.3" }
+ast-grep-language = { path = "crates/language", version = "0.27.3" }
+ast-grep-lsp = { path = "crates/lsp", version = "0.27.3" }
 
 bit-set = { version = "0.8.0" }
 ignore = { version = "0.4.22" }

{ast_grep_cli-0.27.2 → ast_grep_cli-0.27.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ast-grep-cli
-Version: 0.27.2
+Version: 0.27.3
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{ast_grep_cli-0.27.2 → ast_grep_cli-0.27.3}/crates/cli/src/debug.rs

@@ -1,7 +1,7 @@
 use crate::lang::SgLang;
 use crate::print::ColorArg;
 use ansi_term::Style;
-use ast_grep_core::Pattern;
+use ast_grep_core::{language::TSLanguage, matcher::PatternNode, meta_var::MetaVariable, Pattern};
 use ast_grep_language::Language;
 use clap::ValueEnum;
 use tree_sitter as ts;
@@ -18,24 +18,28 @@ pub enum DebugFormat {
   Sexp,
 }
 impl DebugFormat {
-  pub fn debug_query(&self, pattern: &str, lang: SgLang, color: ColorArg) {
+  pub fn debug_query(&self, src: &str, pattern: &Pattern<SgLang>, lang: SgLang, color: ColorArg) {
     let colored = color.should_use_color();
     match self {
       DebugFormat::Pattern => {
-        let pattern = Pattern::try_new(pattern, lang).expect("pattern must be validated in run");
-        println!("Debug Pattern:\n{:?}", pattern);
+        let lang = lang.get_ts_language();
+        let mut ret = String::new();
+        let fmt = DumpFmt::named(colored);
+        dump_pattern(&pattern.node, &lang, &fmt, 0, &mut ret)
+          .expect("unexpected error in writing string");
+        println!("Debug Pattern:\n{}", ret);
       }
       DebugFormat::Sexp => {
-        let root = lang.ast_grep(pattern);
+        let root = lang.ast_grep(src);
         println!("Debug Sexp:\n{}", root.root().to_sexp());
       }
       DebugFormat::Ast => {
-        let root = lang.ast_grep(pattern);
+        let root = lang.ast_grep(src);
         let dumped = dump_node(root.root().get_ts_node());
         println!("Debug AST:\n{}", dumped.ast(colored));
       }
       DebugFormat::Cst => {
-        let root = lang.ast_grep(pattern);
+        let root = lang.ast_grep(src);
         let dumped = dump_node(root.root().get_ts_node());
         println!("Debug CST:\n{}", dumped.cst(colored));
       }
@@ -43,6 +47,51 @@ impl DebugFormat {
   }
 }
 
+fn dump_pattern(
+  pattern: &PatternNode,
+  lang: &TSLanguage,
+  style: &DumpFmt,
+  indent: usize,
+  ret: &mut String,
+) -> FmtResult {
+  write!(ret, "{}", "  ".repeat(indent))?;
+  match pattern {
+    PatternNode::MetaVar { meta_var } => {
+      let meta_var = match meta_var {
+        MetaVariable::Capture(name, _) => format!("${name}"),
+        MetaVariable::MultiCapture(name) => format!("$$${name}"),
+        MetaVariable::Multiple => "$$$".to_string(),
+        MetaVariable::Dropped(_) => "$_".to_string(),
+      };
+      let meta_var = style.kind_style.paint(meta_var);
+      writeln!(ret, "{} {meta_var}", style.field_style.paint("MetaVar"))?;
+    }
+    PatternNode::Terminal {
+      text,
+      kind_id,
+      is_named,
+    } => {
+      let lang = lang.get_ts_language();
+      if *is_named {
+        let kind = lang.node_kind_for_id(*kind_id).unwrap();
+        let kind = style.kind_style.paint(format!("{kind}"));
+        writeln!(ret, "{kind} {text}")?;
+      } else {
+        writeln!(ret, "{text}")?;
+      }
+    }
+    PatternNode::Internal { kind_id, children } => {
+      let kind = lang.node_kind_for_id(*kind_id).unwrap();
+      let kind = style.kind_style.paint(kind);
+      writeln!(ret, "{kind}")?;
+      for child in children {
+        dump_pattern(child, lang, style, indent + 1, ret)?;
+      }
+    }
+  }
+  Ok(())
+}
+
 pub struct DumpNode {
   field: Option<String>,
   kind: String,
@@ -77,7 +126,6 @@ impl DumpFmt {
   }
 }
 
-// TODO: add colorized output
 use std::fmt::{Result as FmtResult, Write};
 impl DumpNode {
   pub fn ast(&self, colored: bool) -> String {
@@ -178,3 +226,39 @@ fn dump_nodes(cursor: &mut ts::TreeCursor, target: &mut Vec<DumpNode>) {
     }
   }
 }
+
+#[cfg(test)]
+mod test {
+  use super::*;
+  use ast_grep_language::{TypeScript, C};
+  const DUMPED: &str = r#"
+program (0,0)-(0,11)
+  variable_declaration (0,0)-(0,11)
+    variable_declarator (0,4)-(0,11)
+      name: identifier (0,4)-(0,5)
+      value: number (0,8)-(0,11)"#;
+  #[test]
+  fn test_dump_node() {
+    let lang = SgLang::Builtin(TypeScript.into());
+    let root = lang.ast_grep("var a = 123");
+    let dumped = dump_node(root.root().get_ts_node());
+    assert_eq!(DUMPED.trim(), dumped.ast(false).trim());
+  }
+
+  const MISSING: &str = r#"
+translation_unit (0,0)-(0,9)
+  declaration (0,0)-(0,9)
+    type: primitive_type (0,0)-(0,3)
+    declarator: init_declarator (0,4)-(0,9)
+      declarator: identifier (0,4)-(0,5)
+      = (0,6)-(0,7)
+      value: number_literal (0,8)-(0,9)
+    MISSING ; (0,9)-(0,9)"#;
+  #[test]
+  fn test_missing_node() {
+    let lang = SgLang::Builtin(C.into());
+    let root = lang.ast_grep("int a = 1");
+    let dumped = dump_node(root.root().get_ts_node());
+    assert_eq!(MISSING.trim(), dumped.cst(false).trim());
+  }
+}

{ast_grep_cli-0.27.2 → ast_grep_cli-0.27.3}/crates/cli/src/run.rs

@@ -264,6 +264,9 @@ impl<Printer> RunWithSpecificLang<Printer> {
   fn new(arg: RunArg, printer: Printer) -> Result<Self> {
     let lang = arg.lang.ok_or(anyhow::anyhow!(EC::LanguageNotSpecified))?;
     let pattern = arg.build_pattern(lang)?;
+    if let Some(format) = arg.debug_query {
+      format.debug_query(&arg.pattern, &pattern, lang, arg.output.color);
+    }
     let rewrite = if let Some(s) = &arg.rewrite {
       Some(Fixer::from_str(s, &lang).context(EC::ParsePattern)?)
     } else {
@@ -284,11 +287,6 @@ impl<P: Printer> Worker for RunWithSpecificLang<P> {
   fn consume_items(&self, items: Items<Self::Item>) -> Result<()> {
     let printer = &self.printer;
     printer.before_print()?;
-    let arg = &self.arg;
-    let lang = arg.lang.expect("must present");
-    if let Some(format) = arg.debug_query {
-      format.debug_query(&self.arg.pattern, lang, self.arg.output.color);
-    }
     let mut has_matches = false;
     for match_unit in items {
       match_one_file(printer, &match_unit, &self.rewrite)?;

{ast_grep_cli-0.27.2 → ast_grep_cli-0.27.3}/crates/core/src/matcher/pattern.rs

@@ -260,6 +260,11 @@ impl<L: Language> Matcher<L> for Pattern<L> {
     node: Node<'tree, D>,
     env: &mut Cow<MetaVarEnv<'tree, D>>,
   ) -> Option<Node<'tree, D>> {
+    if let Some(k) = self.root_kind {
+      if node.kind_id() != k {
+        return None;
+      }
+    }
     // do not pollute the env if pattern does not match
     let mut may_write = Cow::Borrowed(env.as_ref());
     let node = match_node_non_recursive(self, node, &mut may_write)?;
@@ -523,8 +528,8 @@ mod test {
   fn test_bare_wildcard_in_context() {
     let pattern = Pattern::contextual("class A { $F }", "property_identifier", Tsx).expect("test");
     let cand = pattern_node("let b = 123");
-    // should it match?
-    assert!(pattern.find_node(cand.root()).is_some());
+    // it should not match
+    assert!(pattern.find_node(cand.root()).is_none());
   }
 
   #[test]

{ast_grep_cli-0.27.2 → ast_grep_cli-0.27.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ast-grep-cli"
-version = "0.27.2"
+version = "0.27.3"
 description = "Structural Search and Rewrite code at large scale using precise AST pattern."
 authors = [{ name = "Herrington Darkholme", email = "2883231+HerringtonDarkholme@users.noreply.github.com" }]
 maintainers = [{ name = "Herrington Darkholme", email = "2883231+HerringtonDarkholme@users.noreply.github.com" }]