dotdog 0.5.0 → 0.5.1

package/dist/cli.js

@@ -2751,7 +2751,7 @@ function parseBlocks(lines, start, end) {
   let i = start;
   while (i < end) {
     const line = lines[i];
-    const entityMatch = line.match(/^###\s+Entity:\s*(.+)/);
+    const entityMatch = line.match(/^#{3,5}\s+Entity:\s*(.+)/);
     if (entityMatch) {
       const result = parseStructuredBlock(lines, i, end, "entity", entityMatch[1]);
       if (result) {
@@ -2760,7 +2760,7 @@ function parseBlocks(lines, start, end) {
         continue;
       }
     }
-    const relMatch = line.match(/^###\s+Relationship:\s*(.+)/);
+    const relMatch = line.match(/^#{3,5}\s+Relationship:\s*(.+)/);
     if (relMatch) {
       const result = parseStructuredBlock(lines, i, end, "relationship", relMatch[1]);
       if (result) {
@@ -2769,7 +2769,7 @@ function parseBlocks(lines, start, end) {
         continue;
       }
     }
-    const eventMatch = line.match(/^###\s+Event:\s*(.+)/);
+    const eventMatch = line.match(/^#{3,5}\s+Event:\s*(.+)/);
     if (eventMatch) {
       const result = parseStructuredBlock(lines, i, end, "event", eventMatch[1]);
       if (result) {
@@ -2778,7 +2778,7 @@ function parseBlocks(lines, start, end) {
         continue;
       }
     }
-    const predMatch = line.match(/^###\s+Prediction:\s*(.+)/);
+    const predMatch = line.match(/^#{3,5}\s+Prediction:\s*(.+)/);
     if (predMatch) {
       const result = parseStructuredBlock(lines, i, end, "prediction", predMatch[1]);
       if (result) {
@@ -2787,6 +2787,83 @@ function parseBlocks(lines, start, end) {
         continue;
       }
     }
+    if (lines[i].startsWith("```")) {
+      let yamlEnd = i + 1;
+      while (yamlEnd < end && !lines[yamlEnd].startsWith("```"))
+        yamlEnd++;
+      if (yamlEnd < end) {
+        const yamlContent = lines.slice(i + 1, yamlEnd);
+        const yaml = parseSimpleYAML(yamlContent);
+        if (yaml.prediction) {
+          blocks.push({
+            kind: "prediction",
+            statement: yaml.prediction || "",
+            description: yaml.description || "",
+            trigger: yaml.trigger || "",
+            timeframe: yaml.timeframe || "",
+            confidence: yaml.confidence || 0,
+            measurement: yaml.measurement || "",
+            status: yaml.status || "pending",
+            yaml,
+            lineStart: i + 1,
+            lineEnd: yamlEnd
+          });
+          i = yamlEnd + 1;
+          continue;
+        }
+        if (yaml.entity) {
+          blocks.push({
+            kind: "entity",
+            name: yaml.entity || "",
+            description: yaml.description || "",
+            type: yaml.type || "node",
+            properties: {},
+            states: Array.isArray(yaml.states) ? yaml.states : [],
+            lifecycle: [],
+            yaml,
+            lineStart: i + 1,
+            lineEnd: yamlEnd
+          });
+          i = yamlEnd + 1;
+          continue;
+        }
+        if (yaml.relationship || yaml.verb) {
+          blocks.push({
+            kind: "relationship",
+            source: yaml.source || "",
+            target: yaml.target || "",
+            verb: yaml.verb || "connects",
+            description: yaml.description || "",
+            cardinality: yaml.cardinality || "N:M",
+            required: false,
+            cascade: "none",
+            invariants: [],
+            yaml,
+            lineStart: i + 1,
+            lineEnd: yamlEnd
+          });
+          i = yamlEnd + 1;
+          continue;
+        }
+        if (yaml.event) {
+          blocks.push({
+            kind: "event",
+            name: yaml.event || "",
+            trigger: yaml.trigger || "",
+            payload: {},
+            preconditions: [],
+            postconditions: [],
+            sideEffects: [],
+            probability: null,
+            yaml,
+            lineStart: i + 1,
+            lineEnd: yamlEnd
+          });
+          i = yamlEnd + 1;
+          continue;
+        }
+      }
+    }
     if (/^\|.+\|/.test(line) && i + 1 < end && /^\|[-| ]+\|/.test(lines[i + 1])) {
       const table = parseTable(lines, i, end);
       if (table) {
@@ -2795,8 +2872,31 @@ function parseBlocks(lines, start, end) {
         continue;
       }
     }
+    if (lines[i].startsWith("```")) {
+      let yamlEnd = i + 1;
+      while (yamlEnd < end && !lines[yamlEnd].startsWith("```"))
+        yamlEnd++;
+      if (yamlEnd < end && yamlEnd > i + 1) {
+        const yamlContent = lines.slice(i + 1, yamlEnd);
+        const yaml = parseSimpleYAML(yamlContent);
+        const key = yaml.prediction ? "prediction" : yaml.entity ? "entity" : yaml.event ? "event" : yaml.relationship || yaml.verb ? "relationship" : null;
+        if (key) {
+          if (key === "prediction") {
+            blocks.push({ kind: "prediction", statement: yaml.prediction || "", description: yaml.description || "", trigger: yaml.trigger || "", timeframe: yaml.timeframe || "", confidence: yaml.confidence || 0, measurement: yaml.measurement || "", status: yaml.status || "pending", yaml, lineStart: i + 1, lineEnd: yamlEnd });
+          } else if (key === "entity") {
+            blocks.push({ kind: "entity", name: yaml.entity || "", description: yaml.description || "", type: yaml.type || "node", properties: {}, states: Array.isArray(yaml.states) ? yaml.states : [], lifecycle: [], yaml, lineStart: i + 1, lineEnd: yamlEnd });
+          } else if (key === "event") {
+            blocks.push({ kind: "event", name: yaml.event || "", trigger: yaml.trigger || "", payload: {}, preconditions: [], postconditions: [], sideEffects: [], probability: null, yaml, lineStart: i + 1, lineEnd: yamlEnd });
+          } else if (key === "relationship") {
+            blocks.push({ kind: "relationship", source: yaml.source || "", target: yaml.target || "", verb: yaml.verb || "connects", description: yaml.description || "", cardinality: yaml.cardinality || "N:M", required: false, cascade: "none", invariants: [], yaml, lineStart: i + 1, lineEnd: yamlEnd });
+          }
+          i = yamlEnd + 1;
+          continue;
+        }
+      }
+    }
     const proseStart = i;
-    while (i < end && !isBlockStart(lines[i])) {
+    while (i < end && !isBlockStart(lines[i]) && !lines[i].startsWith("```")) {
       i++;
     }
     const proseLines = lines.slice(proseStart, i).filter((l) => l.trim() !== "" || i === proseStart + 1);
@@ -2813,7 +2913,7 @@ function parseBlocks(lines, start, end) {
   return blocks;
 }
 function isBlockStart(line) {
-  return /^###\s+(Entity|Relationship|Event|Prediction):/.test(line) || /^\|.+\|/.test(line);
+  return /^#{3,5}\s+(Entity|Relationship|Event|Prediction):/.test(line) || /^\|.+\|/.test(line);
 }
 function parseStructuredBlock(lines, start, end, kind, headerRest) {
   let i = start + 1;
@@ -3390,7 +3490,7 @@ program2.command("validate [dir]").action((d = ".") => {
       const missing = ["SPEC.dog", "constitution.dog", "data-model.dog"].filter((f) => !files.includes(f));
       const optional = ["COPY.dog", "plan.dog", "DESIGN-SYSTEM.dog", "INDEX.dog"].filter((f) => !files.includes(f));
       console.log(source_default.bold(`
-  ${p} : ${files.length} .dog files, ${100 - Math.round((missing.length * 3 + optional.length) / 20 * 100)}% complete`));
+  ${p} : ${files.length} .dog files, ${Math.max(0, 100 - Math.round(missing.length * 3 / 20 * 100))}% complete`));
       for (const f of files)
         console.log(source_default.gray(`    ${f}`));
       if (missing.length) {
@@ -3398,7 +3498,7 @@ program2.command("validate [dir]").action((d = ".") => {
         hasErrors = true;
       }
       if (optional.length)
-        console.log(source_default.yellow(`  Missing optional: ${optional.join(", ")}`));
+        console.log(source_default.gray(`  Optional: ${optional.join(", ")} — not required for 100%`));
     }
   }
   if (!found)
@@ -3832,7 +3932,7 @@ Spec Analysis
       for (const f of missingReq)
         gaps.push(`\uD83D\uDD34 ${f}: Missing required file`);
       for (const f of missingOpt)
-        gaps.push(`\uD83D\uDFE1 ${f}: Missing optional file`);
+        gaps.push(`ℹ️ ${f}: Optional file not present`);
       const entityNames = new Set(allEntities.map((e) => e.name));
       for (const e of allEntities) {
         if (!e.description || e.description.length < 10)
@@ -4469,8 +4569,19 @@ program2.command("resolve <name>").description("Mark a prediction as correct, wr
             if (block.kind === "prediction") {
               const b = block;
               if ((b.statement || b.name || "").toLowerCase().includes(name.toLowerCase())) {
-                const searchFor = `### Prediction: ${b.statement || b.name}`;
-                const headingIdx = content.indexOf(searchFor);
+                let headingIdx = -1;
+                const stmt = b.statement || b.name || "";
+                for (const prefix of ["###", "####", "#####"]) {
+                  for (const fmt of [`${prefix} Prediction: ${stmt}`, `${prefix} ${stmt}`]) {
+                    const idx = content.indexOf(fmt);
+                    if (idx >= 0) {
+                      headingIdx = idx;
+                      break;
+                    }
+                  }
+                  if (headingIdx >= 0)
+                    break;
+                }
                 if (headingIdx >= 0) {
                   const blockStart = content.indexOf("```yaml", headingIdx);
                   const blockEnd = content.indexOf("```", blockStart + 7);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotdog",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "CLI tool for structured software specifications. Validate .dog files, compile .dag graphs, query via MCP.",
   "type": "module",
   "main": "dist/cli.js",