feat: make svg output reproducible

Author: not-my-profile

Cargo.lock

@@ -55,6 +55,7 @@ regex = "1.12.2"
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 assert_cmd = "2.1.1"
 libtest-mimic = "0.8.1"
+similar-asserts = "1.7.0"
 tempfile = "3"
 
 [dev-dependencies]

Cargo.toml

@@ -441,8 +441,9 @@ impl Diagram {
                 svg.push_str("  </g>\n");
             }
         }
+        for id in &self.order {
+            let node = self.nodes.get(id).unwrap();
 
-        for (id, node) in &self.nodes {
             let position = geometry
                 .positions
                 .get(id)

src/diagram.rs

@@ -8,6 +8,8 @@ use assert_cmd::cargo::cargo_bin_cmd;
 #[cfg(not(target_arch = "wasm32"))]
 use libtest_mimic::Failed;
 #[cfg(not(target_arch = "wasm32"))]
+use similar_asserts::SimpleDiff;
+#[cfg(not(target_arch = "wasm32"))]
 use tempfile::TempDir;
 
 #[cfg(target_arch = "wasm32")]
@@ -43,10 +45,10 @@ fn main() {
             [
                 libtest_mimic::Trial::test(format!("svg_{stem}"), {
                     let in_path = in_path.clone();
-                    let out_path = manifest_dir
-                        .join("tests/output/svg")
+                    let expected_path = manifest_dir
+                        .join("tests/expected")
                         .join(format!("{stem}.svg"));
-                    move || smoke_test_svg(in_path, out_path)
+                    move || test_svg(in_path, expected_path)
                 }),
                 libtest_mimic::Trial::test(format!("png_{stem}"), {
                     let in_path = in_path.clone();
@@ -61,10 +63,11 @@ fn main() {
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-fn smoke_test_svg(in_path: PathBuf, out_path: PathBuf) -> Result<(), Failed> {
-    if out_path.exists() {
-        fs::remove_file(&out_path)?;
-    }
+fn test_svg(in_path: PathBuf, expected_path: PathBuf) -> Result<(), Failed> {
+    let temp_dir = TempDir::new().expect("create temp dir");
+
+    let stem = in_path.file_stem().unwrap().to_str().unwrap();
+    let out_path = temp_dir.path().join(format!("{stem}.svg"));
 
     let mut cmd = cargo_bin_cmd!("oxdraw");
     cmd.arg("--input")
@@ -76,12 +79,23 @@ fn smoke_test_svg(in_path: PathBuf, out_path: PathBuf) -> Result<(), Failed> {
 
     cmd.assert().success();
 
-    let svg_contents = fs::read_to_string(&out_path)?;
-    assert!(
-        svg_contents.contains("<svg"),
-        "{} output should contain an <svg> element",
-        out_path.display()
-    );
+    let actual = fs::read_to_string(&out_path)?;
+
+    if std::env::var("UPDATE_EXPECTED").is_ok() {
+        fs::write(expected_path, actual)?;
+        return Ok(());
+    }
+
+    let expected = fs::read_to_string(&expected_path)?;
+
+    if expected != actual {
+        let diff = format!(
+            "{}",
+            SimpleDiff::from_str(&actual, &expected, "actual", "expected")
+        );
+        return Err(diff.into());
+    }
+
     Ok(())
 }
 

tests/cli.rs

@@ -41,34 +41,34 @@
     <rect x="273.8" y="2154.8" width="38.2" height="28.0" rx="6" ry="6" fill="white" fill-opacity="0.96" stroke="#2d3748" stroke-width="1" />
     <text x="292.9" y="2168.8" fill="#2d3748" font-size="13" text-anchor="middle" dominant-baseline="middle" xml:space="preserve">无反馈</text>
   </g>
-  <rect x="188.6" y="1601.0" width="148.8" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
-  <text x="263.0" y="1626.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.3 规范文档生成引擎</text>
-  <rect x="173.8" y="617.0" width="178.4" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
-  <text x="263.0" y="642.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.1.1 跨模态融合与冲突检测</text>
+  <ellipse cx="263.0" cy="150.0" rx="70.0" ry="70.0" fill="#e9d8fd" stroke="#2d3748" stroke-width="2" />
+  <text x="263.0" y="150.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">开始</text>
+  <rect x="193.0" y="289.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
+  <text x="263.0" y="314.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">接收多模态输入</text>
   <rect x="184.9" y="453.0" width="156.2" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
   <text x="263.0" y="478.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.1 多模态输入理解引擎</text>
-  <rect x="192.3" y="1929.0" width="141.4" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
-  <text x="263.0" y="1954.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.4 规范一致性验证</text>
+  <rect x="173.8" y="617.0" width="178.4" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
+  <text x="263.0" y="642.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.1.1 跨模态融合与冲突检测</text>
+  <rect x="193.0" y="781.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
+  <text x="263.0" y="806.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">生成统一需求表示</text>
+  <rect x="184.9" y="945.0" width="156.2" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
+  <text x="263.0" y="970.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.2 需求完整性检查引擎</text>
   <polygon points="263.0,1109.0 333.0,1134.0 263.0,1159.0 193.0,1134.0" fill="#fbcfe8" stroke="#2d3748" stroke-width="2" />
   <text x="263.0" y="1134.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">发现缺失或冲突?</text>
-  <ellipse cx="343.7" cy="2282.0" rx="70.0" ry="70.0" fill="#e9d8fd" stroke="#2d3748" stroke-width="2" />
-  <text x="343.7" y="2282.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">结束</text>
-  <rect x="193.0" y="1437.0" width="140.0" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
-  <text x="263.0" y="1462.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">等待用户澄清</text>
   <rect x="193.0" y="1273.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
   <text x="263.0" y="1298.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">生成澄清问题列表</text>
-  <ellipse cx="263.0" cy="150.0" rx="70.0" ry="70.0" fill="#e9d8fd" stroke="#2d3748" stroke-width="2" />
-  <text x="263.0" y="150.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">开始</text>
-  <rect x="184.9" y="945.0" width="156.2" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
-  <text x="263.0" y="970.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.2 需求完整性检查引擎</text>
+  <rect x="193.0" y="1437.0" width="140.0" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
+  <text x="263.0" y="1462.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">等待用户澄清</text>
+  <rect x="188.6" y="1601.0" width="148.8" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
+  <text x="263.0" y="1626.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.3 规范文档生成引擎</text>
   <rect x="193.0" y="1765.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
   <text x="263.0" y="1790.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">生成完整规范文档</text>
-  <rect x="112.3" y="2257.0" width="141.4" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
-  <text x="183.0" y="2282.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.5 交互式规范细化</text>
+  <rect x="192.3" y="1929.0" width="141.4" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
+  <text x="263.0" y="1954.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.4 规范一致性验证</text>
   <polygon points="263.0,2093.0 333.0,2118.0 263.0,2143.0 193.0,2118.0" fill="#fbcfe8" stroke="#2d3748" stroke-width="2" />
   <text x="263.0" y="2118.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">等待用户反馈</text>
-  <rect x="193.0" y="781.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
-  <text x="263.0" y="806.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">生成统一需求表示</text>
-  <rect x="193.0" y="289.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
-  <text x="263.0" y="314.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">接收多模态输入</text>
+  <rect x="112.3" y="2257.0" width="141.4" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
+  <text x="183.0" y="2282.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">6.5 交互式规范细化</text>
+  <ellipse cx="343.7" cy="2282.0" rx="70.0" ry="70.0" fill="#e9d8fd" stroke="#2d3748" stroke-width="2" />
+  <text x="343.7" y="2282.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">结束</text>
 </svg>

tests/output/svg/conditional.svg tests/expected/conditional.svgtests/output/svg/conditional.svg renamed to tests/expected/conditional.svg

@@ -36,24 +36,24 @@
   <line x1="1048.6" y1="381.1" x2="1115.2" y2="351.6" stroke="#2d3748" stroke-width="2" marker-end="url(#arrow-end)" />
   <line x1="1250.4" y1="326.1" x2="1269.4" y2="326.1" stroke="#2d3748" stroke-width="2" marker-end="url(#arrow-end)" />
   <polyline points="1323.5,301.1 1102.3,80.0 856.2,80.0 610.1,80.0 384.6,305.4" fill="none" stroke="#2d3748" stroke-width="2" marker-end="url(#arrow-end)" />
+  <rect x="80.0" y="301.1" width="163.6" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
+  <text x="161.8" y="326.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Deploy Release</text>
   <polygon points="363.9,301.1 464.2,326.1 363.9,351.1 263.6,326.1" fill="#fbcfe8" stroke="#2d3748" stroke-width="2" />
   <text x="363.9" y="326.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Health Checks Pass?</text>
-  <rect x="484.2" y="381.1" width="193.2" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
-  <text x="580.8" y="406.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Continuous Monitor</text>
-  <rect x="910.6" y="381.1" width="163.6" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
-  <text x="992.4" y="406.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Follow Runbook</text>
-  <polygon points="794.0,381.1 890.6,406.1 794.0,431.1 697.4,406.1" fill="#fbcfe8" stroke="#2d3748" stroke-width="2" />
-  <text x="794.0" y="406.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Incident Detected?</text>
   <rect x="491.6" y="221.1" width="178.4" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
   <text x="580.8" y="246.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Trigger Rollback</text>
-  <rect x="1270.4" y="301.1" width="156.2" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
-  <text x="1348.5" y="326.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Deploy Hotfix</text>
   <rect x="723.3" y="221.1" width="141.4" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
   <text x="794.0" y="246.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Notify Team</text>
+  <rect x="484.2" y="381.1" width="193.2" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
+  <text x="580.8" y="406.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Continuous Monitor</text>
+  <polygon points="794.0,381.1 890.6,406.1 794.0,431.1 697.4,406.1" fill="#fbcfe8" stroke="#2d3748" stroke-width="2" />
+  <text x="794.0" y="406.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Incident Detected?</text>
   <rect x="922.4" y="221.1" width="140.0" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
   <text x="992.4" y="246.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Stable</text>
+  <rect x="910.6" y="381.1" width="163.6" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
+  <text x="992.4" y="406.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Follow Runbook</text>
   <rect x="1094.2" y="301.1" width="156.2" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
   <text x="1172.3" y="326.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Create Hotfix</text>
-  <rect x="80.0" y="301.1" width="163.6" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
-  <text x="161.8" y="326.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Deploy Release</text>
+  <rect x="1270.4" y="301.1" width="156.2" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
+  <text x="1348.5" y="326.1" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Deploy Hotfix</text>
 </svg>

tests/output/svg/failure_modes.svg tests/expected/failure_modes.svgtests/output/svg/failure_modes.svg renamed to tests/expected/failure_modes.svg

@@ -32,14 +32,14 @@
   </g>
   <rect x="240.0" y="80.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
   <text x="310.0" y="105.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Start</text>
-  <rect x="240.0" y="560.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
-  <text x="310.0" y="585.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Python</text>
+  <rect x="240.0" y="240.0" width="140.0" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
+  <text x="310.0" y="265.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Idea</text>
+  <polygon points="310.0,400.0 380.0,425.0 310.0,450.0 240.0,425.0" fill="#fbcfe8" stroke="#2d3748" stroke-width="2" />
+  <text x="310.0" y="425.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Lang?</text>
   <rect x="80.0" y="560.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
   <text x="150.0" y="585.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Go</text>
+  <rect x="240.0" y="560.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
+  <text x="310.0" y="585.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Python</text>
   <rect x="400.0" y="560.0" width="140.0" height="50.0" rx="8" ry="8" fill="#fde68a" stroke="#2d3748" stroke-width="2" />
   <text x="470.0" y="585.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Rust</text>
-  <polygon points="310.0,400.0 380.0,425.0 310.0,450.0 240.0,425.0" fill="#fbcfe8" stroke="#2d3748" stroke-width="2" />
-  <text x="310.0" y="425.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Lang?</text>
-  <rect x="240.0" y="240.0" width="140.0" height="50.0" rx="30" ry="30" fill="#c4f1f9" stroke="#2d3748" stroke-width="2" />
-  <text x="310.0" y="265.0" fill="#1a202c" font-size="14" text-anchor="middle" dominant-baseline="middle">Idea</text>
 </svg>