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

package/dist/action-body.js

@@ -32,14 +32,12 @@ function parseActionBodyRecords(source, state) {
       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.close + 1 : close + 1;
+      offset = elseBlock ? elseBlock.end : 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;
+    const elseBlock = readElseHeaderBlock(source, offset, source.length, { skipWhitespace: skipWhitespaceAndComments, findMatchingBrace });
+    if (elseBlock) {
+      offset = elseBlock.end;
       continue;
     }
     const lineEnd = source.indexOf('\n', offset);
@@ -57,7 +55,7 @@ function parseActionBodyRecords(source, 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;
+  const elseDetails = parseActionElseBlock(elseBlock, state, index);
   return compactRecord({
     kind: 'if',
     id: details.id,
@@ -68,10 +66,20 @@ function parseActionIfBlock(header, body, index, state, elseBlock) {
     body: parseActionBodyRecords(body, state),
     elseId: elseDetails?.id,
     elseName: elseDetails?.name,
-    elseBody: elseBlock ? parseActionBodyRecords(elseBlock.body, state) : undefined
+    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);

package/dist/action-else-block.js

@@ -3,16 +3,27 @@ export function readElseHeaderBlock(source, offset, endOffset = source.length, h
   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;
-  return { header, start: elseOffset, open, close, body: source.slice(open + 1, close), supported: isSupportedElseHeader(header) };
+  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

@@ -36,14 +36,15 @@ function readActionSyntaxRows(source, block, options, state, startOffset, endOff
       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;
+        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;
@@ -56,7 +57,7 @@ function readActionSyntaxRows(source, block, options, state, startOffset, endOff
         startOffset: elseBlock.start,
         endOffset: elseBlock.open + 1
       }, state, parentActionBodyId));
-      offset = elseBlock.close + 1;
+      offset = elseBlock.end;
       continue;
     }
     const lineEnd = source.indexOf('\n', offset);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.50",
+  "version": "0.3.51",
   "description": "Parser for the first Frontier Lang .frontier syntax slice.",
   "type": "module",
   "main": "./dist/index.js",