ast-grep-py 0.38.7__tar.gz → 0.39.1__tar.gz

{ast_grep_py-0.38.7 → ast_grep_py-0.39.1}/Cargo.lock

@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.38.7"
+version = "0.39.1"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -143,7 +143,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.38.7"
+version = "0.39.1"
 dependencies = [
  "ast-grep-core",
  "bit-set",
@@ -158,7 +158,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-core"
-version = "0.38.7"
+version = "0.39.1"
 dependencies = [
  "bit-set",
  "regex",
@@ -169,7 +169,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.38.7"
+version = "0.39.1"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -183,7 +183,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-language"
-version = "0.38.7"
+version = "0.39.1"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -203,11 +203,13 @@ dependencies = [
  "tree-sitter-json",
  "tree-sitter-kotlin-sg",
  "tree-sitter-lua",
+ "tree-sitter-nix",
  "tree-sitter-php",
  "tree-sitter-python",
  "tree-sitter-ruby",
  "tree-sitter-rust",
  "tree-sitter-scala",
+ "tree-sitter-solidity",
  "tree-sitter-swift",
  "tree-sitter-typescript",
  "tree-sitter-yaml",
@@ -215,7 +217,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.38.7"
+version = "0.39.1"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -229,7 +231,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.38.7"
+version = "0.39.1"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -245,7 +247,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-py"
-version = "0.38.7"
+version = "0.39.1"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -362,9 +364,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "clap"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -372,9 +374,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -384,18 +386,18 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.54"
+version = "4.5.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aad5b1b4de04fead402672b48897030eec1f3bfe1550776322f59f6d6e6a5677"
+checksum = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -428,18 +430,18 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "convert_case"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
 dependencies = [
  "unicode-segmentation",
 ]
 
 [[package]]
 name = "convert_case"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -580,14 +582,20 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.2.9"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
+checksum = "a4735f265ba6a1188052ca32d461028a7d1125868be18e287e756019da7607b5"
 dependencies = [
- "quote",
- "syn",
+ "ctor-proc-macro",
+ "dtor",
 ]
 
+[[package]]
+name = "ctor-proc-macro"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f211af61d8efdd104f96e57adf5e426ba1bc3ed7a4ead616e15e5881fd79c4d"
+
 [[package]]
 name = "dashmap"
 version = "6.1.0"
@@ -644,6 +652,21 @@ dependencies = [
  "litrs",
 ]
 
+[[package]]
+name = "dtor"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8"
+dependencies = [
+ "dtor-proc-macro",
+]
+
+[[package]]
+name = "dtor-proc-macro"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055"
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.19"
@@ -898,6 +921,17 @@ dependencies = [
  "unicode-width 0.1.14",
 ]
 
+[[package]]
+name = "io-uring"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
+dependencies = [
+ "bitflags 2.9.0",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1049,34 +1083,35 @@ dependencies = [
 
 [[package]]
 name = "napi"
-version = "2.16.17"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55740c4ae1d8696773c78fdafd5d0e5fe9bc9f1b071c7ba493ba5c413a9184f3"
+checksum = "abf3f418eeb94d86f02f3388324017e1e21e36937e4b1d8075ea5843d980f766"
 dependencies = [
  "anyhow",
  "bitflags 2.9.0",
  "ctor",
- "napi-derive",
+ "napi-build",
  "napi-sys",
- "once_cell",
+ "nohash-hasher",
+ "rustc-hash",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "napi-build"
-version = "2.2.0"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03acbfa4f156a32188bfa09b86dc11a431b5725253fc1fc6f6df5bed273382c4"
+checksum = "fff539e61c5e3dd4d7d283610662f5d672c2aea0f158df78af694f13dbb3287b"
 
 [[package]]
 name = "napi-derive"
-version = "2.16.13"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cbe2585d8ac223f7d34f13701434b9d5f4eb9c332cccce8dee57ea18ab8ab0c"
+checksum = "ce09c2a155c7c38447a6ff1711899375bdd8f9dd5a50aad700a9c765c9f8a375"
 dependencies = [
- "cfg-if",
- "convert_case 0.6.0",
+ "convert_case 0.8.0",
+ "ctor",
  "napi-derive-backend",
  "proc-macro2",
  "quote",
@@ -1085,24 +1120,22 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "1.0.75"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1639aaa9eeb76e91c6ae66da8ce3e89e921cd3885e99ec85f4abacae72fc91bf"
+checksum = "17923387d68ecfe057a04a38ee89aeb41f415c43b4c7a508a3683bf0c1511c5a"
 dependencies = [
- "convert_case 0.6.0",
- "once_cell",
+ "convert_case 0.8.0",
  "proc-macro2",
  "quote",
- "regex",
  "semver",
  "syn",
 ]
 
 [[package]]
 name = "napi-sys"
-version = "2.4.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3"
+checksum = "3e4e7135a8f97aa0f1509cce21a8a1f9dcec1b50d8dee006b48a5adb69a9d64d"
 dependencies = [
  "libloading",
 ]
@@ -1128,6 +1161,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nohash-hasher"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
+
 [[package]]
 name = "normalize-line-endings"
 version = "0.3.0"
@@ -1370,6 +1409,12 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
 [[package]]
 name = "rustix"
 version = "1.0.5"
@@ -1467,9 +1512,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1715,13 +1760,17 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.45.1"
+version = "1.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
 dependencies = [
  "backtrace",
  "bytes",
+ "io-uring",
+ "libc",
+ "mio 1.0.3",
  "pin-project-lite",
+ "slab",
 ]
 
 [[package]]
@@ -1739,27 +1788,40 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "d1dee9dc43ac2aaf7d3b774e2fba5148212bf2bd9374f4e50152ebe9afd03d42"
 dependencies = [
  "indexmap",
  "toml_datetime",
- "toml_write",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
+dependencies = [
  "winnow",
 ]
 
 [[package]]
-name = "toml_write"
-version = "0.1.2"
+name = "toml_writer"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
 
 [[package]]
 name = "tower"
@@ -1840,9 +1902,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter"
-version = "0.25.4"
+version = "0.25.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69aff09fea9a41fb061ae6b206cb87cac1b8db07df31be3ba271fbc26760f213"
+checksum = "6d7b8994f367f16e6fa14b5aebbcb350de5d7cbea82dc5b00ae997dd71680dd2"
 dependencies = [
  "cc",
  "regex",
@@ -1998,6 +2060,16 @@ dependencies = [
  "tree-sitter-language",
 ]
 
+[[package]]
+name = "tree-sitter-nix"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4952a9733f3a98f6683a0ccd1035d84ab7a52f7e84eeed58548d86765ad92de3"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
 [[package]]
 name = "tree-sitter-php"
 version = "0.23.11"
@@ -2048,11 +2120,21 @@ dependencies = [
  "tree-sitter-language",
 ]
 
+[[package]]
+name = "tree-sitter-solidity"
+version = "1.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "316bcbf903cd09a781734f4127ef21341e810cf85f89b0b96fffab48d55fd672"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
 [[package]]
 name = "tree-sitter-swift"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdc72ea9c62a6d188c9f7d64109a9b14b09231852b87229c68c44e8738b9e6b9"
+checksum = "4ef216011c3e3df4fa864736f347cb8d509b1066cf0c8549fb1fd81ac9832e59"
 dependencies = [
  "cc",
  "tree-sitter-language",

{ast_grep_py-0.38.7 → ast_grep_py-0.39.1}/Cargo.toml

@@ -7,22 +7,22 @@ resolver = "2"
 lto = true
 
 [workspace.package]
-version = "0.38.7"
+version = "0.39.1"
 authors = ["Herrington Darkholme <2883231+HerringtonDarkholme@users.noreply.github.com>"]
 edition = "2021"
 license = "MIT"
 documentation = "https://ast-grep.github.io/guide/introduction.html"
 homepage = "https://ast-grep.github.io/"
 repository = "https://github.com/ast-grep/ast-grep"
-rust-version = "1.70"
+rust-version = "1.79"
 readme = "README.md"
 
 [workspace.dependencies]
-ast-grep-core = { path = "crates/core", version = "0.38.7", default-features = false }
-ast-grep-config = { path = "crates/config", version = "0.38.7" }
-ast-grep-dynamic = { path = "crates/dynamic", version = "0.38.7" }
-ast-grep-language = { path = "crates/language", version = "0.38.7" }
-ast-grep-lsp = { path = "crates/lsp", version = "0.38.7" }
+ast-grep-core = { path = "crates/core", version = "0.39.1", default-features = false }
+ast-grep-config = { path = "crates/config", version = "0.39.1" }
+ast-grep-dynamic = { path = "crates/dynamic", version = "0.39.1" }
+ast-grep-language = { path = "crates/language", version = "0.39.1" }
+ast-grep-lsp = { path = "crates/lsp", version = "0.39.1" }
 
 bit-set = { version = "0.8.0" }
 ignore = { version = "0.4.22" }

{ast_grep_py-0.38.7 → ast_grep_py-0.39.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ast-grep-py
-Version: 0.38.7
+Version: 0.39.1
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{ast_grep_py-0.38.7 → ast_grep_py-0.39.1}/crates/config/src/rule/mod.rs

@@ -3,10 +3,12 @@ mod nth_child;
 mod range;
 pub mod referent_rule;
 mod relational_rule;
+mod selector;
 mod stop_by;
 
 pub use deserialize_env::DeserializeEnv;
 pub use relational_rule::Relation;
+use selector::{parse_selector, SelectorError};
 pub use stop_by::StopBy;
 
 use crate::maybe::Maybe;
@@ -16,7 +18,7 @@ use referent_rule::{ReferentRule, ReferentRuleError};
 use relational_rule::{Follows, Has, Inside, Precedes};
 
 use ast_grep_core::language::Language;
-use ast_grep_core::matcher::{KindMatcher, KindMatcherError, RegexMatcher, RegexMatcherError};
+use ast_grep_core::matcher::{KindMatcher, RegexMatcher, RegexMatcherError};
 use ast_grep_core::meta_var::MetaVarEnv;
 use ast_grep_core::{ops as o, Doc, Node};
 use ast_grep_core::{MatchStrictness, Matcher, Pattern, PatternError};
@@ -147,6 +149,8 @@ pub enum Strictness {
   Relaxed,
   /// ast-nodes excluding comments, without text
   Signature,
+  /// similar to smart, but node kinds are ignored, only text is matched.
+  Template,
 }
 
 impl From<MatchStrictness> for Strictness {
@@ -159,6 +163,7 @@ impl From<MatchStrictness> for Strictness {
       M::Ast => S::Ast,
       M::Relaxed => S::Relaxed,
       M::Signature => S::Signature,
+      M::Template => S::Template,
     }
   }
 }
@@ -173,6 +178,7 @@ impl From<Strictness> for MatchStrictness {
       S::Ast => M::Ast,
       S::Relaxed => M::Relaxed,
       S::Signature => M::Signature,
+      S::Template => M::Template,
     }
   }
 }
@@ -349,7 +355,7 @@ pub enum RuleSerializeError {
   #[error("Rule must have one positive matcher.")]
   MissPositiveMatcher,
   #[error("Rule contains invalid kind matcher.")]
-  InvalidKind(#[from] KindMatcherError),
+  InvalidKind(#[from] SelectorError),
   #[error("Rule contains invalid pattern matcher.")]
   InvalidPattern(#[from] PatternError),
   #[error("Rule contains invalid nthChild.")]
@@ -470,7 +476,8 @@ fn deserialze_atomic_rule<L: Language>(
     });
   }
   if let Some(kind) = atomic.kind {
-    rules.push(R::Kind(KindMatcher::try_new(&kind, env.lang.clone())?));
+    let rule = parse_selector(&kind, env.lang.clone())?;
+    rules.push(rule);
   }
   if let Some(regex) = atomic.regex {
     rules.push(R::Regex(RegexMatcher::try_new(&regex)?));

{ast_grep_py-0.38.7 → ast_grep_py-0.39.1}/crates/config/src/rule/relational_rule.rs

@@ -39,6 +39,20 @@ pub struct Inside {
   stop_by: StopBy,
 }
 impl Inside {
+  pub(crate) fn rule(rule: Rule) -> Self {
+    Self {
+      outer: rule,
+      field: None,
+      stop_by: StopBy::Neighbor,
+    }
+  }
+  pub(crate) fn rule_descent(rule: Rule) -> Self {
+    Self {
+      outer: rule,
+      field: None,
+      stop_by: StopBy::End,
+    }
+  }
   pub fn try_new<L: Language>(
     relation: Relation,
     env: &DeserializeEnv<L>,
@@ -225,6 +239,18 @@ pub struct Follows {
   stop_by: StopBy,
 }
 impl Follows {
+  pub(crate) fn rule(rule: Rule) -> Self {
+    Self {
+      former: rule,
+      stop_by: StopBy::Neighbor,
+    }
+  }
+  pub(crate) fn rule_descent(rule: Rule) -> Self {
+    Self {
+      former: rule,
+      stop_by: StopBy::End,
+    }
+  }
   pub fn try_new<L: Language>(
     relation: Relation,
     env: &DeserializeEnv<L>,