dotdog 0.8.3 → 0.8.4

package/dist/cli.js

@@ -2856,6 +2856,26 @@ function parseBlocks(lines, start, end, errors2) {
           i = yamlEnd + 1;
           continue;
         }
+        if (Array.isArray(yaml.relationships)) {
+          for (const item of yaml.relationships) {
+            blocks.push({
+              kind: "relationship",
+              source: item.from || item.source || "",
+              target: item.to || item.target || "",
+              verb: item.verb || "connects",
+              description: item.description || "",
+              cardinality: item.cardinality || "N:M",
+              required: item.required === true,
+              cascade: item.cascade || "none",
+              invariants: [],
+              yaml: item,
+              lineStart: i + 1,
+              lineEnd: yamlEnd
+            });
+          }
+          i = yamlEnd + 1;
+          continue;
+        }
         if (yaml.event) {
           blocks.push({
             kind: "event",
@@ -2898,7 +2918,7 @@ function parseBlocks(lines, start, end, errors2) {
           i = yamlEnd + 1;
           continue;
         }
-        const key = yaml.prediction ? "prediction" : yaml.entity ? "entity" : yaml.event ? "event" : yaml.relationship || yaml.verb ? "relationship" : null;
+        const key = yaml.prediction ? "prediction" : yaml.entity ? "entity" : yaml.event ? "event" : yaml.relationship || yaml.verb ? "relationship" : Array.isArray(yaml.relationships) ? "relationship_list" : 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 });
@@ -2908,6 +2928,10 @@ function parseBlocks(lines, start, end, errors2) {
             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 });
+          } else if (key === "relationship_list") {
+            for (const item of yaml.relationships) {
+              blocks.push({ kind: "relationship", source: item.from || item.source || "", target: item.to || item.target || "", verb: item.verb || "connects", description: item.description || "", cardinality: item.cardinality || "N:M", required: item.required === true, cascade: item.cascade || "none", invariants: [], yaml: item, lineStart: i + 1, lineEnd: yamlEnd });
+            }
           }
           i = yamlEnd + 1;
           continue;
@@ -3023,13 +3047,19 @@ function buildEntityNode(name, description, yaml, lineStart, lineEnd) {
   const rawProps = yaml.properties;
   if (rawProps) {
     for (const [key, val] of Object.entries(rawProps)) {
-      if (typeof val === "object" && val !== null) {
+      let resolved = val;
+      if (typeof val === "string" && val.startsWith("{") && val.endsWith("}")) {
+        const inline = parseInlineObject(val);
+        if (inline)
+          resolved = inline;
+      }
+      if (typeof resolved === "object" && resolved !== null) {
         properties[key] = {
-          type: val.type || "string",
-          required: val.required !== false,
-          default: val.default,
-          constraints: val.constraints,
-          example: val.example
+          type: resolved.type || "string",
+          required: resolved.required !== false,
+          default: resolved.default,
+          constraints: resolved.constraints,
+          example: resolved.example
         };
       }
     }
@@ -3136,7 +3166,12 @@ function parseSimpleYAML(lines) {
     const topMatch = line.match(/^(\w[\w_]*):\s*(.+)?$/);
     if (topMatch && !line.startsWith("  ") && !line.startsWith("\t")) {
       if (inNested && currentKey) {
-        result[currentKey] = currentObj;
+        if (Array.isArray(currentObj.__list) && currentObj.__list.length > 0) {
+          result[currentKey] = currentObj.__list;
+          delete currentObj.__list;
+        } else {
+          result[currentKey] = currentObj;
+        }
         inNested = false;
         currentObj = {};
       }
@@ -3179,6 +3214,26 @@ function parseSimpleYAML(lines) {
       }
       continue;
     }
+    const listMatch = line.match(/^\s{2}-(?:\s+)?(.+)?$/);
+    if (listMatch && inNested && currentKey) {
+      const item = (listMatch[1] || "").trim();
+      if (!Array.isArray(currentObj.__list)) {
+        currentObj.__list = [];
+      }
+      if (item.startsWith("{") && item.endsWith("}")) {
+        const inline = parseInlineObject(item);
+        currentObj.__list.push(inline || item);
+      } else if (item === "true") {
+        currentObj.__list.push(true);
+      } else if (item === "false") {
+        currentObj.__list.push(false);
+      } else if (/^-?\d+(\.\d+)?$/.test(item)) {
+        currentObj.__list.push(parseFloat(item));
+      } else {
+        currentObj.__list.push(item);
+      }
+      continue;
+    }
     if (nestedMatch && !inNested) {
       const key = nestedMatch[1];
       const value = (nestedMatch[2] || "").trim();
@@ -3204,7 +3259,12 @@ function parseSimpleYAML(lines) {
     }
   }
   if (inNested && currentKey) {
-    result[currentKey] = currentObj;
+    if (Array.isArray(currentObj.__list) && currentObj.__list.length > 0) {
+      result[currentKey] = currentObj.__list;
+      delete currentObj.__list;
+    } else {
+      result[currentKey] = currentObj;
+    }
   }
   return result;
 }

package/package.json

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