DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Styles: a non-string Based On or Next Style is refused on creation too
moppeeera74ea0d3c98c
diff --git a/crates/engine/src/cmd/style.rs b/crates/engine/src/cmd/style.rsindex 699b01ea8..cfd2bbbe9 100644--- a/crates/engine/src/cmd/style.rs+++ b/crates/engine/src/cmd/style.rs@@ -841,8 +841,19 @@ fn continue_numbering(p: Option<&Value>, para: &mut ParaAttrs) {}}+/// The style `p[key]` names: none when absent or null; anything but a name is refused.+fn style_name_param(cmd: &str, p: &Value, key: &str) -> Result<Option<String>> {+ match p.get(key) {+ None | Some(Value::Null) => Ok(None),+ Some(Value::String(n)) => Ok(Some(n.clone())),+ Some(_) => Err(bad(cmd, format!("`{key}` is a style name or null"))),+ }+}+fn create_para(s: &mut Session, p: &Value) -> Result<Value> {let base = str_param(p, "name").unwrap_or("Paragraph Style 1").to_string();+ let based_on = style_name_param("style.paragraph.create", p, "basedOn")?;+ let next = style_name_param("style.paragraph.create", p, "nextStyle")?;let mut para: ParaAttrs =attrs("style.paragraph.create", "para", p, |a: &mut ParaAttrs, k, v| a.set_json_over(k, v, &designcraft_doc::ParaProps::default()))?;continue_numbering(p.get("para"), &mut para);@@ -866,8 +877,6 @@ fn create_para(s: &mut Session, p: &Value) -> Result<Value> {chars = full;}}- let based_on = str_param(p, "basedOn").map(str::to_string);- let next = str_param(p, "nextStyle").map(str::to_string);s.edit(|d, _| {let name = Styles::unique_name(|n| d.styles.para(n).is_some(), &base);if let Some(b) = &based_on@@ -1231,7 +1240,7 @@ fn create_char(s: &mut Session, p: &Value) -> Result<Value> {chars = captured;}// Based on [None] is based on nothing.- let based_on = str_param(p, "basedOn").filter(|b| *b != designcraft_doc::NO_CHAR_STYLE).map(str::to_string);+ let based_on = style_name_param("style.character.create", p, "basedOn")?.filter(|b| b != designcraft_doc::NO_CHAR_STYLE);s.edit(|d, _| {if let Some(b) = &based_on&& d.styles.char_style(b).is_none()diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rsindex 67ad4626c..769051740 100644--- a/crates/engine/src/tests.rs+++ b/crates/engine/src/tests.rs@@ -1675,6 +1675,13 @@ fn paragraph_style_references_must_name_styles() {s.execute("style.paragraph.create", &json!({"name": "Body"})).unwrap();assert!(s.execute("style.paragraph.create", &json!({"name": "Lost", "nextStyle": "Nowhere"})).is_err());assert!(s.doc().unwrap().doc.styles.para("Lost").is_none());+ // On creation too, a reference that isn't a name or null is refused, not dropped.+ for p in [json!({"name": "Lost", "nextStyle": true}), json!({"name": "Lost", "basedOn": 3})] {+ assert!(s.execute("style.paragraph.create", &p).is_err(), "{p}");+ assert!(s.doc().unwrap().doc.styles.para("Lost").is_none(), "{p}");+ }+ assert!(s.execute("style.character.create", &json!({"name": "Lost", "basedOn": ["Body"]})).is_err());+ assert!(s.doc().unwrap().doc.styles.char_style("Lost").is_none());s.execute("style.paragraph.create", &json!({"name": "Self", "nextStyle": "Self"})).unwrap();let before = s.doc().unwrap().doc.clone();for p in [json!({"name": "Body", "basedOn": "Nowhere"}), json!({"name": "Body", "basedOn": 3}), json!({"name": "Body", "nextStyle": true})] {