@markdy/cli 1.4.2 → 1.4.3

package/README.md

@@ -55,9 +55,26 @@ markdy explain scene.markdy              # display AST structure and stats
 markdy new demo.markdy                   # scaffold fresh starter scene
 markdy docs                              # display docs and tutorial links
 markdy ai                                # generate prompt context for LLMs
+markdy check docs/                       # validate diagrams in Markdown, MDX, and .markdy files
+markdy check docs/ --json                # machine-readable validation report
+markdy check --dist dist/                # validate diagrams embedded in built HTML
 markdy check-all . --arch-rules          # batch lint entire workspace
 ```
 
+## Validate Documentation
+
+Run `markdy check docs/` to validate embedded diagrams alongside standalone `.markdy` files.
+Markdown fences accept the `markdy` and `markdyscript` language names, backticks or tildes,
+and optional metadata. Fences inside lists and blockquotes are supported. As in Markdown,
+an unclosed fence continues to the end of its container or document.
+
+Live MDX `<Markdy>` and `<MarkdyDiagram>` components with literal `code` values are also
+checked. Fences and components quoted inside other code blocks, plus inline code examples,
+are ignored. Diagnostics point to the original document's line numbers.
+
+Use `--strict` to treat warnings as failures, `--arch-rules` for architecture governance,
+or `--json` for structured CI output. Validation errors return a nonzero exit code.
+
 ## Notes
 
 - The CLI resolves `import "file.markdy" as ns` from disk before parsing.

package/dist/index.js

@@ -32,6 +32,8 @@ import { fileURLToPath, pathToFileURL } from "url";
 import { createServer } from "http";
 import { readdir, readFile, stat, writeFile } from "fs/promises";
 import { spawn } from "child_process";
+import { fromMarkdown } from "mdast-util-from-markdown";
+import { visit } from "unist-util-visit";
 
 // src/format.ts
 import { formatScene } from "@markdy/core";
@@ -659,41 +661,30 @@ async function checkAllCommand(parsed, io) {
 }
 function extractDiagramsFromMarkdown(content) {
   const diagrams = [];
-  const lines = content.replace(/\r\n/g, "\n").split("\n");
-  let inFence = false;
-  let fenceStartLine = 0;
-  let fenceBuffer = [];
-  for (let idx = 0; idx < lines.length; idx++) {
-    const line = lines[idx];
-    const lineNo = idx + 1;
-    const trimmed = line.trim();
-    if (!inFence) {
-      const match = trimmed.match(/^```+(markdy|markdyscript)\b/i);
-      if (match) {
-        inFence = true;
-        fenceStartLine = lineNo + 1;
-        fenceBuffer = [];
-        continue;
-      }
-    } else {
-      if (/^```+\s*$/.test(trimmed)) {
-        inFence = false;
-        diagrams.push({
-          code: fenceBuffer.join("\n"),
-          line: fenceStartLine,
-          kind: "fence"
-        });
-        fenceBuffer = [];
-        continue;
-      }
-      fenceBuffer.push(line);
+  const codeRanges = [];
+  const tree = fromMarkdown(content);
+  visit(tree, (node) => {
+    if (node.type !== "code" && node.type !== "inlineCode") return;
+    const position = node.position;
+    if (position?.start.offset !== void 0 && position.end.offset !== void 0) {
+      codeRanges.push({ start: position.start.offset, end: position.end.offset });
     }
-  }
+    if (node.type === "code" && /^(markdy|markdyscript)$/i.test(node.lang ?? "") && position) {
+      diagrams.push({
+        code: node.value.replace(/\r\n?/g, "\n"),
+        line: position.start.line + 1,
+        kind: "fence"
+      });
+    }
+  });
   const jsxRegex = /<(?:Markdy|MarkdyDiagram)\b([\s\S]*?)(?:\/>|<\/(?:Markdy|MarkdyDiagram)>)/g;
   let jsxMatch;
   while ((jsxMatch = jsxRegex.exec(content)) !== null) {
     const tagContent = jsxMatch[1];
     const tagStartIndex = jsxMatch.index;
+    if (codeRanges.some((range) => tagStartIndex >= range.start && tagStartIndex < range.end)) {
+      continue;
+    }
     const lineBefore = content.slice(0, tagStartIndex).split("\n").length;
     const templateMatch = tagContent.match(/\bcode=\{\s*`([\s\S]*?)`\s*\}/);
     if (templateMatch) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markdy/cli",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "First-party CLI for diagram-native MarkdyScript diagrams: lint, format, explain, render, and preview.",
   "license": "MIT",
   "type": "module",
@@ -43,10 +43,12 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@markdy/compat": "1.4.2",
-    "@markdy/core": "1.4.2",
-    "@markdy/stdlib-systems": "1.4.2",
-    "@markdy/renderer-dom": "1.4.2"
+    "mdast-util-from-markdown": "^2.0.3",
+    "unist-util-visit": "^5.0.0",
+    "@markdy/compat": "1.4.3",
+    "@markdy/core": "1.4.3",
+    "@markdy/stdlib-systems": "1.4.3",
+    "@markdy/renderer-dom": "1.4.3"
   },
   "devDependencies": {
     "@types/node": "^25.9.5",