@almadar/evaluator 2.3.0 → 2.4.0

package/dist/index.js

@@ -500,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");
@@ -513,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) {
@@ -809,6 +823,28 @@ function evalWithItem(expr, evaluate2, ctx, item, index) {
   const locals = /* @__PURE__ */ new Map();
   locals.set("item", item);
   locals.set("index", index);
+  if (isSExpr(expr)) {
+    const op = getOperator(expr);
+    if (op === "fn" || op === "lambda") {
+      const fnArgs = getArgs(expr);
+      const params = fnArgs[0];
+      const body = fnArgs[1];
+      if (typeof params === "string") {
+        const key = params.startsWith("@") ? params.slice(1) : params;
+        locals.set(key, item);
+      } else if (Array.isArray(params)) {
+        const paramNames = params;
+        const values = [item, index];
+        for (let i = 0; i < paramNames.length; i++) {
+          const p = paramNames[i];
+          const key = p.startsWith("@") ? p.slice(1) : p;
+          locals.set(key, values[i]);
+        }
+      }
+      const childCtx2 = createChildContext(ctx, locals);
+      return evaluate2(body, childCtx2);
+    }
+  }
   const childCtx = createChildContext(ctx, locals);
   return evaluate2(expr, childCtx);
 }
@@ -2451,6 +2487,9 @@ var SExpressionEvaluator = class {
         return evalDo(args, evaluate2, ctx);
       case "when":
         return evalWhen(args, evaluate2, ctx);
+      case "fn":
+      case "lambda":
+        return evalFn(args);
       // Collections
       case "map":
         return evalMap(args, evaluate2, ctx);