@shapeshift-labs/frontier-lang-parser 0.3.52 → 0.3.54

package/dist/action-body.js

@@ -1,6 +1,8 @@
 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 { readActionRepeatHeader, readRepeatHeaderBlock, validateActionRepeatHeader } from './action-repeat-block.js';
 import { findActionMatchingBrace, skipActionWhitespaceAndComments } from './action-source-blocks.js';
 import {
   readActionMatchCaseHeader,
@@ -33,6 +35,20 @@ function parseActionBodyRecords(source, state) {
   while (offset < source.length) {
     offset = skipActionWhitespaceAndComments(source, offset);
     if (offset >= source.length) break;
+    const repeatBlock = readRepeatHeaderBlock(source, offset, source.length);
+    if (repeatBlock) {
+      const record = parseActionRepeatBlock(repeatBlock.header, repeatBlock.body, state.index++, state);
+      if (record) records.push(record);
+      offset = repeatBlock.end;
+      continue;
+    }
+    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);
@@ -70,6 +86,34 @@ function parseActionBodyRecords(source, state) {
   return records;
 }
 
+function parseActionRepeatBlock(header, body, index, state) {
+  const validation = validateActionRepeatHeader(header);
+  if (!validation.ok) return undefined;
+  const details = readActionRepeatHeader(header, index);
+  return compactRecord({
+    kind: 'repeat',
+    id: details.id,
+    name: details.name,
+    indexName: details.indexName,
+    count: details.count,
+    body: parseActionBodyRecords(body, state)
+  });
+}
+
+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;

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-repeat-block.js

@@ -0,0 +1,78 @@
+import { parseActionValue, readActionValue } from './action-expression.js';
+import { findActionMatchingBrace } from './action-source-blocks.js';
+
+export function readRepeatHeaderBlock(source, offset, endOffset, helpers = {}) {
+  const match = /^repeat\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 readActionRepeatHeader(header, index) {
+  const rawText = rawHeader(header, 'repeat');
+  const hasExplicitId = hasId(rawText);
+  const text = stripIds(rawText);
+  const shape = /^([A-Za-z_$][\w$-]*)\s+times\s+(.+)$/.exec(text);
+  const indexName = shape?.[1];
+  const countText = shape?.[2]?.trim();
+  const count = countText ? readActionValue(countText) : undefined;
+  return cleanRecord({
+    id: idFrom(header, `action_body_repeat_${indexName ?? index}`),
+    name: indexName ?? `repeat_${index}`,
+    indexName,
+    count,
+    countText,
+    hasExplicitId,
+    malformed: !shape
+  });
+}
+
+export function validateActionRepeatHeader(header) {
+  const details = readActionRepeatHeader(header, 0);
+  const stripped = stripIds(rawHeader(header, 'repeat'));
+  if (details.malformed && /^times\b/.test(stripped)) return { ok: false, reason: 'missing-action-repeat-index' };
+  if (details.malformed && !/\btimes\b/.test(stripped)) return { ok: false, reason: 'missing-action-repeat-count' };
+  if (details.malformed) return { ok: false, reason: 'malformed-action-repeat-header' };
+  if (!details.indexName) return { ok: false, reason: 'missing-action-repeat-index' };
+  if (!isActionBindingName(details.indexName) || details.indexName === 'times') return { ok: false, reason: 'unsupported-action-repeat-index' };
+  if (!details.hasExplicitId) return { ok: false, reason: 'missing-action-repeat-id' };
+  if (!details.countText) return { ok: false, reason: 'missing-action-repeat-count' };
+  const parsed = parseActionValue(details.countText);
+  if (!parsed.ok) return { ok: false, reason: 'unsupported-action-repeat-count' };
+  if (!details.count) return { ok: false, reason: 'unsupported-action-repeat-count' };
+  if (!isSupportedCountExpression(details.count)) return { ok: false, reason: 'unsupported-action-repeat-count' };
+  return { ok: true };
+}
+
+function isSupportedCountExpression(value) {
+  if (Object.hasOwn(value ?? {}, 'value')) {
+    return typeof value.value === 'number' && Number.isFinite(value.value) && value.value >= 0;
+  }
+  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-syntax-children.js

@@ -1,9 +1,11 @@
 import { parseActionValue } from './action-expression.js';
 import { readElseHeaderBlock } from './action-else-block.js';
+import { readForInHeaderBlock, validateActionForInHeader } from './action-for-in-block.js';
+import { readRepeatHeaderBlock, validateActionRepeatHeader } from './action-repeat-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', 'match']);
+const ACTION_BODY_ROWS = new Set(['set', 'insert', 'remove', 'merge', 'callEffect', 'return', 'if', 'let', 'match', 'for', 'repeat']);
 
 export function readActionSyntaxChildren(source, block, options) {
   const body = source.slice(block.bodyStartOffset, block.bodyEndOffset);
@@ -24,6 +26,22 @@ function readActionSyntaxRows(source, block, options, state, startOffset, endOff
   while (offset < endOffset) {
     offset = skipActionWhitespaceAndComments(source, offset, endOffset);
     if (offset >= endOffset) break;
+    const repeatBlock = readRepeatHeaderBlock(source, offset, endOffset);
+    if (repeatBlock) {
+      const child = actionSyntaxChild(source, block, options, { text: source.slice(offset, repeatBlock.open + 1).trim(), startOffset: offset, endOffset: repeatBlock.open + 1 }, state, parentActionBodyId);
+      children.push(child);
+      if (child.recognized) children.push(...readActionSyntaxRows(source, block, options, state, repeatBlock.open + 1, repeatBlock.close, child.id));
+      offset = repeatBlock.end;
+      continue;
+    }
+    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);
@@ -141,6 +159,8 @@ 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 === 'repeat') return validateActionRepeatHeader(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) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.52",
+  "version": "0.3.54",
   "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-match-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-repeat-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",