ast-grep-cli 0.22.2__tar.gz → 0.22.4__tar.gz

{ast_grep_cli-0.22.2 → ast_grep_cli-0.22.4}/Cargo.lock

@@ -92,9 +92,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.83"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "assert_cmd"
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.22.2"
+version = "0.22.4"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -144,7 +144,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.22.2"
+version = "0.22.4"
 dependencies = [
  "anyhow",
  "ast-grep-core",
@@ -160,7 +160,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-core"
-version = "0.22.2"
+version = "0.22.4"
 dependencies = [
  "bit-set",
  "regex",
@@ -171,7 +171,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.22.2"
+version = "0.22.4"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -183,7 +183,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-language"
-version = "0.22.2"
+version = "0.22.4"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -214,7 +214,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.22.2"
+version = "0.22.4"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -228,7 +228,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.22.2"
+version = "0.22.4"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -246,7 +246,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-py"
-version = "0.22.2"
+version = "0.22.4"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -312,7 +312,7 @@ dependencies = [
 
 [[package]]
 name = "benches"
-version = "0.22.2"
+version = "0.22.4"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -1064,9 +1064,9 @@ checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a"
 
 [[package]]
 name = "napi-derive"
-version = "2.16.4"
+version = "2.16.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb613535cde46cff231e53cd819c1694a32d48946bc2dda6b41174ace52ac08"
+checksum = "e0e034ddf6155192cf83f267ede763fe6c164dfa9971585436b16173718d94c4"
 dependencies = [
  "cfg-if",
  "convert_case",
@@ -1078,9 +1078,9 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da041b19246ab4240998774e987fd9a7d92cc7406b91b5eddb6691e81feac044"
+checksum = "bff2c00437f3b3266391eb5e6aa25d0029187daf5caf05b8e3271468fb5ae73e"
 dependencies = [
  "convert_case",
  "once_cell",
@@ -1466,9 +1466,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.19"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef"
+checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
 dependencies = [
  "dyn-clone",
  "schemars_derive",
@@ -1478,9 +1478,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.19"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49"
+checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1502,18 +1502,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.201"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.201"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1670,18 +1670,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "thiserror"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1750,15 +1750,15 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 
 [[package]]
 name = "toml_edit"
-version = "0.22.12"
+version = "0.22.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -1878,9 +1878,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-c"
-version = "0.21.1"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f0e5c383fd633a792eb8878367dc9d4a3c0e788bad5dcc84c200332ed1b8f2"
+checksum = "0e942d789b24dda298d41c95db353841159232feb80a52103c717e7c062bb9f3"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -1898,9 +1898,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-cpp"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cd45e7e51833e81da966a15b0cb42baa50d82a45467292e2e5e25999e9736b"
+checksum = "128d495a2a236f365661c098f077cd57aada284891fb06df22a8cfbbcb596199"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -1938,9 +1938,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-facade-sg"
-version = "0.21.4"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ca50a891218430da4837d9f411b365b83ce6a22c28f8d99933bcc5bc18cd0c"
+checksum = "906493dd94525dbb0cc38af596432245bede875810a4804dccd72433f450d223"
 dependencies = [
  "js-sys",
  "tree-sitter",
@@ -2031,9 +2031,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-php"
-version = "0.22.4"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcd2a1c0c0e32fe11b2cd96ef6b978ed366989c893e17f8af0f3b49beb4aaf5e"
+checksum = "579299df8217105cae7688e8781f233af7eba6a1c10d870115bb34ba56341593"
 dependencies = [
  "cc",
  "tree-sitter",

{ast_grep_cli-0.22.2 → ast_grep_cli-0.22.4}/Cargo.toml

@@ -7,7 +7,7 @@ resolver = "2"
 lto = true
 
 [workspace.package]
-version = "0.22.2"
+version = "0.22.4"
 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.22.2" }
-ast-grep-config = { path = "crates/config", version = "0.22.2" }
-ast-grep-dynamic = { path = "crates/dynamic", version = "0.22.2" }
-ast-grep-language = { path = "crates/language", version = "0.22.2" }
-ast-grep-lsp = { path = "crates/lsp", version = "0.22.2" }
+ast-grep-core = { path = "crates/core", version = "0.22.4" }
+ast-grep-config = { path = "crates/config", version = "0.22.4" }
+ast-grep-dynamic = { path = "crates/dynamic", version = "0.22.4" }
+ast-grep-language = { path = "crates/language", version = "0.22.4" }
+ast-grep-lsp = { path = "crates/lsp", version = "0.22.4" }
 
 bit-set = { version = "0.5.3" }
 ignore = { version = "0.4.22" }

{ast_grep_cli-0.22.2 → ast_grep_cli-0.22.4}/PKG-INFO

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

{ast_grep_cli-0.22.2 → ast_grep_cli-0.22.4}/crates/cli/src/utils.rs

@@ -187,7 +187,7 @@ fn run_worker<W: PathWorker + ?Sized + 'static>(worker: Arc<W>) -> Result<()> {
 fn read_file(path: &Path) -> Option<String> {
   let file_content = read_to_string(path)
     .with_context(|| format!("Cannot read file {}", path.to_string_lossy()))
-    .map_err(|err| eprintln!("{err}"))
+    .map_err(|err| eprintln!("{err:#}"))
     .ok()?;
   // skip large files or empty file
   if file_too_large(&file_content) || file_content.is_empty() {

{ast_grep_cli-0.22.2 → ast_grep_cli-0.22.4}/crates/config/src/check_var.rs

@@ -1,4 +1,5 @@
 use crate::fixer::Fixer;
+use crate::rule::referent_rule::RuleRegistration;
 use crate::rule::Rule;
 use crate::rule_config::RuleConfigError;
 use crate::rule_core::RuleCoreError;
@@ -21,6 +22,7 @@ pub enum CheckHint<'r> {
 /// so we need to check rules with different hints.
 pub fn check_rule_with_hint<'r, L: Language>(
   rule: &'r Rule<L>,
+  utils: &'r RuleRegistration<L>,
   constraints: &'r HashMap<String, Rule<L>>,
   transform: &'r Option<HashMap<String, Transformation>>,
   fixer: &Option<Fixer<L>>,
@@ -29,16 +31,16 @@ pub fn check_rule_with_hint<'r, L: Language>(
   match hint {
     CheckHint::Global => {
       // do not check utils defined here because global rules are not yet ready
-      check_vars(rule, constraints, transform, fixer)?;
+      check_vars(rule, utils, constraints, transform, fixer)?;
     }
     CheckHint::Normal => {
       check_utils_defined(rule, constraints)?;
-      check_vars(rule, constraints, transform, fixer)?;
+      check_vars(rule, utils, constraints, transform, fixer)?;
     }
     // upper_vars is needed to check metavar defined in containing vars
     CheckHint::Rewriter(upper_vars) => {
       check_utils_defined(rule, constraints)?;
-      check_vars_in_rewriter(rule, constraints, transform, fixer, upper_vars)?;
+      check_vars_in_rewriter(rule, utils, constraints, transform, fixer, upper_vars)?;
     }
   }
   Ok(())
@@ -46,12 +48,14 @@ pub fn check_rule_with_hint<'r, L: Language>(
 
 fn check_vars_in_rewriter<'r, L: Language>(
   rule: &'r Rule<L>,
+  utils: &'r RuleRegistration<L>,
   constraints: &'r HashMap<String, Rule<L>>,
   transform: &'r Option<HashMap<String, Transformation>>,
   fixer: &Option<Fixer<L>>,
   upper_var: &HashSet<&str>,
 ) -> RResult<()> {
-  let vars = check_var_in_constraints(rule, constraints)?;
+  let vars = get_vars_from_rules(rule, utils);
+  let vars = check_var_in_constraints(vars, constraints)?;
   let mut vars = check_var_in_transform(vars, transform)?;
   for v in upper_var {
     vars.insert(v);
@@ -73,21 +77,33 @@ fn check_utils_defined<L: Language>(
 
 fn check_vars<'r, L: Language>(
   rule: &'r Rule<L>,
+  utils: &'r RuleRegistration<L>,
   constraints: &'r HashMap<String, Rule<L>>,
   transform: &'r Option<HashMap<String, Transformation>>,
   fixer: &Option<Fixer<L>>,
 ) -> RResult<()> {
-  let vars = check_var_in_constraints(rule, constraints)?;
+  let vars = get_vars_from_rules(rule, utils);
+  let vars = check_var_in_constraints(vars, constraints)?;
   let vars = check_var_in_transform(vars, transform)?;
   check_var_in_fix(vars, fixer)?;
   Ok(())
 }
 
-fn check_var_in_constraints<'r, L: Language>(
+fn get_vars_from_rules<'r, L: Language>(
   rule: &'r Rule<L>,
+  utils: &'r RuleRegistration<L>,
+) -> HashSet<&'r str> {
+  let mut vars = rule.defined_vars();
+  for var in utils.get_local_util_vars() {
+    vars.insert(var);
+  }
+  vars
+}
+
+fn check_var_in_constraints<'r, L: Language>(
+  mut vars: HashSet<&'r str>,
   constraints: &'r HashMap<String, Rule<L>>,
 ) -> RResult<HashSet<&'r str>> {
-  let mut vars = rule.defined_vars();
   for rule in constraints.values() {
     for var in rule.defined_vars() {
       vars.insert(var);
@@ -269,6 +285,21 @@ utils:
     assert_eq!(matcher.defined_vars(), ["B"].into_iter().collect());
   }
 
+  #[test]
+  fn test_use_vars_in_utils() {
+    let env = DeserializeEnv::new(TypeScript::Tsx);
+    let ser_rule: SerializableRuleCore = from_str(
+      r"
+utils:
+  test: { pattern: $B }
+rule: { matches: test }
+fix: $B = 123",
+    )
+    .expect("should deser");
+    let matcher = ser_rule.get_matcher(env).expect("should parse");
+    assert_eq!(matcher.defined_vars(), ["B"].into_iter().collect());
+  }
+
   #[test]
   fn test_defined_vars_cyclic() {
     let env = DeserializeEnv::new(TypeScript::Tsx);

{ast_grep_cli-0.22.2 → ast_grep_cli-0.22.4}/crates/config/src/rule/mod.rs

@@ -554,4 +554,23 @@ inside:
     let rule = deserialize_rule(rule, &env).expect("should deserialize");
     assert_eq!(rule.defined_vars(), ["A", "B"].into_iter().collect());
   }
+
+  #[test]
+  fn test_issue_1164() {
+    let src = r"
+    kind: statement_block
+    has:
+      pattern: this.$A = promise()
+      stopBy: end";
+    let rule: SerializableRule = from_str(src).expect("cannot parse rule");
+    let env = DeserializeEnv::new(TypeScript::Tsx);
+    let rule = deserialize_rule(rule, &env).expect("should deserialize");
+    let root = TypeScript::Tsx.ast_grep(
+      "if (a) {
+      this.a = b;
+      this.d = promise()
+    }",
+    );
+    assert!(root.root().find(rule).is_some());
+  }
 }

{ast_grep_cli-0.22.2 → ast_grep_cli-0.22.4}/crates/config/src/rule_core.rs

@@ -131,6 +131,7 @@ impl SerializableRuleCore {
     let ret = self.get_matcher_from_env(&env)?;
     check_rule_with_hint(
       &ret.rule,
+      &ret.utils,
       &ret.constraints,
       &self.transform,
       &ret.fixer,

{ast_grep_cli-0.22.2 → ast_grep_cli-0.22.4}/crates/core/src/matcher/pattern.rs

@@ -221,7 +221,14 @@ impl<L: Language> Matcher<L> for Pattern<L> {
     node: Node<'tree, D>,
     env: &mut Cow<MetaVarEnv<'tree, D>>,
   ) -> Option<Node<'tree, D>> {
-    match_node_non_recursive(self, node, env)
+    // 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)?;
+    if let Cow::Owned(map) = may_write {
+      // only change env when pattern matches
+      *env = Cow::Owned(map);
+    }
+    Some(node)
   }
 
   fn potential_kinds(&self) -> Option<bit_set::BitSet> {
@@ -312,6 +319,20 @@ mod test {
     assert_eq!(env["VALUE"], "123");
   }
 
+  #[test]
+  fn test_pattern_should_not_pollute_env() {
+    // gh issue #1164
+    let pattern = Pattern::str("const $A = 114", Tsx);
+    let cand = pattern_node("const a = 514");
+    let cand = cand.root().child(0).unwrap();
+    let map = MetaVarEnv::new();
+    let mut env = Cow::Borrowed(&map);
+    let nm = pattern.match_node_with_env(cand, &mut env);
+    assert!(nm.is_none());
+    assert!(env.get_match("A").is_none());
+    assert!(map.get_match("A").is_none());
+  }
+
   #[test]
   fn test_match_non_atomic() {
     let env = match_env("const a = $VALUE", "const a = 5 + 3");

{ast_grep_cli-0.22.2 → ast_grep_cli-0.22.4}/crates/core/src/node.rs

@@ -379,6 +379,7 @@ impl<'r, D: Doc> Node<'r, D> {
   // NOTE: Need go to parent first, then move to current node by byte offset.
   // This is because tree_sitter cursor is scoped to the starting node.
   // See https://github.com/tree-sitter/tree-sitter/issues/567
+  #[cfg(not(target_arch = "wasm32"))]
   pub fn next_all(&self) -> impl Iterator<Item = Node<'r, D>> + '_ {
     // if root is none, use self as fallback to return a type-stable Iterator
     let node = self.parent().unwrap_or_else(|| self.clone());
@@ -393,6 +394,18 @@ impl<'r, D: Doc> Node<'r, D> {
     })
   }
 
+  // wasm32 has wrong goto_first_child_for_byte
+  #[cfg(target_arch = "wasm32")]
+  pub fn next_all(&self) -> impl Iterator<Item = Node<'r, D>> + '_ {
+    let mut node = self.clone();
+    std::iter::from_fn(move || {
+      node.next().map(|n| {
+        node = n.clone();
+        n
+      })
+    })
+  }
+
   #[must_use]
   pub fn prev(&self) -> Option<Node<'r, D>> {
     let inner = self.inner.prev_sibling()?;
@@ -402,6 +415,7 @@ impl<'r, D: Doc> Node<'r, D> {
     })
   }
 
+  #[cfg(not(target_arch = "wasm32"))]
   pub fn prev_all(&self) -> impl Iterator<Item = Node<'r, D>> + '_ {
     // if root is none, use self as fallback to return a type-stable Iterator
     let node = self.parent().unwrap_or_else(|| self.clone());
@@ -416,6 +430,18 @@ impl<'r, D: Doc> Node<'r, D> {
     })
   }
 
+  // wasm32 has wrong goto_first_child_for_byte
+  #[cfg(target_arch = "wasm32")]
+  pub fn prev_all(&self) -> impl Iterator<Item = Node<'r, D>> + '_ {
+    let mut node = self.clone();
+    std::iter::from_fn(move || {
+      node.prev().map(|n| {
+        node = n.clone();
+        n
+      })
+    })
+  }
+
   pub fn dfs<'s>(&'s self) -> Pre<'r, D> {
     Pre::new(self)
   }

{ast_grep_cli-0.22.2 → ast_grep_cli-0.22.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ast-grep-cli"
-version = "0.22.2"
+version = "0.22.4"
 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" }]