@almadar/ui 4.15.2 → 4.15.4

package/dist/components/index.js

@@ -17401,25 +17401,15 @@ function DataGrid({
   }
   const hasRenderProp = typeof children === "function";
   useEffect(() => {
-    const renderItemTypeOf = typeof schemaRenderItem;
-    const childrenTypeOf = typeof children;
-    if (data.length > 0 && !hasRenderProp) {
-      const firstRow = data[0];
-      const sampleKeys = firstRow ? Object.keys(firstRow).slice(0, 6) : [];
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
       const renderItemRaw = schemaRenderItem;
       const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
       dataGridLog.warn("renderItem-unresolved", {
         rowCount: data.length,
-        fieldsCount: fields?.length ?? 0,
-        renderItemTypeOf,
-        renderItemIsArray: Array.isArray(renderItemRaw),
-        renderItemIsFnLambda: isFnLambda,
-        renderItemHead: Array.isArray(renderItemRaw) ? String(renderItemRaw[0]) : void 0,
-        childrenTypeOf,
-        sampleRowKeys: sampleKeys
+        renderItemIsFnLambda: isFnLambda
       });
     }
-  }, [data, hasRenderProp, schemaRenderItem, children, fields]);
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -37704,40 +37694,6 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
 function isPatternConfig(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) && "type" in value && typeof value.type === "string";
 }
-function isFnFormLambda(value) {
-  return Array.isArray(value) && value.length === 3 && value[0] === "fn" && typeof value[1] === "string" && value[2] !== null && typeof value[2] === "object";
-}
-function resolveLambdaBindings(body, argName, arg) {
-  const prefix = `@${argName}.`;
-  const lookup = (path) => {
-    let cur = arg;
-    for (const seg of path.split(".")) {
-      if (cur === null || cur === void 0) return void 0;
-      if (typeof cur !== "object") return void 0;
-      cur = cur[seg];
-    }
-    return cur;
-  };
-  if (typeof body === "string") {
-    if (body === `@${argName}`) return arg;
-    if (body.startsWith(prefix)) {
-      const v = lookup(body.slice(prefix.length));
-      return v === void 0 || v === null ? "" : v;
-    }
-    return body;
-  }
-  if (Array.isArray(body)) {
-    return body.map((b) => resolveLambdaBindings(b, argName, arg));
-  }
-  if (body !== null && typeof body === "object") {
-    const out = {};
-    for (const [k, v] of Object.entries(body)) {
-      out[k] = resolveLambdaBindings(v, argName, arg);
-    }
-    return out;
-  }
-  return body;
-}
 function renderPatternProps(props, onDismiss) {
   const rendered = {};
   for (const [key, value] of Object.entries(props)) {
@@ -37753,26 +37709,6 @@ function renderPatternProps(props, onDismiss) {
         priority: 0
       };
       rendered[key] = /* @__PURE__ */ jsx(SlotContentRenderer, { content: childContent, onDismiss });
-    } else if (isFnFormLambda(value)) {
-      const [, argName, body] = value;
-      const lambdaBody = body;
-      const fn = (item, index) => {
-        const resolvedBody = resolveLambdaBindings(lambdaBody, argName, item);
-        if (!isPatternConfig(resolvedBody)) {
-          return null;
-        }
-        const childContent = {
-          id: `lambda-${key}-${index}`,
-          pattern: resolvedBody.type,
-          props: Object.fromEntries(
-            Object.entries(resolvedBody).filter(([k]) => k !== "type")
-          ),
-          priority: 0
-        };
-        return /* @__PURE__ */ jsx(SlotContentRenderer, { content: childContent, onDismiss });
-      };
-      const targetKey = key === "renderItem" ? "children" : key;
-      rendered[targetKey] = fn;
     } else {
       rendered[key] = value;
     }
@@ -37816,7 +37752,10 @@ function SlotContentRenderer({
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
     const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
-    const { children: _childrenConfig, ...restProps } = content.props;
+    const incomingChildren = content.props.children;
+    const childrenIsRenderFn = typeof incomingChildren === "function";
+    const { children: _childrenConfig, ...restPropsNoChildren } = content.props;
+    const restProps = childrenIsRenderFn ? { ...restPropsNoChildren, children: incomingChildren } : restPropsNoChildren;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;
     const resolvedItems = Array.isArray(

package/dist/providers/index.cjs

@@ -18769,25 +18769,15 @@ function DataGrid({
   }
   const hasRenderProp = typeof children === "function";
   React115.useEffect(() => {
-    const renderItemTypeOf = typeof schemaRenderItem;
-    const childrenTypeOf = typeof children;
-    if (data.length > 0 && !hasRenderProp) {
-      const firstRow = data[0];
-      const sampleKeys = firstRow ? Object.keys(firstRow).slice(0, 6) : [];
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
       const renderItemRaw = schemaRenderItem;
       const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
       dataGridLog.warn("renderItem-unresolved", {
         rowCount: data.length,
-        fieldsCount: fields?.length ?? 0,
-        renderItemTypeOf,
-        renderItemIsArray: Array.isArray(renderItemRaw),
-        renderItemIsFnLambda: isFnLambda,
-        renderItemHead: Array.isArray(renderItemRaw) ? String(renderItemRaw[0]) : void 0,
-        childrenTypeOf,
-        sampleRowKeys: sampleKeys
+        renderItemIsFnLambda: isFnLambda
       });
     }
-  }, [data, hasRenderProp, schemaRenderItem, children, fields]);
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -38269,40 +38259,6 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
 function isPatternConfig(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) && "type" in value && typeof value.type === "string";
 }
-function isFnFormLambda(value) {
-  return Array.isArray(value) && value.length === 3 && value[0] === "fn" && typeof value[1] === "string" && value[2] !== null && typeof value[2] === "object";
-}
-function resolveLambdaBindings(body, argName, arg) {
-  const prefix = `@${argName}.`;
-  const lookup = (path) => {
-    let cur = arg;
-    for (const seg of path.split(".")) {
-      if (cur === null || cur === void 0) return void 0;
-      if (typeof cur !== "object") return void 0;
-      cur = cur[seg];
-    }
-    return cur;
-  };
-  if (typeof body === "string") {
-    if (body === `@${argName}`) return arg;
-    if (body.startsWith(prefix)) {
-      const v = lookup(body.slice(prefix.length));
-      return v === void 0 || v === null ? "" : v;
-    }
-    return body;
-  }
-  if (Array.isArray(body)) {
-    return body.map((b) => resolveLambdaBindings(b, argName, arg));
-  }
-  if (body !== null && typeof body === "object") {
-    const out = {};
-    for (const [k, v] of Object.entries(body)) {
-      out[k] = resolveLambdaBindings(v, argName, arg);
-    }
-    return out;
-  }
-  return body;
-}
 function renderPatternProps(props, onDismiss) {
   const rendered = {};
   for (const [key, value] of Object.entries(props)) {
@@ -38318,26 +38274,6 @@ function renderPatternProps(props, onDismiss) {
         priority: 0
       };
       rendered[key] = /* @__PURE__ */ jsxRuntime.jsx(SlotContentRenderer, { content: childContent, onDismiss });
-    } else if (isFnFormLambda(value)) {
-      const [, argName, body] = value;
-      const lambdaBody = body;
-      const fn = (item, index) => {
-        const resolvedBody = resolveLambdaBindings(lambdaBody, argName, item);
-        if (!isPatternConfig(resolvedBody)) {
-          return null;
-        }
-        const childContent = {
-          id: `lambda-${key}-${index}`,
-          pattern: resolvedBody.type,
-          props: Object.fromEntries(
-            Object.entries(resolvedBody).filter(([k]) => k !== "type")
-          ),
-          priority: 0
-        };
-        return /* @__PURE__ */ jsxRuntime.jsx(SlotContentRenderer, { content: childContent, onDismiss });
-      };
-      const targetKey = key === "renderItem" ? "children" : key;
-      rendered[targetKey] = fn;
     } else {
       rendered[key] = value;
     }
@@ -38381,7 +38317,10 @@ function SlotContentRenderer({
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
     const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
-    const { children: _childrenConfig, ...restProps } = content.props;
+    const incomingChildren = content.props.children;
+    const childrenIsRenderFn = typeof incomingChildren === "function";
+    const { children: _childrenConfig, ...restPropsNoChildren } = content.props;
+    const restProps = childrenIsRenderFn ? { ...restPropsNoChildren, children: incomingChildren } : restPropsNoChildren;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;
     const resolvedItems = Array.isArray(

package/dist/providers/index.js

@@ -18724,25 +18724,15 @@ function DataGrid({
   }
   const hasRenderProp = typeof children === "function";
   useEffect(() => {
-    const renderItemTypeOf = typeof schemaRenderItem;
-    const childrenTypeOf = typeof children;
-    if (data.length > 0 && !hasRenderProp) {
-      const firstRow = data[0];
-      const sampleKeys = firstRow ? Object.keys(firstRow).slice(0, 6) : [];
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
       const renderItemRaw = schemaRenderItem;
       const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
       dataGridLog.warn("renderItem-unresolved", {
         rowCount: data.length,
-        fieldsCount: fields?.length ?? 0,
-        renderItemTypeOf,
-        renderItemIsArray: Array.isArray(renderItemRaw),
-        renderItemIsFnLambda: isFnLambda,
-        renderItemHead: Array.isArray(renderItemRaw) ? String(renderItemRaw[0]) : void 0,
-        childrenTypeOf,
-        sampleRowKeys: sampleKeys
+        renderItemIsFnLambda: isFnLambda
       });
     }
-  }, [data, hasRenderProp, schemaRenderItem, children, fields]);
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -38224,40 +38214,6 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
 function isPatternConfig(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) && "type" in value && typeof value.type === "string";
 }
-function isFnFormLambda(value) {
-  return Array.isArray(value) && value.length === 3 && value[0] === "fn" && typeof value[1] === "string" && value[2] !== null && typeof value[2] === "object";
-}
-function resolveLambdaBindings(body, argName, arg) {
-  const prefix = `@${argName}.`;
-  const lookup = (path) => {
-    let cur = arg;
-    for (const seg of path.split(".")) {
-      if (cur === null || cur === void 0) return void 0;
-      if (typeof cur !== "object") return void 0;
-      cur = cur[seg];
-    }
-    return cur;
-  };
-  if (typeof body === "string") {
-    if (body === `@${argName}`) return arg;
-    if (body.startsWith(prefix)) {
-      const v = lookup(body.slice(prefix.length));
-      return v === void 0 || v === null ? "" : v;
-    }
-    return body;
-  }
-  if (Array.isArray(body)) {
-    return body.map((b) => resolveLambdaBindings(b, argName, arg));
-  }
-  if (body !== null && typeof body === "object") {
-    const out = {};
-    for (const [k, v] of Object.entries(body)) {
-      out[k] = resolveLambdaBindings(v, argName, arg);
-    }
-    return out;
-  }
-  return body;
-}
 function renderPatternProps(props, onDismiss) {
   const rendered = {};
   for (const [key, value] of Object.entries(props)) {
@@ -38273,26 +38229,6 @@ function renderPatternProps(props, onDismiss) {
         priority: 0
       };
       rendered[key] = /* @__PURE__ */ jsx(SlotContentRenderer, { content: childContent, onDismiss });
-    } else if (isFnFormLambda(value)) {
-      const [, argName, body] = value;
-      const lambdaBody = body;
-      const fn = (item, index) => {
-        const resolvedBody = resolveLambdaBindings(lambdaBody, argName, item);
-        if (!isPatternConfig(resolvedBody)) {
-          return null;
-        }
-        const childContent = {
-          id: `lambda-${key}-${index}`,
-          pattern: resolvedBody.type,
-          props: Object.fromEntries(
-            Object.entries(resolvedBody).filter(([k]) => k !== "type")
-          ),
-          priority: 0
-        };
-        return /* @__PURE__ */ jsx(SlotContentRenderer, { content: childContent, onDismiss });
-      };
-      const targetKey = key === "renderItem" ? "children" : key;
-      rendered[targetKey] = fn;
     } else {
       rendered[key] = value;
     }
@@ -38336,7 +38272,10 @@ function SlotContentRenderer({
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
     const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
-    const { children: _childrenConfig, ...restProps } = content.props;
+    const incomingChildren = content.props.children;
+    const childrenIsRenderFn = typeof incomingChildren === "function";
+    const { children: _childrenConfig, ...restPropsNoChildren } = content.props;
+    const restProps = childrenIsRenderFn ? { ...restPropsNoChildren, children: incomingChildren } : restPropsNoChildren;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;
     const resolvedItems = Array.isArray(

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

@@ -0,0 +1,26 @@
+/**
+ * fn-form lambda → React render-prop conversion at the render-ui
+ * dispatch site, before the pattern lands in `useUISlots`.
+ *
+ * `.lolo` authors per-row render functions for DataGrid/DataList/Carousel
+ * as `["fn", argName, body]`. By converting them to functions here,
+ * SlotContent's props match what consumer components expect (children =
+ * real function) without depending on a render-time conversion pass.
+ *
+ * @packageDocumentation
+ */
+import type { EntityRow, RenderItemLambda } from "@almadar/core";
+export declare function isFnFormLambda(value: unknown): value is RenderItemLambda;
+/**
+ * Walk a pattern body replacing every `@<argName>.path` string with the
+ * value at `path` of `arg`. Mirrors the compiler's inline substitution
+ * for `renderItem` lambda bodies.
+ */
+export declare function resolveLambdaBindings(body: unknown, argName: string, arg: EntityRow): unknown;
+/**
+ * Walk a pattern's props (and recursively their nested children),
+ * converting every fn-form lambda value into a React render-prop
+ * function. Pure on inputs without lambdas: returns the props object
+ * unchanged by reference.
+ */
+export declare function convertFnFormLambdasInProps(props: Record<string, unknown>): Record<string, unknown>;