@shapeshift-labs/frontier-lang-parser 0.3.35 → 0.3.36

package/dist/index.js

@@ -16,7 +16,7 @@ import { parseRuntimeCapabilityBlock } from './runtime-capability.js';
 import { parseNativeSourceBlock } from './source-evidence.js';
 import { parseTargetProjectionMetadata } from './target-projection.js';
 import { parseViewBlock } from './view.js';
-import { FrontierSourceBlockKinds } from './source-syntax-report.js';
+import { FrontierSourceBlockKinds, readFrontierSourceBlocks } from './source-syntax-report.js';
 export { FrontierSourceBlockKinds, inspectFrontierSourceSyntax } from './source-syntax-report.js';
 
 export function parseFrontierSource(source, options = {}) {
@@ -77,16 +77,7 @@ export function parseFrontierFile(name, source) { return parseFrontierSource(sou
 function readName(source) { return /module\s+([A-Za-z_$][\w$]*)/.exec(source)?.[1]; }
 function readId(source) { return /module\s+[A-Za-z_$][\w$]*\s+@id\(\s*["']([^"']+)["']\s*\)/.exec(source)?.[1]; }
 function readBlocks(source) {
-  const blocks = [];
-  const header = new RegExp('\\b(' + FrontierSourceBlockKinds.join('|') + ')\\s+([^{}]+)\\{', 'g');
-  let match;
-  while ((match = header.exec(source))) {
-    let depth = 1; let index = header.lastIndex;
-    while (index < source.length && depth > 0) { const ch = source[index++]; if (ch === '{') depth++; if (ch === '}') depth--; }
-    blocks.push({ kind: match[1], header: match[2].trim(), body: source.slice(header.lastIndex, index - 1) });
-    header.lastIndex = index;
-  }
-  return blocks;
+  return readFrontierSourceBlocks(source);
 }
 function idFrom(header, fallback) { return /@id\(\s*["']([^"']+)["']\s*\)/.exec(header)?.[1] ?? fallback; }
 function nameFrom(header) { return /^([A-Za-z_$][\w$]*)/.exec(header)?.[1] ?? 'Unnamed'; }

package/dist/source-syntax-report.js

@@ -102,6 +102,39 @@ export function inspectFrontierSourceSyntax(source, options = {}) {
   };
 }
 
+export function readFrontierSourceBlocks(source, options = {}) {
+  const report = inspectFrontierSourceSyntax(source, options);
+  return report.recognizedBlocks.filter((block) => !block.malformed).map((block) => ({
+    kind: block.kind,
+    header: block.header,
+    body: source.slice(block.bodyStartOffset, block.bodyEndOffset),
+    syntax: block
+  }));
+}
+
+export function readFrontierNestedBlocks(kind, source) {
+  const structure = scanFrontierStructure(source);
+  const blocks = [];
+  const header = new RegExp('\\b' + escapeRegExp(kind) + '\\s+([^{}]+?)\\{', 'g');
+  let match;
+  while ((match = header.exec(source))) {
+    const start = match.index;
+    const open = header.lastIndex - 1;
+    if (!structure.codeOffsets[start] || !structure.codeOffsets[open]) continue;
+    const close = findMatchingBrace(structure, open);
+    if (close < 0) continue;
+    blocks.push({
+      kind,
+      header: match[1].trim(),
+      body: source.slice(header.lastIndex, close),
+      start,
+      end: close + 1
+    });
+    header.lastIndex = close + 1;
+  }
+  return blocks;
+}
+
 function readCandidateDeclarationBlocks(source, structure) {
   const moduleRanges = readModuleRanges(source, structure);
   const blocks = [];
@@ -282,3 +315,4 @@ function readId(source) { return /module\s+[A-Za-z_$][\w$]*\s+@id\(\s*["']([^"']
 function idFrom(header) { return /@id\(\s*["']([^"']+)["']\s*\)/.exec(header)?.[1]; }
 function nameFrom(header) { return /^([A-Za-z_$][\w$]*)/.exec(header)?.[1] ?? 'Unnamed'; }
 function unique(values) { return [...new Set(values.filter(Boolean))]; }
+function escapeRegExp(value) { return String(value).replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); }

package/dist/view.js

@@ -1,4 +1,5 @@
 import { viewNode } from '@shapeshift-labs/frontier-lang-kernel';
+import { readFrontierNestedBlocks } from './source-syntax-report.js';
 
 export function parseViewBlock(block) {
   const name = nameFrom(block.header);
@@ -79,16 +80,7 @@ function readRenderEvents(body) {
 }
 
 function readNestedBlocks(kind, source) {
-  const blocks = [];
-  const header = new RegExp('\\b' + kind + '\\s+([^{}]+)\\{', 'g');
-  let match;
-  while ((match = header.exec(source))) {
-    let depth = 1; let index = header.lastIndex;
-    while (index < source.length && depth > 0) { const ch = source[index++]; if (ch === '{') depth++; if (ch === '}') depth--; }
-    blocks.push({ kind, header: match[1].trim(), body: source.slice(header.lastIndex, index - 1), start: match.index, end: index });
-    header.lastIndex = index;
-  }
-  return blocks;
+  return readFrontierNestedBlocks(kind, source);
 }
 
 function stripNestedBlocks(kind, source) {

package/package.json

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