@shapeshift-labs/frontier-lang-parser 0.3.46 → 0.3.47

package/dist/action-body.js

@@ -52,6 +52,7 @@ function parseActionIfBlock(header, body, index, state) {
     kind: 'if',
     id: details.id,
     name: details.name,
+    comparisonType: details.comparisonType,
     condition: details.condition,
     body: parseActionBodyRecords(body, state)
   });
@@ -63,10 +64,12 @@ function parseActionIfHeader(header, index) {
   const nameText = explicitCondition ? withoutId.slice(0, explicitCondition.index).trim() : '';
   const name = firstIdentifier(nameText) ?? `if_${index}`;
   const conditionText = explicitCondition?.[1]?.trim() || withoutId;
+  const comparisonType = readInlineComparisonType(header);
   return {
     id: idFrom(header, `action_body_if_${name}`),
     name,
-    condition: conditionText ? readActionValue(conditionText) : undefined
+    comparisonType,
+    condition: conditionText ? readActionValue(conditionText, { comparisonType }) : undefined
   };
 }
 
@@ -79,9 +82,10 @@ function parseActionBodyLine(line, index) {
   if (rowKind === 'set' || rowKind === 'insert' || rowKind === 'merge') {
     const path = readInlineWord('path', rest);
     const valueType = readInlineType(rest);
-    const value = readInlineActionValue('value', rest, { valueType });
+    const comparisonType = readInlineComparisonType(rest);
+    const value = readInlineActionValue('value', rest, { valueType, comparisonType });
     if (!path || !value) return undefined;
-    return compactRecord({ kind: 'patch', op: rowKind, id: idFrom(rest, `action_body_${rowKind}_${name}`), name, path, valueType, value });
+    return compactRecord({ kind: 'patch', op: rowKind, id: idFrom(rest, `action_body_${rowKind}_${name}`), name, path, valueType, comparisonType, value });
   }
   if (rowKind === 'remove') {
     const path = readInlineWord('path', rest);
@@ -96,9 +100,10 @@ function parseActionBodyLine(line, index) {
   }
   if (rowKind === 'let') {
     const valueType = readInlineType(rest);
-    const value = readInlineActionBindingValue('value', rest, { valueType });
+    const comparisonType = readInlineComparisonType(rest);
+    const value = readInlineActionBindingValue('value', rest, { valueType, comparisonType });
     if (!rawName || rawName.startsWith('@') || !isActionBindingName(name) || !value) return undefined;
-    return compactRecord({ kind: 'let', id: idFrom(rest, `action_body_let_${name}`), name, valueType, value });
+    return compactRecord({ kind: 'let', id: idFrom(rest, `action_body_let_${name}`), name, valueType, comparisonType, value });
   }
   if (rowKind === 'return') {
     const valueText = stripIds(rawName?.startsWith('@') ? rest : `${rawName ?? ''}${rest ?? ''}`).trim();
@@ -189,6 +194,7 @@ function isActionBindingName(value) {
 
 function idFrom(header, fallback) { return /@id\(\s*["']([^"']+)["']\s*\)/.exec(header)?.[1] ?? fallback; }
 function readInlineType(text) { return readInlineWord('type', text) ?? readInlineWord('valueType', text); }
+function readInlineComparisonType(text) { return readInlineWord('compare', text) ?? readInlineWord('comparisonType', text) ?? readInlineWord('compareType', text); }
 function readInlineWord(label, text) { return new RegExp('(?:^|\\s)' + label + '\\s+([^\\s,]+)').exec(text)?.[1]?.trim(); }
 function readInlineValue(label, text) { return new RegExp('(?:^|\\s)' + label + '\\s+(.+?)(?=\\s+[A-Za-z_$][\\w$-]*\\s+|$)').exec(text)?.[1]?.trim(); }
 function stripIds(text) { return String(text ?? '').replace(/@id\(\s*["'][^"']+["']\s*\)/g, '').trim(); }

package/dist/action-expression-semantics.js

@@ -0,0 +1,31 @@
+export const NUMERIC_OPERATORS = new Set(['+', '-', '*', '/', '%']);
+
+const ORDERED_COMPARISON_OPERATORS = new Set(['>', '>=', '<', '<=']);
+const NUMERIC_TYPES = new Set(['number', 'numeric', 'int', 'integer', 'float', 'double', 'decimal']);
+
+export function hasNumericOperator(node) {
+  if (!node || typeof node !== 'object') return false;
+  if (node.kind === 'binary') return NUMERIC_OPERATORS.has(node.op) || hasNumericOperator(node.left) || hasNumericOperator(node.right);
+  if (node.kind === 'logical') return hasNumericOperator(node.left) || hasNumericOperator(node.right);
+  if (node.kind === 'unary') return hasNumericOperator(node.argument);
+  return false;
+}
+
+export function hasNonLiteralOrderedComparison(node) {
+  if (!node || typeof node !== 'object') return false;
+  if (node.kind === 'binary') {
+    const current = ORDERED_COMPARISON_OPERATORS.has(node.op) && !isLiteralNumericComparison(node);
+    return current || hasNonLiteralOrderedComparison(node.left) || hasNonLiteralOrderedComparison(node.right);
+  }
+  if (node.kind === 'logical') return hasNonLiteralOrderedComparison(node.left) || hasNonLiteralOrderedComparison(node.right);
+  if (node.kind === 'unary') return hasNonLiteralOrderedComparison(node.argument);
+  return false;
+}
+
+export function isNumericType(value) {
+  return NUMERIC_TYPES.has(String(value ?? '').trim().toLowerCase());
+}
+
+function isLiteralNumericComparison(node) {
+  return node.left?.kind === 'literal' && typeof node.left.value === 'number' && node.right?.kind === 'literal' && typeof node.right.value === 'number';
+}

package/dist/action-expression.js

@@ -1,7 +1,7 @@
+import { NUMERIC_OPERATORS, hasNonLiteralOrderedComparison, hasNumericOperator, isNumericType } from './action-expression-semantics.js';
+
 const IDENTIFIER = /^[A-Za-z_$][\w$-]*$/;
 const BLOCKED_REF_ROOTS = new Set(['globalThis', 'process', 'window', 'document', 'constructor', 'prototype', '__proto__', 'env']);
-const NUMERIC_OPERATORS = new Set(['+', '-', '*', '/', '%']);
-const NUMERIC_TYPES = new Set(['number', 'numeric', 'int', 'integer', 'float', 'double', 'decimal']);
 
 export function readActionValue(value, options = {}) {
   const parsed = parseActionValue(value, options);
@@ -16,9 +16,13 @@ export function parseActionValue(value, options = {}) {
   if (hasNumericOperator(expression.ast) && !isNumericType(options.valueType ?? options.type)) {
     return fail((options.valueType ?? options.type) ? 'unsupported-action-expression-type' : 'missing-action-expression-type');
   }
+  if (hasNonLiteralOrderedComparison(expression.ast) && !isNumericType(options.comparisonType ?? options.compareType)) {
+    return fail((options.comparisonType ?? options.compareType) ? 'unsupported-action-comparison-type' : 'missing-action-comparison-type');
+  }
   const valueType = options.valueType ?? options.type;
-  if (expression.literal) return { ok: true, value: compactRecord({ value: expression.ast.value, valueType }) };
-  return { ok: true, value: compactRecord({ expression: text, expressionAst: expression.ast, valueType }) };
+  const comparisonType = options.comparisonType ?? options.compareType;
+  if (expression.literal) return { ok: true, value: compactRecord({ value: expression.ast.value, valueType, comparisonType }) };
+  return { ok: true, value: compactRecord({ expression: text, expressionAst: expression.ast, valueType, comparisonType }) };
 }
 
 export function parseActionExpression(value, options = {}) {
@@ -288,18 +292,6 @@ function canStartSignedNumber(tokens) {
   return previous.type === 'punctuation' && previous.text === '(';
 }
 
-function hasNumericOperator(node) {
-  if (!node || typeof node !== 'object') return false;
-  if (node.kind === 'binary') return NUMERIC_OPERATORS.has(node.op) || hasNumericOperator(node.left) || hasNumericOperator(node.right);
-  if (node.kind === 'logical') return hasNumericOperator(node.left) || hasNumericOperator(node.right);
-  if (node.kind === 'unary') return hasNumericOperator(node.argument);
-  return false;
-}
-
-function isNumericType(value) {
-  return NUMERIC_TYPES.has(String(value ?? '').trim().toLowerCase());
-}
-
 function refNode(parts) {
   const [root, ...rest] = parts;
   const scope = root === 'input' || root === 'state' || root === 'patches' ? root : 'local';

package/dist/action-syntax-children.js

@@ -91,10 +91,10 @@ function actionRowName(rowKind, rawName, rowIndex) {
 
 function validateActionRow(rowKind, rawName, rest, header) {
   if (!ACTION_BODY_ROWS.has(rowKind)) return { ok: false, reason: 'unsupported-action-body-row' };
-  if (rowKind === 'if') return validateActionExpressionText(readIfCondition(header));
+  if (rowKind === 'if') return validateActionExpressionText(readIfCondition(header), { comparisonType: readInlineComparisonType(header) });
   if (rowKind === 'set' || rowKind === 'insert' || rowKind === 'merge') {
     if (!readInlineWord('path', rest)) return { ok: false, reason: 'missing-action-path' };
-    return validateActionExpressionText(readInlineValue('value', rest), { valueType: readInlineType(rest) });
+    return validateActionExpressionText(readInlineValue('value', rest), { valueType: readInlineType(rest), comparisonType: readInlineComparisonType(rest) });
   }
   if (rowKind === 'remove') {
     return readInlineWord('path', rest) ? { ok: true } : { ok: false, reason: 'missing-action-path' };
@@ -112,9 +112,9 @@ function validateActionRow(rowKind, rawName, rest, header) {
       return { ok: false, reason: 'unsupported-action-binding-name' };
     }
     const value = readInlineValue('value', rest);
-    const parsed = value ? parseActionValue(value, { valueType: readInlineType(rest) }) : undefined;
+    const parsed = value ? parseActionValue(value, { valueType: readInlineType(rest), comparisonType: readInlineComparisonType(rest) }) : undefined;
     if (parsed?.ok) return { ok: true };
-    if (parsed?.reason === 'missing-action-expression-type' || parsed?.reason === 'unsupported-action-expression-type') {
+    if (parsed?.reason === 'missing-action-expression-type' || parsed?.reason === 'unsupported-action-expression-type' || parsed?.reason === 'missing-action-comparison-type' || parsed?.reason === 'unsupported-action-comparison-type') {
       return { ok: false, reason: parsed.reason };
     }
     return { ok: false, reason: 'unsupported-action-binding-value' };
@@ -134,6 +134,10 @@ function readInlineType(text) {
   return readInlineWord('type', text) ?? readInlineWord('valueType', text);
 }
 
+function readInlineComparisonType(text) {
+  return readInlineWord('compare', text) ?? readInlineWord('comparisonType', text) ?? readInlineWord('compareType', text);
+}
+
 function readIfCondition(header) {
   const text = header.replace(/^if\b/, '').replace(/\{\s*$/, '').replace(/@id\(\s*["'][^"']+["']\s*\)/g, '').trim();
   const explicit = /\bcondition\s+(.+)$/.exec(text);

package/package.json

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