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

package/dist/action-body.js

@@ -92,6 +92,7 @@ function parseActionRepeatBlock(header, body, index, state) {
   const details = readActionRepeatHeader(header, index);
   return compactRecord({
     kind: 'repeat',
+    repeatKind: 'times',
     id: details.id,
     name: details.name,
     indexName: details.indexName,

package/dist/action-expression-semantics.js

@@ -9,6 +9,8 @@ export function hasNumericOperator(node) {
   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);
+  if (node.kind === 'array') return (node.elements ?? []).some(hasNumericOperator);
+  if (node.kind === 'object') return (node.entries ?? []).some((entry) => hasNumericOperator(entry.value));
   return false;
 }
 
@@ -20,6 +22,8 @@ export function hasNonLiteralOrderedComparison(node) {
   }
   if (node.kind === 'logical') return hasNonLiteralOrderedComparison(node.left) || hasNonLiteralOrderedComparison(node.right);
   if (node.kind === 'unary') return hasNonLiteralOrderedComparison(node.argument);
+  if (node.kind === 'array') return (node.elements ?? []).some(hasNonLiteralOrderedComparison);
+  if (node.kind === 'object') return (node.entries ?? []).some((entry) => hasNonLiteralOrderedComparison(entry.value));
   return false;
 }
 
@@ -28,6 +32,8 @@ export function hasCallExpression(node) {
   if (node.kind === 'call') return true;
   if (node.kind === 'binary' || node.kind === 'logical') return hasCallExpression(node.left) || hasCallExpression(node.right);
   if (node.kind === 'unary') return hasCallExpression(node.argument);
+  if (node.kind === 'array') return (node.elements ?? []).some(hasCallExpression);
+  if (node.kind === 'object') return (node.entries ?? []).some((entry) => hasCallExpression(entry.value));
   return false;
 }
 

package/dist/action-expression-tokenizer.js

@@ -42,12 +42,12 @@ export function tokenizeActionExpression(text) {
       index++;
       continue;
     }
-    if (char === '(' || char === ')' || char === '.' || char === ',') {
+    if (char === '(' || char === ')' || char === '.' || char === ',' || char === '[' || char === ']' || char === '{' || char === '}' || char === ':') {
       tokens.push({ type: 'punctuation', text: char, start: index, end: index + 1 });
       index++;
       continue;
     }
-    if ('=&|?:[]{}'.includes(char)) return fail('unsupported-action-expression-operator');
+    if ('=&|?'.includes(char)) return fail('unsupported-action-expression-operator');
     return fail('malformed-action-expression');
   }
   tokens.push({ type: 'eof', text: '', start: text.length, end: text.length });
@@ -84,7 +84,7 @@ function canStartSignedNumber(tokens) {
   const previous = tokens[tokens.length - 1];
   if (!previous) return true;
   if (previous.type === 'operator') return true;
-  return previous.type === 'punctuation' && (previous.text === '(' || previous.text === ',');
+  return previous.type === 'punctuation' && (previous.text === '(' || previous.text === ',' || previous.text === '[' || previous.text === ':');
 }
 
 function fail(reason) {

package/dist/action-expression.js

@@ -138,10 +138,66 @@ class ExpressionParser {
       if (!this.matchPunctuation(')')) this.reject('malformed-action-expression');
       return expression;
     }
+    if (token.type === 'punctuation' && token.text === '[') return this.parseArray();
+    if (token.type === 'punctuation' && token.text === '{') return this.parseObject();
     this.reject('malformed-action-expression');
     return { kind: 'literal', value: null };
   }
 
+  parseArray() {
+    this.matchPunctuation('[');
+    const elements = [];
+    if (this.matchPunctuation(']')) return { kind: 'array', elements };
+    while (this.ok) {
+      elements.push(this.parseExpression());
+      if (this.matchPunctuation(']')) break;
+      if (!this.matchPunctuation(',')) {
+        this.reject('malformed-action-expression');
+        break;
+      }
+      if (this.peek().type === 'punctuation' && this.peek().text === ']') {
+        this.reject('malformed-action-expression');
+        break;
+      }
+    }
+    return { kind: 'array', elements };
+  }
+
+  parseObject() {
+    this.matchPunctuation('{');
+    const entries = [];
+    if (this.matchPunctuation('}')) return { kind: 'object', entries };
+    while (this.ok) {
+      const key = this.readObjectKey();
+      if (key === undefined) {
+        this.reject('malformed-action-expression');
+        break;
+      }
+      if (!this.matchPunctuation(':')) {
+        this.reject('malformed-action-expression');
+        break;
+      }
+      entries.push({ key, value: this.parseExpression() });
+      if (this.matchPunctuation('}')) break;
+      if (!this.matchPunctuation(',')) {
+        this.reject('malformed-action-expression');
+        break;
+      }
+      if (this.peek().type === 'punctuation' && this.peek().text === '}') {
+        this.reject('malformed-action-expression');
+        break;
+      }
+    }
+    return { kind: 'object', entries };
+  }
+
+  readObjectKey() {
+    const token = this.peek();
+    if (token.type !== 'identifier' && token.type !== 'string') return undefined;
+    this.index++;
+    return token.text === '__proto__' ? '__proto__' : String(token.value ?? token.text);
+  }
+
   parseRef() {
     const parts = [];
     const first = this.consumeIdentifier();
@@ -254,6 +310,8 @@ function attachCallType(node, callType) {
   if (node.kind === 'call') return compactRecord({ ...node, callType });
   if (node.kind === 'binary' || node.kind === 'logical') return { ...node, left: attachCallType(node.left, callType), right: attachCallType(node.right, callType) };
   if (node.kind === 'unary') return { ...node, argument: attachCallType(node.argument, callType) };
+  if (node.kind === 'array') return { ...node, elements: (node.elements ?? []).map((element) => attachCallType(element, callType)) };
+  if (node.kind === 'object') return { ...node, entries: (node.entries ?? []).map((entry) => ({ ...entry, value: attachCallType(entry.value, callType) })) };
   return node;
 }
 

package/dist/action-repeat-block.js

@@ -21,8 +21,7 @@ export function readRepeatHeaderBlock(source, offset, endOffset, helpers = {}) {
 export function readActionRepeatHeader(header, index) {
   const rawText = rawHeader(header, 'repeat');
   const hasExplicitId = hasId(rawText);
-  const text = stripIds(rawText);
-  const shape = /^([A-Za-z_$][\w$-]*)\s+times\s+(.+)$/.exec(text);
+  const shape = /^([A-Za-z_$][\w$-]*)\s+@id\(\s*["'][^"']+["']\s*\)\s+times\s+(.+)$/.exec(rawText);
   const indexName = shape?.[1];
   const countText = shape?.[2]?.trim();
   const count = countText ? readActionValue(countText) : undefined;
@@ -41,7 +40,11 @@ export function validateActionRepeatHeader(header) {
   const details = readActionRepeatHeader(header, 0);
   const stripped = stripIds(rawHeader(header, 'repeat'));
   if (details.malformed && /^times\b/.test(stripped)) return { ok: false, reason: 'missing-action-repeat-index' };
+  if (details.malformed && /\btimes\s*$/.test(stripped)) return { ok: false, reason: 'missing-action-repeat-count' };
   if (details.malformed && !/\btimes\b/.test(stripped)) return { ok: false, reason: 'missing-action-repeat-count' };
+  if (details.malformed && !details.hasExplicitId && /^[A-Za-z_$][\w$-]*\s+times\s+.+$/.test(stripped)) {
+    return { ok: false, reason: 'missing-action-repeat-id' };
+  }
   if (details.malformed) return { ok: false, reason: 'malformed-action-repeat-header' };
   if (!details.indexName) return { ok: false, reason: 'missing-action-repeat-index' };
   if (!isActionBindingName(details.indexName) || details.indexName === 'times') return { ok: false, reason: 'unsupported-action-repeat-index' };
@@ -56,7 +59,7 @@ export function validateActionRepeatHeader(header) {
 
 function isSupportedCountExpression(value) {
   if (Object.hasOwn(value ?? {}, 'value')) {
-    return typeof value.value === 'number' && Number.isFinite(value.value) && value.value >= 0;
+    return typeof value.value === 'number' && Number.isInteger(value.value) && value.value >= 0;
   }
   const ast = value?.expressionAst;
   return ast?.kind === 'ref'

package/dist/action-syntax-children.js

@@ -187,7 +187,7 @@ function validateActionRow(rowKind, rawName, rest, header) {
     const value = readInlineValue('value', rest);
     const parsed = value ? parseActionValue(value, { valueType: readInlineType(rest), comparisonType: readInlineComparisonType(rest), callType: readInlineCallType(rest) }) : undefined;
     if (parsed?.ok) return { ok: true };
-    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' || parsed?.reason === 'missing-action-call-type' || parsed?.reason === 'unsupported-action-call-type' || parsed?.reason === 'unsupported-action-call-callee' || parsed?.reason === 'unsupported-action-call-argument') {
+    if (isActionExpressionAdmissionReason(parsed?.reason)) {
       return { ok: false, reason: parsed.reason };
     }
     return { ok: false, reason: 'unsupported-action-binding-value' };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.54",
+  "version": "0.3.56",
   "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-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/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",