Update render-mermaid-from-readme.mjs

Author: marcostfermin

scripts/render-mermaid-from-readme.mjs

@@ -18,28 +18,41 @@ if (!fs.existsSync(readmePath)) die("README.md not found");
 
 const readme = fs.readFileSync(readmePath, "utf8");
 
-// Find the Mermaid block inside the "## Architecture" section.
-function extractArchitectureMermaid(md) {
-  const sectionRe = /(^##\s+Architecture\s*$)([\s\S]*?)(?=^\s*##\s+|\s*$)/m;
-  const sectionMatch = md.match(sectionRe);
-  if (!sectionMatch) return null;
-
-  const sectionBody = sectionMatch[2];
-
-  const mermaidRe = /```mermaid\s*\n([\s\S]*?)\n```/m;
-  const mermaidMatch = sectionBody.match(mermaidRe);
-  if (!mermaidMatch) return null;
-
-  return {
-    sectionHeader: sectionMatch[1],
-    sectionBody,
-    mermaidBody: mermaidMatch[1].trimEnd(),
-  };
+// CRLF-safe helpers
+const NL = String.raw`\r?\n`;
+
+function getArchitectureSection(md) {
+  // Capture "## Architecture" section until next "## " heading or EOF
+  const sectionRe = new RegExp(
+    String.raw`(^##\s+Architecture\s*$)([\s\S]*?)(?=^\s*##\s+|\s*$)`,
+    "m"
+  );
+  const m = md.match(sectionRe);
+  if (!m) return null;
+  return { header: m[1], body: m[2], fullMatch: m[0] };
 }
 
-const arch = extractArchitectureMermaid(readme);
+function getFirstMermaidBlock(text) {
+  // CRLF-safe fenced block capture
+  const mermaidRe = new RegExp(
+    String.raw"```mermaid\\s*" + NL + String.raw"([\\s\\S]*?)" + NL + String.raw"```",
+    "m"
+  );
+  const m = text.match(mermaidRe);
+  if (!m) return null;
+  return m[1].trimEnd();
+}
+
+const arch = getArchitectureSection(readme);
 
 if (!arch) {
+  console.log('No "## Architecture" section found in README.md. Nothing to do.');
+  process.exit(0);
+}
+
+const mermaidBody = getFirstMermaidBlock(arch.body);
+
+if (!mermaidBody) {
   console.log('No Mermaid block found under "## Architecture". Nothing to do.');
   process.exit(0);
 }
@@ -50,14 +63,14 @@ fs.mkdirSync(docsDir, { recursive: true });
 const mmdFile = path.join(docsDir, "architecture.mmd");
 const svgFile = path.join(docsDir, "architecture.svg");
 
-fs.writeFileSync(mmdFile, arch.mermaidBody + "\n", "utf8");
+fs.writeFileSync(mmdFile, mermaidBody + "\n", "utf8");
 
 // Render using mermaid-cli (mmdc)
 run("mmdc", ["-i", mmdFile, "-o", svgFile, "-b", "transparent"]);
 
 console.log("Rendered docs/architecture.svg");
 
-// Raw GitHub URL so PyPI can render the image
+// Use raw GitHub URL so PyPI can load the image
 const imgUrl = "https://raw.githubusercontent.com/marcostfermin/GeoFabric/main/docs/architecture.svg";
 
 const replacement =
@@ -70,30 +83,33 @@ const replacement =
     "<summary>Mermaid source</summary>",
     "",
     "```mermaid",
-    arch.mermaidBody.trimEnd(),
+    mermaidBody.trimEnd(),
     "```",
     "",
     "</details>",
     ""
   ].join("\n");
 
-// Rewrite only the Mermaid block inside the Architecture section
-const sectionRe = /(^##\s+Architecture\s*$)([\s\S]*?)(?=^\s*##\s+|\s*$)/m;
-const rewritten = readme.replace(sectionRe, (full, headerLine, body) => {
-  const mermaidRe = /```mermaid\s*\n[\s\S]*?\n```/m;
+// Replace the first Mermaid fenced block inside the Architecture section (CRLF-safe)
+const mermaidBlockRe = new RegExp(
+  String.raw"```mermaid\\s*" + NL + String.raw"[\\s\\S]*?" + NL + String.raw"```",
+  "m"
+);
+
+const alreadyRendered = arch.body.includes(imgUrl) && arch.body.includes("<details>") && arch.body.includes("Mermaid source");
 
-  // Idempotency: don't churn commits if already rendered
-  const alreadyHasImg = body.includes(imgUrl);
-  const alreadyHasDetails = body.includes("<details>") && body.includes("Mermaid source");
-  if (alreadyHasImg && alreadyHasDetails) return full;
+let rewritten = readme;
 
-  const newBody = body.replace(mermaidRe, replacement);
-  return `${headerLine}${newBody}`;
-});
+if (!alreadyRendered) {
+  const newArchBody = arch.body.replace(mermaidBlockRe, replacement);
+  rewritten = readme.replace(arch.fullMatch, `${arch.header}${newArchBody}`);
 
-if (rewritten !== readme) {
-  fs.writeFileSync(readmePath, rewritten, "utf8");
-  console.log('Updated README.md (Architecture section now uses rendered SVG and keeps Mermaid source).');
+  if (rewritten !== readme) {
+    fs.writeFileSync(readmePath, rewritten, "utf8");
+    console.log("Updated README.md (Architecture now uses rendered SVG + keeps Mermaid source).");
+  } else {
+    console.log("README.md not modified (replacement did not apply).");
+  }
 } else {
-  console.log("README.md already up to date. No changes made.");
+  console.log("README.md already contains rendered diagram markup. No rewrite needed.");
 }