@diagrammo/dgmo 0.7.3 → 0.8.0

package/src/infra/parser.ts

@@ -2,12 +2,13 @@
 // Infra Chart Parser
 // ============================================================
 //
-// Parses `chart: infra` syntax into a structured InfraModel.
+// Parses `infra [Title]` syntax into a structured InfraModel.
 // Handles: chart metadata, component blocks with indented properties
-// and connections, [Group] containers, tag groups, pipe metadata.
+// and connections, [Group] / # Group containers, tag groups, pipe metadata.
 
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
-import { measureIndent } from '../utils/parsing';
+import { measureIndent, normalizeDirection, parseFirstLine, GROUP_HASH_RE, OPTION_NOCOLON_RE } from '../utils/parsing';
+import { matchTagBlockHeading } from '../utils/tag-groups';
 import type {
   ParsedInfra,
   InfraNode,
@@ -20,22 +21,37 @@ import { INFRA_BEHAVIOR_KEYS, EDGE_ONLY_KEYS } from './types';
 // Regex patterns
 // ============================================================
 
-// Connection: -label-> Target  or  -> Target  (with optional | split: N%  and optional x5 fanout)
+// Connection: -label-> Target  or  -> Target  (with optional | split: N%  or pipe metadata)
 const CONNECTION_RE =
-  /^-(?:([^-].*?))?->\s+(.+?)(?:(?:\s*\|\s*|\s+)split\s*:?\s*(\d+)%)?\s*(?:x(\d+))?\s*$/;
+  /^-(?:([^-].*?))?->\s*(.+?)(?:(?:\s*\|\s*|\s+)split\s*:?\s*(\d+)%)?\s*$/;
 
 // Simple connection shorthand: -> Target (no label, no dash prefix needed for edge)
 const SIMPLE_CONNECTION_RE =
-  /^->\s+(.+?)(?:(?:\s*\|\s*|\s+)split\s*:?\s*(\d+)%)?\s*(?:x(\d+))?\s*$/;
+  /^->\s*(.+?)(?:(?:\s*\|\s*|\s+)split\s*:?\s*(\d+)%)?\s*$/;
 
-// Group declaration: [Group Name]
-const GROUP_RE = /^\[([^\]]+)\]$/;
+// Async connection: ~label~> Target  or  ~> Target  (with optional | split: N%  or pipe metadata)
+const ASYNC_CONNECTION_RE =
+  /^~(?:([^~].*?))?~>\s*(.+?)(?:(?:\s*\|\s*|\s+)split\s*:?\s*(\d+)%)?\s*$/;
 
-// Tag group declaration: tag: Name alias x
-const TAG_GROUP_RE = /^tag\s*:\s*(\w[\w\s]*?)(?:\s+alias\s+(\w+))?\s*$/;
+// Async simple connection shorthand: ~> Target
+const ASYNC_SIMPLE_CONNECTION_RE =
+  /^~>\s*(.+?)(?:(?:\s*\|\s*|\s+)split\s*:?\s*(\d+)%)?\s*$/;
 
-// Tag value: Name  or  Name(color)  or  Name(color) default
-const TAG_VALUE_RE = /^(\w[\w\s]*?)(?:\(([^)]+)\))?(\s+default)?\s*$/;
+// Deprecated xN fanout suffix (e.g. "x5" at end of line)
+const DEPRECATED_FANOUT_RE = /\bx(\d+)\s*$/;
+
+// "is a" type declaration: NodeName is a <type>
+const IS_A_RE = /^(.+?)\s+is\s+an?\s+(database|cache|queue|service|gateway|storage|function|network)\s*$/i;
+
+// Valid node types for "is a" declarations
+const VALID_NODE_TYPES = new Set(['database', 'cache', 'queue', 'service', 'gateway', 'storage', 'function', 'network']);
+
+// Group declaration: [Group Name] with optional pipe metadata
+const GROUP_RE = /^\[([^\]]+)\]\s*(?:\|\s*(.+))?$/;
+
+// Tag value: Name  or  Name(color)
+// Note: `default` keyword removed — first value is the default.
+const TAG_VALUE_RE = /^(\w[\w\s]*?)(?:\(([^)]+)\))?\s*$/;
 
 // Component line: ComponentName  or  ComponentName | t: Backend | env: Prod
 // Allows hyphens in names (e.g. api-gateway, my-service-v2) — but not at the start.
@@ -44,8 +60,8 @@ const COMPONENT_RE = /^([a-zA-Z_][\w-]*)(.*)$/;
 // Pipe metadata: | key: value  or  | k1: v1, k2: v2  (comma-separated)
 const PIPE_META_RE = /[|,]\s*(\w+)\s*:\s*([^|,]+)/g;
 
-// Property: key: value
-const PROPERTY_RE = /^([\w-]+)\s*:\s*(.+)$/;
+// Property: key value (space-separated, no colon)
+const PROPERTY_RE = /^([\w-]+)\s+(.+)$/;
 
 // Percentage value: 80% or 99.99%
 const PERCENT_RE = /^([\d.]+)%$/;
@@ -56,6 +72,12 @@ const RANGE_RE = /^(\d+)-(\d+)$/;
 // Node names that act as the traffic entry point (edge node)
 const EDGE_NODE_NAMES = new Set(['edge', 'internet']);
 
+// Known top-level option keys (space-separated, no colon)
+const TOP_LEVEL_OPTIONS = new Set([
+  'slo-availability', 'slo-p90-latency-ms', 'slo-warning-margin',
+  'default-latency-ms', 'default-uptime', 'default-rps',
+]);
+
 // ============================================================
 // Helpers
 // ============================================================
@@ -182,72 +204,52 @@ export function parseInfra(content: string): ParsedInfra {
         finishCurrentNode();
       }
 
-      // chart: infra
-      if (/^chart\s*:/i.test(trimmed)) {
-        const val = trimmed.replace(/^chart\s*:\s*/i, '').trim().toLowerCase();
-        if (val !== 'infra') {
-          setError(lineNumber, `Expected chart type 'infra', got '${val}'`);
+      // First line: `infra [Title]` or legacy `chart: infra`
+      const firstLineResult = parseFirstLine(trimmed);
+      if (firstLineResult) {
+        if (firstLineResult.chartType !== 'infra') {
+          setError(lineNumber, `Expected chart type 'infra', got '${firstLineResult.chartType}'`);
+        }
+        if (firstLineResult.title) {
+          result.title = firstLineResult.title;
+          result.titleLineNumber = lineNumber;
         }
         continue;
       }
 
-      // title: ...
-      if (/^title\s*:/i.test(trimmed)) {
-        result.title = trimmed.replace(/^title\s*:\s*/i, '').trim();
-        result.titleLineNumber = lineNumber;
-        continue;
-      }
-
-      // direction: LR | TB
-      if (/^direction\s*:/i.test(trimmed)) {
-        const dir = trimmed.replace(/^direction\s*:\s*/i, '').trim().toUpperCase();
-        if (dir === 'LR' || dir === 'TB') {
+      // direction LR | TB  (also accepts orientation as alias)
+      // Supports both `direction LR` (new) and `direction: LR` (legacy)
+      if (/^(?:direction|orientation)\s/i.test(trimmed)) {
+        const raw = trimmed.replace(/^(?:direction|orientation)\s+/i, '').trim();
+        const dir = normalizeDirection(raw);
+        if (dir) {
           result.direction = dir;
         } else {
-          warn(lineNumber, `Unknown direction '${dir}'. Expected 'LR' or 'TB'.`);
+          warn(lineNumber, `Unknown direction '${raw}'. Expected 'LR', 'TB', 'horizontal', or 'vertical'.`);
         }
         continue;
       }
 
-      // animate: on | off
-      if (/^animate\s*:/i.test(trimmed)) {
-        result.options.animate = trimmed.replace(/^animate\s*:\s*/i, '').trim().toLowerCase();
-        continue;
-      }
-
-      // default-latency-ms: <number>
-      if (/^default-latency-ms\s*:/i.test(trimmed)) {
-        result.options['default-latency-ms'] = trimmed.replace(/^default-latency-ms\s*:\s*/i, '').trim();
-        continue;
-      }
-
-      // default-uptime: <number>
-      if (/^default-uptime\s*:/i.test(trimmed)) {
-        result.options['default-uptime'] = trimmed.replace(/^default-uptime\s*:\s*/i, '').trim();
-        continue;
-      }
-
-      // slo-availability: <percentage e.g. 99.9%>
-      if (/^slo-availability\s*:/i.test(trimmed)) {
-        result.options['slo-availability'] = trimmed.replace(/^slo-availability\s*:\s*/i, '').trim();
+      // animate (default ON) / no-animate
+      if (trimmed === 'animate') {
+        result.options.animate = 'on';
         continue;
       }
-
-      // slo-p90-latency-ms: <number>
-      if (/^slo-p90-latency-ms\s*:/i.test(trimmed)) {
-        result.options['slo-p90-latency-ms'] = trimmed.replace(/^slo-p90-latency-ms\s*:\s*/i, '').trim();
+      if (trimmed === 'no-animate') {
+        result.options.animate = 'off';
         continue;
       }
 
-      // slo-warning-margin: <percentage e.g. 5%>
-      if (/^slo-warning-margin\s*:/i.test(trimmed)) {
-        result.options['slo-warning-margin'] = trimmed.replace(/^slo-warning-margin\s*:\s*/i, '').trim();
+      // Top-level options: `key value` (space-separated, no colon)
+      const optMatch = trimmed.match(OPTION_NOCOLON_RE);
+      if (optMatch && TOP_LEVEL_OPTIONS.has(optMatch[1].toLowerCase())) {
+        result.options[optMatch[1].toLowerCase()] = optMatch[2].trim();
         continue;
       }
 
-      // scenario: Name — deprecated, emit warning and skip block
+      // scenario: Name — no longer supported
       if (/^scenario\s*:/i.test(trimmed)) {
-        console.warn('[dgmo warn] scenario syntax is deprecated and will be ignored');
+        setError(lineNumber, `'scenario:' syntax is no longer supported`);
         // Skip indented block
         let si = i + 1;
         while (si < lines.length) {
@@ -262,32 +264,81 @@ export function parseInfra(content: string): ParsedInfra {
         continue;
       }
 
-      // tag: GroupName alias x
-      const tagMatch = trimmed.match(TAG_GROUP_RE);
+      // Tag group: `tag Name [alias]` (via shared matchTagBlockHeading)
+      const tagMatch = matchTagBlockHeading(trimmed);
       if (tagMatch) {
         finishCurrentNode();
         finishCurrentTagGroup();
         currentTagGroup = {
-          name: tagMatch[1].trim(),
-          alias: tagMatch[2] ?? null,
+          name: tagMatch.name,
+          alias: tagMatch.alias ?? null,
           values: [],
           lineNumber,
         };
         continue;
       }
 
-      // [Group Name]
+      // # GroupName (alternate group notation)
+      const hashGroupMatch = trimmed.match(GROUP_HASH_RE);
+      if (hashGroupMatch) {
+        finishCurrentNode();
+        finishCurrentTagGroup();
+        const gLabel = hashGroupMatch[1].trim();
+        const gId = groupId(gLabel);
+        currentGroup = {
+          id: gId,
+          label: gLabel,
+          metadata: undefined,
+          lineNumber,
+        };
+        result.groups.push(currentGroup);
+        continue;
+      }
+
+      // [Group Name] or [Group Name] | t: Engineering
       const groupMatch = trimmed.match(GROUP_RE);
       if (groupMatch) {
         finishCurrentNode();
         finishCurrentTagGroup();
         const gLabel = groupMatch[1].trim();
         const gId = groupId(gLabel);
-        currentGroup = { id: gId, label: gLabel, lineNumber };
+        const groupMeta = groupMatch[2] ? extractPipeMetadata('|' + groupMatch[2]).tags : undefined;
+        currentGroup = {
+          id: gId,
+          label: gLabel,
+          metadata: groupMeta && Object.keys(groupMeta).length > 0 ? groupMeta : undefined,
+          lineNumber,
+        };
         result.groups.push(currentGroup);
         continue;
       }
 
+      // "is a" type declaration: NodeName is a <type>
+      const isaMatch = trimmed.match(IS_A_RE);
+      if (isaMatch) {
+        finishCurrentNode();
+        finishCurrentTagGroup();
+
+        const name = isaMatch[1].trim();
+        const nType = isaMatch[2].toLowerCase();
+        const id = nodeId(name);
+        const isEdge = EDGE_NODE_NAMES.has(id.toLowerCase());
+
+        currentNode = {
+          id,
+          label: name,
+          properties: [],
+          groupId: null,
+          tags: {},
+          isEdge,
+          nodeType: nType,
+          lineNumber,
+        };
+        currentGroup = null;
+        baseIndent = 0;
+        continue;
+      }
+
       // Component at top level (no indent)
       const compMatch = trimmed.match(COMPONENT_RE);
       if (compMatch) {
@@ -317,7 +368,7 @@ export function parseInfra(content: string): ParsedInfra {
 
     // ---- Indented lines ----
 
-    // Tag value inside tag group
+    // Tag value inside tag group — first value is the default
     if (currentTagGroup && indent > 0) {
       const tvMatch = trimmed.match(TAG_VALUE_RE);
       if (tvMatch) {
@@ -326,7 +377,8 @@ export function parseInfra(content: string): ParsedInfra {
           name: valueName,
           color: tvMatch[2]?.trim(),
         });
-        if (tvMatch[3]) {
+        // First value is the default
+        if (currentTagGroup.values.length === 1) {
           currentTagGroup.defaultValue = valueName;
         }
         continue;
@@ -356,13 +408,41 @@ export function parseInfra(content: string): ParsedInfra {
         }
       }
 
+      // "is a" type declaration inside group
+      const isaMatchG = trimmed.match(IS_A_RE);
+      if (isaMatchG) {
+        finishCurrentTagGroup();
+        const name = isaMatchG[1].trim();
+        const nType = isaMatchG[2].toLowerCase();
+        const id = nodeId(name);
+        // Cascade group metadata into node tags (node-level overrides later)
+        const tags: Record<string, string> = currentGroup.metadata ? { ...currentGroup.metadata } : {};
+
+        currentNode = {
+          id,
+          label: name,
+          properties: [],
+          groupId: currentGroup.id,
+          tags,
+          isEdge: false,
+          nodeType: nType,
+          lineNumber,
+        };
+        baseIndent = indent;
+        continue;
+      }
+
       const compMatch = trimmed.match(COMPONENT_RE);
       if (compMatch) {
         finishCurrentTagGroup();
         const name = compMatch[1];
         const rest = compMatch[2] || '';
-        const { tags } = extractPipeMetadata(rest);
+        const { tags: nodeTags } = extractPipeMetadata(rest);
         const id = nodeId(name);
+        // Cascade group metadata into node tags; node-level metadata overrides
+        const tags: Record<string, string> = currentGroup.metadata
+          ? { ...currentGroup.metadata, ...nodeTags }
+          : nodeTags;
 
         currentNode = {
           id,
@@ -380,22 +460,96 @@ export function parseInfra(content: string): ParsedInfra {
 
     // Inside a component block — properties and connections
     if (currentNode && indent > baseIndent) {
-      // Simple connection: -> Target
+      // Detect deprecated xN fanout syntax
+      const deprecatedFanout = trimmed.match(DEPRECATED_FANOUT_RE);
+      if (deprecatedFanout && (trimmed.startsWith('->') || trimmed.startsWith('-') || trimmed.startsWith('~'))) {
+        const n = deprecatedFanout[1];
+        setError(lineNumber, `'x${n}' fanout syntax is no longer supported — use '| fanout: ${n}' instead`);
+        continue;
+      }
+
+      // Async simple connection: ~> Target
+      const asyncSimpleConn = trimmed.match(ASYNC_SIMPLE_CONNECTION_RE);
+      if (asyncSimpleConn) {
+        const targetRaw = asyncSimpleConn[1].trim();
+        const splitStr = asyncSimpleConn[2];
+        const pipeMeta = extractPipeMetadata(targetRaw);
+        const targetName = pipeMeta.clean || targetRaw;
+        const split = splitStr ? parseFloat(splitStr)
+          : pipeMeta.tags.split ? parseFloat(pipeMeta.tags.split) : null;
+        const fanoutRaw = pipeMeta.tags.fanout ? parseInt(pipeMeta.tags.fanout, 10) : null;
+        if (fanoutRaw !== null && fanoutRaw < 1) {
+          warn(lineNumber, `Fan-out multiplier must be at least 1 (got fanout: ${fanoutRaw}). Ignoring.`);
+        }
+        const fanout = fanoutRaw !== null && fanoutRaw >= 1 ? fanoutRaw : null;
+        result.edges.push({
+          sourceId: currentNode.id,
+          targetId: nodeId(targetName),
+          label: '',
+          async: true,
+          split,
+          fanout,
+          lineNumber,
+        });
+        continue;
+      }
+
+      // Async labeled connection: ~label~> Target
+      const asyncConnMatch = trimmed.match(ASYNC_CONNECTION_RE);
+      if (asyncConnMatch) {
+        const label = asyncConnMatch[1]?.trim() || '';
+        const targetRaw = asyncConnMatch[2].trim();
+        const splitStr = asyncConnMatch[3];
+        const pipeMeta = extractPipeMetadata(targetRaw);
+        const targetName = pipeMeta.clean || targetRaw;
+        const split = splitStr ? parseFloat(splitStr)
+          : pipeMeta.tags.split ? parseFloat(pipeMeta.tags.split) : null;
+        const fanoutRaw = pipeMeta.tags.fanout ? parseInt(pipeMeta.tags.fanout, 10) : null;
+        if (fanoutRaw !== null && fanoutRaw < 1) {
+          warn(lineNumber, `Fan-out multiplier must be at least 1 (got fanout: ${fanoutRaw}). Ignoring.`);
+        }
+        const fanout = fanoutRaw !== null && fanoutRaw >= 1 ? fanoutRaw : null;
+
+        let targetId: string;
+        const targetGroupMatch = targetName.match(/^\[([^\]]+)\]/);
+        if (targetGroupMatch) {
+          targetId = groupId(targetGroupMatch[1]);
+        } else {
+          targetId = nodeId(targetName);
+        }
+
+        result.edges.push({
+          sourceId: currentNode.id,
+          targetId,
+          label,
+          async: true,
+          split,
+          fanout,
+          lineNumber,
+        });
+        continue;
+      }
+
+      // Simple connection: -> Target  or  -> Target | fanout: 5
       const simpleConn = trimmed.match(SIMPLE_CONNECTION_RE);
       if (simpleConn) {
-        const targetName = simpleConn[1].trim();
+        const targetRaw = simpleConn[1].trim();
         const splitStr = simpleConn[2];
-        const fanoutStr = simpleConn[3];
-        const split = splitStr ? parseFloat(splitStr) : null;
-        const fanoutRaw = fanoutStr ? parseInt(fanoutStr, 10) : null;
+        // Parse pipe metadata for fanout/split (and clean target name)
+        const pipeMeta = extractPipeMetadata(targetRaw);
+        const targetName = pipeMeta.clean || targetRaw;
+        const split = splitStr ? parseFloat(splitStr)
+          : pipeMeta.tags.split ? parseFloat(pipeMeta.tags.split) : null;
+        const fanoutRaw = pipeMeta.tags.fanout ? parseInt(pipeMeta.tags.fanout, 10) : null;
         if (fanoutRaw !== null && fanoutRaw < 1) {
-          warn(lineNumber, `Fan-out multiplier must be at least 1 (got x${fanoutRaw}). Ignoring.`);
+          warn(lineNumber, `Fan-out multiplier must be at least 1 (got fanout: ${fanoutRaw}). Ignoring.`);
         }
         const fanout = fanoutRaw !== null && fanoutRaw >= 1 ? fanoutRaw : null;
         result.edges.push({
           sourceId: currentNode.id,
           targetId: nodeId(targetName),
           label: '',
+          async: false,
           split,
           fanout,
           lineNumber,
@@ -403,23 +557,26 @@ export function parseInfra(content: string): ParsedInfra {
         continue;
       }
 
-      // Labeled connection: -label-> Target | split: N%
+      // Labeled connection: -label-> Target | split: N%, fanout: 3
       const connMatch = trimmed.match(CONNECTION_RE);
       if (connMatch) {
         const label = connMatch[1]?.trim() || '';
-        const targetName = connMatch[2].trim();
+        const targetRaw = connMatch[2].trim();
         const splitStr = connMatch[3];
-        const fanoutStr = connMatch[4];
-        const split = splitStr ? parseFloat(splitStr) : null;
-        const fanoutRaw = fanoutStr ? parseInt(fanoutStr, 10) : null;
+        // Parse pipe metadata for fanout/split (and clean target name)
+        const pipeMeta = extractPipeMetadata(targetRaw);
+        const targetName = pipeMeta.clean || targetRaw;
+        const split = splitStr ? parseFloat(splitStr)
+          : pipeMeta.tags.split ? parseFloat(pipeMeta.tags.split) : null;
+        const fanoutRaw = pipeMeta.tags.fanout ? parseInt(pipeMeta.tags.fanout, 10) : null;
         if (fanoutRaw !== null && fanoutRaw < 1) {
-          warn(lineNumber, `Fan-out multiplier must be at least 1 (got x${fanoutRaw}). Ignoring.`);
+          warn(lineNumber, `Fan-out multiplier must be at least 1 (got fanout: ${fanoutRaw}). Ignoring.`);
         }
         const fanout = fanoutRaw !== null && fanoutRaw >= 1 ? fanoutRaw : null;
 
         // Target might be a group ref like [API Pods]
         let targetId: string;
-        const targetGroupMatch = targetName.match(GROUP_RE);
+        const targetGroupMatch = targetName.match(/^\[([^\]]+)\]/);
         if (targetGroupMatch) {
           targetId = groupId(targetGroupMatch[1]);
         } else {
@@ -430,6 +587,7 @@ export function parseInfra(content: string): ParsedInfra {
           sourceId: currentNode.id,
           targetId,
           label,
+          async: false,
           split,
           fanout,
           lineNumber,
@@ -437,8 +595,8 @@ export function parseInfra(content: string): ParsedInfra {
         continue;
       }
 
-      // Empty description: (no value) — silently skip rather than emitting "Unexpected line"
-      if (/^description\s*:\s*$/i.test(trimmed)) continue;
+      // Empty description (no value) — silently skip rather than emitting "Unexpected line"
+      if (/^description\s*:?\s*$/i.test(trimmed)) continue;
 
       // Property: key: value
       const propMatch = trimmed.match(PROPERTY_RE);
@@ -480,12 +638,38 @@ export function parseInfra(content: string): ParsedInfra {
     // Component inside group (same indent as group children)
     if (currentGroup && indent > 0) {
       finishCurrentNode();
+
+      // "is a" type declaration inside group
+      const isaMatchG2 = trimmed.match(IS_A_RE);
+      if (isaMatchG2) {
+        const name = isaMatchG2[1].trim();
+        const nType = isaMatchG2[2].toLowerCase();
+        const id = nodeId(name);
+        const tags: Record<string, string> = currentGroup.metadata ? { ...currentGroup.metadata } : {};
+
+        currentNode = {
+          id,
+          label: name,
+          properties: [],
+          groupId: currentGroup.id,
+          tags,
+          isEdge: false,
+          nodeType: nType,
+          lineNumber,
+        };
+        baseIndent = indent;
+        continue;
+      }
+
       const compMatch = trimmed.match(COMPONENT_RE);
       if (compMatch) {
         const name = compMatch[1];
         const rest = compMatch[2] || '';
-        const { tags } = extractPipeMetadata(rest);
+        const { tags: nodeTags } = extractPipeMetadata(rest);
         const id = nodeId(name);
+        const tags: Record<string, string> = currentGroup.metadata
+          ? { ...currentGroup.metadata, ...nodeTags }
+          : nodeTags;
 
         currentNode = {
           id,
@@ -590,25 +774,40 @@ export function extractSymbols(docText: string): DiagramSymbols {
     const indented = /^\s/.test(rawLine);
 
     // Metadata phase: skip until first non-metadata root-level line.
-    // All lines (including indented) are skipped while inMetadata = true.
+    // Metadata includes: `infra [Title]`, `chart: type`, `direction X`, `slo-*`, etc.
     if (inMetadata) {
-      if (!indented && !/^[a-z-]+\s*:/i.test(line)) inMetadata = false;
-      else continue;
+      if (!indented) {
+        // Recognize new-style bare options (`key value`) and old-style (`key: value`)
+        const firstLine = parseFirstLine(line);
+        if (firstLine) continue; // chart type line
+        if (/^(?:direction|orientation|animate|no-animate|slo-|default-)/i.test(line)) continue;
+        if (/^[a-z-]+\s*:/i.test(line)) continue; // legacy colon options
+        inMetadata = false;
+      } else {
+        continue;
+      }
     }
 
     if (!indented) {
       // Root-level: tag group declaration, group header, or component
-      if (/^tag\s*:/i.test(line)) { inTagGroup = true; continue; }
+      if (/^tag\s/i.test(line)) { inTagGroup = true; continue; }
+      if (/^tag\s*:/i.test(line)) { inTagGroup = true; continue; } // legacy
       inTagGroup = false;
-      if (/^\[/.test(line)) continue; // group header
+      if (/^\[/.test(line)) continue; // [Group] header
+      if (/^#\s/.test(line)) continue; // # Group header
       const m = COMPONENT_RE.exec(line);
       if (m && !entities.includes(m[1]!)) entities.push(m[1]!);
     } else {
       // Indented: skip tag values, connections, and properties; extract grouped components
       if (inTagGroup) continue;
       if (/^->/.test(line)) continue; // simple connection
+      if (/^~>/.test(line)) continue; // async simple connection
       if (/^-[^>]+-?>/.test(line)) continue; // labeled connection
-      if (/^\w[\w-]*\s*:/.test(line)) continue; // property (key: value)
+      if (/^~[^~]+~>/.test(line)) continue; // async labeled connection
+      if (/^\w[\w-]*\s*:/.test(line)) continue; // property (key: value) legacy
+      // New-style property: first token is a known behavior/property key
+      const firstToken = line.split(/\s/)[0].toLowerCase();
+      if ((INFRA_BEHAVIOR_KEYS.has(firstToken) || EDGE_ONLY_KEYS.has(firstToken) || firstToken === 'description' || firstToken === 'instances' || firstToken === 'collapsed') && /\s/.test(line)) continue;
       const m = COMPONENT_RE.exec(line);
       if (m && !entities.includes(m[1]!)) entities.push(m[1]!);
     }