From 0a94b092eb56decd9ca85779fa8f6b1a0553ec23 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 10:08:47 -0500 Subject: [PATCH] refactor(svg): share XML escaping and character validation --- Cargo.lock | 10 ++++++++++ Cargo.toml | 1 + crates/svg/Cargo.toml | 1 + crates/svg/src/lib.rs | 13 +++---------- crates/svg/src/tests.rs | 12 ++++++++++++ docs/target-app-parity.md | 2 ++ 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 40e8410ff..d6d010579 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1236,6 +1236,15 @@ dependencies = [ "wayland-client", ] +[[package]] +name = "craft-xml" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=d13ac58a15c45d618f25910772502e38c4ce1d4c#d13ac58a15c45d618f25910772502e38c4ce1d4c" +dependencies = [ + "quick-xml 0.41.0", + "thiserror 2.0.21", +] + [[package]] name = "craft-zip" version = "0.1.0" @@ -2141,6 +2150,7 @@ name = "figcraft-svg" version = "0.18.1" dependencies = [ "base64 0.22.1", + "craft-xml", "figcraft-color", "figcraft-doc", "figcraft-geom", diff --git a/Cargo.toml b/Cargo.toml index aa4c0f79a..05aa2d393 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,7 @@ rust-version = "1.95" repository = "https://github.com/storytold/figcraft" [workspace.dependencies] +craft-xml = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "d13ac58a15c45d618f25910772502e38c4ce1d4c" } craft-vectordrawable = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "d13ac58a15c45d618f25910772502e38c4ce1d4c" } # internal figcraft-geom = { path = "crates/geom" } diff --git a/crates/svg/Cargo.toml b/crates/svg/Cargo.toml index d248bdf07..57f578249 100644 --- a/crates/svg/Cargo.toml +++ b/crates/svg/Cargo.toml @@ -9,6 +9,7 @@ description = "FigCraft SVG export (shapes, gradients, images, strokes, effects workspace = true [dependencies] +craft-xml = { workspace = true } figcraft-geom = { workspace = true } figcraft-color = { workspace = true } figcraft-doc = { workspace = true } diff --git a/crates/svg/src/lib.rs b/crates/svg/src/lib.rs index 680f0eb4a..97c8ba0f7 100644 --- a/crates/svg/src/lib.rs +++ b/crates/svg/src/lib.rs @@ -195,16 +195,9 @@ fn blend_style(b: figcraft_color::BlendMode) -> String { } } -/// `s` escaped for XML text and attribute values; characters XML 1.0 forbids (control characters -/// other than tab, newline and carriage return, U+FFFE and U+FFFF) are left out. -fn esc(s: &str) -> String { - s.chars().filter(|&c| xml_char(c)).collect::().replace('&', "&").replace('<', "<").replace('>', ">").replace('"', """) -} - -/// Whether XML 1.0 allows `c` (see [`esc`]). -fn xml_char(c: char) -> bool { - !matches!(c, '\u{0}'..='\u{8}' | '\u{b}' | '\u{c}' | '\u{e}'..='\u{1f}' | '\u{fffe}' | '\u{ffff}') -} +// Shared XML wire escaping and character validity; layer-name policy stays below. +// Attribute escaping also preserves tabs/LF/CR through XML readers' whitespace normalization. +use craft_xml::{esc_attr as esc, is_xml_char as xml_char}; fn hex(c: Color) -> String { format!("#{}", c.to_hex()) diff --git a/crates/svg/src/tests.rs b/crates/svg/src/tests.rs index 8bce898da..e2a262890 100644 --- a/crates/svg/src/tests.rs +++ b/crates/svg/src/tests.rs @@ -451,3 +451,15 @@ fn a_whole_ellipse_drawn_backwards_keeps_its_simple_stroke() { assert_eq!(backwards, forwards, "{align:?}"); } } + +#[test] +fn shared_xml_escaping_keeps_markup_controls_and_attribute_whitespace() { + let input = "A<&\"'\t\n\r\u{1}\u{fffe}🦊"; + assert_eq!(super::esc(input), "A<&"' 🦊"); + let markup = format!("", super::esc(input)); + let root = craft_xml::parse(markup.as_bytes()).unwrap(); + assert_eq!(root.attr("label"), Some("A<&\"'\t\n\r🦊")); + for c in ['\0', '\u{b}', '\u{fffe}', '\u{ffff}'] { + assert!(!super::xml_char(c)); + } +} diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index f7f1d7054..c88776361 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -11,6 +11,8 @@ summarizes it; [`gaps.md`](gaps.md) is the ranked work list; the measured menu c [`prototyping-parity.md`](prototyping-parity.md), [`dev-mode-parity.md`](dev-mode-parity.md), [`collaboration-parity.md`](collaboration-parity.md), [`boards-parity.md`](boards-parity.md). +> SVG XML wire follow-up (2026-11-16): export escaping and XML 1.0 character checks delegate to pinned `craft-xml`. Attribute tab/LF/CR are emitted as references to survive XML normalization. Local SVG document/path serialization and import mapping remain; this scoped change does not raise the parity grade. Hosted validation is pending. + ## Headline | Number | Value | Kind |