@almadar/evaluator 2.2.0 → 2.3.1

package/dist/{index-CTcWSDo1.d.ts → index-C-vYm4zW.d.ts}

@@ -261,19 +261,22 @@ declare function evalFn(args: SExpr[], _evaluate: Evaluator$2, _ctx: EvaluationC
  * Collection Operator Implementations
  *
  * Implements: map, filter, find, count, sum, first, last, nth, concat, includes, empty
+ *
+ * These short-form operators (map, filter, find) use @item/@index bindings,
+ * matching the Rust evaluator's approach.
  */
 
 type Evaluator$1 = (expr: SExpr, ctx: EvaluationContext) => unknown;
 /**
- * Evaluate map: ["map", collection, ["fn", varName, body]]
+ * Evaluate map: ["map", collection, expr_using_@item]
  */
 declare function evalMap(args: SExpr[], evaluate: Evaluator$1, ctx: EvaluationContext): unknown[];
 /**
- * Evaluate filter: ["filter", collection, ["fn", varName, predicate]]
+ * Evaluate filter: ["filter", collection, expr_using_@item]
  */
 declare function evalFilter(args: SExpr[], evaluate: Evaluator$1, ctx: EvaluationContext): unknown[];
 /**
- * Evaluate find: ["find", collection, ["fn", varName, predicate]]
+ * Evaluate find: ["find", collection, expr_using_@item]
  */
 declare function evalFind(args: SExpr[], evaluate: Evaluator$1, ctx: EvaluationContext): unknown;
 /**
@@ -281,7 +284,7 @@ declare function evalFind(args: SExpr[], evaluate: Evaluator$1, ctx: EvaluationC
  */
 declare function evalCount(args: SExpr[], evaluate: Evaluator$1, ctx: EvaluationContext): number;
 /**
- * Evaluate sum: ["sum", collection] or ["sum", collection, ["fn", varName, mapper]]
+ * Evaluate sum: ["sum", collection] or ["sum", collection, mapExpr_using_@item]
  */
 declare function evalSum(args: SExpr[], evaluate: Evaluator$1, ctx: EvaluationContext): number;
 /**

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { SExpr } from '@almadar/core';
 export { CORE_BINDINGS, CoreBinding, Expression, ExpressionSchema, ParsedBinding, SExpr, SExprAtom, SExprSchema, collectBindings, getArgs, getOperator, isBinding, isSExpr, isSExprAtom, isSExprCall, isValidBinding, parseBinding, sexpr, walkSExpr } from '@almadar/core';
-import { E as EvaluationContext } from './index-CTcWSDo1.js';
-export { c as createChildContext, a as createEffectContext, b as createMinimalContext, e as evalAbs, d as evalAdd, f as evalAnd, g as evalCallService, h as evalCeil, i as evalClamp, j as evalConcat, k as evalCount, l as evalDecrement, m as evalDespawn, n as evalDivide, o as evalDo, p as evalEmit, q as evalEmpty, r as evalEqual, s as evalFilter, t as evalFind, u as evalFirst, v as evalFloor, w as evalFn, x as evalGreaterThan, y as evalGreaterThanOrEqual, z as evalIf, A as evalIncludes, B as evalIncrement, C as evalLast, D as evalLessThan, F as evalLessThanOrEqual, G as evalLet, H as evalMap, I as evalMatches, J as evalMax, K as evalMin, L as evalModulo, M as evalMultiply, N as evalNavigate, O as evalNot, P as evalNotEqual, Q as evalNotify, R as evalNth, S as evalOr, T as evalPersist, U as evalRenderUI, V as evalRound, W as evalSet, X as evalSetDynamic, Y as evalSpawn, Z as evalSubtract, _ as evalSum, $ as evalWhen, a0 as resolveBinding } from './index-CTcWSDo1.js';
+import { E as EvaluationContext } from './index-C-vYm4zW.js';
+export { c as createChildContext, a as createEffectContext, b as createMinimalContext, e as evalAbs, d as evalAdd, f as evalAnd, g as evalCallService, h as evalCeil, i as evalClamp, j as evalConcat, k as evalCount, l as evalDecrement, m as evalDespawn, n as evalDivide, o as evalDo, p as evalEmit, q as evalEmpty, r as evalEqual, s as evalFilter, t as evalFind, u as evalFirst, v as evalFloor, w as evalFn, x as evalGreaterThan, y as evalGreaterThanOrEqual, z as evalIf, A as evalIncludes, B as evalIncrement, C as evalLast, D as evalLessThan, F as evalLessThanOrEqual, G as evalLet, H as evalMap, I as evalMatches, J as evalMax, K as evalMin, L as evalModulo, M as evalMultiply, N as evalNavigate, O as evalNot, P as evalNotEqual, Q as evalNotify, R as evalNth, S as evalOr, T as evalPersist, U as evalRenderUI, V as evalRound, W as evalSet, X as evalSetDynamic, Y as evalSpawn, Z as evalSubtract, _ as evalSum, $ as evalWhen, a0 as resolveBinding } from './index-C-vYm4zW.js';
 
 /**
  * S-Expression Evaluator

package/dist/index.js

@@ -298,44 +298,26 @@ function evalFn(args, _evaluate, _ctx) {
 }
 
 // operators/collections.ts
+function withItem(expr, evaluate2, ctx, item, index) {
+  const locals = /* @__PURE__ */ new Map();
+  locals.set("item", item);
+  locals.set("index", index);
+  return evaluate2(expr, createChildContext(ctx, locals));
+}
 function evalMap(args, evaluate2, ctx) {
   const collection = toArray(evaluate2(args[0], ctx));
-  const fnExpr = args[1];
-  const params = fnExpr[1];
-  const body = fnExpr[2];
-  const varName = typeof params === "string" ? params : params[0];
-  return collection.map((item) => {
-    const locals = /* @__PURE__ */ new Map();
-    locals.set(varName, item);
-    const childCtx = createChildContext(ctx, locals);
-    return evaluate2(body, childCtx);
-  });
+  const mapExpr = args[1];
+  return collection.map((item, i) => withItem(mapExpr, evaluate2, ctx, item, i));
 }
 function evalFilter(args, evaluate2, ctx) {
   const collection = toArray(evaluate2(args[0], ctx));
-  const fnExpr = args[1];
-  const params = fnExpr[1];
-  const body = fnExpr[2];
-  const varName = typeof params === "string" ? params : params[0];
-  return collection.filter((item) => {
-    const locals = /* @__PURE__ */ new Map();
-    locals.set(varName, item);
-    const childCtx = createChildContext(ctx, locals);
-    return Boolean(evaluate2(body, childCtx));
-  });
+  const predExpr = args[1];
+  return collection.filter((item, i) => Boolean(withItem(predExpr, evaluate2, ctx, item, i)));
 }
 function evalFind(args, evaluate2, ctx) {
   const collection = toArray(evaluate2(args[0], ctx));
-  const fnExpr = args[1];
-  const params = fnExpr[1];
-  const body = fnExpr[2];
-  const varName = typeof params === "string" ? params : params[0];
-  return collection.find((item) => {
-    const locals = /* @__PURE__ */ new Map();
-    locals.set(varName, item);
-    const childCtx = createChildContext(ctx, locals);
-    return Boolean(evaluate2(body, childCtx));
-  });
+  const predExpr = args[1];
+  return collection.find((item, i) => Boolean(withItem(predExpr, evaluate2, ctx, item, i)));
 }
 function evalCount(args, evaluate2, ctx) {
   const collection = toArray(evaluate2(args[0], ctx));
@@ -346,15 +328,13 @@ function evalSum(args, evaluate2, ctx) {
   if (args.length === 1) {
     return collection.reduce((sum, item) => sum + toNumber2(item), 0);
   }
-  const fnExpr = args[1];
-  const params = fnExpr[1];
-  const body = fnExpr[2];
-  const varName = typeof params === "string" ? params : params[0];
-  return collection.reduce((sum, item) => {
+  const mapExpr = args[1];
+  return collection.reduce((sum, item, i) => {
     const locals = /* @__PURE__ */ new Map();
-    locals.set(varName, item);
+    locals.set("item", item);
+    locals.set("index", i);
     const childCtx = createChildContext(ctx, locals);
-    return sum + toNumber2(evaluate2(body, childCtx));
+    return sum + toNumber2(evaluate2(mapExpr, childCtx));
   }, 0);
 }
 function evalFirst(args, evaluate2, ctx) {
@@ -520,10 +500,23 @@ function evalCallService(args, evaluate2, ctx) {
     console.error(`Service call ${service}.${method} failed:`, err);
   });
 }
+function evaluateNestedProps(obj, evaluate2, ctx) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (Array.isArray(value) && value.length > 0 && typeof value[0] === "string") {
+      result[key] = evaluate2(value, ctx);
+    } else if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+      result[key] = evaluateNestedProps(value, evaluate2, ctx);
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}
 function evalRenderUI(args, evaluate2, ctx) {
   const slot = args[0];
   const pattern = evaluate2(args[1], ctx);
-  const props = args.length > 2 ? evaluate2(args[2], ctx) : void 0;
+  const rawProps = args.length > 2 ? args[2] : void 0;
   const priority = args.length > 3 ? evaluate2(args[3], ctx) : void 0;
   if (!ctx.renderUI) {
     console.warn("No renderUI handler in context for render-ui effect");
@@ -533,6 +526,7 @@ function evalRenderUI(args, evaluate2, ctx) {
     ctx.renderUI(slot, { type: "clear" }, void 0, priority);
     return;
   }
+  const props = rawProps ? evaluateNestedProps(rawProps, evaluate2, ctx) : void 0;
   ctx.renderUI(slot, pattern, props, priority);
 }
 function evalSetDynamic(args, evaluate2, ctx) {
@@ -825,29 +819,37 @@ function evalStrTruncate(args, evaluate2, ctx) {
 }
 
 // std/array.ts
-function evalLambda(lambdaExpr, evaluate2, ctx, ...values) {
-  if (!isSExpr(lambdaExpr) || getOperator(lambdaExpr) !== "fn") {
-    return evaluate2(lambdaExpr, ctx);
-  }
-  const args = getArgs(lambdaExpr);
-  const params = args[0];
-  const body = args[1];
-  const newLocals = /* @__PURE__ */ new Map();
-  if (Array.isArray(params)) {
-    const paramNames = params;
-    values.forEach((v, i) => {
-      if (paramNames[i]) {
-        const paramName = paramNames[i];
-        const key = paramName.startsWith("@") ? paramName.slice(1) : paramName;
-        newLocals.set(key, v);
-      }
-    });
-  } else if (typeof params === "string") {
-    const paramName = params.startsWith("@") ? params.slice(1) : params;
-    newLocals.set(paramName, values[0]);
+function evalWithItem(expr, evaluate2, ctx, item, index) {
+  const locals = /* @__PURE__ */ new Map();
+  locals.set("item", item);
+  locals.set("index", index);
+  const childCtx = createChildContext(ctx, locals);
+  return evaluate2(expr, childCtx);
+}
+function evalReduceLambda(lambdaExpr, evaluate2, ctx, acc, item) {
+  const locals = /* @__PURE__ */ new Map();
+  if (isSExpr(lambdaExpr) && getOperator(lambdaExpr) === "fn") {
+    const fnArgs = getArgs(lambdaExpr);
+    const params = fnArgs[0];
+    const body = fnArgs[1];
+    if (Array.isArray(params)) {
+      const paramNames = params;
+      const values = [acc, item];
+      paramNames.forEach((p, i) => {
+        const key = p.startsWith("@") ? p.slice(1) : p;
+        locals.set(key, values[i]);
+      });
+    } else if (typeof params === "string") {
+      const key = params.startsWith("@") ? params.slice(1) : params;
+      locals.set(key, acc);
+    }
+    const childCtx2 = createChildContext(ctx, locals);
+    return evaluate2(body, childCtx2);
   }
-  const childCtx = createChildContext(ctx, newLocals);
-  return evaluate2(body, childCtx);
+  locals.set("acc", acc);
+  locals.set("item", item);
+  const childCtx = createChildContext(ctx, locals);
+  return evaluate2(lambdaExpr, childCtx);
 }
 function evalArrayLen(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
@@ -981,53 +983,53 @@ function evalArrayIndexOf(args, evaluate2, ctx) {
 }
 function evalArrayFind(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
-  const lambda = args[1];
-  return (arr ?? []).find((item) => evalLambda(lambda, evaluate2, ctx, item));
+  const predExpr = args[1];
+  return (arr ?? []).find((item, i) => evalWithItem(predExpr, evaluate2, ctx, item, i));
 }
 function evalArrayFindIndex(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
-  const lambda = args[1];
-  return (arr ?? []).findIndex((item) => evalLambda(lambda, evaluate2, ctx, item));
+  const predExpr = args[1];
+  return (arr ?? []).findIndex((item, i) => evalWithItem(predExpr, evaluate2, ctx, item, i));
 }
 function evalArrayFilter(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
-  const lambda = args[1];
-  return (arr ?? []).filter((item) => evalLambda(lambda, evaluate2, ctx, item));
+  const predExpr = args[1];
+  return (arr ?? []).filter((item, i) => evalWithItem(predExpr, evaluate2, ctx, item, i));
 }
 function evalArrayReject(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
-  const lambda = args[1];
-  return (arr ?? []).filter((item) => !evalLambda(lambda, evaluate2, ctx, item));
+  const predExpr = args[1];
+  return (arr ?? []).filter((item, i) => !evalWithItem(predExpr, evaluate2, ctx, item, i));
 }
 function evalArrayMap(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
-  const lambda = args[1];
-  return (arr ?? []).map((item) => evalLambda(lambda, evaluate2, ctx, item));
+  const mapExpr = args[1];
+  return (arr ?? []).map((item, i) => evalWithItem(mapExpr, evaluate2, ctx, item, i));
 }
 function evalArrayReduce(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
-  const lambda = args[1];
-  const init = evaluate2(args[2], ctx);
+  const init = evaluate2(args[1], ctx);
+  const reducerExpr = args[2];
   return (arr ?? []).reduce(
-    (acc, item) => evalLambda(lambda, evaluate2, ctx, acc, item),
+    (acc, item) => evalReduceLambda(reducerExpr, evaluate2, ctx, acc, item),
     init
   );
 }
 function evalArrayEvery(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
-  const lambda = args[1];
-  return (arr ?? []).every((item) => Boolean(evalLambda(lambda, evaluate2, ctx, item)));
+  const predExpr = args[1];
+  return (arr ?? []).every((item, i) => Boolean(evalWithItem(predExpr, evaluate2, ctx, item, i)));
 }
 function evalArraySome(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
-  const lambda = args[1];
-  return (arr ?? []).some((item) => Boolean(evalLambda(lambda, evaluate2, ctx, item)));
+  const predExpr = args[1];
+  return (arr ?? []).some((item, i) => Boolean(evalWithItem(predExpr, evaluate2, ctx, item, i)));
 }
 function evalArrayCount(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
   if (args.length > 1) {
-    const lambda = args[1];
-    return (arr ?? []).filter((item) => evalLambda(lambda, evaluate2, ctx, item)).length;
+    const predExpr = args[1];
+    return (arr ?? []).filter((item, i) => evalWithItem(predExpr, evaluate2, ctx, item, i)).length;
   }
   return arr?.length ?? 0;
 }
@@ -1084,16 +1086,16 @@ function evalArrayGroupBy(args, evaluate2, ctx) {
 }
 function evalArrayPartition(args, evaluate2, ctx) {
   const arr = evaluate2(args[0], ctx);
-  const lambda = args[1];
+  const predExpr = args[1];
   const matches = [];
   const nonMatches = [];
-  for (const item of arr ?? []) {
-    if (evalLambda(lambda, evaluate2, ctx, item)) {
+  (arr ?? []).forEach((item, i) => {
+    if (evalWithItem(predExpr, evaluate2, ctx, item, i)) {
       matches.push(item);
     } else {
       nonMatches.push(item);
     }
-  }
+  });
   return [matches, nonMatches];
 }
 function evalArrayTake(args, evaluate2, ctx) {
@@ -1118,7 +1120,7 @@ function evalArrayDropLast(args, evaluate2, ctx) {
 }
 
 // std/object.ts
-function evalLambda2(lambdaExpr, evaluate2, ctx, ...values) {
+function evalLambda(lambdaExpr, evaluate2, ctx, ...values) {
   if (!isSExpr(lambdaExpr) || getOperator(lambdaExpr) !== "fn") {
     return evaluate2(lambdaExpr, ctx);
   }
@@ -1258,7 +1260,7 @@ function evalObjectMapValues(args, evaluate2, ctx) {
   const lambda = args[1];
   const result = {};
   for (const [key, value] of Object.entries(obj ?? {})) {
-    result[key] = evalLambda2(lambda, evaluate2, ctx, value);
+    result[key] = evalLambda(lambda, evaluate2, ctx, value);
   }
   return result;
 }
@@ -1267,7 +1269,7 @@ function evalObjectMapKeys(args, evaluate2, ctx) {
   const lambda = args[1];
   const result = {};
   for (const [key, value] of Object.entries(obj ?? {})) {
-    const newKey = String(evalLambda2(lambda, evaluate2, ctx, key));
+    const newKey = String(evalLambda(lambda, evaluate2, ctx, key));
     result[newKey] = value;
   }
   return result;
@@ -1277,7 +1279,7 @@ function evalObjectFilter(args, evaluate2, ctx) {
   const lambda = args[1];
   const result = {};
   for (const [key, value] of Object.entries(obj ?? {})) {
-    if (evalLambda2(lambda, evaluate2, ctx, key, value)) {
+    if (evalLambda(lambda, evaluate2, ctx, key, value)) {
       result[key] = value;
     }
   }