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

package/dist/action-body.js

@@ -1,5 +1,6 @@
 import { readFrontierNestedBlocks } from './source-syntax-report.js';
 import { readActionValue } from './action-expression.js';
+import { readElseHeaderBlock } from './action-else-block.js';
 
 export function readActionBodyRecords(body) {
   const records = [];
@@ -27,10 +28,16 @@ function parseActionBodyRecords(source, state) {
       const open = offset + ifHeader[0].length - 1;
       const close = findMatchingBrace(source, open);
       if (close < 0) break;
+      const elseBlock = readElseHeaderBlock(source, close + 1, source.length, { skipWhitespace: skipWhitespaceAndComments, findMatchingBrace });
       const index = state.index++;
-      const record = parseActionIfBlock(ifHeader[1].trim(), source.slice(open + 1, close), index, state);
+      const record = parseActionIfBlock(ifHeader[1].trim(), source.slice(open + 1, close), index, state, elseBlock);
       if (record) records.push(record);
-      offset = close + 1;
+      offset = elseBlock ? elseBlock.end : close + 1;
+      continue;
+    }
+    const elseBlock = readElseHeaderBlock(source, offset, source.length, { skipWhitespace: skipWhitespaceAndComments, findMatchingBrace });
+    if (elseBlock) {
+      offset = elseBlock.end;
       continue;
     }
     const lineEnd = source.indexOf('\n', offset);
@@ -45,9 +52,10 @@ function parseActionBodyRecords(source, state) {
   return records;
 }
 
-function parseActionIfBlock(header, body, index, state) {
+function parseActionIfBlock(header, body, index, state, elseBlock) {
   const details = parseActionIfHeader(header, index);
   if (!details.condition) return undefined;
+  const elseDetails = parseActionElseBlock(elseBlock, state, index);
   return compactRecord({
     kind: 'if',
     id: details.id,
@@ -55,10 +63,23 @@ function parseActionIfBlock(header, body, index, state) {
     comparisonType: details.comparisonType,
     callType: details.callType,
     condition: details.condition,
-    body: parseActionBodyRecords(body, state)
+    body: parseActionBodyRecords(body, state),
+    elseId: elseDetails?.id,
+    elseName: elseDetails?.name,
+    elseBody: elseDetails?.body
   });
 }
 
+function parseActionElseBlock(elseBlock, state, index) {
+  if (!elseBlock) return undefined;
+  if (elseBlock.isElseIf) {
+    const nested = parseActionIfBlock(elseBlock.header, elseBlock.body, state.index++, state, elseBlock.tail);
+    return nested ? { id: nested.id, name: nested.name, body: [nested] } : undefined;
+  }
+  const details = parseActionElseHeader(elseBlock.header, index);
+  return { ...details, body: parseActionBodyRecords(elseBlock.body, state) };
+}
+
 function parseActionIfHeader(header, index) {
   const withoutId = header.replace(/@id\(\s*["'][^"']+["']\s*\)/g, '').trim();
   const explicitCondition = /\bcondition\s+(.+)$/.exec(withoutId);
@@ -76,6 +97,15 @@ function parseActionIfHeader(header, index) {
   };
 }
 
+function parseActionElseHeader(header, index) {
+  const withoutId = header.replace(/@id\(\s*["'][^"']+["']\s*\)/g, '').trim();
+  const name = firstIdentifier(withoutId) ?? `else_${index}`;
+  return {
+    id: idFrom(header, `action_body_else_${name}`),
+    name
+  };
+}
+
 function parseActionBodyLine(line, index) {
   const statement = /^([A-Za-z_$][\w$-]*)(?:\s+([A-Za-z_$@./:*+-][\w$./@:*+-]*))?(.*)$/.exec(line);
   if (!statement) return undefined;

package/dist/action-else-block.js

@@ -0,0 +1,29 @@
+export function readElseHeaderBlock(source, offset, endOffset = source.length, helpers = {}) {
+  const skipWhitespace = helpers.skipWhitespace;
+  const findMatchingBrace = helpers.findMatchingBrace;
+  if (typeof skipWhitespace !== 'function' || typeof findMatchingBrace !== 'function') return undefined;
+  const elseOffset = skipWhitespace(source, offset, endOffset);
+  const elseIfHeader = /^else\s+if\b([^{\n]*)\{/.exec(source.slice(elseOffset, endOffset));
+  if (elseIfHeader) return readBlock(source, elseOffset, elseIfHeader, endOffset, findMatchingBrace, true, helpers);
+  const elseHeader = /^else\b([^{\n]*)\{/.exec(source.slice(elseOffset, endOffset));
+  if (!elseHeader) return undefined;
+  return readBlock(source, elseOffset, elseHeader, endOffset, findMatchingBrace, false, helpers);
+}
+
+function readBlock(source, elseOffset, elseHeader, endOffset, findMatchingBrace, isElseIf, helpers) {
+  const header = elseHeader[1].trim();
+  const open = elseOffset + elseHeader[0].length - 1;
+  const close = findMatchingBrace(source, open);
+  if (close < 0 || close > endOffset) return undefined;
+  const tail = isElseIf ? readElseHeaderBlock(source, close + 1, endOffset, helpers) : undefined;
+  return { header, start: elseOffset, open, close, end: tail?.end ?? close + 1, body: source.slice(open + 1, close), isElseIf, tail, supported: isElseIf ? isSupportedElseIfHeader(header) : isSupportedElseHeader(header) };
+}
+
+export function isSupportedElseHeader(header) {
+  const withoutId = String(header ?? '').replace(/@id\(\s*["'][^"']+["']\s*\)/g, '').trim();
+  return !withoutId || /^[A-Za-z_$][\w$-]*$/.test(withoutId);
+}
+
+function isSupportedElseIfHeader(header) {
+  return String(header ?? '').replace(/@id\(\s*["'][^"']+["']\s*\)/g, '').trim().length > 0;
+}

package/dist/action-syntax-children.js

@@ -1,4 +1,5 @@
 import { parseActionValue } from './action-expression.js';
+import { readElseHeaderBlock } from './action-else-block.js';
 
 const ACTION_BODY_ROWS = new Set(['set', 'insert', 'remove', 'merge', 'callEffect', 'return', 'if', 'let']);
 
@@ -33,9 +34,32 @@ 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 });
+      if (elseBlock) {
+        let branch = elseBlock, parentId = child.id;
+        while (branch) {
+          const elseChild = actionSyntaxChild(source, block, options, { text: source.slice(branch.start, branch.open + 1).trim(), startOffset: branch.start, endOffset: branch.open + 1 }, state, parentId, { recognized: branch.supported });
+          children.push(elseChild);
+          if (branch.supported) children.push(...readActionSyntaxRows(source, block, options, state, branch.open + 1, branch.close, elseChild.id));
+          parentId = elseChild.id;
+          branch = branch.tail;
+        }
+        offset = elseBlock.end;
+        continue;
+      }
       offset = close + 1;
       continue;
     }
+    const elseBlock = readElseHeaderBlock(source, offset, endOffset, { skipWhitespace: skipWhitespaceAndLineComments, findMatchingBrace });
+    if (elseBlock) {
+      children.push(actionSyntaxChild(source, block, options, {
+        text: source.slice(elseBlock.start, elseBlock.open + 1).trim(),
+        startOffset: elseBlock.start,
+        endOffset: elseBlock.open + 1
+      }, state, parentActionBodyId));
+      offset = elseBlock.end;
+      continue;
+    }
     const lineEnd = source.indexOf('\n', offset);
     const rawEnd = lineEnd < 0 || lineEnd > endOffset ? endOffset : lineEnd;
     const rawLine = source.slice(offset, rawEnd);
@@ -52,14 +76,14 @@ function readActionSyntaxRows(source, block, options, state, startOffset, endOff
   return children;
 }
 
-function actionSyntaxChild(source, block, options, line, state, parentActionBodyId) {
+function actionSyntaxChild(source, block, options, line, state, parentActionBodyId, overrides = {}) {
   const rowIndex = state.rowIndex++;
   const row = /^([A-Za-z_$][\w$-]*)(?:\s+([A-Za-z_$@./:*+-][\w$./@:*+-]*))?(.*)$/.exec(line.text);
   const rowKind = row?.[1] ?? 'unknown';
   const name = actionRowName(rowKind, row?.[2], rowIndex);
   const rest = row?.[2]?.startsWith('@') ? ` ${row[2]}${row[3] ?? ''}` : (row?.[3] ?? '');
   const validation = validateActionRow(rowKind, row?.[2], rest, line.text);
-  const recognized = ACTION_BODY_ROWS.has(rowKind) && validation.ok;
+  const recognized = overrides.recognized ?? (ACTION_BODY_ROWS.has(rowKind) && validation.ok);
   return cleanRecord({
     kind: recognized ? 'actionBodyRow' : 'actionUnknownRow',
     rowKind,

package/package.json

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