ast-grep-cli 0.26.2__tar.gz → 0.26.3__tar.gz

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/Cargo.lock

@@ -114,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -145,7 +145,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "anyhow",
  "ast-grep-core",
@@ -161,7 +161,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-core"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "bit-set",
  "regex",
@@ -172,7 +172,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -184,7 +184,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-language"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -216,7 +216,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -230,7 +230,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -249,7 +249,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-py"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -317,7 +317,7 @@ dependencies = [
 
 [[package]]
 name = "benches"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -450,9 +450,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.18"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee158892bd7ce77aa15c208abbdb73e155d191c287a659b57abd5adb92feb03"
+checksum = "531d7959c5bbb6e266cecdd0f20213639c3a5c3e4d615f97db87661745f781ff"
 dependencies = [
  "clap",
 ]
@@ -1514,18 +1514,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.208"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.208"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1545,9 +1545,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.125"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
 dependencies = [
  "indexmap",
  "itoa",

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/Cargo.toml

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

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/PKG-INFO

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

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/config/Cargo.toml

@@ -26,4 +26,4 @@ thiserror.workspace = true
 schemars.workspace = true
 
 [dev-dependencies]
-tree-sitter-typescript = "0.21.1"
+tree-sitter-typescript = "0.21.1"

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/config/src/transform/mod.rs

@@ -118,4 +118,30 @@ mod test {
     let ret = Transform::deserialize(&trans, &env);
     assert!(ret.is_ok());
   }
+
+  #[test]
+  fn test_transform_indentation() {
+    let src = "
+if (true) {
+  let a = {
+    b: 123
+  }
+}
+";
+    let expected = "{
+  b: 123
+}";
+    let mut trans = HashMap::new();
+    let tr = from_str("{ substring: { source: $A } }").expect("should work");
+    trans.insert("TR".into(), tr);
+    let grep = TypeScript::Tsx.ast_grep(src);
+    let root = grep.root();
+    let mut nm = root.find("let a = $A").expect("should find");
+    let env = DeserializeEnv::new(TypeScript::Tsx);
+    let trans = Transform::deserialize(&trans, &env).expect("should deserialize");
+    trans.apply_transform(nm.get_env_mut(), &Default::default(), &Default::default());
+    let actual = nm.get_env().get_transformed("TR").expect("should have TR");
+    let actual = std::str::from_utf8(actual).expect("should work");
+    assert_eq!(actual, expected);
+  }
 }

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/config/src/transform/transformation.rs

@@ -109,6 +109,18 @@ pub enum Transformation<T> {
   Rewrite(Rewrite<T>),
 }
 
+impl<T> Transformation<T> {
+  fn source(&self) -> &T {
+    use Transformation as T;
+    match self {
+      T::Replace(r) => &r.source,
+      T::Substring(s) => &s.source,
+      T::Convert(c) => &c.source,
+      T::Rewrite(r) => &r.source,
+    }
+  }
+}
+
 pub(crate) fn parse_meta_var<L: Language>(
   src: &str,
   lang: &L,
@@ -148,38 +160,25 @@ impl Transformation<String> {
   }
 
   pub fn used_vars(&self) -> &str {
-    fn strip(s: &str) -> &str {
-      s.strip_prefix("$$$").unwrap_or_else(|| &s[1..])
-      // match s {
-      //   MetaVariable::Capture(s, _) => s,
-      //   MetaVariable::Dropped(_) => "",
-      //   MetaVariable::MultiCapture(s) => s,
-      //   MetaVariable::Multiple => "",
-      // }
-    }
-    use Transformation as T;
     // NOTE: meta_var in transform always starts with `$`, for now
-    match self {
-      T::Replace(r) => strip(&r.source),
-      T::Substring(s) => strip(&s.source),
-      T::Convert(c) => strip(&c.source),
-      T::Rewrite(r) => strip(&r.source),
-    }
+    let s = self.source();
+    s.strip_prefix("$$$").unwrap_or_else(|| &s[1..])
   }
 }
 impl Transformation<MetaVariable> {
   pub(super) fn insert<D: Doc>(&self, key: &str, ctx: &mut Ctx<D>) {
+    let src = self.source();
     // TODO: add this debug assertion back
     // debug_assert!(ctx.env.get_transformed(key).is_none());
     // avoid cyclic
-    ctx.env.insert_transformation(key, vec![]);
+    ctx.env.insert_transformation(src, key, vec![]);
     let opt = self.compute(ctx);
     let bytes = if let Some(s) = opt {
       <D::Source as Content>::decode_str(&s).to_vec()
     } else {
       vec![]
     };
-    ctx.env.insert_transformation(key, bytes);
+    ctx.env.insert_transformation(src, key, bytes);
   }
   fn compute<D: Doc>(&self, ctx: &mut Ctx<D>) -> Option<String> {
     use Transformation as T;
@@ -436,5 +435,25 @@ mod test {
     assert_eq!(actual, "camelcase_not");
     Ok(())
   }
+
+  #[test]
+  fn test_transform_indentation_with_insertion() -> R {
+    let src = "
+if (true) {
+  let a = {
+    b: 123
+  }
+}
+";
+    // note the indentation
+    let expected = "{
+    b: 123
+  }";
+    let tr = parse("{ substring: { source: $A } }")?;
+    let actual = get_transformed(src, "let a = $A", &tr).ok_or(())?;
+    assert_eq!(actual, expected);
+    Ok(())
+  }
+
   // TODO: add a symbolic test for Rewrite
 }

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/core/Cargo.toml

@@ -23,4 +23,4 @@ tree-sitter.workspace = true
 default = ["regex"]
 
 [dev-dependencies]
-tree-sitter-typescript = "0.21.1"
+tree-sitter-typescript = "0.21.1"

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/core/src/match_tree/strictness.rs

@@ -39,7 +39,10 @@ impl MatchStrictness {
   ) -> MatchOneNode {
     use MatchStrictness as M;
     let k = candidate.kind_id();
-    if k == kind && text == candidate.text() {
+    // work around ast-grep/ast-grep#1419 and tree-sitter/tree-sitter-typescript#306
+    // tree-sitter-typescript has wrong span of unnamed node so text would not match
+    // just compare kind for unnamed node
+    if k == kind && (!is_named || text == candidate.text()) {
       return MatchOneNode::MatchedBoth;
     }
     let (skip_goal, skip_candidate) = match self {

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/core/src/meta_var.rs

@@ -5,6 +5,8 @@ use crate::{Doc, Language, Node, StrDoc};
 use std::borrow::Cow;
 use std::collections::HashMap;
 
+use crate::replacer::formatted_slice;
+
 pub type MetaVariableID = String;
 
 type Underlying<D> = Vec<<<D as Doc>::Source as Content>::Underlying>;
@@ -44,8 +46,18 @@ impl<'tree, D: Doc> MetaVarEnv<'tree, D> {
     }
   }
 
-  pub fn insert_transformation(&mut self, name: &str, src: Underlying<D>) {
-    self.transformed_var.insert(name.to_string(), src);
+  pub fn insert_transformation(&mut self, var: &MetaVariable, name: &str, slice: Underlying<D>) {
+    let node = match var {
+      MetaVariable::Capture(v, _) => self.single_matched.get(v),
+      MetaVariable::MultiCapture(vs) => self.multi_matched.get(vs).and_then(|vs| vs.first()),
+      _ => None,
+    };
+    let deindented = if let Some(v) = node {
+      formatted_slice(&slice, v.root.doc.get_source(), v.range().start).to_vec()
+    } else {
+      slice
+    };
+    self.transformed_var.insert(name.to_string(), deindented);
   }
 
   pub fn get_match(&self, var: &str) -> Option<&'_ Node<'tree, D>> {

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/core/src/replacer/indent.rs

@@ -146,6 +146,27 @@ pub fn extract_with_deindent<C: Content>(content: &C, range: Range<usize>) -> De
   DeindentedExtract::MultiLine(extract_slice, indent)
 }
 
+fn deindent_slice<'a, C: Content>(
+  slice: &'a [C::Underlying],
+  content: &'a C,
+  start: usize,
+) -> DeindentedExtract<'a, C> {
+  if !slice.contains(&get_new_line::<C>()) {
+    return DeindentedExtract::SingleLine(slice);
+  }
+  let indent = get_indent_at_offset::<C>(content.get_range(0..start));
+  DeindentedExtract::MultiLine(slice, indent)
+}
+
+pub fn formatted_slice<'a, C: Content>(
+  slice: &'a [C::Underlying],
+  content: &'a C,
+  start: usize,
+) -> Cow<'a, [C::Underlying]> {
+  let deindent = deindent_slice(slice, content, start);
+  indent_lines(0, deindent)
+}
+
 pub fn indent_lines<C: Content>(
   indent: usize,
   extract: DeindentedExtract<C>,

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/core/src/replacer.rs

@@ -4,6 +4,8 @@ use crate::source::Edit as E;
 use crate::{Doc, Node, Root};
 use std::ops::Range;
 
+pub(crate) use indent::formatted_slice;
+
 type Edit<D> = E<<D as Doc>::Source>;
 type Underlying<S> = Vec<<S as Content>::Underlying>;
 

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/dynamic/Cargo.toml

@@ -17,4 +17,4 @@ ignore.workspace = true
 libloading = "0.8.3"
 serde.workspace = true
 thiserror.workspace = true
-tree-sitter-native = { version = "0.22.6", package = "tree-sitter" }
+tree-sitter-native = { version = "0.22.6", package = "tree-sitter" }

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/language/Cargo.toml

@@ -66,4 +66,4 @@ builtin-parser = [
   "tree-sitter-swift",
   "tree-sitter-typescript",
 ]
-default = ["builtin-parser"]
+default = ["builtin-parser"]

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/crates/lsp/Cargo.toml

@@ -31,4 +31,4 @@ tokio = { version = "1.37.0", features = [
   "rt-multi-thread",
   "io-std",
   "io-util",
-] }
+] }

{ast_grep_cli-0.26.2 → ast_grep_cli-0.26.3}/pyproject.toml

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