@shapeshift-labs/frontier-lang-parser 0.3.59 → 0.3.60

package/dist/type-expressions.js

@@ -14,6 +14,8 @@ export function parseTypeExpression(value) {
   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] };
+  if (application.name === 'Record') return readRecordTypeExpression(application.body) ?? { kind: 'ref', name: application.name, args: parsedArgs };
+  if (application.name === 'Union') return readUnionTypeExpression(application.body) ?? { kind: 'ref', name: application.name, args: parsedArgs };
   return { kind: 'ref', name: application.name, args: parsedArgs };
 }
 
@@ -31,3 +33,54 @@ function readTypeApplication(text) {
   if (depth !== 0) return undefined;
   return { name: match[1], body: text.slice(match[1].length + 1, -1).trim() };
 }
+
+function readRecordTypeExpression(body) {
+  const fields = [];
+  for (const source of splitTopLevelCommaList(body)) {
+    const field = readInlineTypeField(source, 'record_field');
+    if (!field) return undefined;
+    fields.push(field);
+  }
+  return fields.length ? { kind: 'record', fields } : undefined;
+}
+
+function readUnionTypeExpression(body) {
+  const variants = [];
+  for (const source of splitTopLevelCommaList(body)) {
+    const variant = readInlineTypeVariant(source);
+    if (!variant) return undefined;
+    variants.push(variant);
+  }
+  return variants.length ? { kind: 'union', variants } : undefined;
+}
+
+function readInlineTypeVariant(source) {
+  const match = /^\s*([A-Za-z_$][\w$]*)(?:\s+@id\(\s*["']([^"']+)["']\s*\))?(?:\((.*)\))?\s*$/.exec(source);
+  if (!match) return undefined;
+  const payload = match[3]?.trim();
+  const fields = [];
+  if (payload) {
+    for (const fieldSource of splitTopLevelCommaList(payload)) {
+      const field = readInlineTypeField(fieldSource, `variant_field_${match[1]}`);
+      if (!field) return undefined;
+      fields.push(field);
+    }
+  }
+  return {
+    ...(match[2] ? { id: match[2] } : {}),
+    name: match[1],
+    ...(fields.length ? { fields } : {})
+  };
+}
+
+function readInlineTypeField(source, idPrefix) {
+  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] ?? `${idPrefix}_${match[1]}`,
+    name: match[1],
+    type: parseTypeExpression(match[5].trim()),
+    ...(optional ? { optional: true } : {})
+  };
+}

package/dist/type-variants.js

@@ -47,8 +47,8 @@ export function splitTopLevelCommaList(source) {
   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 === '<' || char === '(' || char === '[' || char === '{') depth++;
+    if (char === '>' || char === ')' || char === ']' || char === '}') depth = Math.max(0, depth - 1);
     if (char === ',' && depth === 0) {
       parts.push(source.slice(start, index).trim());
       start = index + 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.59",
+  "version": "0.3.60",
   "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/type-variant-payload-smoke.mjs && node test/type-generic-ref-smoke.mjs && node test/type-parameter-constraints-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/type-parameter-constraints-smoke.mjs && node test/type-structural-expression-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",
@@ -54,7 +54,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@shapeshift-labs/frontier-lang-kernel": "0.3.14"
+    "@shapeshift-labs/frontier-lang-kernel": "0.3.15"
   },
   "devDependencies": {
     "typescript": "^5.9.3"