@shapeshift-labs/frontier-lang-parser 0.3.48 → 0.3.49

package/dist/action-body.js

@@ -111,14 +111,36 @@ function parseActionBodyLine(line, index) {
     return compactRecord({ kind: 'let', id: idFrom(rest, `action_body_let_${name}`), name, valueType, comparisonType, callType, value });
   }
   if (rowKind === 'return') {
-    const valueText = stripIds(rawName?.startsWith('@') ? rest : `${rawName ?? ''}${rest ?? ''}`).trim();
-    const value = valueText ? readActionValue(valueText) : undefined;
-    if (valueText && !value) return undefined;
-    return compactRecord({ kind: 'return', id: idFrom(rest, `action_body_return_${index}`), value });
+    const details = readReturnDetails(rawName, rest);
+    const value = details.valueText ? readActionValue(details.valueText, details) : undefined;
+    if (details.valueText && !value) return undefined;
+    return compactRecord({
+      kind: 'return',
+      id: idFrom(rest, `action_body_return_${index}`),
+      valueType: details.valueType,
+      comparisonType: details.comparisonType,
+      callType: details.callType,
+      value
+    });
   }
   return undefined;
 }
 
+function readReturnDetails(rawName, rest) {
+  const text = stripIds(rawName?.startsWith('@') ? rest : `${rawName ?? ''}${rest ?? ''}`).trim();
+  const explicitValue = /\bvalue\s+/.test(text);
+  const valueType = readInlineType(text);
+  const comparisonType = readInlineComparisonType(text);
+  const callType = readInlineCallType(text);
+  const valueText = explicitValue ? readInlineValue('value', text) : text;
+  return {
+    valueText,
+    valueType,
+    comparisonType,
+    callType
+  };
+}
+
 function skipWhitespaceAndComments(source, offset) {
   let index = offset;
   while (index < source.length) {

package/dist/action-syntax-children.js

@@ -104,8 +104,12 @@ function validateActionRow(rowKind, rawName, rest, header) {
     return input ? validateActionExpressionText(input) : { ok: true };
   }
   if (rowKind === 'return') {
-    const value = readReturnValue(rawName, rest);
-    return value ? validateActionExpressionText(value) : { ok: true };
+    const details = readReturnDetails(rawName, rest);
+    if (!details.valueText) return { ok: true };
+    const parsed = parseActionValue(details.valueText, details);
+    if (parsed.ok) return { ok: true };
+    if (isActionExpressionAdmissionReason(parsed.reason)) return { ok: false, reason: parsed.reason };
+    return { ok: false, reason: 'unsupported-action-return-value' };
   }
   if (rowKind === 'let') {
     if (!rawName || rawName.startsWith('@') || !/^[A-Za-z_$][\w$-]*$/.test(rawName)) {
@@ -148,9 +152,15 @@ function readIfCondition(header) {
   return explicit ? explicit[1].trim() : text;
 }
 
-function readReturnValue(rawName, rest) {
-  if (rawName?.startsWith('@')) return stripIds(`${rawName}${rest ?? ''}`).trim();
-  return stripIds(`${rawName ?? ''}${rest ?? ''}`).trim();
+function readReturnDetails(rawName, rest) {
+  const text = stripIds(rawName?.startsWith('@') ? rest : `${rawName ?? ''}${rest ?? ''}`).trim();
+  const explicitValue = /\bvalue\s+/.test(text);
+  return {
+    valueText: explicitValue ? readInlineValue('value', text) : text,
+    valueType: readInlineType(text),
+    comparisonType: readInlineComparisonType(text),
+    callType: readInlineCallType(text)
+  };
 }
 
 function stripIds(text) {
@@ -162,6 +172,20 @@ function validateActionExpressionText(text, options = {}) {
   return parsed.ok ? { ok: true } : { ok: false, reason: parsed.reason };
 }
 
+function isActionExpressionAdmissionReason(reason) {
+  return reason === 'missing-action-expression-type'
+    || reason === 'unsupported-action-expression-type'
+    || reason === 'missing-action-comparison-type'
+    || reason === 'unsupported-action-comparison-type'
+    || reason === 'missing-action-call-type'
+    || reason === 'unsupported-action-call-type'
+    || reason === 'unsupported-action-call-callee'
+    || reason === 'unsupported-action-call-argument'
+    || reason === 'unsupported-action-expression-ref'
+    || reason === 'malformed-action-expression'
+    || reason === 'missing-action-expression';
+}
+
 function readNestedBodyBlocks(kind, source) {
   const blocks = [];
   const header = new RegExp('\\b' + kind.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '(?:\\s+([^{}\\n]+?))?\\s*\\{', 'g');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.48",
+  "version": "0.3.49",
   "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-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/action-body-smoke.mjs && node test/action-return-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",