@almadar/ui 5.17.1 → 5.18.1

package/dist/avl/index.cjs

@@ -9831,10 +9831,11 @@ function DayCell({
   onClick,
   className
 }) {
+  const safeDate = date instanceof Date && !Number.isNaN(date.getTime()) ? date : /* @__PURE__ */ new Date();
   const handleClick = React98.useCallback(() => {
-    onClick?.(date);
-  }, [onClick, date]);
-  const dayAbbr = DAY_ABBREVIATIONS[date.getDay()];
+    onClick?.(safeDate);
+  }, [onClick, safeDate]);
+  const dayAbbr = DAY_ABBREVIATIONS[safeDate.getDay()];
   return /* @__PURE__ */ jsxRuntime.jsxs(
     Box,
     {
@@ -9865,7 +9866,7 @@ function DayCell({
               "h-8 w-8 mx-auto items-center justify-center",
               isToday && "bg-blue-600 text-white"
             ),
-            children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", className: "font-semibold", children: date.getDate() })
+            children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", className: "font-semibold", children: safeDate.getDate() })
           }
         )
       ]
@@ -56590,11 +56591,15 @@ function SlotContentRenderer({
     }
     if (propsSchema) {
       for (const [propKey, propDef] of Object.entries(propsSchema)) {
-        const v = renderedProps[propKey];
-        if ((typeof v === "string" || typeof v === "number") && propDef.types?.some(
+        const isDate = propDef.types?.some(
           (t) => t === "date" || t === "datetime" || t === "timestamp"
-        )) {
+        );
+        if (!isDate) continue;
+        const v = renderedProps[propKey];
+        if (typeof v === "string" || typeof v === "number") {
           renderedProps[propKey] = new Date(v);
+        } else if (v == null && propDef.required) {
+          renderedProps[propKey] = /* @__PURE__ */ new Date();
         }
       }
     }
@@ -60286,12 +60291,26 @@ function collectEmbeddedTraits(schema) {
 }
 var lambdaLog = logger.createLogger("almadar:ui:fn-form-lambda");
 function isFnFormLambda(value) {
-  return Array.isArray(value) && value.length === 3 && value[0] === "fn" && typeof value[1] === "string" && value[2] !== null && typeof value[2] === "object";
+  if (!Array.isArray(value)) return false;
+  const arr = value;
+  if (arr.length !== 3 || arr[0] !== "fn" || arr[2] === null || typeof arr[2] !== "object") {
+    return false;
+  }
+  const params = arr[1];
+  return typeof params === "string" || Array.isArray(params) && params.length > 0 && params.every((p2) => typeof p2 === "string");
+}
+function fnFormParams(value) {
+  const p2 = value[1];
+  if (typeof p2 === "string") return [p2];
+  if (Array.isArray(p2)) return p2.filter((x) => typeof x === "string");
+  return [];
 }
-function resolveLambdaBindings(body, argName, arg) {
-  const prefix = `@${argName}.`;
+function resolveLambdaBindings(body, params, item, index) {
+  const itemName = params[0];
+  const indexName = params[1];
+  const itemPrefix = itemName ? `@${itemName}.` : null;
   const lookup = (path) => {
-    let cur = arg;
+    let cur = item;
     for (const seg of path.split(".")) {
       if (cur === null || cur === void 0) return void 0;
       if (typeof cur !== "object" || Array.isArray(cur)) return void 0;
@@ -60299,21 +60318,23 @@ function resolveLambdaBindings(body, argName, arg) {
     }
     return cur;
   };
+  const recur = (b) => resolveLambdaBindings(b, params, item, index);
   if (typeof body === "string") {
-    if (body === `@${argName}`) return arg;
-    if (body.startsWith(prefix)) {
-      const v = lookup(body.slice(prefix.length));
+    if (indexName && body === `@${indexName}`) return index;
+    if (itemName && body === `@${itemName}`) return item;
+    if (itemPrefix && body.startsWith(itemPrefix)) {
+      const v = lookup(body.slice(itemPrefix.length));
       return v === void 0 || v === null ? "" : v;
     }
     return body;
   }
   if (Array.isArray(body)) {
-    return body.map((b) => resolveLambdaBindings(b, argName, arg));
+    return body.map((b) => recur(b));
   }
   if (body !== null && typeof body === "object" && !React98__namespace.default.isValidElement(body) && !(body instanceof Date) && typeof body !== "function") {
     const out = {};
     for (const [k, v] of Object.entries(body)) {
-      out[k] = resolveLambdaBindings(v, argName, arg);
+      out[k] = recur(v);
     }
     return out;
   }
@@ -60326,9 +60347,9 @@ function getSlotContentRenderer2() {
   _slotContentRenderer2 = mod.SlotContentRenderer;
   return _slotContentRenderer2;
 }
-function makeLambdaFn(argName, lambdaBody, callerKey) {
+function makeLambdaFn(params, lambdaBody, callerKey) {
   return (item, index) => {
-    const resolvedBody = resolveLambdaBindings(lambdaBody, argName, item);
+    const resolvedBody = resolveLambdaBindings(lambdaBody, params, item, index);
     if (resolvedBody === null || typeof resolvedBody !== "object" || Array.isArray(resolvedBody) || typeof resolvedBody === "function" || React98__namespace.default.isValidElement(resolvedBody) || resolvedBody instanceof Date) {
       return null;
     }
@@ -60355,8 +60376,8 @@ function convertNode(node, callerKey) {
   if (node === null || node === void 0) return node;
   if (Array.isArray(node)) {
     if (isFnFormLambda(node)) {
-      const [, argName, body] = node;
-      return makeLambdaFn(argName, body, callerKey);
+      const arr2 = node;
+      return makeLambdaFn(fnFormParams(arr2), arr2[2], callerKey);
     }
     const arr = node;
     let anyChanged = false;
@@ -60378,9 +60399,9 @@ function convertObjectProps(props) {
   for (const [key, value] of Object.entries(props)) {
     if (isFnFormLambda(value)) {
       convertedAny = true;
-      const [, argName, body] = value;
+      const arr = value;
       const targetKey = key === "renderItem" ? "children" : key;
-      out[targetKey] = makeLambdaFn(argName, body, key);
+      out[targetKey] = makeLambdaFn(fnFormParams(arr), arr[2], key);
       lambdaLog.debug(`convert key=${key} \u2192 ${targetKey}`);
       continue;
     }

package/dist/avl/index.js

@@ -9782,10 +9782,11 @@ function DayCell({
   onClick,
   className
 }) {
+  const safeDate = date instanceof Date && !Number.isNaN(date.getTime()) ? date : /* @__PURE__ */ new Date();
   const handleClick = useCallback(() => {
-    onClick?.(date);
-  }, [onClick, date]);
-  const dayAbbr = DAY_ABBREVIATIONS[date.getDay()];
+    onClick?.(safeDate);
+  }, [onClick, safeDate]);
+  const dayAbbr = DAY_ABBREVIATIONS[safeDate.getDay()];
   return /* @__PURE__ */ jsxs(
     Box,
     {
@@ -9816,7 +9817,7 @@ function DayCell({
               "h-8 w-8 mx-auto items-center justify-center",
               isToday && "bg-blue-600 text-white"
             ),
-            children: /* @__PURE__ */ jsx(Typography, { variant: "body", className: "font-semibold", children: date.getDate() })
+            children: /* @__PURE__ */ jsx(Typography, { variant: "body", className: "font-semibold", children: safeDate.getDate() })
           }
         )
       ]
@@ -56541,11 +56542,15 @@ function SlotContentRenderer({
     }
     if (propsSchema) {
       for (const [propKey, propDef] of Object.entries(propsSchema)) {
-        const v = renderedProps[propKey];
-        if ((typeof v === "string" || typeof v === "number") && propDef.types?.some(
+        const isDate = propDef.types?.some(
           (t) => t === "date" || t === "datetime" || t === "timestamp"
-        )) {
+        );
+        if (!isDate) continue;
+        const v = renderedProps[propKey];
+        if (typeof v === "string" || typeof v === "number") {
           renderedProps[propKey] = new Date(v);
+        } else if (v == null && propDef.required) {
+          renderedProps[propKey] = /* @__PURE__ */ new Date();
         }
       }
     }
@@ -60237,12 +60242,26 @@ function collectEmbeddedTraits(schema) {
 }
 var lambdaLog = createLogger("almadar:ui:fn-form-lambda");
 function isFnFormLambda(value) {
-  return Array.isArray(value) && value.length === 3 && value[0] === "fn" && typeof value[1] === "string" && value[2] !== null && typeof value[2] === "object";
+  if (!Array.isArray(value)) return false;
+  const arr = value;
+  if (arr.length !== 3 || arr[0] !== "fn" || arr[2] === null || typeof arr[2] !== "object") {
+    return false;
+  }
+  const params = arr[1];
+  return typeof params === "string" || Array.isArray(params) && params.length > 0 && params.every((p2) => typeof p2 === "string");
+}
+function fnFormParams(value) {
+  const p2 = value[1];
+  if (typeof p2 === "string") return [p2];
+  if (Array.isArray(p2)) return p2.filter((x) => typeof x === "string");
+  return [];
 }
-function resolveLambdaBindings(body, argName, arg) {
-  const prefix = `@${argName}.`;
+function resolveLambdaBindings(body, params, item, index) {
+  const itemName = params[0];
+  const indexName = params[1];
+  const itemPrefix = itemName ? `@${itemName}.` : null;
   const lookup = (path) => {
-    let cur = arg;
+    let cur = item;
     for (const seg of path.split(".")) {
       if (cur === null || cur === void 0) return void 0;
       if (typeof cur !== "object" || Array.isArray(cur)) return void 0;
@@ -60250,21 +60269,23 @@ function resolveLambdaBindings(body, argName, arg) {
     }
     return cur;
   };
+  const recur = (b) => resolveLambdaBindings(b, params, item, index);
   if (typeof body === "string") {
-    if (body === `@${argName}`) return arg;
-    if (body.startsWith(prefix)) {
-      const v = lookup(body.slice(prefix.length));
+    if (indexName && body === `@${indexName}`) return index;
+    if (itemName && body === `@${itemName}`) return item;
+    if (itemPrefix && body.startsWith(itemPrefix)) {
+      const v = lookup(body.slice(itemPrefix.length));
       return v === void 0 || v === null ? "" : v;
     }
     return body;
   }
   if (Array.isArray(body)) {
-    return body.map((b) => resolveLambdaBindings(b, argName, arg));
+    return body.map((b) => recur(b));
   }
   if (body !== null && typeof body === "object" && !React98__default.isValidElement(body) && !(body instanceof Date) && typeof body !== "function") {
     const out = {};
     for (const [k, v] of Object.entries(body)) {
-      out[k] = resolveLambdaBindings(v, argName, arg);
+      out[k] = recur(v);
     }
     return out;
   }
@@ -60277,9 +60298,9 @@ function getSlotContentRenderer2() {
   _slotContentRenderer2 = mod.SlotContentRenderer;
   return _slotContentRenderer2;
 }
-function makeLambdaFn(argName, lambdaBody, callerKey) {
+function makeLambdaFn(params, lambdaBody, callerKey) {
   return (item, index) => {
-    const resolvedBody = resolveLambdaBindings(lambdaBody, argName, item);
+    const resolvedBody = resolveLambdaBindings(lambdaBody, params, item, index);
     if (resolvedBody === null || typeof resolvedBody !== "object" || Array.isArray(resolvedBody) || typeof resolvedBody === "function" || React98__default.isValidElement(resolvedBody) || resolvedBody instanceof Date) {
       return null;
     }
@@ -60306,8 +60327,8 @@ function convertNode(node, callerKey) {
   if (node === null || node === void 0) return node;
   if (Array.isArray(node)) {
     if (isFnFormLambda(node)) {
-      const [, argName, body] = node;
-      return makeLambdaFn(argName, body, callerKey);
+      const arr2 = node;
+      return makeLambdaFn(fnFormParams(arr2), arr2[2], callerKey);
     }
     const arr = node;
     let anyChanged = false;
@@ -60329,9 +60350,9 @@ function convertObjectProps(props) {
   for (const [key, value] of Object.entries(props)) {
     if (isFnFormLambda(value)) {
       convertedAny = true;
-      const [, argName, body] = value;
+      const arr = value;
       const targetKey = key === "renderItem" ? "children" : key;
-      out[targetKey] = makeLambdaFn(argName, body, key);
+      out[targetKey] = makeLambdaFn(fnFormParams(arr), arr[2], key);
       lambdaLog.debug(`convert key=${key} \u2192 ${targetKey}`);
       continue;
     }

package/dist/components/atoms/DayCell.d.ts

@@ -6,8 +6,9 @@
  */
 import React from "react";
 export interface DayCellProps {
-    /** The date this cell represents */
-    date: Date;
+    /** The date this cell represents. Optional at the dynamic render edge: an
+     *  unbound `@config.date` arrives as `undefined`, so the cell falls back to today. */
+    date?: Date;
     /** Whether this date is today */
     isToday?: boolean;
     /** Called when the day is clicked */

package/dist/components/index.cjs

@@ -4587,10 +4587,11 @@ function DayCell({
   onClick,
   className
 }) {
+  const safeDate = date instanceof Date && !Number.isNaN(date.getTime()) ? date : /* @__PURE__ */ new Date();
   const handleClick = React80.useCallback(() => {
-    onClick?.(date);
-  }, [onClick, date]);
-  const dayAbbr = DAY_ABBREVIATIONS[date.getDay()];
+    onClick?.(safeDate);
+  }, [onClick, safeDate]);
+  const dayAbbr = DAY_ABBREVIATIONS[safeDate.getDay()];
   return /* @__PURE__ */ jsxRuntime.jsxs(
     exports.Box,
     {
@@ -4621,7 +4622,7 @@ function DayCell({
               "h-8 w-8 mx-auto items-center justify-center",
               isToday && "bg-blue-600 text-white"
             ),
-            children: /* @__PURE__ */ jsxRuntime.jsx(exports.Typography, { variant: "body", className: "font-semibold", children: date.getDate() })
+            children: /* @__PURE__ */ jsxRuntime.jsx(exports.Typography, { variant: "body", className: "font-semibold", children: safeDate.getDate() })
           }
         )
       ]
@@ -47825,11 +47826,15 @@ function SlotContentRenderer({
     }
     if (propsSchema) {
       for (const [propKey, propDef] of Object.entries(propsSchema)) {
-        const v = renderedProps[propKey];
-        if ((typeof v === "string" || typeof v === "number") && propDef.types?.some(
+        const isDate = propDef.types?.some(
           (t) => t === "date" || t === "datetime" || t === "timestamp"
-        )) {
+        );
+        if (!isDate) continue;
+        const v = renderedProps[propKey];
+        if (typeof v === "string" || typeof v === "number") {
           renderedProps[propKey] = new Date(v);
+        } else if (v == null && propDef.required) {
+          renderedProps[propKey] = /* @__PURE__ */ new Date();
         }
       }
     }

package/dist/components/index.js

@@ -4538,10 +4538,11 @@ function DayCell({
   onClick,
   className
 }) {
+  const safeDate = date instanceof Date && !Number.isNaN(date.getTime()) ? date : /* @__PURE__ */ new Date();
   const handleClick = useCallback(() => {
-    onClick?.(date);
-  }, [onClick, date]);
-  const dayAbbr = DAY_ABBREVIATIONS[date.getDay()];
+    onClick?.(safeDate);
+  }, [onClick, safeDate]);
+  const dayAbbr = DAY_ABBREVIATIONS[safeDate.getDay()];
   return /* @__PURE__ */ jsxs(
     Box,
     {
@@ -4572,7 +4573,7 @@ function DayCell({
               "h-8 w-8 mx-auto items-center justify-center",
               isToday && "bg-blue-600 text-white"
             ),
-            children: /* @__PURE__ */ jsx(Typography, { variant: "body", className: "font-semibold", children: date.getDate() })
+            children: /* @__PURE__ */ jsx(Typography, { variant: "body", className: "font-semibold", children: safeDate.getDate() })
           }
         )
       ]
@@ -47776,11 +47777,15 @@ function SlotContentRenderer({
     }
     if (propsSchema) {
       for (const [propKey, propDef] of Object.entries(propsSchema)) {
-        const v = renderedProps[propKey];
-        if ((typeof v === "string" || typeof v === "number") && propDef.types?.some(
+        const isDate = propDef.types?.some(
           (t) => t === "date" || t === "datetime" || t === "timestamp"
-        )) {
+        );
+        if (!isDate) continue;
+        const v = renderedProps[propKey];
+        if (typeof v === "string" || typeof v === "number") {
           renderedProps[propKey] = new Date(v);
+        } else if (v == null && propDef.required) {
+          renderedProps[propKey] = /* @__PURE__ */ new Date();
         }
       }
     }

package/dist/providers/index.cjs

@@ -5097,10 +5097,11 @@ function DayCell({
   onClick,
   className
 }) {
+  const safeDate = date instanceof Date && !Number.isNaN(date.getTime()) ? date : /* @__PURE__ */ new Date();
   const handleClick = React86.useCallback(() => {
-    onClick?.(date);
-  }, [onClick, date]);
-  const dayAbbr = DAY_ABBREVIATIONS[date.getDay()];
+    onClick?.(safeDate);
+  }, [onClick, safeDate]);
+  const dayAbbr = DAY_ABBREVIATIONS[safeDate.getDay()];
   return /* @__PURE__ */ jsxRuntime.jsxs(
     Box,
     {
@@ -5131,7 +5132,7 @@ function DayCell({
               "h-8 w-8 mx-auto items-center justify-center",
               isToday && "bg-blue-600 text-white"
             ),
-            children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", className: "font-semibold", children: date.getDate() })
+            children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", className: "font-semibold", children: safeDate.getDate() })
           }
         )
       ]
@@ -47892,11 +47893,15 @@ function SlotContentRenderer({
     }
     if (propsSchema) {
       for (const [propKey, propDef] of Object.entries(propsSchema)) {
-        const v = renderedProps[propKey];
-        if ((typeof v === "string" || typeof v === "number") && propDef.types?.some(
+        const isDate = propDef.types?.some(
           (t) => t === "date" || t === "datetime" || t === "timestamp"
-        )) {
+        );
+        if (!isDate) continue;
+        const v = renderedProps[propKey];
+        if (typeof v === "string" || typeof v === "number") {
           renderedProps[propKey] = new Date(v);
+        } else if (v == null && propDef.required) {
+          renderedProps[propKey] = /* @__PURE__ */ new Date();
         }
       }
     }

package/dist/providers/index.js

@@ -5048,10 +5048,11 @@ function DayCell({
   onClick,
   className
 }) {
+  const safeDate = date instanceof Date && !Number.isNaN(date.getTime()) ? date : /* @__PURE__ */ new Date();
   const handleClick = useCallback(() => {
-    onClick?.(date);
-  }, [onClick, date]);
-  const dayAbbr = DAY_ABBREVIATIONS[date.getDay()];
+    onClick?.(safeDate);
+  }, [onClick, safeDate]);
+  const dayAbbr = DAY_ABBREVIATIONS[safeDate.getDay()];
   return /* @__PURE__ */ jsxs(
     Box,
     {
@@ -5082,7 +5083,7 @@ function DayCell({
               "h-8 w-8 mx-auto items-center justify-center",
               isToday && "bg-blue-600 text-white"
             ),
-            children: /* @__PURE__ */ jsx(Typography, { variant: "body", className: "font-semibold", children: date.getDate() })
+            children: /* @__PURE__ */ jsx(Typography, { variant: "body", className: "font-semibold", children: safeDate.getDate() })
           }
         )
       ]
@@ -47843,11 +47844,15 @@ function SlotContentRenderer({
     }
     if (propsSchema) {
       for (const [propKey, propDef] of Object.entries(propsSchema)) {
-        const v = renderedProps[propKey];
-        if ((typeof v === "string" || typeof v === "number") && propDef.types?.some(
+        const isDate = propDef.types?.some(
           (t) => t === "date" || t === "datetime" || t === "timestamp"
-        )) {
+        );
+        if (!isDate) continue;
+        const v = renderedProps[propKey];
+        if (typeof v === "string" || typeof v === "number") {
           renderedProps[propKey] = new Date(v);
+        } else if (v == null && propDef.required) {
+          renderedProps[propKey] = /* @__PURE__ */ new Date();
         }
       }
     }

package/dist/runtime/fn-form-lambda.d.ts

@@ -17,7 +17,7 @@ export declare function isFnFormLambda(value: SlotPropValue): value is RenderIte
  * value at `path` of `arg`. Mirrors the compiler's inline substitution
  * for `renderItem` lambda bodies.
  */
-export declare function resolveLambdaBindings(body: SlotPropValue, argName: string, arg: EntityRow): SlotPropValue;
+export declare function resolveLambdaBindings(body: SlotPropValue, params: readonly string[], item: EntityRow, index: number): SlotPropValue;
 /**
  * Walk a pattern's props (and recursively their nested children),
  * converting every fn-form lambda value into a React render-prop

package/dist/runtime/index.cjs

@@ -5507,10 +5507,11 @@ function DayCell({
   onClick,
   className
 }) {
+  const safeDate = date instanceof Date && !Number.isNaN(date.getTime()) ? date : /* @__PURE__ */ new Date();
   const handleClick = React85.useCallback(() => {
-    onClick?.(date);
-  }, [onClick, date]);
-  const dayAbbr = DAY_ABBREVIATIONS[date.getDay()];
+    onClick?.(safeDate);
+  }, [onClick, safeDate]);
+  const dayAbbr = DAY_ABBREVIATIONS[safeDate.getDay()];
   return /* @__PURE__ */ jsxRuntime.jsxs(
     Box,
     {
@@ -5541,7 +5542,7 @@ function DayCell({
               "h-8 w-8 mx-auto items-center justify-center",
               isToday && "bg-blue-600 text-white"
             ),
-            children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", className: "font-semibold", children: date.getDate() })
+            children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", className: "font-semibold", children: safeDate.getDate() })
           }
         )
       ]
@@ -47478,11 +47479,15 @@ function SlotContentRenderer({
     }
     if (propsSchema) {
       for (const [propKey, propDef] of Object.entries(propsSchema)) {
-        const v = renderedProps[propKey];
-        if ((typeof v === "string" || typeof v === "number") && propDef.types?.some(
+        const isDate = propDef.types?.some(
           (t) => t === "date" || t === "datetime" || t === "timestamp"
-        )) {
+        );
+        if (!isDate) continue;
+        const v = renderedProps[propKey];
+        if (typeof v === "string" || typeof v === "number") {
           renderedProps[propKey] = new Date(v);
+        } else if (v == null && propDef.required) {
+          renderedProps[propKey] = /* @__PURE__ */ new Date();
         }
       }
     }
@@ -47726,12 +47731,26 @@ function createClientEffectHandlers(options) {
 }
 var lambdaLog = logger.createLogger("almadar:ui:fn-form-lambda");
 function isFnFormLambda(value) {
-  return Array.isArray(value) && value.length === 3 && value[0] === "fn" && typeof value[1] === "string" && value[2] !== null && typeof value[2] === "object";
+  if (!Array.isArray(value)) return false;
+  const arr = value;
+  if (arr.length !== 3 || arr[0] !== "fn" || arr[2] === null || typeof arr[2] !== "object") {
+    return false;
+  }
+  const params = arr[1];
+  return typeof params === "string" || Array.isArray(params) && params.length > 0 && params.every((p2) => typeof p2 === "string");
+}
+function fnFormParams(value) {
+  const p2 = value[1];
+  if (typeof p2 === "string") return [p2];
+  if (Array.isArray(p2)) return p2.filter((x) => typeof x === "string");
+  return [];
 }
-function resolveLambdaBindings(body, argName, arg) {
-  const prefix = `@${argName}.`;
+function resolveLambdaBindings(body, params, item, index) {
+  const itemName = params[0];
+  const indexName = params[1];
+  const itemPrefix = itemName ? `@${itemName}.` : null;
   const lookup = (path) => {
-    let cur = arg;
+    let cur = item;
     for (const seg of path.split(".")) {
       if (cur === null || cur === void 0) return void 0;
       if (typeof cur !== "object" || Array.isArray(cur)) return void 0;
@@ -47739,21 +47758,23 @@ function resolveLambdaBindings(body, argName, arg) {
     }
     return cur;
   };
+  const recur = (b) => resolveLambdaBindings(b, params, item, index);
   if (typeof body === "string") {
-    if (body === `@${argName}`) return arg;
-    if (body.startsWith(prefix)) {
-      const v = lookup(body.slice(prefix.length));
+    if (indexName && body === `@${indexName}`) return index;
+    if (itemName && body === `@${itemName}`) return item;
+    if (itemPrefix && body.startsWith(itemPrefix)) {
+      const v = lookup(body.slice(itemPrefix.length));
       return v === void 0 || v === null ? "" : v;
     }
     return body;
   }
   if (Array.isArray(body)) {
-    return body.map((b) => resolveLambdaBindings(b, argName, arg));
+    return body.map((b) => recur(b));
   }
   if (body !== null && typeof body === "object" && !React85__namespace.default.isValidElement(body) && !(body instanceof Date) && typeof body !== "function") {
     const out = {};
     for (const [k, v] of Object.entries(body)) {
-      out[k] = resolveLambdaBindings(v, argName, arg);
+      out[k] = recur(v);
     }
     return out;
   }
@@ -47766,9 +47787,9 @@ function getSlotContentRenderer2() {
   _slotContentRenderer2 = mod.SlotContentRenderer;
   return _slotContentRenderer2;
 }
-function makeLambdaFn(argName, lambdaBody, callerKey) {
+function makeLambdaFn(params, lambdaBody, callerKey) {
   return (item, index) => {
-    const resolvedBody = resolveLambdaBindings(lambdaBody, argName, item);
+    const resolvedBody = resolveLambdaBindings(lambdaBody, params, item, index);
     if (resolvedBody === null || typeof resolvedBody !== "object" || Array.isArray(resolvedBody) || typeof resolvedBody === "function" || React85__namespace.default.isValidElement(resolvedBody) || resolvedBody instanceof Date) {
       return null;
     }
@@ -47795,8 +47816,8 @@ function convertNode(node, callerKey) {
   if (node === null || node === void 0) return node;
   if (Array.isArray(node)) {
     if (isFnFormLambda(node)) {
-      const [, argName, body] = node;
-      return makeLambdaFn(argName, body, callerKey);
+      const arr2 = node;
+      return makeLambdaFn(fnFormParams(arr2), arr2[2], callerKey);
     }
     const arr = node;
     let anyChanged = false;
@@ -47818,9 +47839,9 @@ function convertObjectProps(props) {
   for (const [key, value] of Object.entries(props)) {
     if (isFnFormLambda(value)) {
       convertedAny = true;
-      const [, argName, body] = value;
+      const arr = value;
       const targetKey = key === "renderItem" ? "children" : key;
-      out[targetKey] = makeLambdaFn(argName, body, key);
+      out[targetKey] = makeLambdaFn(fnFormParams(arr), arr[2], key);
       lambdaLog.debug(`convert key=${key} \u2192 ${targetKey}`);
       continue;
     }

package/dist/runtime/index.js

@@ -5458,10 +5458,11 @@ function DayCell({
   onClick,
   className
 }) {
+  const safeDate = date instanceof Date && !Number.isNaN(date.getTime()) ? date : /* @__PURE__ */ new Date();
   const handleClick = useCallback(() => {
-    onClick?.(date);
-  }, [onClick, date]);
-  const dayAbbr = DAY_ABBREVIATIONS[date.getDay()];
+    onClick?.(safeDate);
+  }, [onClick, safeDate]);
+  const dayAbbr = DAY_ABBREVIATIONS[safeDate.getDay()];
   return /* @__PURE__ */ jsxs(
     Box,
     {
@@ -5492,7 +5493,7 @@ function DayCell({
               "h-8 w-8 mx-auto items-center justify-center",
               isToday && "bg-blue-600 text-white"
             ),
-            children: /* @__PURE__ */ jsx(Typography, { variant: "body", className: "font-semibold", children: date.getDate() })
+            children: /* @__PURE__ */ jsx(Typography, { variant: "body", className: "font-semibold", children: safeDate.getDate() })
           }
         )
       ]
@@ -47429,11 +47430,15 @@ function SlotContentRenderer({
     }
     if (propsSchema) {
       for (const [propKey, propDef] of Object.entries(propsSchema)) {
-        const v = renderedProps[propKey];
-        if ((typeof v === "string" || typeof v === "number") && propDef.types?.some(
+        const isDate = propDef.types?.some(
           (t) => t === "date" || t === "datetime" || t === "timestamp"
-        )) {
+        );
+        if (!isDate) continue;
+        const v = renderedProps[propKey];
+        if (typeof v === "string" || typeof v === "number") {
           renderedProps[propKey] = new Date(v);
+        } else if (v == null && propDef.required) {
+          renderedProps[propKey] = /* @__PURE__ */ new Date();
         }
       }
     }
@@ -47677,12 +47682,26 @@ function createClientEffectHandlers(options) {
 }
 var lambdaLog = createLogger("almadar:ui:fn-form-lambda");
 function isFnFormLambda(value) {
-  return Array.isArray(value) && value.length === 3 && value[0] === "fn" && typeof value[1] === "string" && value[2] !== null && typeof value[2] === "object";
+  if (!Array.isArray(value)) return false;
+  const arr = value;
+  if (arr.length !== 3 || arr[0] !== "fn" || arr[2] === null || typeof arr[2] !== "object") {
+    return false;
+  }
+  const params = arr[1];
+  return typeof params === "string" || Array.isArray(params) && params.length > 0 && params.every((p2) => typeof p2 === "string");
+}
+function fnFormParams(value) {
+  const p2 = value[1];
+  if (typeof p2 === "string") return [p2];
+  if (Array.isArray(p2)) return p2.filter((x) => typeof x === "string");
+  return [];
 }
-function resolveLambdaBindings(body, argName, arg) {
-  const prefix = `@${argName}.`;
+function resolveLambdaBindings(body, params, item, index) {
+  const itemName = params[0];
+  const indexName = params[1];
+  const itemPrefix = itemName ? `@${itemName}.` : null;
   const lookup = (path) => {
-    let cur = arg;
+    let cur = item;
     for (const seg of path.split(".")) {
       if (cur === null || cur === void 0) return void 0;
       if (typeof cur !== "object" || Array.isArray(cur)) return void 0;
@@ -47690,21 +47709,23 @@ function resolveLambdaBindings(body, argName, arg) {
     }
     return cur;
   };
+  const recur = (b) => resolveLambdaBindings(b, params, item, index);
   if (typeof body === "string") {
-    if (body === `@${argName}`) return arg;
-    if (body.startsWith(prefix)) {
-      const v = lookup(body.slice(prefix.length));
+    if (indexName && body === `@${indexName}`) return index;
+    if (itemName && body === `@${itemName}`) return item;
+    if (itemPrefix && body.startsWith(itemPrefix)) {
+      const v = lookup(body.slice(itemPrefix.length));
       return v === void 0 || v === null ? "" : v;
     }
     return body;
   }
   if (Array.isArray(body)) {
-    return body.map((b) => resolveLambdaBindings(b, argName, arg));
+    return body.map((b) => recur(b));
   }
   if (body !== null && typeof body === "object" && !React85__default.isValidElement(body) && !(body instanceof Date) && typeof body !== "function") {
     const out = {};
     for (const [k, v] of Object.entries(body)) {
-      out[k] = resolveLambdaBindings(v, argName, arg);
+      out[k] = recur(v);
     }
     return out;
   }
@@ -47717,9 +47738,9 @@ function getSlotContentRenderer2() {
   _slotContentRenderer2 = mod.SlotContentRenderer;
   return _slotContentRenderer2;
 }
-function makeLambdaFn(argName, lambdaBody, callerKey) {
+function makeLambdaFn(params, lambdaBody, callerKey) {
   return (item, index) => {
-    const resolvedBody = resolveLambdaBindings(lambdaBody, argName, item);
+    const resolvedBody = resolveLambdaBindings(lambdaBody, params, item, index);
     if (resolvedBody === null || typeof resolvedBody !== "object" || Array.isArray(resolvedBody) || typeof resolvedBody === "function" || React85__default.isValidElement(resolvedBody) || resolvedBody instanceof Date) {
       return null;
     }
@@ -47746,8 +47767,8 @@ function convertNode(node, callerKey) {
   if (node === null || node === void 0) return node;
   if (Array.isArray(node)) {
     if (isFnFormLambda(node)) {
-      const [, argName, body] = node;
-      return makeLambdaFn(argName, body, callerKey);
+      const arr2 = node;
+      return makeLambdaFn(fnFormParams(arr2), arr2[2], callerKey);
     }
     const arr = node;
     let anyChanged = false;
@@ -47769,9 +47790,9 @@ function convertObjectProps(props) {
   for (const [key, value] of Object.entries(props)) {
     if (isFnFormLambda(value)) {
       convertedAny = true;
-      const [, argName, body] = value;
+      const arr = value;
       const targetKey = key === "renderItem" ? "children" : key;
-      out[targetKey] = makeLambdaFn(argName, body, key);
+      out[targetKey] = makeLambdaFn(fnFormParams(arr), arr[2], key);
       lambdaLog.debug(`convert key=${key} \u2192 ${targetKey}`);
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "5.17.1",
+  "version": "5.18.1",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "sideEffects": [
@@ -191,7 +191,7 @@
     "@types/three": "^0.160.0",
     "@typescript-eslint/parser": "8.56.0",
     "@vitejs/plugin-react": "^4.2.0",
-    "@vitest/ui": "^1.4.0",
+    "@vitest/ui": "^3.2.6",
     "autoprefixer": "^10.4.0",
     "babel-plugin-react-compiler": "19.0.0-beta-af1b7da-20250417",
     "eslint": "10.0.0",
@@ -211,7 +211,7 @@
     "tsx": "^4.7.0",
     "typescript": "^5.4.0",
     "vite": "^5.2.0",
-    "vitest": "^1.4.0"
+    "vitest": "^3.2.6"
   },
   "repository": {
     "type": "git",