@shapeshift-labs/frontier-lang-parser 0.3.48 → 0.3.50

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,18 @@ 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.close + 1 : close + 1;
+      continue;
+    }
+    const elseHeader = /^else\b([^{\n]*)\{/.exec(source.slice(offset));
+    if (elseHeader) {
+      const open = offset + elseHeader[0].length - 1;
+      const close = findMatchingBrace(source, open);
+      offset = close < 0 ? source.length : close + 1;
       continue;
     }
     const lineEnd = source.indexOf('\n', offset);
@@ -45,9 +54,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 = elseBlock ? parseActionElseHeader(elseBlock.header, index) : undefined;
   return compactRecord({
     kind: 'if',
     id: details.id,
@@ -55,7 +65,10 @@ 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: elseBlock ? parseActionBodyRecords(elseBlock.body, state) : undefined
   });
 }
 
@@ -76,6 +89,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;
@@ -111,14 +133,36 @@ function parseActionBodyLine(line, index) {
     return compactRecord({ kind: 'let', id: idFrom(rest, `action_body_let_${name}`), name, valueType, comparisonType, callType, value });
   }
   if (rowKind === 'return') {
-    const valueText = stripIds(rawName?.startsWith('@') ? rest : `${rawName ?? ''}${rest ?? ''}`).trim();
-    const value = valueText ? readActionValue(valueText) : undefined;
-    if (valueText && !value) return undefined;
-    return compactRecord({ kind: 'return', id: idFrom(rest, `action_body_return_${index}`), value });
+    const details = readReturnDetails(rawName, rest);
+    const value = details.valueText ? readActionValue(details.valueText, details) : undefined;
+    if (details.valueText && !value) return undefined;
+    return compactRecord({
+      kind: 'return',
+      id: idFrom(rest, `action_body_return_${index}`),
+      valueType: details.valueType,
+      comparisonType: details.comparisonType,
+      callType: details.callType,
+      value
+    });
   }
   return undefined;
 }
 
+function readReturnDetails(rawName, rest) {
+  const text = stripIds(rawName?.startsWith('@') ? rest : `${rawName ?? ''}${rest ?? ''}`).trim();
+  const explicitValue = /\bvalue\s+/.test(text);
+  const valueType = readInlineType(text);
+  const comparisonType = readInlineComparisonType(text);
+  const callType = readInlineCallType(text);
+  const valueText = explicitValue ? readInlineValue('value', text) : text;
+  return {
+    valueText,
+    valueType,
+    comparisonType,
+    callType
+  };
+}
+
 function skipWhitespaceAndComments(source, offset) {
   let index = offset;
   while (index < source.length) {

package/dist/action-else-block.js

@@ -0,0 +1,18 @@
+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 elseHeader = /^else\b([^{\n]*)\{/.exec(source.slice(elseOffset, endOffset));
+  if (!elseHeader) return undefined;
+  const header = elseHeader[1].trim();
+  const open = elseOffset + elseHeader[0].length - 1;
+  const close = findMatchingBrace(source, open);
+  if (close < 0 || close > endOffset) return undefined;
+  return { header, start: elseOffset, open, close, body: source.slice(open + 1, close), supported: isSupportedElseHeader(header) };
+}
+
+export function isSupportedElseHeader(header) {
+  const withoutId = String(header ?? '').replace(/@id\(\s*["'][^"']+["']\s*\)/g, '').trim();
+  return !withoutId || /^[A-Za-z_$][\w$-]*$/.test(withoutId);
+}

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,31 @@ 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) {
+        const elseChild = actionSyntaxChild(source, block, options, {
+          text: source.slice(elseBlock.start, elseBlock.open + 1).trim(),
+          startOffset: elseBlock.start,
+          endOffset: elseBlock.open + 1
+        }, state, child.id, { recognized: elseBlock.supported });
+        children.push(elseChild);
+        if (elseBlock.supported) children.push(...readActionSyntaxRows(source, block, options, state, elseBlock.open + 1, elseBlock.close, elseChild.id));
+        offset = elseBlock.close + 1;
+        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.close + 1;
+      continue;
+    }
     const lineEnd = source.indexOf('\n', offset);
     const rawEnd = lineEnd < 0 || lineEnd > endOffset ? endOffset : lineEnd;
     const rawLine = source.slice(offset, rawEnd);
@@ -52,14 +75,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,
@@ -104,8 +127,12 @@ function validateActionRow(rowKind, rawName, rest, header) {
     return input ? validateActionExpressionText(input) : { ok: true };
   }
   if (rowKind === 'return') {
-    const value = readReturnValue(rawName, rest);
-    return value ? validateActionExpressionText(value) : { ok: true };
+    const details = readReturnDetails(rawName, rest);
+    if (!details.valueText) return { ok: true };
+    const parsed = parseActionValue(details.valueText, details);
+    if (parsed.ok) return { ok: true };
+    if (isActionExpressionAdmissionReason(parsed.reason)) return { ok: false, reason: parsed.reason };
+    return { ok: false, reason: 'unsupported-action-return-value' };
   }
   if (rowKind === 'let') {
     if (!rawName || rawName.startsWith('@') || !/^[A-Za-z_$][\w$-]*$/.test(rawName)) {
@@ -148,9 +175,15 @@ function readIfCondition(header) {
   return explicit ? explicit[1].trim() : text;
 }
 
-function readReturnValue(rawName, rest) {
-  if (rawName?.startsWith('@')) return stripIds(`${rawName}${rest ?? ''}`).trim();
-  return stripIds(`${rawName ?? ''}${rest ?? ''}`).trim();
+function readReturnDetails(rawName, rest) {
+  const text = stripIds(rawName?.startsWith('@') ? rest : `${rawName ?? ''}${rest ?? ''}`).trim();
+  const explicitValue = /\bvalue\s+/.test(text);
+  return {
+    valueText: explicitValue ? readInlineValue('value', text) : text,
+    valueType: readInlineType(text),
+    comparisonType: readInlineComparisonType(text),
+    callType: readInlineCallType(text)
+  };
 }
 
 function stripIds(text) {
@@ -162,6 +195,20 @@ function validateActionExpressionText(text, options = {}) {
   return parsed.ok ? { ok: true } : { ok: false, reason: parsed.reason };
 }
 
+function isActionExpressionAdmissionReason(reason) {
+  return reason === 'missing-action-expression-type'
+    || reason === 'unsupported-action-expression-type'
+    || reason === 'missing-action-comparison-type'
+    || reason === 'unsupported-action-comparison-type'
+    || reason === 'missing-action-call-type'
+    || reason === 'unsupported-action-call-type'
+    || reason === 'unsupported-action-call-callee'
+    || reason === 'unsupported-action-call-argument'
+    || reason === 'unsupported-action-expression-ref'
+    || reason === 'malformed-action-expression'
+    || reason === 'missing-action-expression';
+}
+
 function readNestedBodyBlocks(kind, source) {
   const blocks = [];
   const header = new RegExp('\\b' + kind.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '(?:\\s+([^{}\\n]+?))?\\s*\\{', 'g');

package/package.json

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