@shapeshift-labs/frontier-lang-parser 0.3.41 → 0.3.42

package/dist/action-body.js

@@ -2,13 +2,9 @@ import { readFrontierNestedBlocks } from './source-syntax-report.js';
 
 export function readActionBodyRecords(body) {
   const records = [];
+  const state = { index: 0 };
   for (const bodyBlock of readFrontierNestedBlocks('body', body)) {
-    for (const rawLine of bodyBlock.body.split('\n')) {
-      const line = rawLine.trim();
-      if (!line || line.startsWith('#')) continue;
-      const record = parseActionBodyLine(line, records.length);
-      if (record) records.push(record);
-    }
+    records.push(...parseActionBodyRecords(bodyBlock.body, state));
   }
   return records;
 }
@@ -19,6 +15,58 @@ export function stripNestedBlocks(kind, source) {
   return text;
 }
 
+function parseActionBodyRecords(source, state) {
+  const records = [];
+  let offset = 0;
+  while (offset < source.length) {
+    offset = skipWhitespaceAndComments(source, offset);
+    if (offset >= source.length) break;
+    const ifHeader = /^if\b([^{\n]*)\{/.exec(source.slice(offset));
+    if (ifHeader) {
+      const open = offset + ifHeader[0].length - 1;
+      const close = findMatchingBrace(source, open);
+      if (close < 0) break;
+      const index = state.index++;
+      records.push(parseActionIfBlock(ifHeader[1].trim(), source.slice(open + 1, close), index, state));
+      offset = close + 1;
+      continue;
+    }
+    const lineEnd = source.indexOf('\n', offset);
+    const end = lineEnd < 0 ? source.length : lineEnd;
+    const line = source.slice(offset, end).trim();
+    if (line && line !== '}') {
+      const record = parseActionBodyLine(line, state.index++);
+      if (record) records.push(record);
+    }
+    offset = end + 1;
+  }
+  return records;
+}
+
+function parseActionIfBlock(header, body, index, state) {
+  const details = parseActionIfHeader(header, index);
+  return compactRecord({
+    kind: 'if',
+    id: details.id,
+    name: details.name,
+    condition: details.condition,
+    body: parseActionBodyRecords(body, state)
+  });
+}
+
+function parseActionIfHeader(header, index) {
+  const withoutId = header.replace(/@id\(\s*["'][^"']+["']\s*\)/g, '').trim();
+  const explicitCondition = /\bcondition\s+(.+)$/.exec(withoutId);
+  const nameText = explicitCondition ? withoutId.slice(0, explicitCondition.index).trim() : '';
+  const name = firstIdentifier(nameText) ?? `if_${index}`;
+  const conditionText = explicitCondition?.[1]?.trim() || withoutId;
+  return {
+    id: idFrom(header, `action_body_if_${name}`),
+    name,
+    condition: conditionText ? readActionValue(conditionText) : undefined
+  };
+}
+
 function parseActionBodyLine(line, index) {
   const statement = /^([A-Za-z_$][\w$-]*)(?:\s+([A-Za-z_$@./:*+-][\w$./@:*+-]*))?(.*)$/.exec(line);
   if (!statement) return undefined;
@@ -41,6 +89,70 @@ function parseActionBodyLine(line, index) {
   return undefined;
 }
 
+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) {
   const value = new RegExp('(?:^|\\s)' + label + '\\s+(.+?)(?=\\s+[A-Za-z_$][\\w$-]*\\s+|$)').exec(text)?.[1]?.trim();
   return value ? readActionValue(value) : undefined;
@@ -59,4 +171,5 @@ function readActionValue(value) {
 
 function idFrom(header, fallback) { return /@id\(\s*["']([^"']+)["']\s*\)/.exec(header)?.[1] ?? fallback; }
 function readInlineWord(label, text) { return new RegExp('(?:^|\\s)' + label + '\\s+([^\\s,]+)').exec(text)?.[1]?.trim(); }
+function firstIdentifier(text) { return /^([A-Za-z_$][\w$-]*)\b/.exec(text)?.[1]; }
 function compactRecord(record) { return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined && (!Array.isArray(value) || value.length > 0))); }

package/dist/action-syntax-children.js

@@ -0,0 +1,195 @@
+const ACTION_BODY_ROWS = new Set(['set', 'insert', 'remove', 'merge', 'callEffect', 'return', 'if']);
+
+export function readActionSyntaxChildren(source, block, options) {
+  const body = source.slice(block.bodyStartOffset, block.bodyEndOffset);
+  const bodyBlocks = readNestedBodyBlocks('body', body);
+  const state = { rowIndex: 0 };
+  const children = [];
+  for (const bodyBlock of bodyBlocks) {
+    const bodyStartOffset = block.bodyStartOffset + bodyBlock.bodyStart;
+    const bodyEndOffset = block.bodyStartOffset + bodyBlock.bodyEnd;
+    children.push(...readActionSyntaxRows(source, block, options, state, bodyStartOffset, bodyEndOffset));
+  }
+  return children;
+}
+
+function readActionSyntaxRows(source, block, options, state, startOffset, endOffset, parentActionBodyId) {
+  const children = [];
+  let offset = startOffset;
+  while (offset < endOffset) {
+    offset = skipWhitespaceAndLineComments(source, offset, endOffset);
+    if (offset >= endOffset) break;
+    const ifHeader = /^if\b([^{\n]*)\{/.exec(source.slice(offset, endOffset));
+    if (ifHeader) {
+      const open = offset + ifHeader[0].length - 1;
+      const close = findMatchingBrace(source, open);
+      if (close < 0 || close > endOffset) break;
+      const child = actionSyntaxChild(source, block, options, {
+        text: source.slice(offset, open + 1).trim(),
+        startOffset: offset,
+        endOffset: open + 1
+      }, state, parentActionBodyId);
+      children.push(child);
+      children.push(...readActionSyntaxRows(source, block, options, state, open + 1, close, child.id));
+      offset = close + 1;
+      continue;
+    }
+    const lineEnd = source.indexOf('\n', offset);
+    const rawEnd = lineEnd < 0 || lineEnd > endOffset ? endOffset : lineEnd;
+    const rawLine = source.slice(offset, rawEnd);
+    const leading = /^\s*/.exec(rawLine)?.[0].length ?? 0;
+    const trailing = /\s*$/.exec(rawLine)?.[0].length ?? 0;
+    const line = {
+      text: rawLine.trim(),
+      startOffset: offset + leading,
+      endOffset: Math.max(offset + leading, rawEnd - trailing)
+    };
+    if (line.text && line.text !== '}') children.push(actionSyntaxChild(source, block, options, line, state, parentActionBodyId));
+    offset = rawEnd + 1;
+  }
+  return children;
+}
+
+function actionSyntaxChild(source, block, options, line, state, parentActionBodyId) {
+  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 recognized = ACTION_BODY_ROWS.has(rowKind);
+  return cleanRecord({
+    kind: recognized ? 'actionBodyRow' : 'actionUnknownRow',
+    rowKind,
+    normalizedRowKind: recognized ? rowKind : 'unknown',
+    name,
+    id: idFrom(rest, `action_body_${safeId(rowKind)}_${safeId(name)}_${rowIndex}`),
+    header: line.text,
+    startOffset: line.startOffset,
+    endOffset: line.endOffset,
+    location: sourcePosition(source, line.startOffset),
+    parentKind: block.kind,
+    parentId: block.id,
+    parentName: block.name,
+    moduleId: block.moduleId,
+    moduleName: block.moduleName,
+    parentActionBodyId,
+    sourceSpan: sourceSpan(source, block, line.startOffset, line.endOffset, options),
+    recognized,
+    reason: recognized ? undefined : 'unsupported-action-body-row'
+  });
+}
+
+function actionRowName(rowKind, rawName, rowIndex) {
+  if (rowKind === 'if') {
+    return rawName && !rawName.startsWith('@') && /^[A-Za-z_$][\w$-]*$/.test(rawName) ? rawName : `${rowKind}_${rowIndex}`;
+  }
+  return rawName && !rawName.startsWith('@') ? rawName : `${rowKind}_${rowIndex}`;
+}
+
+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 };
+}
+
+function sourceSpan(source, block, startOffset, endOffset, options = {}) {
+  return cleanRecord({
+    sourceId: options.documentId,
+    path: options.sourcePath,
+    blockId: block.id,
+    blockKind: block.kind,
+    startOffset,
+    endOffset,
+    start: sourcePosition(source, startOffset),
+    end: sourcePosition(source, endOffset)
+  });
+}
+
+function idFrom(header, fallback) { return /@id\(\s*["']([^"']+)["']\s*\)/.exec(header)?.[1] ?? fallback; }
+function safeId(value) { return String(value).replace(/[^A-Za-z0-9_$-]+/g, '_').replace(/^_+|_+$/g, '') || 'row'; }
+function cleanRecord(record) {
+  return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined && (!Array.isArray(value) || value.length > 0)));
+}

package/dist/source-syntax-children.js

@@ -1,3 +1,4 @@
+import { readActionSyntaxChildren } from './action-syntax-children.js';
 import { ROW_SYNTAX_CONFIG } from './source-syntax-row-config.js';
 
 const ROW_NAME_PATTERN = '([A-Za-z_$@./:*+-][\\w$./@:*+-]*)';
@@ -15,48 +16,6 @@ export function readSourceSyntaxChildren(source, block, options = {}) {
   return [];
 }
 
-const ACTION_BODY_ROWS = new Set(['set', 'insert', 'remove', 'merge', 'callEffect', 'return']);
-
-function readActionSyntaxChildren(source, block, options) {
-  const children = [];
-  const body = source.slice(block.bodyStartOffset, block.bodyEndOffset);
-  const bodyBlocks = readNestedBodyBlocks('body', body);
-  let rowIndex = 0;
-  for (const bodyBlock of bodyBlocks) {
-    const bodyStartOffset = block.bodyStartOffset + bodyBlock.bodyStart;
-    const bodyEndOffset = block.bodyStartOffset + bodyBlock.bodyEnd;
-    for (const line of readTextLines(source, bodyStartOffset, bodyEndOffset)) {
-      if (!line.text || line.text.startsWith('#')) continue;
-      const row = /^([A-Za-z_$][\w$-]*)(?:\s+([A-Za-z_$@./:*+-][\w$./@:*+-]*))?(.*)$/.exec(line.text);
-      const rowKind = row?.[1] ?? 'unknown';
-      const name = row?.[2] && !row[2].startsWith('@') ? row[2] : `${rowKind}_${rowIndex}`;
-      const rest = row?.[2]?.startsWith('@') ? ` ${row[2]}${row[3] ?? ''}` : (row?.[3] ?? '');
-      const recognized = ACTION_BODY_ROWS.has(rowKind);
-      children.push(cleanRecord({
-        kind: recognized ? 'actionBodyRow' : 'actionUnknownRow',
-        rowKind,
-        normalizedRowKind: recognized ? rowKind : 'unknown',
-        name,
-        id: idFrom(rest, `action_body_${safeId(rowKind)}_${safeId(name)}_${rowIndex}`),
-        header: line.text,
-        startOffset: line.startOffset,
-        endOffset: line.endOffset,
-        location: sourcePosition(source, line.startOffset),
-        parentKind: block.kind,
-        parentId: block.id,
-        parentName: block.name,
-        moduleId: block.moduleId,
-        moduleName: block.moduleName,
-        sourceSpan: sourceSpan(source, block, line.startOffset, line.endOffset, options),
-        recognized,
-        reason: recognized ? undefined : 'unsupported-action-body-row'
-      }));
-      rowIndex++;
-    }
-  }
-  return children;
-}
-
 function readConversionSyntaxChildren(source, block, options) {
   const children = [];
   for (const line of readBodyLines(source, block)) {
@@ -196,79 +155,6 @@ function readTextLines(source, startOffset, endOffset) {
   return records;
 }
 
-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 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 === "'") {
-      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.41",
+  "version": "0.3.42",
   "description": "Parser for the first Frontier Lang .frontier syntax slice.",
   "type": "module",
   "main": "./dist/index.js",