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

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

@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.39.1"
+version = "0.39.2"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -143,7 +143,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.39.1"
+version = "0.39.2"
 dependencies = [
  "ast-grep-core",
  "bit-set",
@@ -158,7 +158,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-core"
-version = "0.39.1"
+version = "0.39.2"
 dependencies = [
  "bit-set",
  "regex",
@@ -169,7 +169,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.39.1"
+version = "0.39.2"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -183,7 +183,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-language"
-version = "0.39.1"
+version = "0.39.2"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -217,7 +217,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.39.1"
+version = "0.39.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -231,7 +231,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.39.1"
+version = "0.39.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -247,7 +247,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-py"
-version = "0.39.1"
+version = "0.39.2"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -686,7 +686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -980,7 +980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1083,9 +1083,9 @@ dependencies = [
 
 [[package]]
 name = "napi"
-version = "3.0.0"
+version = "3.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf3f418eeb94d86f02f3388324017e1e21e36937e4b1d8075ea5843d980f766"
+checksum = "afaf586c21f260e9dc327ae3585fc6efcbb24a416d5151da38bbd35a1f2663c8"
 dependencies = [
  "anyhow",
  "bitflags 2.9.0",
@@ -1100,15 +1100,15 @@ dependencies = [
 
 [[package]]
 name = "napi-build"
-version = "2.2.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff539e61c5e3dd4d7d283610662f5d672c2aea0f158df78af694f13dbb3287b"
+checksum = "dcae8ad5609d14afb3a3b91dee88c757016261b151e9dcecabf1b2a31a6cab14"
 
 [[package]]
 name = "napi-derive"
-version = "3.0.0"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce09c2a155c7c38447a6ff1711899375bdd8f9dd5a50aad700a9c765c9f8a375"
+checksum = "43e61844e0c0bb81e711f2084abe7cff187b03ca21ff8b000cb59bbda61e15a9"
 dependencies = [
  "convert_case 0.8.0",
  "ctor",
@@ -1120,9 +1120,9 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "2.0.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17923387d68ecfe057a04a38ee89aeb41f415c43b4c7a508a3683bf0c1511c5a"
+checksum = "b7ab19e9b98efb13895f492a2e367ca50c955ac3c4723613af73fdda4011afcc"
 dependencies = [
  "convert_case 0.8.0",
  "proc-macro2",
@@ -1279,9 +1279,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.25.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f239d656363bcee73afef85277f1b281e8ac6212a1d42aa90e55b90ed43c47a4"
+checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
 dependencies = [
  "anyhow",
  "indoc",
@@ -1297,9 +1297,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.25.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755ea671a1c34044fa165247aaf6f419ca39caa6003aee791a0df2713d8f1b6d"
+checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -1307,9 +1307,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.25.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc95a2e67091e44791d4ea300ff744be5293f394f1bafd9f78c080814d35956e"
+checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1317,9 +1317,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.25.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a179641d1b93920829a62f15e87c0ed791b6c8db2271ba0fd7c2686090510214"
+checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1329,9 +1329,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.25.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dff85ebcaab8c441b0e3f7ae40a6963ecea8a9f5e74f647e33fcf5ec9a1e89e"
+checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1374,6 +1374,26 @@ dependencies = [
  "bitflags 2.9.0",
 ]
 
+[[package]]
+name = "ref-cast"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -1425,7 +1445,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1445,11 +1465,12 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.22"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
+checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
 dependencies = [
  "dyn-clone",
+ "ref-cast",
  "schemars_derive",
  "serde",
  "serde_json",
@@ -1457,9 +1478,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.22"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
+checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1662,7 +1683,7 @@ dependencies = [
  "getrandom",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1760,9 +1781,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.46.1"
+version = "1.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
+checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2122,9 +2143,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-solidity"
-version = "1.2.11"
+version = "1.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "316bcbf903cd09a781734f4127ef21341e810cf85f89b0b96fffab48d55fd672"
+checksum = "92f0b44ef36f0779873ec118f2cbad31cfc18d6ae7ba48ce75d5ce09870884d1"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -2258,7 +2279,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]

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

@@ -7,7 +7,7 @@ resolver = "2"
 lto = true
 
 [workspace.package]
-version = "0.39.1"
+version = "0.39.2"
 authors = ["Herrington Darkholme <2883231+HerringtonDarkholme@users.noreply.github.com>"]
 edition = "2021"
 license = "MIT"
@@ -18,11 +18,11 @@ rust-version = "1.79"
 readme = "README.md"
 
 [workspace.dependencies]
-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" }
+ast-grep-core = { path = "crates/core", version = "0.39.2", default-features = false }
+ast-grep-config = { path = "crates/config", version = "0.39.2" }
+ast-grep-dynamic = { path = "crates/dynamic", version = "0.39.2" }
+ast-grep-language = { path = "crates/language", version = "0.39.2" }
+ast-grep-lsp = { path = "crates/lsp", version = "0.39.2" }
 
 bit-set = { version = "0.8.0" }
 ignore = { version = "0.4.22" }
@@ -31,6 +31,6 @@ serde = { version = "1.0.200", features = ["derive"] }
 serde_yaml = "0.9.33"
 tree-sitter = { version = "0.25.4" }
 thiserror = "2.0.0"
-schemars = "0.8.17"
+schemars = "1.0.0"
 anyhow = "1.0.82"
 dashmap = "6.0.0"

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

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

{ast_grep_py-0.39.1 → ast_grep_py-0.39.2}/crates/config/src/maybe.rs

@@ -1,4 +1,4 @@
-use schemars::{gen::SchemaGenerator, schema::Schema, JsonSchema};
+use schemars::{JsonSchema, Schema, SchemaGenerator};
 use serde::{de, ser, Deserialize, Serialize};
 use std::borrow::Cow;
 
@@ -70,8 +70,8 @@ impl<'de, T: Deserialize<'de>> Deserialize<'de> for Maybe<T> {
 }
 
 impl<T: JsonSchema> JsonSchema for Maybe<T> {
-  fn schema_name() -> String {
-    format!("Maybe_{}", T::schema_name())
+  fn schema_name() -> Cow<'static, str> {
+    Cow::Owned(format!("Maybe_{}", T::schema_name()))
   }
   fn schema_id() -> Cow<'static, str> {
     Cow::Owned(format!("Maybe<{}>", T::schema_id()))
@@ -80,6 +80,10 @@ impl<T: JsonSchema> JsonSchema for Maybe<T> {
     gen.subschema_for::<T>()
   }
 
+  fn inline_schema() -> bool {
+    true
+  }
+
   fn _schemars_private_non_optional_json_schema(gen: &mut SchemaGenerator) -> Schema {
     T::_schemars_private_non_optional_json_schema(gen)
   }

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

@@ -12,6 +12,9 @@ use std::collections::HashSet;
 
 #[derive(Serialize, Deserialize, Clone, JsonSchema)]
 #[serde(rename_all = "camelCase")]
+#[schemars(
+  description = "A relational rule object, which is a Rule object with two additional fields stopBy and field."
+)]
 pub struct Relation {
   #[serde(flatten)]
   pub rule: SerializableRule,

{ast_grep_py-0.39.1 → ast_grep_py-0.39.2}/crates/config/src/rule/stop_by.rs

@@ -4,17 +4,17 @@ use crate::rule::{Rule, RuleSerializeError, SerializableRule};
 use ast_grep_core::language::Language;
 use ast_grep_core::{Doc, Node};
 
-use schemars::JsonSchema;
+use schemars::{json_schema, JsonSchema, Schema, SchemaGenerator};
 use serde::de::{self, Deserializer, MapAccess, Visitor};
 use serde::{Deserialize, Serialize};
 
+use std::borrow::Cow;
 use std::collections::HashSet;
 use std::fmt;
 
 // NB StopBy's JsonSchema is changed in xtask/schema.rs
 // revise schema is easier than manually implementation
-#[derive(Clone, Default, JsonSchema)]
-#[serde(rename_all = "camelCase")]
+#[derive(Clone, Default)]
 pub enum SerializableStopBy {
   #[default]
   Neighbor,
@@ -22,6 +22,27 @@ pub enum SerializableStopBy {
   Rule(Box<SerializableRule>),
 }
 
+impl JsonSchema for SerializableStopBy {
+  fn schema_name() -> Cow<'static, str> {
+    Cow::Borrowed("SerializableStopBy")
+  }
+
+  fn json_schema(_: &mut SchemaGenerator) -> Schema {
+    json_schema!({
+      "description": "Control how the relational rule search should stop",
+      "oneOf": [
+        {
+          "type": "string",
+          "enum": [SerializableStopBy::NEIGHBOR_KEY, SerializableStopBy::END_KEY],
+        },
+        {
+          "$ref": "#/$defs/SerializableRule"
+        }
+      ],
+    })
+  }
+}
+
 impl SerializableStopBy {
   /// String key used for serializing the Neighbor variant
   const NEIGHBOR_KEY: &str = "neighbor";

{ast_grep_py-0.39.1 → ast_grep_py-0.39.2}/crates/config/src/rule_config.rs

@@ -11,7 +11,7 @@ use ast_grep_core::replacer::Replacer;
 use ast_grep_core::source::Content;
 use ast_grep_core::{Doc, Matcher, NodeMatch};
 
-use schemars::{gen::SchemaGenerator, schema::Schema, JsonSchema};
+use schemars::{json_schema, JsonSchema, Schema, SchemaGenerator};
 use serde::{Deserialize, Serialize};
 use serde_yaml::Error as YamlError;
 use serde_yaml::{with::singleton_map_recursive::deserialize, Deserializer};
@@ -64,6 +64,7 @@ pub struct SerializableRewriter {
 }
 
 #[derive(Serialize, Deserialize, Clone, JsonSchema)]
+#[schemars(title = "ast-grep rule")]
 pub struct SerializableRuleConfig<L: Language> {
   #[serde(flatten)]
   pub core: SerializableRuleCore,
@@ -102,24 +103,18 @@ pub struct SerializableRuleConfig<L: Language> {
 pub struct Metadata(HashMap<String, serde_yaml::Value>);
 
 impl JsonSchema for Metadata {
-  fn schema_name() -> String {
-    "Metadata".to_string()
+  fn schema_name() -> Cow<'static, str> {
+    Cow::Borrowed("Metadata")
   }
   fn schema_id() -> Cow<'static, str> {
     Cow::Borrowed("Metadata")
   }
   fn json_schema(_gen: &mut SchemaGenerator) -> Schema {
-    use schemars::schema::{InstanceType, ObjectValidation, SchemaObject};
-    let subschema = Schema::Bool(true);
-    SchemaObject {
-      instance_type: Some(InstanceType::Object.into()),
-      object: Some(Box::new(ObjectValidation {
-        additional_properties: Some(Box::new(subschema)),
-        ..Default::default()
-      })),
-      ..Default::default()
-    }
-    .into()
+    json_schema!({
+      "type": "object",
+      "additionalProperties": true,
+      "description": "Additional metadata for the rule, can be used to store extra information."
+    })
   }
 }
 

{ast_grep_py-0.39.1 → ast_grep_py-0.39.2}/crates/core/src/match_tree/match_node.rs

@@ -28,10 +28,15 @@ pub(super) fn match_node_impl<'tree, D: Doc>(
       }
       c => c,
     },
-    P::MetaVar { meta_var, .. } => match agg.match_meta_var(meta_var, candidate) {
-      Some(()) => MatchOneNode::MatchedBoth,
-      None => MatchOneNode::NoMatch, // TODO: this may be wrong
-    },
+    P::MetaVar { meta_var, .. } => {
+      if strictness.should_skip_cand_for_metavar(candidate) {
+        return MatchOneNode::SkipCandidate;
+      }
+      match agg.match_meta_var(meta_var, candidate) {
+        Some(()) => MatchOneNode::MatchedBoth,
+        None => MatchOneNode::NoMatch, // TODO: this may be wrong
+      }
+    }
     P::Internal {
       kind_id, children, ..
     } => {

{ast_grep_py-0.39.1 → ast_grep_py-0.39.2}/crates/core/src/match_tree/strictness.rs

@@ -23,12 +23,15 @@ pub(crate) enum MatchOneNode {
   NoMatch,
 }
 
+fn skip_comment(n: &Node<impl Doc>) -> bool {
+  n.kind().contains("comment")
+}
+
 fn skip_comment_or_unnamed(n: &Node<impl Doc>) -> bool {
   if !n.is_named() {
     return true;
   }
-  let kind = n.kind();
-  kind.contains("comment")
+  skip_comment(n)
 }
 
 impl MatchStrictness {
@@ -86,6 +89,14 @@ impl MatchStrictness {
     }
   }
 
+  pub(crate) fn should_skip_cand_for_metavar<D: Doc>(&self, candidate: &Node<D>) -> bool {
+    use MatchStrictness as M;
+    match self {
+      M::Cst | M::Ast | M::Smart => false,
+      M::Relaxed | M::Signature | M::Template => skip_comment(candidate),
+    }
+  }
+
   // TODO: this is a method for working around trailing nodes after pattern is matched
   pub(crate) fn should_skip_trailing<D: Doc>(&self, candidate: &Node<D>) -> bool {
     use MatchStrictness as M;
@@ -95,7 +106,7 @@ impl MatchStrictness {
       M::Ast => false,
       M::Relaxed => skip_comment_or_unnamed(candidate),
       M::Signature => skip_comment_or_unnamed(candidate),
-      M::Template => true,
+      M::Template => skip_comment(candidate),
     }
   }
 
@@ -158,14 +169,18 @@ mod test {
   use crate::language::Tsx;
   use crate::{Pattern, Root};
 
-  fn template_pattern(p: &str, n: &str) -> bool {
+  fn test_match(p: &str, n: &str, strictness: MatchStrictness) -> bool {
     let mut pattern = Pattern::new(p, Tsx);
-    pattern.strictness = MatchStrictness::Template;
+    pattern.strictness = strictness;
     let root = Root::str(n, Tsx);
     let node = root.root();
     node.find(pattern).is_some()
   }
 
+  fn template_pattern(p: &str, n: &str) -> bool {
+    test_match(p, n, MatchStrictness::Template)
+  }
+
   #[test]
   fn test_template_pattern() {
     assert!(template_pattern("$A = $B", "a = b"));
@@ -174,4 +189,28 @@ mod test {
     assert!(template_pattern("$A = $B", "const a = b"));
     assert!(template_pattern("$A = $B", "class A { a = b }"));
   }
+
+  fn relaxed_pattern(p: &str, n: &str) -> bool {
+    test_match(p, n, MatchStrictness::Relaxed)
+  }
+
+  #[test]
+  fn test_ignore_comment() {
+    assert!(relaxed_pattern("$A($B)", "foo(bar /* .. */)"));
+    assert!(relaxed_pattern(
+      "$A($B)",
+      "
+      foo(
+        bar, // ..
+      )"
+    ));
+    assert!(relaxed_pattern("$A($B)", "foo(/* .. */ bar)"));
+    assert!(relaxed_pattern(
+      "$A($B)",
+      "
+      foo( // ..
+        bar
+      )"
+    ));
+  }
 }

{ast_grep_py-0.39.1 → ast_grep_py-0.39.2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "maturin"
 [project]
 name = "ast-grep-py"
 requires-python = ">=3.8"
-version = "0.39.1"
+version = "0.39.2"
 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" }]