dotdog 0.3.2 → 0.3.3

package/dist/cli.js

@@ -2636,6 +2636,15 @@ function parseBlocks(lines, start, end) {
         continue;
       }
     }
+    const predMatch = line.match(/^###\s+Prediction:\s*(.+)/);
+    if (predMatch) {
+      const result = parseStructuredBlock(lines, i, end, "prediction", predMatch[1]);
+      if (result) {
+        blocks.push(result.node);
+        i = result.nextLine;
+        continue;
+      }
+    }
     if (/^\|.+\|/.test(line) && i + 1 < end && /^\|[-| ]+\|/.test(lines[i + 1])) {
       const table = parseTable(lines, i, end);
       if (table) {
@@ -2715,6 +2724,12 @@ function parseStructuredBlock(lines, start, end, kind, headerRest) {
       nextLine: i
     };
   }
+  if (kind === "prediction") {
+    return {
+      node: buildPredictionNode(headerRest, description, yaml, start, i),
+      nextLine: i
+    };
+  }
   return null;
 }
 function buildEntityNode(name, description, yaml, lineStart, lineEnd) {
@@ -2735,7 +2750,11 @@ function buildEntityNode(name, description, yaml, lineStart, lineEnd) {
   }
   const states = Array.isArray(yaml.states) ? yaml.states : [];
   const lifecycleStr = yaml.lifecycle || "";
-  const lifecycle = lifecycleStr ? lifecycleStr.split(/\s*→\s*/) : [];
+  const lifecycleParts = lifecycleStr ? lifecycleStr.split(/\s*→\s*/).map((s) => s.trim()) : [];
+  const lifecycle = [];
+  for (let si = 0;si < lifecycleParts.length - 1; si++) {
+    lifecycle.push(`${lifecycleParts[si]} → ${lifecycleParts[si + 1]}`);
+  }
   return {
     kind: "entity",
     name,
@@ -2758,6 +2777,7 @@ function buildRelationshipNode(headerRest, description, yaml, lineStart, lineEnd
     source,
     target,
     verb: yaml.verb || "connects",
+    description: description || yaml.description || "",
     cardinality: yaml.cardinality || "N:M",
     required: yaml.required === true,
     cascade: yaml.cascade || "none",
@@ -2782,6 +2802,22 @@ function buildEventNode(name, description, yaml, lineStart, lineEnd) {
     lineEnd
   };
 }
+function buildPredictionNode(name, description, yaml, lineStart, lineEnd) {
+  return {
+    kind: "prediction",
+    statement: name,
+    description,
+    trigger: yaml.trigger || "",
+    timeframe: yaml.timeframe || "",
+    confidence: typeof yaml.confidence === "number" ? yaml.confidence : 0,
+    measurement: yaml.measurement || "",
+    preconditions: Array.isArray(yaml.preconditions) ? yaml.preconditions : [],
+    postconditions: Array.isArray(yaml.postconditions) ? yaml.postconditions : [],
+    yaml,
+    lineStart: lineStart + 1,
+    lineEnd
+  };
+}
 function parseTable(lines, start, end) {
   const headerLine = lines[start];
   const headers = headerLine.split("|").map((h) => h.trim()).filter(Boolean);
@@ -2854,15 +2890,25 @@ function parseSimpleYAML(lines) {
       } else if (value.startsWith("[") && value.endsWith("]")) {
         currentObj[nestedKey] = value.slice(1, -1).split(",").map((s) => s.trim());
       } else {
-        const inlineObj = parseInlineObject(value);
-        if (inlineObj) {
-          currentObj[nestedKey] = inlineObj;
-        } else {
-          currentObj[nestedKey] = value;
-        }
+        currentObj[nestedKey] = value;
       }
       continue;
     }
+    if (nestedMatch && !inNested) {
+      const key = nestedMatch[1];
+      const value = (nestedMatch[2] || "").trim();
+      if (value === "true")
+        result[key] = true;
+      else if (value === "false")
+        result[key] = false;
+      else if (/^-?\d+(\.\d+)?$/.test(value))
+        result[key] = parseFloat(value);
+      else if (value.startsWith("[") && value.endsWith("]"))
+        result[key] = value.slice(1, -1).split(",").map((s) => s.trim());
+      else
+        result[key] = value;
+      continue;
+    }
     const deepMatch = line.match(/^\s{4}(\w[\w_]*):\s*(.+)?$/);
     if (deepMatch && inNested && nestedKey && typeof currentObj[nestedKey] === "object") {
       const deepNested = currentObj[nestedKey];
@@ -3285,9 +3331,9 @@ program2.command("compile [dir]").option("-o, --output <file>").action((d = ".",
         const ast = parse(sources[f]);
         for (const section of ast.sections) {
           for (const block of section.blocks) {
-            if (block.kind === "entity" || block.kind === "event" || block.kind === "prediction") {
+            if (block.kind === "entity" || block.kind === "event") {
               const compactProps = {};
-              for (const [key, val] of Object.entries(block.properties)) {
+              for (const [key, val] of Object.entries(block.properties || {})) {
                 let enc = "";
                 const t = val.type || "string";
                 if (t === "string")
@@ -3307,8 +3353,8 @@ program2.command("compile [dir]").option("-o, --output <file>").action((d = ".",
                 compactProps[key] = enc;
               }
               nodes.push({
-                i: block.name,
-                t: block.type,
+                i: block.name || "",
+                t: block.type || "",
                 g: block.kind,
                 d: block.description || "",
                 p: compactProps,
@@ -3316,6 +3362,21 @@ program2.command("compile [dir]").option("-o, --output <file>").action((d = ".",
                 l: block.lifecycle || []
               });
             }
+            if (block.kind === "prediction") {
+              nodes.push({
+                i: block.statement || block.name || "",
+                t: "prediction",
+                g: "prediction",
+                d: block.description || "",
+                p: {},
+                s: [],
+                l: [],
+                cf: block.confidence || 0,
+                tf: block.timeframe || "",
+                tg: block.trigger || "",
+                ms: block.measurement || ""
+              });
+            }
             if (block.kind === "relationship") {
               edges.push({
                 s: block.source,
@@ -3347,6 +3408,46 @@ program2.command("compile [dir]").option("-o, --output <file>").action((d = ".",
   if (!found)
     console.log(source_default.yellow("No projects found."));
 });
+program2.command("tokens [dir]").action((d = ".") => {
+  const dir = resolvePath2(d);
+  const dirs = [join2(dir, "projects"), join2(dir, "specs"), dir];
+  let found = false;
+  for (const dd of dirs) {
+    if (!existsSync2(dd))
+      continue;
+    const projects = readdirSync2(dd, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+    for (const p of projects) {
+      const pd = join2(dd, p);
+      if (!existsSync2(join2(pd, "SPEC.dog")))
+        continue;
+      const dagFile = join2(pd, `${p}.dag`);
+      if (!existsSync2(dagFile))
+        continue;
+      found = true;
+      const dogFiles = readdirSync2(pd).filter((f) => f.endsWith(".dog"));
+      let sourceBytes = 0, contentBytes = 0;
+      for (const f of dogFiles) {
+        const bytes = Buffer.byteLength(readFileSync2(join2(pd, f), "utf-8"), "utf-8");
+        sourceBytes += bytes;
+        if (bytes >= 100)
+          contentBytes += bytes;
+      }
+      const dagBytes = Buffer.byteLength(readFileSync2(dagFile, "utf-8"), "utf-8");
+      const savings = sourceBytes > 0 ? Math.round((1 - dagBytes / sourceBytes) * 1000) / 10 : 0;
+      console.log(source_default.bold(`
+  ${p}`));
+      console.log(source_default.gray(`    ${dogFiles.length} .dog files: ${sourceBytes} bytes`));
+      console.log(source_default.gray(`    .dag file: ${dagBytes} bytes`));
+      console.log(source_default.green(`    ${savings}% smaller (${sourceBytes - dagBytes} bytes saved)`));
+      if (contentBytes && contentBytes !== sourceBytes) {
+        const cs = Math.round((1 - dagBytes / contentBytes) * 1000) / 10;
+        console.log(source_default.gray(`    content-only: ${contentBytes} bytes → ${cs}% savings`));
+      }
+    }
+  }
+  if (!found)
+    console.log(source_default.yellow("No .dag files found. Run compile first."));
+});
 program2.command("visualize [dir]").option("-s, --save").action((d = ".", opts) => {
   const dir = resolvePath2(d);
   const dirs = [join2(dir, "projects"), join2(dir, "specs"), dir];

package/package.json

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