@shapeshift-labs/frontier-lang-parser 0.3.51 → 0.3.53

package/dist/action-body.js

@@ -1,6 +1,17 @@
 import { readFrontierNestedBlocks } from './source-syntax-report.js';
 import { readActionValue } from './action-expression.js';
 import { readElseHeaderBlock } from './action-else-block.js';
+import { readActionForInHeader, readForInHeaderBlock, validateActionForInHeader } from './action-for-in-block.js';
+import { findActionMatchingBrace, skipActionWhitespaceAndComments } from './action-source-blocks.js';
+import {
+  readActionMatchCaseHeader,
+  readActionMatchDefaultHeader,
+  readActionMatchHeader,
+  readMatchBranchBlock,
+  readMatchBranchBlocks,
+  readMatchHeaderBlock,
+  validateActionMatchBranchHeader
+} from './action-match-block.js';
 
 export function readActionBodyRecords(body) {
   const records = [];
@@ -21,23 +32,38 @@ function parseActionBodyRecords(source, state) {
   const records = [];
   let offset = 0;
   while (offset < source.length) {
-    offset = skipWhitespaceAndComments(source, offset);
+    offset = skipActionWhitespaceAndComments(source, offset);
     if (offset >= source.length) break;
+    const forBlock = readForInHeaderBlock(source, offset, source.length);
+    if (forBlock) {
+      const record = parseActionForInBlock(forBlock.header, forBlock.body, state.index++, state);
+      if (record) records.push(record);
+      offset = forBlock.end;
+      continue;
+    }
+    const matchBlock = readMatchHeaderBlock(source, offset, source.length);
+    if (matchBlock) {
+      const record = parseActionMatchBlock(matchBlock.header, matchBlock.body, state.index++, state);
+      if (record) records.push(record);
+      offset = matchBlock.end;
+      continue;
+    }
     const ifHeader = /^if\b([^{\n]*)\{/.exec(source.slice(offset));
     if (ifHeader) {
       const open = offset + ifHeader[0].length - 1;
-      const close = findMatchingBrace(source, open);
+      const close = findActionMatchingBrace(source, open);
       if (close < 0) break;
-      const elseBlock = readElseHeaderBlock(source, close + 1, source.length, { skipWhitespace: skipWhitespaceAndComments, findMatchingBrace });
+      const elseBlock = readElseHeaderBlock(source, close + 1, source.length, { skipWhitespace: skipActionWhitespaceAndComments, findMatchingBrace: findActionMatchingBrace });
       const index = state.index++;
       const record = parseActionIfBlock(ifHeader[1].trim(), source.slice(open + 1, close), index, state, elseBlock);
       if (record) records.push(record);
       offset = elseBlock ? elseBlock.end : close + 1;
       continue;
     }
-    const elseBlock = readElseHeaderBlock(source, offset, source.length, { skipWhitespace: skipWhitespaceAndComments, findMatchingBrace });
-    if (elseBlock) {
-      offset = elseBlock.end;
+    const branchBlock = readMatchBranchBlock(source, offset, source.length);
+    const elseBlock = readElseHeaderBlock(source, offset, source.length, { skipWhitespace: skipActionWhitespaceAndComments, findMatchingBrace: findActionMatchingBrace });
+    if (branchBlock || elseBlock) {
+      offset = branchBlock?.end ?? elseBlock.end;
       continue;
     }
     const lineEnd = source.indexOf('\n', offset);
@@ -52,6 +78,56 @@ function parseActionBodyRecords(source, state) {
   return records;
 }
 
+function parseActionForInBlock(header, body, index, state) {
+  const validation = validateActionForInHeader(header);
+  if (!validation.ok) return undefined;
+  const details = readActionForInHeader(header, index);
+  return compactRecord({
+    kind: 'forIn',
+    id: details.id,
+    name: details.name,
+    itemName: details.itemName,
+    collection: details.collection,
+    body: parseActionBodyRecords(body, state)
+  });
+}
+
+function parseActionMatchBlock(header, body, index, state) {
+  const details = readActionMatchHeader(header, index);
+  if (!details.value) return undefined;
+  const branches = readMatchBranchBlocks(body, 0, body.length);
+  const cases = [];
+  let defaultRecord;
+  for (const branch of branches) {
+    const branchIndex = state.index++;
+    if (branch.kind === 'case') {
+      const validation = validateActionMatchBranchHeader('case', branch.header);
+      const caseDetails = readActionMatchCaseHeader(branch.header, branchIndex);
+      const { valueText: _valueText, ...caseRecord } = caseDetails;
+      if (validation.ok) cases.push({ ...caseRecord, body: parseActionBodyRecords(branch.body, state) });
+      continue;
+    }
+    if (!defaultRecord) {
+      const defaultDetails = readActionMatchDefaultHeader(branch.header, branchIndex);
+      defaultRecord = { ...defaultDetails, body: parseActionBodyRecords(branch.body, state) };
+    }
+  }
+  if (!cases.length) return undefined;
+  return compactRecord({
+    kind: 'match',
+    id: details.id,
+    name: details.name,
+    valueType: details.valueType,
+    comparisonType: details.comparisonType,
+    callType: details.callType,
+    value: details.value,
+    cases,
+    defaultId: defaultRecord?.id,
+    defaultName: defaultRecord?.name,
+    defaultBody: defaultRecord?.body
+  });
+}
+
 function parseActionIfBlock(header, body, index, state, elseBlock) {
   const details = parseActionIfHeader(header, index);
   if (!details.condition) return undefined;
@@ -171,70 +247,6 @@ function readReturnDetails(rawName, rest) {
   };
 }
 
-function skipWhitespaceAndComments(source, offset) {
-  let index = offset;
-  while (index < source.length) {
-    while (index < source.length && /\s/.test(source[index])) index++;
-    if (source[index] !== '#') return index;
-    const lineEnd = source.indexOf('\n', index);
-    index = lineEnd < 0 ? source.length : lineEnd + 1;
-  }
-  return index;
-}
-
-function findMatchingBrace(source, open) {
-  let depth = 0;
-  let state = 'code';
-  let quote = '';
-  for (let index = open; index < source.length; index++) {
-    const char = source[index];
-    const next = source[index + 1];
-    if (state === 'line-comment') {
-      if (char === '\n') state = 'code';
-      continue;
-    }
-    if (state === 'block-comment') {
-      if (char === '*' && next === '/') {
-        index++;
-        state = 'code';
-      }
-      continue;
-    }
-    if (state === 'string') {
-      if (char === '\\') {
-        index++;
-        continue;
-      }
-      if (char === quote) {
-        state = 'code';
-        quote = '';
-      }
-      continue;
-    }
-    if (char === '/' && next === '/') {
-      index++;
-      state = 'line-comment';
-      continue;
-    }
-    if (char === '/' && next === '*') {
-      index++;
-      state = 'block-comment';
-      continue;
-    }
-    if (char === '"' || char === "'" || char === '`') {
-      state = 'string';
-      quote = char;
-      continue;
-    }
-    if (char === '{') depth++;
-    if (char === '}') {
-      depth--;
-      if (depth === 0) return index;
-    }
-  }
-  return -1;
-}
-
 function readInlineActionValue(label, text, options = {}) {
   const value = readInlineValue(label, text);
   return value ? readActionValue(value, options) : undefined;

package/dist/action-for-in-block.js

@@ -0,0 +1,77 @@
+import { parseActionValue, readActionValue } from './action-expression.js';
+import { findActionMatchingBrace } from './action-source-blocks.js';
+
+export function readForInHeaderBlock(source, offset, endOffset, helpers = {}) {
+  const match = /^for\b([^{\n]*)\{/.exec(source.slice(offset, endOffset));
+  if (!match) return undefined;
+  const open = offset + match[0].length - 1;
+  const findBrace = helpers.findMatchingBrace ?? findActionMatchingBrace;
+  const close = findBrace(source, open);
+  if (close < 0 || close > endOffset) return undefined;
+  return {
+    start: offset,
+    header: match[1].trim(),
+    open,
+    close,
+    body: source.slice(open + 1, close),
+    end: close + 1
+  };
+}
+
+export function readActionForInHeader(header, index) {
+  const rawText = rawHeader(header, 'for');
+  const hasExplicitId = hasId(rawText);
+  const text = stripIds(rawText);
+  const shape = /^([A-Za-z_$][\w$-]*)\s+in\s+(.+)$/.exec(text);
+  const itemName = shape?.[1];
+  const collectionText = shape?.[2]?.trim();
+  const collection = collectionText ? readActionValue(collectionText) : undefined;
+  return cleanRecord({
+    id: idFrom(header, `action_body_for_${itemName ?? index}`),
+    name: itemName ?? `for_${index}`,
+    itemName,
+    collection,
+    collectionText,
+    hasExplicitId,
+    malformed: !shape
+  });
+}
+
+export function validateActionForInHeader(header) {
+  const details = readActionForInHeader(header, 0);
+  const stripped = stripIds(rawHeader(header, 'for'));
+  if (details.malformed && /^in\b/.test(stripped)) return { ok: false, reason: 'missing-action-for-item' };
+  if (details.malformed && !/\bin\b/.test(stripped)) return { ok: false, reason: 'missing-action-for-collection' };
+  if (details.malformed) return { ok: false, reason: 'malformed-action-for-header' };
+  if (!details.itemName) return { ok: false, reason: 'missing-action-for-item' };
+  if (!isActionBindingName(details.itemName) || details.itemName === 'in') return { ok: false, reason: 'unsupported-action-for-item' };
+  if (!details.hasExplicitId) return { ok: false, reason: 'missing-action-for-id' };
+  if (!details.collectionText) return { ok: false, reason: 'missing-action-for-collection' };
+  const parsed = parseActionValue(details.collectionText);
+  if (!parsed.ok) return { ok: false, reason: 'unsupported-action-for-collection' };
+  if (!details.collection) return { ok: false, reason: 'unsupported-action-for-collection' };
+  if (!isSupportedCollectionExpression(details.collection)) {
+    return { ok: false, reason: 'unsupported-action-for-collection' };
+  }
+  return { ok: true };
+}
+
+function isSupportedCollectionExpression(value) {
+  const ast = value?.expressionAst;
+  return ast?.kind === 'ref'
+    && (ast.scope === 'input' || ast.scope === 'state' || ast.scope === 'local')
+    && Array.isArray(ast.path)
+    && ast.path.length > 0;
+}
+
+function rawHeader(header, keyword) {
+  return String(header ?? '').replace(new RegExp('^' + keyword + '\\b'), '').replace(/\{\s*$/, '').trim();
+}
+
+function idFrom(header, fallback) { return /@id\(\s*["']([^"']+)["']\s*\)/.exec(header)?.[1] ?? fallback; }
+function hasId(header) { return /@id\(\s*["'][^"']+["']\s*\)/.test(header); }
+function stripIds(text) { return String(text ?? '').replace(/@id\(\s*["'][^"']+["']\s*\)/g, '').trim(); }
+function isActionBindingName(value) { return /^[A-Za-z_$][\w$-]*$/.test(String(value ?? '')); }
+function cleanRecord(record) {
+  return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined && (!Array.isArray(value) || value.length > 0)));
+}

package/dist/action-match-block.js

@@ -0,0 +1,128 @@
+import { readActionValue } from './action-expression.js';
+import { findActionMatchingBrace, skipActionWhitespaceAndComments } from './action-source-blocks.js';
+
+export function readMatchHeaderBlock(source, offset, endOffset, helpers = {}) {
+  const match = /^match\b([^{\n]*)\{/.exec(source.slice(offset, endOffset));
+  if (!match) return undefined;
+  const open = offset + match[0].length - 1;
+  const findBrace = helpers.findMatchingBrace ?? findActionMatchingBrace;
+  const close = findBrace(source, open);
+  if (close < 0 || close > endOffset) return undefined;
+  return {
+    start: offset,
+    header: match[1].trim(),
+    open,
+    close,
+    body: source.slice(open + 1, close),
+    end: close + 1
+  };
+}
+
+export function readMatchBranchBlock(source, offset, endOffset, helpers = {}) {
+  const start = (helpers.skipWhitespace ?? skipActionWhitespaceAndComments)(source, offset, endOffset);
+  const match = /^(case|default)\b([^{\n]*)\{/.exec(source.slice(start, endOffset));
+  if (!match) return undefined;
+  const open = start + match[0].length - 1;
+  const close = (helpers.findMatchingBrace ?? findActionMatchingBrace)(source, open);
+  if (close < 0 || close > endOffset) return undefined;
+  return {
+    kind: match[1],
+    start,
+    header: match[2].trim(),
+    open,
+    close,
+    body: source.slice(open + 1, close),
+    end: close + 1
+  };
+}
+
+export function readMatchBranchBlocks(source, startOffset, endOffset, helpers = {}) {
+  const branches = [];
+  let offset = startOffset;
+  while (offset < endOffset) {
+    const branch = readMatchBranchBlock(source, offset, endOffset, helpers);
+    if (branch) {
+      branches.push(branch);
+      offset = branch.end;
+      continue;
+    }
+    const lineEnd = source.indexOf('\n', offset);
+    offset = lineEnd < 0 || lineEnd > endOffset ? endOffset : lineEnd + 1;
+  }
+  return branches;
+}
+
+export function readActionMatchHeader(header, index) {
+  const text = cleanHeader(header, 'match');
+  const valueText = readInlineValue('value', text);
+  const valueType = readInlineType(text);
+  const comparisonType = readInlineComparisonType(text);
+  const callType = readInlineCallType(text);
+  const value = valueText ? readActionValue(valueText, { valueType, comparisonType, callType }) : undefined;
+  return cleanRecord({
+    id: idFrom(header, `action_body_match_${firstIdentifier(beforeLabel(text, 'value')) ?? index}`),
+    name: firstIdentifier(beforeLabel(text, 'value')) ?? `match_${index}`,
+    valueType,
+    comparisonType,
+    callType,
+    value,
+    valueText
+  });
+}
+
+export function readActionMatchCaseHeader(header, index) {
+  const text = cleanHeader(header, 'case');
+  const valueText = readInlineValue('value', text);
+  const value = valueText ? readActionValue(valueText) : undefined;
+  return cleanRecord({
+    id: idFrom(header, `action_body_case_${firstIdentifier(beforeLabel(text, 'value')) ?? index}`),
+    name: firstIdentifier(beforeLabel(text, 'value')) ?? `case_${index}`,
+    value,
+    valueText
+  });
+}
+
+export function readActionMatchDefaultHeader(header, index) {
+  const text = cleanHeader(header, 'default');
+  return {
+    id: idFrom(header, `action_body_default_${firstIdentifier(text) ?? index}`),
+    name: firstIdentifier(text) ?? `default_${index}`
+  };
+}
+
+export function validateActionMatchHeader(header) {
+  const details = readActionMatchHeader(header, 0);
+  return details.value ? { ok: true } : { ok: false, reason: 'missing-action-match-value' };
+}
+
+export function validateActionMatchBranchHeader(rowKind, header) {
+  if (rowKind === 'default') return { ok: true };
+  if (rowKind !== 'case') return { ok: false, reason: 'unsupported-action-match-branch' };
+  const details = readActionMatchCaseHeader(header, 0);
+  if (!details.value) return { ok: false, reason: 'missing-action-match-case-value' };
+  if (!Object.prototype.hasOwnProperty.call(details.value, 'value')) {
+    return { ok: false, reason: 'unsupported-action-match-case-value' };
+  }
+  return { ok: true };
+}
+
+function cleanHeader(header, keyword) {
+  return stripIds(String(header ?? '').replace(new RegExp('^' + keyword + '\\b'), '').replace(/\{\s*$/, '')).trim();
+}
+
+function beforeLabel(text, label) {
+  const index = text.search(new RegExp('(?:^|\\s)' + label + '\\s+'));
+  return index < 0 ? text : text.slice(0, index).trim();
+}
+
+function idFrom(header, fallback) { return /@id\(\s*["']([^"']+)["']\s*\)/.exec(header)?.[1] ?? fallback; }
+function readInlineType(text) { return readInlineWord('type', text) ?? readInlineWord('valueType', text); }
+function readInlineComparisonType(text) { return readInlineWord('compare', text) ?? readInlineWord('comparisonType', text) ?? readInlineWord('compareType', text); }
+function readInlineCallType(text) { return readInlineWord('call', text) ?? readInlineWord('callType', text); }
+function readInlineWord(label, text) { return new RegExp('(?:^|\\s)' + label + '\\s+([^\\s,]+)').exec(text)?.[1]?.trim(); }
+function readInlineValue(label, text) { return new RegExp('(?:^|\\s)' + label + '\\s+(.+?)(?=\\s+[A-Za-z_$][\\w$-]*\\s+|$)').exec(text)?.[1]?.trim(); }
+function stripIds(text) { return String(text ?? '').replace(/@id\(\s*["'][^"']+["']\s*\)/g, '').trim(); }
+function firstIdentifier(text) { return /^([A-Za-z_$][\w$-]*)\b/.exec(text)?.[1]; }
+function cleanRecord(record) {
+  return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined && (!Array.isArray(value) || value.length > 0)));
+}

package/dist/action-source-blocks.js

@@ -0,0 +1,87 @@
+export function readActionNestedBlocks(kind, source) {
+  const blocks = [];
+  const header = new RegExp('\\b' + escapeRegExp(kind) + '(?:\\s+([^{}\\n]+?))?\\s*\\{', 'g');
+  let match;
+  while ((match = header.exec(source))) {
+    const open = header.lastIndex - 1;
+    const close = findActionMatchingBrace(source, open);
+    if (close < 0) continue;
+    blocks.push({
+      header: (match[1] ?? '').trim(),
+      start: match.index,
+      bodyStart: open + 1,
+      bodyEnd: close,
+      end: close + 1
+    });
+    header.lastIndex = close + 1;
+  }
+  return blocks;
+}
+
+export function skipActionWhitespaceAndComments(source, offset, endOffset = source.length) {
+  let index = offset;
+  while (index < endOffset) {
+    while (index < endOffset && /\s/.test(source[index])) index++;
+    if (source[index] !== '#') return index;
+    const lineEnd = source.indexOf('\n', index);
+    index = lineEnd < 0 || lineEnd > endOffset ? endOffset : lineEnd + 1;
+  }
+  return index;
+}
+
+export function findActionMatchingBrace(source, open) {
+  let depth = 0;
+  let state = 'code';
+  let quote = '';
+  for (let index = open; index < source.length; index++) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (state === 'line-comment') {
+      if (char === '\n') state = 'code';
+      continue;
+    }
+    if (state === 'block-comment') {
+      if (char === '*' && next === '/') {
+        index++;
+        state = 'code';
+      }
+      continue;
+    }
+    if (state === 'string') {
+      if (char === '\\') {
+        index++;
+        continue;
+      }
+      if (char === quote) {
+        state = 'code';
+        quote = '';
+      }
+      continue;
+    }
+    if (char === '/' && next === '/') {
+      index++;
+      state = 'line-comment';
+      continue;
+    }
+    if (char === '/' && next === '*') {
+      index++;
+      state = 'block-comment';
+      continue;
+    }
+    if (char === '"' || char === "'" || char === '`') {
+      state = 'string';
+      quote = char;
+      continue;
+    }
+    if (char === '{') depth++;
+    if (char === '}') {
+      depth--;
+      if (depth === 0) return index;
+    }
+  }
+  return -1;
+}
+
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}

package/dist/action-syntax-children.js

@@ -1,12 +1,15 @@
 import { parseActionValue } from './action-expression.js';
 import { readElseHeaderBlock } from './action-else-block.js';
+import { readForInHeaderBlock, validateActionForInHeader } from './action-for-in-block.js';
+import { findActionMatchingBrace, readActionNestedBlocks, skipActionWhitespaceAndComments } from './action-source-blocks.js';
+import { readMatchBranchBlock, readMatchHeaderBlock, validateActionMatchBranchHeader, validateActionMatchHeader } from './action-match-block.js';
 
-const ACTION_BODY_ROWS = new Set(['set', 'insert', 'remove', 'merge', 'callEffect', 'return', 'if', 'let']);
+const ACTION_BODY_ROWS = new Set(['set', 'insert', 'remove', 'merge', 'callEffect', 'return', 'if', 'let', 'match', 'for']);
 
 export function readActionSyntaxChildren(source, block, options) {
   const body = source.slice(block.bodyStartOffset, block.bodyEndOffset);
-  const bodyBlocks = readNestedBodyBlocks('body', body);
-  const state = { rowIndex: 0 };
+  const bodyBlocks = readActionNestedBlocks('body', body);
+  const state = { rowIndex: 0, rowKinds: new Map() };
   const children = [];
   for (const bodyBlock of bodyBlocks) {
     const bodyStartOffset = block.bodyStartOffset + bodyBlock.bodyStart;
@@ -20,12 +23,28 @@ function readActionSyntaxRows(source, block, options, state, startOffset, endOff
   const children = [];
   let offset = startOffset;
   while (offset < endOffset) {
-    offset = skipWhitespaceAndLineComments(source, offset, endOffset);
+    offset = skipActionWhitespaceAndComments(source, offset, endOffset);
     if (offset >= endOffset) break;
+    const forBlock = readForInHeaderBlock(source, offset, endOffset);
+    if (forBlock) {
+      const child = actionSyntaxChild(source, block, options, { text: source.slice(offset, forBlock.open + 1).trim(), startOffset: offset, endOffset: forBlock.open + 1 }, state, parentActionBodyId);
+      children.push(child);
+      if (child.recognized) children.push(...readActionSyntaxRows(source, block, options, state, forBlock.open + 1, forBlock.close, child.id));
+      offset = forBlock.end;
+      continue;
+    }
+    const matchBlock = readMatchHeaderBlock(source, offset, endOffset);
+    if (matchBlock) {
+      const child = actionSyntaxChild(source, block, options, { text: source.slice(offset, matchBlock.open + 1).trim(), startOffset: offset, endOffset: matchBlock.open + 1 }, state, parentActionBodyId);
+      children.push(child);
+      if (child.recognized) children.push(...readActionSyntaxRows(source, block, options, state, matchBlock.open + 1, matchBlock.close, child.id));
+      offset = matchBlock.end;
+      continue;
+    }
     const ifHeader = /^if\b([^{\n]*)\{/.exec(source.slice(offset, endOffset));
     if (ifHeader) {
       const open = offset + ifHeader[0].length - 1;
-      const close = findMatchingBrace(source, open);
+      const close = findActionMatchingBrace(source, open);
       if (close < 0 || close > endOffset) break;
       const child = actionSyntaxChild(source, block, options, {
         text: source.slice(offset, open + 1).trim(),
@@ -34,7 +53,7 @@ function readActionSyntaxRows(source, block, options, state, startOffset, endOff
       }, state, parentActionBodyId);
       children.push(child);
       children.push(...readActionSyntaxRows(source, block, options, state, open + 1, close, child.id));
-      const elseBlock = readElseHeaderBlock(source, close + 1, endOffset, { skipWhitespace: skipWhitespaceAndLineComments, findMatchingBrace });
+      const elseBlock = readElseHeaderBlock(source, close + 1, endOffset, { skipWhitespace: skipActionWhitespaceAndComments, findMatchingBrace: findActionMatchingBrace });
       if (elseBlock) {
         let branch = elseBlock, parentId = child.id;
         while (branch) {
@@ -50,7 +69,19 @@ function readActionSyntaxRows(source, block, options, state, startOffset, endOff
       offset = close + 1;
       continue;
     }
-    const elseBlock = readElseHeaderBlock(source, offset, endOffset, { skipWhitespace: skipWhitespaceAndLineComments, findMatchingBrace });
+    const branchBlock = readMatchBranchBlock(source, offset, endOffset);
+    if (branchBlock) {
+      const parentKind = state.rowKinds.get(parentActionBodyId);
+      const validation = parentKind === 'match'
+        ? validateActionMatchBranchHeader(branchBlock.kind, source.slice(branchBlock.start, branchBlock.open + 1).trim())
+        : { ok: false, reason: 'unsupported-action-body-row' };
+      const child = actionSyntaxChild(source, block, options, { text: source.slice(branchBlock.start, branchBlock.open + 1).trim(), startOffset: branchBlock.start, endOffset: branchBlock.open + 1 }, state, parentActionBodyId, { recognized: validation.ok, reason: validation.reason });
+      children.push(child);
+      if (child.recognized) children.push(...readActionSyntaxRows(source, block, options, state, branchBlock.open + 1, branchBlock.close, child.id));
+      offset = branchBlock.end;
+      continue;
+    }
+    const elseBlock = readElseHeaderBlock(source, offset, endOffset, { skipWhitespace: skipActionWhitespaceAndComments, findMatchingBrace: findActionMatchingBrace });
     if (elseBlock) {
       children.push(actionSyntaxChild(source, block, options, {
         text: source.slice(elseBlock.start, elseBlock.open + 1).trim(),
@@ -84,7 +115,7 @@ function actionSyntaxChild(source, block, options, line, state, parentActionBody
   const rest = row?.[2]?.startsWith('@') ? ` ${row[2]}${row[3] ?? ''}` : (row?.[3] ?? '');
   const validation = validateActionRow(rowKind, row?.[2], rest, line.text);
   const recognized = overrides.recognized ?? (ACTION_BODY_ROWS.has(rowKind) && validation.ok);
-  return cleanRecord({
+  const child = cleanRecord({
     kind: recognized ? 'actionBodyRow' : 'actionUnknownRow',
     rowKind,
     normalizedRowKind: recognized ? rowKind : 'unknown',
@@ -102,8 +133,10 @@ function actionSyntaxChild(source, block, options, line, state, parentActionBody
     parentActionBodyId,
     sourceSpan: sourceSpan(source, block, line.startOffset, line.endOffset, options),
     recognized,
-    reason: recognized ? undefined : validation.reason
+    reason: recognized ? undefined : overrides.reason ?? validation.reason
   });
+  state.rowKinds?.set(child.id, child.rowKind);
+  return child;
 }
 
 function actionRowName(rowKind, rawName, rowIndex) {
@@ -116,6 +149,8 @@ function actionRowName(rowKind, rawName, rowIndex) {
 function validateActionRow(rowKind, rawName, rest, header) {
   if (!ACTION_BODY_ROWS.has(rowKind)) return { ok: false, reason: 'unsupported-action-body-row' };
   if (rowKind === 'if') return validateActionExpressionText(readIfCondition(header), { comparisonType: readInlineComparisonType(header), callType: readInlineCallType(header) });
+  if (rowKind === 'match') return validateActionMatchHeader(header);
+  if (rowKind === 'for') return validateActionForInHeader(header);
   if (rowKind === 'set' || rowKind === 'insert' || rowKind === 'merge') {
     if (!readInlineWord('path', rest)) return { ok: false, reason: 'missing-action-path' };
     return validateActionExpressionText(readInlineValue('value', rest), { valueType: readInlineType(rest), comparisonType: readInlineComparisonType(rest), callType: readInlineCallType(rest) });
@@ -210,90 +245,6 @@ function isActionExpressionAdmissionReason(reason) {
     || reason === 'missing-action-expression';
 }
 
-function readNestedBodyBlocks(kind, source) {
-  const blocks = [];
-  const header = new RegExp('\\b' + kind.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '(?:\\s+([^{}\\n]+?))?\\s*\\{', 'g');
-  let match;
-  while ((match = header.exec(source))) {
-    const open = header.lastIndex - 1;
-    const close = findMatchingBrace(source, open);
-    if (close < 0) continue;
-    blocks.push({
-      header: (match[1] ?? '').trim(),
-      start: match.index,
-      bodyStart: open + 1,
-      bodyEnd: close,
-      end: close + 1
-    });
-    header.lastIndex = close + 1;
-  }
-  return blocks;
-}
-
-function skipWhitespaceAndLineComments(source, offset, endOffset) {
-  let index = offset;
-  while (index < endOffset) {
-    while (index < endOffset && /\s/.test(source[index])) index++;
-    if (source[index] !== '#') return index;
-    const lineEnd = source.indexOf('\n', index);
-    index = lineEnd < 0 || lineEnd > endOffset ? endOffset : lineEnd + 1;
-  }
-  return index;
-}
-
-function findMatchingBrace(source, open) {
-  let depth = 0;
-  let state = 'code';
-  let quote = '';
-  for (let index = open; index < source.length; index++) {
-    const char = source[index];
-    const next = source[index + 1];
-    if (state === 'line-comment') {
-      if (char === '\n') state = 'code';
-      continue;
-    }
-    if (state === 'block-comment') {
-      if (char === '*' && next === '/') {
-        index++;
-        state = 'code';
-      }
-      continue;
-    }
-    if (state === 'string') {
-      if (char === '\\') {
-        index++;
-        continue;
-      }
-      if (char === quote) {
-        state = 'code';
-        quote = '';
-      }
-      continue;
-    }
-    if (char === '/' && next === '/') {
-      index++;
-      state = 'line-comment';
-      continue;
-    }
-    if (char === '/' && next === '*') {
-      index++;
-      state = 'block-comment';
-      continue;
-    }
-    if (char === '"' || char === "'" || char === '`') {
-      state = 'string';
-      quote = char;
-      continue;
-    }
-    if (char === '{') depth++;
-    if (char === '}') {
-      depth--;
-      if (depth === 0) return index;
-    }
-  }
-  return -1;
-}
-
 function sourcePosition(source, offset) {
   const lines = source.slice(0, offset).split('\n');
   return { line: lines.length, column: lines[lines.length - 1].length + 1, offset };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.51",
+  "version": "0.3.53",
   "description": "Parser for the first Frontier Lang .frontier syntax slice.",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,7 +22,7 @@
   ],
   "scripts": {
     "build": "node scripts/build.mjs",
-    "test": "npm run build && node test/smoke.mjs && node test/action-body-smoke.mjs && node test/action-return-smoke.mjs && node test/action-else-smoke.mjs && node test/action-call-smoke.mjs && node test/target-projection-aggregate-smoke.mjs && node test/conversion-constraint-fields-smoke.mjs && node test/conversion-evidence-smoke.mjs && node test/package-canvas-surface-smoke.mjs && node test/view-render-graph-smoke.mjs && node test/resource-graph-smoke.mjs && node test/interlingua-smoke.mjs && node test/dialect-registry-smoke.mjs",
+    "test": "npm run build && node test/smoke.mjs && node test/action-body-smoke.mjs && node test/action-return-smoke.mjs && node test/action-else-smoke.mjs && node test/action-match-smoke.mjs && node test/action-for-in-smoke.mjs && node test/action-call-smoke.mjs && node test/target-projection-aggregate-smoke.mjs && node test/conversion-constraint-fields-smoke.mjs && node test/conversion-evidence-smoke.mjs && node test/package-canvas-surface-smoke.mjs && node test/view-render-graph-smoke.mjs && node test/resource-graph-smoke.mjs && node test/interlingua-smoke.mjs && node test/dialect-registry-smoke.mjs",
     "typecheck": "node ./node_modules/typescript/bin/tsc --noEmit -p test/tsconfig.json",
     "fuzz": "npm run build && node fuzz/smoke.mjs",
     "bench": "npm run build && node bench/smoke.mjs",