@shapeshift-labs/frontier-lang-parser 0.3.56 → 0.3.58

package/dist/index.js

@@ -16,6 +16,8 @@ import { parseResourceGraphBlock } from './resource-graph.js';
 import { parseRuntimeCapabilityBlock } from './runtime-capability.js';
 import { parseNativeSourceBlock } from './source-evidence.js';
 import { parseTargetProjectionMetadata } from './target-projection.js';
+import { parseOptionalTypeExpression, parseTypeExpression } from './type-expressions.js';
+import { readVariantPayloadFields } from './type-variants.js';
 import { parseViewBlock } from './view.js';
 import { FrontierSourceBlockKinds, readFrontierSourceBlocks } from './source-syntax-report.js';
 export { FrontierSourceBlockKinds, inspectFrontierSourceSyntax } from './source-syntax-report.js';
@@ -166,15 +168,7 @@ function parseCapability(block) {
 function parseType(block) {
   const name = nameFrom(block.header);
   const alias = /^\s*=\s*([^\n]+)/m.exec(block.body)?.[1]?.trim();
-  return typeNode({
-    id: idFrom(block.header, `type_${name}`),
-    name,
-    parameters: readTypeParameters(block.header),
-    type: alias ? parseTypeExpression(alias) : undefined,
-    fields: readTypeFields(block.body),
-    variants: readVariants(block.body),
-    invariants: readList('invariants', block.body)
-  });
+  return typeNode({ id: idFrom(block.header, `type_${name}`), name, parameters: readTypeParameters(block.header), type: alias ? parseTypeExpression(alias) : undefined, fields: readTypeFields(block.body), variants: readVariants(block.body), invariants: readList('invariants', block.body) });
 }
 function parseExtern(block) {
   const name = nameFrom(block.header);
@@ -287,15 +281,6 @@ function parseSemantic(text) {
   if (latticeId) return { kind: 'lattice', latticeId };
   return undefined;
 }
-function parseOptionalTypeExpression(value) { return value ? parseTypeExpression(value.trim()) : undefined; }
-function parseTypeExpression(value) {
-  const text = value.trim();
-  if (/^Set<.+>$/.test(text)) return { kind: 'set', item: parseTypeExpression(text.slice(4, -1)) };
-  if (/^List<.+>$/.test(text)) return { kind: 'list', item: parseTypeExpression(text.slice(5, -1)) };
-  const map = /^Map<(.+),\s*(.+)>$/.exec(text);
-  if (map) return { kind: 'map', key: parseTypeExpression(map[1]), value: parseTypeExpression(map[2]) };
-  return text;
-}
 function readTypeParameters(header) {
   return /<([^>]+)>/.exec(header)?.[1]?.split(',').map((item) => item.trim()).filter(Boolean);
 }
@@ -310,8 +295,13 @@ function readTypeFields(body) {
 }
 function readVariants(body) {
   const variants = [];
-  const re = /^\s*variant\s+([A-Za-z_$][\w$]*)(?:\s+@id\(\s*["']([^"']+)["']\s*\))?/gm;
+  const re = /^\s*variant\s+([A-Za-z_$][\w$]*)(.*)$/gm;
   let match;
-  while ((match = re.exec(body))) variants.push({ id: match[2], name: match[1] });
+  while ((match = re.exec(body))) {
+    const fields = readVariantPayloadFields(match[2] ?? '', match[1], parseTypeExpression);
+    if (fields === null) continue;
+    const id = /@id\(\s*["']([^"']+)["']\s*\)/.exec(match[2] ?? '')?.[1];
+    variants.push({ ...(id ? { id } : {}), name: match[1], ...(fields?.length ? { fields } : {}) });
+  }
   return variants.length ? variants : undefined;
 }

package/dist/source-syntax-children.js

@@ -1,5 +1,6 @@
 import { readActionSyntaxChildren } from './action-syntax-children.js';
 import { ROW_SYNTAX_CONFIG } from './source-syntax-row-config.js';
+import { inspectVariantPayload } from './type-variants.js';
 
 const ROW_NAME_PATTERN = '([A-Za-z_$@./:*+-][\\w$./@:*+-]*)';
 
@@ -11,11 +12,47 @@ export function readSourceSyntaxChildren(source, block, options = {}) {
   if (block.kind === 'conversion' || block.kind === 'universalConversionPlan') {
     return readConversionSyntaxChildren(source, block, options);
   }
+  if (block.kind === 'type') {
+    return readTypeSyntaxChildren(source, block, options);
+  }
   const rowConfig = ROW_SYNTAX_CONFIG[block.kind];
   if (rowConfig) return readGenericRowSyntaxChildren(source, block, options, rowConfig);
   return [];
 }
 
+function readTypeSyntaxChildren(source, block, options) {
+  const children = [];
+  for (const line of readBodyLines(source, block)) {
+    if (!line.text || line.text.startsWith('#')) continue;
+    const variant = /^variant\s+([A-Za-z_$][\w$]*)(.*)$/.exec(line.text);
+    if (!variant) continue;
+    const [, name, rest] = variant;
+    const payload = inspectVariantPayload(rest ?? '');
+    children.push(cleanRecord({
+      kind: 'typeVariant',
+      rowKind: 'variant',
+      normalizedRowKind: 'variant',
+      name,
+      id: idFrom(rest, `type_variant_${safeId(name)}`),
+      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: payload.ok,
+      reason: payload.ok ? undefined : payload.reason,
+      fieldCount: payload.fieldCount,
+      fieldIds: payload.fieldIds
+    }));
+  }
+  return children;
+}
+
 function readConversionSyntaxChildren(source, block, options) {
   const children = [];
   for (const line of readBodyLines(source, block)) {

package/dist/type-expressions.js

@@ -0,0 +1,33 @@
+import { splitTopLevelCommaList } from './type-variants.js';
+
+export function parseOptionalTypeExpression(value) {
+  return value ? parseTypeExpression(value.trim()) : undefined;
+}
+
+export function parseTypeExpression(value) {
+  const text = value.trim();
+  const application = readTypeApplication(text);
+  if (!application) return text;
+  const args = splitTopLevelCommaList(application.body);
+  if (args.some((arg) => !arg)) return text;
+  const parsedArgs = args.map(parseTypeExpression);
+  if (application.name === 'Set' && parsedArgs.length === 1) return { kind: 'set', item: parsedArgs[0] };
+  if (application.name === 'List' && parsedArgs.length === 1) return { kind: 'list', item: parsedArgs[0] };
+  if (application.name === 'Map' && parsedArgs.length === 2) return { kind: 'map', key: parsedArgs[0], value: parsedArgs[1] };
+  return { kind: 'ref', name: application.name, args: parsedArgs };
+}
+
+function readTypeApplication(text) {
+  const match = /^([A-Za-z_$][\w$]*)</.exec(text);
+  if (!match || !text.endsWith('>')) return undefined;
+  let depth = 0;
+  for (let index = match[1].length; index < text.length; index++) {
+    const char = text[index];
+    if (char === '<') depth++;
+    if (char === '>') depth--;
+    if (depth < 0) return undefined;
+    if (depth === 0 && index !== text.length - 1) return undefined;
+  }
+  if (depth !== 0) return undefined;
+  return { name: match[1], body: text.slice(match[1].length + 1, -1).trim() };
+}

package/dist/type-variants.js

@@ -0,0 +1,63 @@
+export function readVariantPayloadFields(rest, variantName, parseTypeExpression) {
+  const withoutId = stripLeadingVariantId(rest);
+  if (!withoutId) return undefined;
+  const payload = /^\((.*)\)$/.exec(withoutId);
+  if (!payload || !payload[1].trim()) return null;
+  const fields = [];
+  for (const part of splitTopLevelCommaList(payload[1])) {
+    const field = parseVariantPayloadField(part, variantName, parseTypeExpression);
+    if (!field) return null;
+    fields.push(field);
+  }
+  return fields;
+}
+
+export function inspectVariantPayload(rest) {
+  const withoutId = stripLeadingVariantId(rest);
+  if (!withoutId) return { ok: true };
+  const payload = /^\((.*)\)$/.exec(withoutId);
+  if (!payload || !payload[1].trim()) return { ok: false, reason: 'malformed-type-variant-payload' };
+  const fieldIds = [];
+  const seen = new Set();
+  for (const fieldSource of splitTopLevelCommaList(payload[1])) {
+    const field = parseVariantPayloadField(fieldSource);
+    if (!field) return { ok: false, reason: 'malformed-type-variant-payload' };
+    if (seen.has(field.id)) return { ok: false, reason: 'duplicate-type-variant-field-id' };
+    seen.add(field.id);
+    fieldIds.push(field.id);
+  }
+  return { ok: true, fieldCount: fieldIds.length, fieldIds };
+}
+
+function parseVariantPayloadField(source, variantName, parseTypeExpression) {
+  const match = /^\s*([A-Za-z_$][\w$]*)(\?)?(?:\s+@id\(\s*["']([^"']+)["']\s*\))?(\?)?\s*:\s*(.+)\s*$/.exec(source);
+  if (!match || !match[5].trim()) return undefined;
+  const optional = Boolean(match[2] || match[4]);
+  return {
+    id: match[3] ?? (variantName ? `variant_field_${variantName}_${match[1]}` : match[1]),
+    name: match[1],
+    ...(parseTypeExpression ? { type: parseTypeExpression(match[5].trim()) } : {}),
+    ...(optional ? { optional: true } : {})
+  };
+}
+
+export function splitTopLevelCommaList(source) {
+  const parts = [];
+  let depth = 0;
+  let start = 0;
+  for (let index = 0; index < source.length; index++) {
+    const char = source[index];
+    if (char === '<') depth++;
+    if (char === '>') depth = Math.max(0, depth - 1);
+    if (char === ',' && depth === 0) {
+      parts.push(source.slice(start, index).trim());
+      start = index + 1;
+    }
+  }
+  parts.push(source.slice(start).trim());
+  return parts;
+}
+
+function stripLeadingVariantId(rest) {
+  return rest.replace(/^\s*@id\(\s*["'][^"']+["']\s*\)/, '').trim();
+}

package/dist/view.js

@@ -1,5 +1,6 @@
 import { viewNode } from '@shapeshift-labs/frontier-lang-kernel';
 import { readFrontierNestedBlocks } from './source-syntax-report.js';
+import { parseOptionalTypeExpression, parseTypeExpression } from './type-expressions.js';
 
 export function parseViewBlock(block) {
   const name = nameFrom(block.header);
@@ -30,7 +31,7 @@ function readViewEvents(body) {
   const events = [];
   const re = /^\s*event\s+([A-Za-z_$][\w$.-]*)(?:\s+@id\(\s*["']([^"']+)["']\s*\))?([^\n]*)$/gm;
   let match;
-  while ((match = re.exec(body))) events.push({ id: match[2] ?? `view_event_${match[1]}`, name: match[1], action: readInlineWord('action', match[3]), input: parseOptionalTypeExpression(readInlineWord('input', match[3])) });
+  while ((match = re.exec(body))) events.push({ id: match[2] ?? `view_event_${match[1]}`, name: match[1], action: readInlineWord('action', match[3]), input: parseOptionalTypeExpression(readInlineType('input', match[3])) });
   return events;
 }
 
@@ -95,15 +96,7 @@ function readList(label, body) { const line = new RegExp('^\\s*' + label + '\\s+
 function readLine(label, body) { return new RegExp('^\\s*' + label + '\\s+([^\\n]+)', 'm').exec(body)?.[1]?.trim(); }
 function readQuotedLine(label, body) { return new RegExp(`^\\s*${label}\\s+["']([^"']+)["']`, 'm').exec(body)?.[1]; }
 function readInlineWord(label, text = '') { return new RegExp('(?:^|\\s)' + label + '\\s+([^\\s,]+)').exec(text)?.[1]?.trim(); }
+function readInlineType(label, text = '') { return new RegExp('(?:^|\\s)' + label + '\\s+(.+)$').exec(text)?.[1]?.trim(); }
 function readRenderValue(value) { const quoted = /^["']([^"']+)["']$/.exec(value.trim()); return quoted ? { value: quoted[1] } : { expression: value.trim() }; }
 function compactRecord(record) { return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined)); }
 function uniqueStrings(values) { const result = []; for (const value of values) if (value && !result.includes(value)) result.push(value); return result.length ? result : undefined; }
-function parseOptionalTypeExpression(value) { return value ? parseTypeExpression(value.trim()) : undefined; }
-function parseTypeExpression(value) {
-  const text = value.trim();
-  if (/^Set<.+>$/.test(text)) return { kind: 'set', item: parseTypeExpression(text.slice(4, -1)) };
-  if (/^List<.+>$/.test(text)) return { kind: 'list', item: parseTypeExpression(text.slice(5, -1)) };
-  const map = /^Map<(.+),\s*(.+)>$/.exec(text);
-  if (map) return { kind: 'map', key: parseTypeExpression(map[1]), value: parseTypeExpression(map[2]) };
-  return text;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.56",
+  "version": "0.3.58",
   "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-structured-literals-smoke.mjs && node test/action-return-smoke.mjs && node test/action-else-smoke.mjs && node test/action-match-smoke.mjs && node test/action-for-in-smoke.mjs && node test/action-repeat-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/type-variant-payload-smoke.mjs && node test/type-generic-ref-smoke.mjs && node test/action-body-smoke.mjs && node test/action-structured-literals-smoke.mjs && node test/action-return-smoke.mjs && node test/action-else-smoke.mjs && node test/action-match-smoke.mjs && node test/action-for-in-smoke.mjs && node test/action-repeat-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",