ast-grep-cli 0.36.2__tar.gz → 0.36.3__tar.gz

{ast_grep_cli-0.36.2 → ast_grep_cli-0.36.3}/Cargo.lock

@@ -114,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.36.2"
+version = "0.36.3"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -128,7 +128,7 @@ dependencies = [
  "clap",
  "clap_complete",
  "codespan-reporting",
- "crossterm 0.28.1",
+ "crossterm 0.29.0",
  "ignore",
  "inquire",
  "predicates",
@@ -145,7 +145,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.36.2"
+version = "0.36.3"
 dependencies = [
  "anyhow",
  "ast-grep-core",
@@ -161,7 +161,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-core"
-version = "0.36.2"
+version = "0.36.3"
 dependencies = [
  "bit-set",
  "regex",
@@ -172,7 +172,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.36.2"
+version = "0.36.3"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -185,7 +185,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-language"
-version = "0.36.2"
+version = "0.36.3"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -216,7 +216,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.36.2"
+version = "0.36.3"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -230,7 +230,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.36.2"
+version = "0.36.3"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -246,7 +246,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-py"
-version = "0.36.2"
+version = "0.36.3"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -314,7 +314,7 @@ dependencies = [
 
 [[package]]
 name = "benches"
-version = "0.36.2"
+version = "0.36.3"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -345,9 +345,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
 [[package]]
 name = "bstr"
@@ -428,9 +428,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.32"
+version = "4.5.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
+checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -438,9 +438,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.32"
+version = "4.5.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
+checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5"
 dependencies = [
  "anstream",
  "anstyle",
@@ -450,9 +450,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.46"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98"
+checksum = "c06f5378ea264ad4f82bbc826628b5aad714a75abf6ece087e923010eb937fb6"
 dependencies = [
  "clap",
 ]
@@ -477,10 +477,11 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "codespan-reporting"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
 dependencies = [
+ "serde",
  "termcolor",
  "unicode-width",
 ]
@@ -500,6 +501,15 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "convert_case"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "criterion"
 version = "0.5.1"
@@ -579,15 +589,17 @@ dependencies = [
 
 [[package]]
 name = "crossterm"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
+checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.9.0",
  "crossterm_winapi",
+ "derive_more",
+ "document-features",
  "mio 1.0.1",
  "parking_lot",
- "rustix 0.38.41",
+ "rustix",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -645,6 +657,27 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+dependencies = [
+ "convert_case 0.7.1",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "difflib"
 version = "0.4.0"
@@ -657,6 +690,15 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
+[[package]]
+name = "document-features"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
+dependencies = [
+ "litrs",
+]
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.17"
@@ -926,7 +968,7 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.9.0",
  "crossterm 0.25.0",
  "dyn-clone",
  "fuzzy-matcher",
@@ -996,15 +1038,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.9.2"
+name = "litrs"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
+checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
 
 [[package]]
 name = "lock_api"
@@ -1086,12 +1128,12 @@ dependencies = [
 
 [[package]]
 name = "napi"
-version = "2.16.16"
+version = "2.16.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "839ae2ee5e62c6348669c50098b187c08115bd3cced658c9c0bf945fca0fec83"
+checksum = "55740c4ae1d8696773c78fdafd5d0e5fe9bc9f1b071c7ba493ba5c413a9184f3"
 dependencies = [
  "anyhow",
- "bitflags 2.5.0",
+ "bitflags 2.9.0",
  "ctor",
  "napi-derive",
  "napi-sys",
@@ -1102,9 +1144,9 @@ dependencies = [
 
 [[package]]
 name = "napi-build"
-version = "2.1.5"
+version = "2.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40685973218af4aa4b42486652692c294c44b5a67e4b2202df721c9063f2e51c"
+checksum = "e28acfa557c083f6e254a786e01ba253fc56f18ee000afcd4f79af735f73a6da"
 
 [[package]]
 name = "napi-derive"
@@ -1113,7 +1155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cbe2585d8ac223f7d34f13701434b9d5f4eb9c332cccce8dee57ea18ab8ab0c"
 dependencies = [
  "cfg-if",
- "convert_case",
+ "convert_case 0.6.0",
  "napi-derive-backend",
  "proc-macro2",
  "quote",
@@ -1126,7 +1168,7 @@ version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1639aaa9eeb76e91c6ae66da8ce3e89e921cd3885e99ec85f4abacae72fc91bf"
 dependencies = [
- "convert_case",
+ "convert_case 0.6.0",
  "once_cell",
  "proc-macro2",
  "quote",
@@ -1325,9 +1367,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.23.5"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872"
+checksum = "17da310086b068fbdcefbba30aeb3721d5bb9af8db4987d6735b2183ca567229"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -1344,9 +1386,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.23.5"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb"
+checksum = "e27165889bd793000a098bb966adc4300c312497ea25cf7a690a9f0ac5aa5fc1"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -1354,9 +1396,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.23.5"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d"
+checksum = "05280526e1dbf6b420062f3ef228b78c0c54ba94e157f5cb724a609d0f2faabc"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1364,9 +1406,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.23.5"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da"
+checksum = "5c3ce5686aa4d3f63359a5100c62a127c9f15e8398e5fdeb5deef1fed5cd5f44"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1376,9 +1418,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.23.5"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028"
+checksum = "f4cf6faa0cbfb0ed08e89beb8103ae9724eb4750e3a78084ba4017cbe94f3855"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1389,9 +1431,9 @@ dependencies = [
 
 [[package]]
 name = "pythonize"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91a6ee7a084f913f98d70cdc3ebec07e852b735ae3059a1500db2661265da9ff"
+checksum = "d5bcac0d0b71821f0d69e42654f1e15e5c94b85196446c4de9588951a2117e7b"
 dependencies = [
  "pyo3",
  "serde",
@@ -1432,7 +1474,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
@@ -1470,29 +1512,16 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
-[[package]]
-name = "rustix"
-version = "0.38.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
-dependencies = [
- "bitflags 2.5.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.14",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "rustix"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17f8dcd64f141950290e45c99f7710ede1b600297c91818bb30b3667c0f45dc0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.9.0",
  "errno",
  "libc",
- "linux-raw-sys 0.9.2",
+ "linux-raw-sys",
  "windows-sys 0.52.0",
 ]
 
@@ -1669,9 +1698,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "streaming-iterator"
@@ -1698,20 +1727,20 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
 
 [[package]]
 name = "tempfile"
-version = "3.19.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600"
+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
 dependencies = [
  "fastrand",
  "getrandom",
  "once_cell",
- "rustix 1.0.0",
+ "rustix",
  "windows-sys 0.52.0",
 ]
 
@@ -1787,9 +1816,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.1"
+version = "1.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2539,7 +2568,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
@@ -2549,6 +2578,7 @@ dependencies = [
  "anyhow",
  "ast-grep-config",
  "ast-grep-core",
+ "ast-grep-language",
  "schemars",
  "serde_json",
  "toml_edit",

{ast_grep_cli-0.36.2 → ast_grep_cli-0.36.3}/Cargo.toml

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

{ast_grep_cli-0.36.2 → ast_grep_cli-0.36.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ast-grep-cli
-Version: 0.36.2
+Version: 0.36.3
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{ast_grep_cli-0.36.2 → ast_grep_cli-0.36.3}/crates/cli/Cargo.toml

@@ -37,8 +37,8 @@ ansi_term = "0.12.1"
 anyhow.workspace = true
 atty = "0.2.14"
 clap = { version = "4.5.4", features = ["derive"] }
-codespan-reporting = "0.11.1"
-crossterm = "0.28.0"
+codespan-reporting = "0.12.0"
+crossterm = "0.29.0"
 ignore.workspace = true
 regex.workspace = true
 inquire = "0.7.5"

{ast_grep_cli-0.36.2 → ast_grep_cli-0.36.3}/crates/cli/tests/scan_test.rs

@@ -232,3 +232,39 @@ fn test_severity_override() -> Result<()> {
     .stdout(contains("warning"));
   Ok(())
 }
+
+const PY_RULE: &str = r"
+id: transform-indent
+language: python
+rule: { pattern: 'class $CN(): $A' }
+transform:
+  AR:
+    substring: { source: $A }
+fix: |-
+  class $CN():
+      $AR
+";
+
+const PY_FILE: &str = r"
+if something:
+    class B():
+        def replace(self):
+        print(self1)
+";
+
+#[test]
+fn test_transform_indent() -> Result<()> {
+  let dir = create_test_files([
+    ("sgconfig.yml", CONFIG),
+    ("rules/rule.yml", PY_RULE),
+    ("test.py", PY_FILE),
+  ])?;
+  Command::cargo_bin("ast-grep")?
+    .current_dir(dir.path())
+    .args(["scan"])
+    .assert()
+    .success()
+    .stdout(contains("print").not())
+    .stdout(contains("transform-indent"));
+  Ok(())
+}

{ast_grep_cli-0.36.2 → ast_grep_cli-0.36.3}/crates/config/src/check_var.rs

@@ -4,7 +4,7 @@ use crate::rule::Rule;
 use crate::rule_config::RuleConfigError;
 use crate::rule_core::RuleCoreError;
 use crate::transform::{TransformError, Transformation};
-use crate::{GlobalRules, RuleCore};
+use crate::RuleCore;
 
 use ast_grep_core::language::Language;
 
@@ -162,15 +162,14 @@ fn check_var_in_fix<L: Language>(vars: HashSet<&str>, fixer: &Option<Fixer<L>>)
 
 pub fn check_rewriters_in_transform<L: Language>(
   rule: &RuleCore<L>,
-  rewriters: &GlobalRules<L>,
+  rewriters: &HashMap<String, RuleCore<L>>,
 ) -> Result<(), RuleConfigError> {
-  let rewriters = rewriters.read();
-  if let Some(err) = check_one_rewriter_in_rule(rule, &rewriters) {
+  if let Some(err) = check_one_rewriter_in_rule(rule, rewriters) {
     return Err(err);
   }
   let error = rewriters
     .values()
-    .find_map(|rewriter| check_one_rewriter_in_rule(rewriter, &rewriters));
+    .find_map(|rewriter| check_one_rewriter_in_rule(rewriter, rewriters));
   if let Some(err) = error {
     return Err(err);
   }

{ast_grep_cli-0.36.2 → ast_grep_cli-0.36.3}/crates/config/src/rule/deserialize_env.rs

@@ -34,6 +34,7 @@ fn into_map<L: Language>(
 type OrderResult<T> = Result<T, String>;
 
 /// A struct to store information to deserialize rules.
+#[derive(Clone)]
 pub struct DeserializeEnv<L: Language> {
   /// registration for global utility rules and local utility rules.
   pub(crate) registration: RuleRegistration<L>,
@@ -153,7 +154,7 @@ impl<L: Language> DeserializeEnv<L> {
   /// register utils rule in the DeserializeEnv for later usage.
   /// N.B. This function will manage the util registration order
   /// by their dependency. `potential_kinds` need ordered insertion.
-  pub fn register_local_utils(
+  pub fn with_utils(
     self,
     utils: &HashMap<String, SerializableRule>,
   ) -> Result<Self, RuleSerializeError> {
@@ -208,12 +209,6 @@ impl<L: Language> DeserializeEnv<L> {
       lang: self.lang,
     }
   }
-  pub fn with_rewriters(self, globals: &GlobalRules<L>) -> Self {
-    Self {
-      registration: self.registration.with_rewriters(globals),
-      lang: self.lang,
-    }
-  }
 }
 
 #[cfg(test)]
@@ -234,7 +229,7 @@ member-name:
   kind: identifier
 ",
     )?;
-    let env = DeserializeEnv::new(TypeScript::Tsx).register_local_utils(&utils)?;
+    let env = DeserializeEnv::new(TypeScript::Tsx).with_utils(&utils)?;
     assert_eq!(utils.keys().count(), 2);
     let rule = from_str("matches: accessor-name").unwrap();
     Ok((
@@ -271,7 +266,7 @@ local-rule:
 ",
     )?;
     // should not panic
-    DeserializeEnv::new(TypeScript::Tsx).register_local_utils(&utils)?;
+    DeserializeEnv::new(TypeScript::Tsx).with_utils(&utils)?;
     Ok(())
   }
 
@@ -283,7 +278,7 @@ local-rule:
   matches: local-rule
 ",
     )?;
-    let ret = DeserializeEnv::new(TypeScript::Tsx).register_local_utils(&utils);
+    let ret = DeserializeEnv::new(TypeScript::Tsx).with_utils(&utils);
     assert!(ret.is_err());
     Ok(())
   }
@@ -302,7 +297,7 @@ local-rule-c:
     - matches: local-rule-a
 ",
     )?;
-    let ret = DeserializeEnv::new(TypeScript::Tsx).register_local_utils(&utils);
+    let ret = DeserializeEnv::new(TypeScript::Tsx).with_utils(&utils);
     assert!(ret.is_err());
     Ok(())
   }
@@ -316,7 +311,7 @@ local-rule-a:
 local-rule-b:
   matches: local-rule-a",
     )?;
-    let ret = DeserializeEnv::new(TypeScript::Tsx).register_local_utils(&utils);
+    let ret = DeserializeEnv::new(TypeScript::Tsx).with_utils(&utils);
     assert!(matches!(
       ret,
       Err(RuleSerializeError::MatchesReference(