mirror of
https://github.com/storytold/cadcraft.git
synced 2026-10-25 19:36:49 -06:00
Valentin KleinandClaude Opus 5.5
eee9de96f5
targets() fell back to the current selection when `handle` wasn't a hex
handle or `handles` wasn't an array, and dropped unreadable entries from
`handles`. A typo such as {"handle": "#101"} made ERASE, MOVE and the other
~70 commands that take objects act on whatever was selected (in a bridged
MCP session: the user's selection in the window). Such values are now an
error naming the bad value; the selection is used only when neither key is
given (or it is null).
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
42 lines
2.0 KiB
Rust
42 lines
2.0 KiB
Rust
//! A `handle`/`handles` param that can't be read is an error. It never falls back to the current
|
|
//! selection, and bad entries are never dropped without a word (#330).
|
|
|
|
use cadcraft_engine::Session;
|
|
use serde_json::{Value, json};
|
|
|
|
fn circles(s: &mut Session) -> Vec<Value> {
|
|
s.execute("entities", &json!({ "type": "Circle" })).unwrap()["entities"].as_array().cloned().unwrap_or_default()
|
|
}
|
|
|
|
#[test]
|
|
fn malformed_handles_are_rejected_instead_of_using_the_selection() {
|
|
let mut s = Session::new();
|
|
let a = s.execute("circle", &json!({ "center": [0, 0], "radius": 1 })).unwrap()["handle"].as_str().unwrap().to_string();
|
|
s.execute("circle", &json!({ "center": [10, 0], "radius": 1 })).unwrap();
|
|
s.execute("qselect", &json!({ "type": "Circle" })).unwrap();
|
|
assert_eq!(s.selection().len(), 2);
|
|
|
|
for (cmd, params) in [
|
|
("erase", json!({ "handle": format!("#{a}") })),
|
|
("erase", json!({ "handle": "" })),
|
|
("erase", json!({ "handle": -1 })),
|
|
("erase", json!({ "handles": a })),
|
|
("erase", json!({ "handles": [a, "#102"] })),
|
|
("move", json!({ "handles": a, "delta": [5, 5] })),
|
|
("move", json!({ "handle": "0x101", "delta": [5, 5] })),
|
|
] {
|
|
let e = s.execute(cmd, ¶ms).expect_err(&format!("{cmd} {params}"));
|
|
assert!(e.to_string().contains("handle"), "{cmd} {params}: {e}");
|
|
let c = circles(&mut s);
|
|
assert_eq!(c.len(), 2, "{cmd} {params} must change nothing");
|
|
assert!(c.iter().all(|e| e["geometry"]["center"]["y"] == json!(0.0)), "{cmd} {params} must move nothing");
|
|
}
|
|
|
|
// Well-formed handles act on exactly those objects; without either key the selection is used.
|
|
assert_eq!(s.execute("move", &json!({ "handle": a, "delta": [0, 5] })).unwrap()["moved"], 1);
|
|
assert_eq!(s.execute("erase", &json!({ "handles": [a] })).unwrap()["erased"], 1);
|
|
s.execute("qselect", &json!({ "type": "Circle" })).unwrap();
|
|
assert_eq!(s.execute("erase", &json!({ "handles": null })).unwrap()["erased"], 1);
|
|
assert!(circles(&mut s).is_empty());
|
|
}
|