Rename json-edit to json-patch using the json-patch crate (RFC 6902)

branchseer · claude · branchseer · commit bb1453768fea · 2026-03-27T13:04:54.000+08:00
Replace custom path/value parsing with standard JSON Patch operations,
reducing ~150 lines of hand-rolled code to a 4-line implementation.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -81,6 +81,7 @@ fspy_shared_unix = { path = "crates/fspy_shared_unix" }
 futures = "0.3.31"
 futures-util = "0.3.31"
 insta = "1.44.3"
+json-patch = "4.1.0"
 jsonc-parser = { version = "0.29.0", features = ["serde"] }
 libc = "0.2.172"
 memmap2 = "0.9.7"
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/associate-existing-cache/snapshots.toml b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/associate-existing-cache/snapshots.toml
@@ -5,6 +5,6 @@ name = "associate existing cache"
 steps = [
   "vt run script1 # cache miss",
   "vt run script2 # cache hit, same command as script1",
-  "vtt json-edit package.json '_.scripts.script2 = \"vtt print world\"' # change script2",
+  "vtt json-patch package.json '[{\"op\":\"add\",\"path\":\"/scripts/script2\",\"value\":\"vtt print world\"}]' # change script2",
   "vt run script2 # cache miss",
 ]
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/associate-existing-cache/snapshots/associate existing cache.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/associate-existing-cache/snapshots/associate existing cache.snap
@@ -11,7 +11,7 @@ hello
 
 ---
 vt run: cache hit.
-> vtt json-edit package.json '_.scripts.script2 = "vtt print world"' # change script2
+> vtt json-patch package.json '[{"op":"add","path":"/scripts/script2","value":"vtt print world"}]' # change script2
 
 > vt run script2 # cache miss
 $ vtt print world ○ cache miss: args changed, executing
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-command-change/snapshots.toml b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-command-change/snapshots.toml
@@ -4,8 +4,8 @@
 name = "cache miss command change"
 steps = [
   "vt run task # cache miss",
-  "vtt json-edit vite-task.json '_.tasks.task.command = \"vtt print baz && vtt print bar\"' # change first subtask",
+  "vtt json-patch vite-task.json '[{\"op\":\"replace\",\"path\":\"/tasks/task/command\",\"value\":\"vtt print baz && vtt print bar\"}]' # change first subtask",
   "vt run task # first: cache miss, second: cache hit",
-  "vtt json-edit vite-task.json '_.tasks.task.command = \"vtt print bar\"' # remove first subtask",
+  "vtt json-patch vite-task.json '[{\"op\":\"replace\",\"path\":\"/tasks/task/command\",\"value\":\"vtt print bar\"}]' # remove first subtask",
   "vt run task # cache hit",
 ]
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-command-change/snapshots/cache miss command change.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-command-change/snapshots/cache miss command change.snap
@@ -11,7 +11,7 @@ bar
 
 ---
 vt run: 0/2 cache hit (0%). (Run `vt run --last-details` for full details)
-> vtt json-edit vite-task.json '_.tasks.task.command = "vtt print baz && vtt print bar"' # change first subtask
+> vtt json-patch vite-task.json '[{"op":"replace","path":"/tasks/task/command","value":"vtt print baz && vtt print bar"}]' # change first subtask
 
 > vt run task # first: cache miss, second: cache hit
 $ vtt print baz ○ cache miss: args changed, executing
@@ -22,7 +22,7 @@ bar
 
 ---
 vt run: 1/2 cache hit (50%). (Run `vt run --last-details` for full details)
-> vtt json-edit vite-task.json '_.tasks.task.command = "vtt print bar"' # remove first subtask
+> vtt json-patch vite-task.json '[{"op":"replace","path":"/tasks/task/command","value":"vtt print bar"}]' # remove first subtask
 
 > vt run task # cache hit
 $ vtt print bar ◉ cache hit, replaying
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-reasons/snapshots.toml b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-reasons/snapshots.toml
@@ -19,16 +19,16 @@ steps = ["MY_ENV=1 vt run test # cache miss", "vt run test # cache miss: env rem
 name = "untracked env added"
 steps = [
   "vt run test # cache miss",
-  "vtt json-edit vite-task.json \"_.tasks.test.untrackedEnv = ['MY_UNTRACKED']\" # add untracked env",
+  "vtt json-patch vite-task.json '[{\"op\":\"add\",\"path\":\"/tasks/test/untrackedEnv\",\"value\":[\"MY_UNTRACKED\"]}]' # add untracked env",
   "vt run test # cache miss: untracked env added",
 ]
 
 [[e2e]]
 name = "untracked env removed"
 steps = [
-  "vtt json-edit vite-task.json \"_.tasks.test.untrackedEnv = ['MY_UNTRACKED']\" # setup",
+  "vtt json-patch vite-task.json '[{\"op\":\"add\",\"path\":\"/tasks/test/untrackedEnv\",\"value\":[\"MY_UNTRACKED\"]}]' # setup",
   "vt run test # cache miss",
-  "vtt json-edit vite-task.json \"delete _.tasks.test.untrackedEnv\" # remove untracked env",
+  "vtt json-patch vite-task.json '[{\"op\":\"remove\",\"path\":\"/tasks/test/untrackedEnv\"}]' # remove untracked env",
   "vt run test # cache miss: untracked env removed",
 ]
 
@@ -38,7 +38,7 @@ steps = [
   "vt run test # cache miss",
   "mkdir -p subfolder",
   "cp test.txt subfolder/test.txt",
-  "vtt json-edit vite-task.json \"_.tasks.test.cwd = 'subfolder'\" # change cwd",
+  "vtt json-patch vite-task.json '[{\"op\":\"add\",\"path\":\"/tasks/test/cwd\",\"value\":\"subfolder\"}]' # change cwd",
   "vt run test # cache miss: cwd changed",
 ]
 
@@ -58,7 +58,7 @@ steps = [
 name = "input config changed"
 steps = [
   "vt run test # cache miss",
-  "vtt json-edit vite-task.json \"_.tasks.test.input = ['test.txt']\" # change input config",
+  "vtt json-patch vite-task.json '[{\"op\":\"add\",\"path\":\"/tasks/test/input\",\"value\":[\"test.txt\"]}]' # change input config",
   "vt run test # cache miss: configuration changed",
 ]
 
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-reasons/snapshots/cwd changed.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-reasons/snapshots/cwd changed.snap
@@ -9,7 +9,7 @@ initial content
 
 > cp test.txt subfolder/test.txt
 
-> vtt json-edit vite-task.json "_.tasks.test.cwd = 'subfolder'" # change cwd
+> vtt json-patch vite-task.json '[{"op":"add","path":"/tasks/test/cwd","value":"subfolder"}]' # change cwd
 
 > vt run test # cache miss: cwd changed
 ~/subfolder$ vtt print-file test.txt ○ cache miss: working directory changed, executing
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-reasons/snapshots/input config changed.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-reasons/snapshots/input config changed.snap
@@ -5,7 +5,7 @@ expression: e2e_outputs
 > vt run test # cache miss
 $ vtt print-file test.txt
 initial content
-> vtt json-edit vite-task.json "_.tasks.test.input = ['test.txt']" # change input config
+> vtt json-patch vite-task.json '[{"op":"add","path":"/tasks/test/input","value":["test.txt"]}]' # change input config
 
 > vt run test # cache miss: configuration changed
 $ vtt print-file test.txt ○ cache miss: input configuration changed, executing
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-reasons/snapshots/untracked env added.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-reasons/snapshots/untracked env added.snap
@@ -5,7 +5,7 @@ expression: e2e_outputs
 > vt run test # cache miss
 $ vtt print-file test.txt
 initial content
-> vtt json-edit vite-task.json "_.tasks.test.untrackedEnv = ['MY_UNTRACKED']" # add untracked env
+> vtt json-patch vite-task.json '[{"op":"add","path":"/tasks/test/untrackedEnv","value":["MY_UNTRACKED"]}]' # add untracked env
 
 > vt run test # cache miss: untracked env added
 $ vtt print-file test.txt ○ cache miss: untracked env config changed, executing
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-reasons/snapshots/untracked env removed.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/cache-miss-reasons/snapshots/untracked env removed.snap
@@ -2,12 +2,12 @@
 source: crates/vite_task_bin/tests/e2e_snapshots/main.rs
 expression: e2e_outputs
 ---
-> vtt json-edit vite-task.json "_.tasks.test.untrackedEnv = ['MY_UNTRACKED']" # setup
+> vtt json-patch vite-task.json '[{"op":"add","path":"/tasks/test/untrackedEnv","value":["MY_UNTRACKED"]}]' # setup
 
 > vt run test # cache miss
 $ vtt print-file test.txt
 initial content
-> vtt json-edit vite-task.json "delete _.tasks.test.untrackedEnv" # remove untracked env
+> vtt json-patch vite-task.json '[{"op":"remove","path":"/tasks/test/untrackedEnv"}]' # remove untracked env
 
 > vt run test # cache miss: untracked env removed
 $ vtt print-file test.txt ○ cache miss: untracked env config changed, executing
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/input-cache-test/snapshots.toml b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/input-cache-test/snapshots.toml
@@ -179,7 +179,7 @@ steps = [
   # Initial run
   "vt run empty-inputs",
   # Change the command
-  "vtt json-edit vite-task.json \"_.tasks['empty-inputs'].command = 'vtt print-file src/utils.ts'\"",
+  "vtt json-patch vite-task.json '[{\"op\":\"replace\",\"path\":\"/tasks/empty-inputs/command\",\"value\":\"vtt print-file src/utils.ts\"}]'",
   # Cache miss: command changed
   "vt run empty-inputs",
 ]
diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/input-cache-test/snapshots/empty input - miss on command change.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/input-cache-test/snapshots/empty input - miss on command change.snap
@@ -5,7 +5,7 @@ expression: e2e_outputs
 > vt run empty-inputs
 $ vtt print-file src/main.ts
 export const main = 'initial';
-> vtt json-edit vite-task.json "_.tasks['empty-inputs'].command = 'vtt print-file src/utils.ts'"
+> vtt json-patch vite-task.json '[{"op":"replace","path":"/tasks/empty-inputs/command","value":"vtt print-file src/utils.ts"}]'
 
 > vt run empty-inputs
 $ vtt print-file src/utils.ts ○ cache miss: args changed, executing
diff --git a/crates/vite_task_tools/Cargo.toml b/crates/vite_task_tools/Cargo.toml
@@ -12,6 +12,7 @@ name = "vtt"
 path = "src/main.rs"
 
 [dependencies]
+json-patch = { workspace = true }
 serde_json = { workspace = true }
 
 [lints]
diff --git a/crates/vite_task_tools/src/main.rs b/crates/vite_task_tools/src/main.rs
@@ -1,7 +1,6 @@
 // This is a standalone test utility binary that deliberately uses std types
 // rather than the project's custom types (vite_str, vite_path, etc.).
 #![expect(clippy::disallowed_types, reason = "standalone test utility uses std types")]
-#![expect(clippy::disallowed_macros, reason = "standalone test utility uses std macros")]
 #![expect(clippy::disallowed_methods, reason = "standalone test utility uses std methods")]
 #![expect(clippy::print_stderr, reason = "CLI tool error output")]
 #![expect(clippy::print_stdout, reason = "CLI tool output")]
@@ -11,7 +10,7 @@ fn main() {
     if args.len() < 2 {
         eprintln!("Usage: vtt <subcommand> [args...]");
         eprintln!(
-            "Subcommands: check-tty, json-edit, print, print-env, print-file, read-stdin, replace-file-content, touch-file"
+            "Subcommands: check-tty, json-patch, print, print-env, print-file, read-stdin, replace-file-content, touch-file"
         );
         std::process::exit(1);
     }
@@ -21,7 +20,7 @@ fn main() {
             cmd_check_tty();
             Ok(())
         }
-        "json-edit" => cmd_json_edit(&args[2..]),
+        "json-patch" => cmd_json_patch(&args[2..]),
         "print" => {
             cmd_print(&args[2..]);
             Ok(())
@@ -116,155 +115,19 @@ fn cmd_touch_file(args: &[String]) -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-// ── json-edit implementation ──
-
-fn cmd_json_edit(args: &[String]) -> Result<(), Box<dyn std::error::Error>> {
+fn cmd_json_patch(args: &[String]) -> Result<(), Box<dyn std::error::Error>> {
     if args.len() < 2 {
-        return Err("Usage: vtt json-edit <filename> <expression>".into());
+        return Err("Usage: vtt json-patch <json_file_path> <json_patch>".into());
     }
     let filename = &args[0];
-    let expr = &args[1];
+    let patch_str = &args[1];
 
     let content = std::fs::read_to_string(filename)?;
     let mut json: serde_json::Value = serde_json::from_str(&content)?;
-
-    let expr = expr.trim();
-    if let Some(path_str) = expr.strip_prefix("delete ") {
-        let path = parse_path(path_str.trim())?;
-        delete_path(&mut json, &path)?;
-    } else if let Some((path_str, value_str)) = expr.split_once('=') {
-        let path = parse_path(path_str.trim())?;
-        let value = parse_value(value_str.trim())?;
-        set_path(&mut json, &path, value)?;
-    } else {
-        return Err(format!("Unsupported expression: {expr}").into());
-    }
+    let patch: json_patch::Patch = serde_json::from_str(patch_str)?;
+    json_patch::patch(&mut json, &patch)?;
 
     let output = serde_json::to_string_pretty(&json)? + "\n";
     std::fs::write(filename, output)?;
     Ok(())
 }
-
-fn parse_path(s: &str) -> Result<Vec<String>, Box<dyn std::error::Error>> {
-    // Parse paths like: _.tasks.test.untrackedEnv or _.tasks['empty-inputs'].command
-    let s = s.strip_prefix("_.").ok_or("Path must start with '_.' ")?;
-    let mut keys = Vec::new();
-    let mut chars = s.chars().peekable();
-    let mut current = String::new();
-
-    while let Some(&ch) = chars.peek() {
-        match ch {
-            '.' => {
-                if !current.is_empty() {
-                    keys.push(std::mem::take(&mut current));
-                }
-                chars.next();
-            }
-            '[' => {
-                if !current.is_empty() {
-                    keys.push(std::mem::take(&mut current));
-                }
-                chars.next(); // consume '['
-                // expect quote
-                let quote = chars.next().ok_or("Expected quote after [")?;
-                if quote != '\'' && quote != '"' {
-                    return Err("Expected quote after [".into());
-                }
-                let mut key = String::new();
-                for ch in chars.by_ref() {
-                    if ch == quote {
-                        break;
-                    }
-                    key.push(ch);
-                }
-                // expect ']'
-                let close = chars.next().ok_or("Expected ]")?;
-                if close != ']' {
-                    return Err("Expected ]".into());
-                }
-                keys.push(key);
-            }
-            _ => {
-                current.push(ch);
-                chars.next();
-            }
-        }
-    }
-    if !current.is_empty() {
-        keys.push(current);
-    }
-    Ok(keys)
-}
-
-fn parse_value(s: &str) -> Result<serde_json::Value, Box<dyn std::error::Error>> {
-    // Handle quoted strings
-    if (s.starts_with('"') && s.ends_with('"')) || (s.starts_with('\'') && s.ends_with('\'')) {
-        let inner = &s[1..s.len() - 1];
-        return Ok(serde_json::Value::String(inner.to_string()));
-    }
-    // Handle arrays like ['foo', 'bar'] or ["foo"]
-    if s.starts_with('[') && s.ends_with(']') {
-        let inner = s[1..s.len() - 1].trim();
-        if inner.is_empty() {
-            return Ok(serde_json::Value::Array(vec![]));
-        }
-        let mut items = Vec::new();
-        let mut chars = inner.chars().peekable();
-        while chars.peek().is_some() {
-            // skip whitespace
-            while chars.peek().is_some_and(|c| c.is_whitespace()) {
-                chars.next();
-            }
-            if chars.peek().is_none() {
-                break;
-            }
-            let quote = chars.next().ok_or("Expected quote")?;
-            if quote != '\'' && quote != '"' {
-                return Err(format!("Expected quote in array, got '{quote}'").into());
-            }
-            let mut val = String::new();
-            for ch in chars.by_ref() {
-                if ch == quote {
-                    break;
-                }
-                val.push(ch);
-            }
-            items.push(serde_json::Value::String(val));
-            // skip whitespace and comma
-            while chars.peek().is_some_and(|c| c.is_whitespace() || *c == ',') {
-                chars.next();
-            }
-        }
-        return Ok(serde_json::Value::Array(items));
-    }
-    Err(format!("Cannot parse value: {s}").into())
-}
-
-fn set_path(
-    root: &mut serde_json::Value,
-    path: &[String],
-    value: serde_json::Value,
-) -> Result<(), Box<dyn std::error::Error>> {
-    let (last, parents) = path.split_last().ok_or("Empty path")?;
-    let mut current = root;
-    for key in parents {
-        current = current.get_mut(key.as_str()).ok_or_else(|| format!("Key not found: {key}"))?;
-    }
-    let obj = current.as_object_mut().ok_or("Parent is not an object")?;
-    obj.insert(last.clone(), value);
-    Ok(())
-}
-
-fn delete_path(
-    root: &mut serde_json::Value,
-    path: &[String],
-) -> Result<(), Box<dyn std::error::Error>> {
-    let (last, parents) = path.split_last().ok_or("Empty path")?;
-    let mut current = root;
-    for key in parents {
-        current = current.get_mut(key.as_str()).ok_or_else(|| format!("Key not found: {key}"))?;
-    }
-    let obj = current.as_object_mut().ok_or("Parent is not an object")?;
-    obj.remove(last.as_str());
-    Ok(())
-}

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ name = "associate existing cache"`
`5`	`5`	`steps = [`
`6`	`6`	`"vt run script1 # cache miss",`
`7`	`7`	`"vt run script2 # cache hit, same command as script1",`
`8`		`- "vtt json-edit package.json '_.scripts.script2 = \"vtt print world\"' # change script2",`
	`8`	`+ "vtt json-patch package.json '[{\"op\":\"add\",\"path\":\"/scripts/script2\",\"value\":\"vtt print world\"}]' # change script2",`
`9`	`9`	`"vt run script2 # cache miss",`
`10`	`10`	`]`