@orcalang/orca-lang 0.1.18 → 0.1.21

package/src/parser/markdown-parser.ts

@@ -10,6 +10,8 @@ import {
   ReachabilityProperty, PassesThroughProperty, RespondsProperty,
   InvariantProperty, InvokeDef,
 } from './ast.js';
+import { DecisionTableDef } from './dt-ast.js';
+import { parseDecisionTable } from './dt-parser.js';
 
 // ============================================================
 // Phase 1: Structural Markdown Parsing
@@ -389,6 +391,7 @@ interface StateEntry {
   invoke?: InvokeDef;
   _pendingOnError?: string;  // temp: on_error parsed before invoke
   ignoredEvents?: string[];
+  ignoredAll?: boolean;
   line: number;
 }
 
@@ -429,9 +432,14 @@ function parseStateBullet(entry: StateEntry, text: string): void {
       entry.timeout = { duration: rest.slice(0, arrowIdx).trim(), target: rest.slice(arrowIdx + 2).trim() };
     }
   } else if (text.startsWith('ignore:')) {
-    const names = text.slice(7).trim().split(',').map(e => e.trim()).filter(Boolean);
-    if (!entry.ignoredEvents) entry.ignoredEvents = [];
-    entry.ignoredEvents.push(...names);
+    const val = text.slice(7).trim();
+    if (val === '*') {
+      entry.ignoredAll = true;
+    } else {
+      const names = val.split(',').map(e => e.trim()).filter(Boolean);
+      if (!entry.ignoredEvents) entry.ignoredEvents = [];
+      entry.ignoredEvents.push(...names);
+    }
   } else if (text.startsWith('on_done:')) {
     let val = text.slice(8).trim();
     if (val.startsWith('->')) val = val.slice(2).trim();
@@ -628,6 +636,7 @@ function buildStatesAtLevel(
     if (entry.onDone) state.onDone = entry.onDone;
     if (entry.timeout) state.timeout = entry.timeout;
     if (entry.ignoredEvents?.length) state.ignoredEvents = entry.ignoredEvents;
+    if (entry.ignoredAll) state.ignoredAll = true;
     if (entry.invoke) state.invoke = entry.invoke;
 
     i++;
@@ -676,6 +685,7 @@ function buildParallelRegions(
         if (e.onDone) s.onDone = e.onDone;
         if (e.timeout) s.timeout = e.timeout;
         if (e.ignoredEvents?.length) s.ignoredEvents = e.ignoredEvents;
+        if (e.ignoredAll) s.ignoredAll = true;
         if (e.invoke) s.invoke = e.invoke;
         regionStates.push(s);
         i++;
@@ -790,7 +800,7 @@ function parseMachineFromElements(elements: MdElement[]): MachineDef {
   return machine;
 }
 
-function parseMarkdownSemantic(elements: MdElement[]): MachineDef[] {
+function parseMarkdownSemantic(elements: MdElement[]): { machines: MachineDef[]; decisionTables: DecisionTableDef[] } {
   // Split elements by --- separators for multi-machine files
   const chunks: MdElement[][] = [];
   let currentChunk: MdElement[] = [];
@@ -809,8 +819,33 @@ function parseMarkdownSemantic(elements: MdElement[]): MachineDef[] {
     chunks.push(currentChunk);
   }
 
-  // Parse each chunk as a separate machine
-  return chunks.map(chunk => parseMachineFromElements(chunk));
+  // Parse each chunk based on its H1 heading type
+  const machines: MachineDef[] = [];
+  const decisionTables: DecisionTableDef[] = [];
+
+  for (const chunk of chunks) {
+    // Find ALL H1 headings in the chunk to determine what it contains
+    const headings = chunk.filter(el => el.kind === 'heading' && el.level === 1) as MdHeading[];
+
+    // Check if chunk contains a decision_table (must be first H1 to be recognized as DT chunk)
+    const firstHeading = headings[0];
+    if (firstHeading?.text.startsWith('decision_table ')) {
+      const { decisionTable } = parseDecisionTable(chunk);
+      decisionTables.push(decisionTable);
+    } else if (firstHeading?.text.startsWith('machine ')) {
+      // First heading is machine - parse entire chunk as machine
+      machines.push(parseMachineFromElements(chunk));
+    } else {
+      // First heading is not machine or decision_table - scan for machine heading
+      const machineHeading = headings.find(h => h.text.startsWith('machine '));
+      if (machineHeading) {
+        machines.push(parseMachineFromElements(chunk));
+      }
+      // Skip chunks without a recognized machine or decision_table heading
+    }
+  }
+
+  return { machines, decisionTables };
 }
 
 function parseEffectsTable(table: MdTable): EffectDef[] {
@@ -834,8 +869,8 @@ function parsePropertiesList(list: MdBulletList): Property[] {
 
 export function parseMarkdown(source: string): ParseResult {
   const elements = parseMarkdownStructure(source);
-  const machines = parseMarkdownSemantic(elements);
-  return { file: { machines }, tokens: [] };
+  const { machines, decisionTables } = parseMarkdownSemantic(elements);
+  return { file: { machines, decisionTables }, tokens: [] };
 }
 
 /**