@object-ui/plugin-form 11.3.0 → 11.5.0

package/dist/index.js

@@ -1,30 +1,31 @@
 import e, { useCallback as t, useContext as n, useEffect as r, useId as i, useMemo as a, useRef as o, useState as s } from "react";
 import { ComponentRegistry as c } from "@object-ui/core";
 import { SchemaRenderer as l, SchemaRendererContext as u, usePreviewMode as d, useRecordContext as f, useSafeFieldLabel as p, useSchemaContext as m } from "@object-ui/react";
-import { LineItemsField as h, buildValidationRules as g, evaluateCondition as _, formatFileSize as v, mapFieldTypeToFormType as y } from "@object-ui/fields";
-import { AlertDialog as b, AlertDialogAction as x, AlertDialogCancel as S, AlertDialogContent as C, AlertDialogDescription as w, AlertDialogFooter as T, AlertDialogHeader as E, AlertDialogTitle as D, Button as O, Card as k, CardContent as A, CardDescription as j, CardHeader as M, CardTitle as N, Dialog as P, DialogDescription as F, DialogHeader as I, DialogTitle as L, MobileDialogContent as R, ResizableHandle as z, ResizablePanel as B, ResizablePanelGroup as V, Sheet as ee, SheetContent as te, SheetDescription as H, SheetHeader as U, SheetTitle as ne, Skeleton as W, Tabs as re, TabsContent as ie, TabsList as ae, TabsTrigger as oe, cn as G, toast as se, useIsMobile as ce } from "@object-ui/components";
-import { usePermissions as le } from "@object-ui/permissions";
-import { Check as K, CheckCircle2 as q, ChevronDown as ue, ChevronLeft as de, ChevronRight as J, Loader2 as fe, Lock as pe, ShieldCheck as me } from "lucide-react";
-import { Fragment as Y, jsx as X, jsxs as Z } from "react/jsx-runtime";
-import { createSafeTranslation as Q } from "@object-ui/i18n";
+import { LineItemsField as h, buildValidationRules as g, formatFileSize as _, mapFieldTypeToFormType as v } from "@object-ui/fields";
+import { AlertDialog as y, AlertDialogAction as b, AlertDialogCancel as x, AlertDialogContent as S, AlertDialogDescription as C, AlertDialogFooter as w, AlertDialogHeader as T, AlertDialogTitle as E, Button as D, Card as O, CardContent as k, CardDescription as A, CardHeader as j, CardTitle as M, Dialog as N, DialogDescription as P, DialogHeader as F, DialogTitle as ee, MobileDialogContent as I, ResizableHandle as L, ResizablePanel as R, ResizablePanelGroup as z, Sheet as B, SheetContent as V, SheetDescription as H, SheetHeader as te, SheetTitle as ne, Skeleton as U, Tabs as W, TabsContent as re, TabsList as ie, TabsTrigger as ae, cn as G, toast as K, useIsMobile as oe } from "@object-ui/components";
+import { usePermissions as se } from "@object-ui/permissions";
+import { Check as ce, CheckCircle2 as le, ChevronDown as q, ChevronLeft as ue, ChevronRight as de, Loader2 as fe, Lock as pe, ShieldCheck as me } from "lucide-react";
+import { Fragment as J, jsx as Y, jsxs as X } from "react/jsx-runtime";
+import { createSafeTranslation as Z } from "@object-ui/i18n";
+import { deriveFieldGroupLayout as he } from "@objectstack/spec/data";
 //#region src/successBehavior.ts
-function he(e) {
+function ge(e) {
 	try {
 		return typeof window > "u" ? !1 : new URL(e, window.location.href).origin === window.location.origin;
 	} catch {
 		return !1;
 	}
 }
-function ge(e, t) {
+function _e(e, t) {
 	if (!e) return null;
 	let n = t?.id ?? t?.recordId ?? t?._id;
 	if (n == null || n === "") return null;
 	let r = e.replace(/\{(?:id|recordId)\}/g, String(n));
-	return he(r) ? r : null;
+	return ge(r) ? r : null;
 }
 //#endregion
 //#region src/FormSection.tsx
-var _e = ({ label: e, description: t, collapsible: n = !1, collapsed: r = !1, columns: i = 1, children: a, className: o, gridClassName: c, showBorder: l }) => {
+var ve = ({ label: e, description: t, collapsible: n = !1, collapsed: r = !1, columns: i = 1, children: a, className: o, gridClassName: c, showBorder: l }) => {
 	let [u, d] = s(r), f = {
 		1: "grid-cols-1",
 		2: "grid-cols-1 md:grid-cols-2",
@@ -32,59 +33,59 @@ var _e = ({ label: e, description: t, collapsible: n = !1, collapsed: r = !1, co
 		4: "grid-cols-1 md:grid-cols-2 lg:grid-cols-4"
 	}, p = () => {
 		n && d(!u);
-	}, m = l ?? !!e, h = e || t ? /* @__PURE__ */ Z("div", {
+	}, m = l ?? !!e, h = e || t ? /* @__PURE__ */ X("div", {
 		className: G("flex items-start gap-2", !m && "mb-4", n && "cursor-pointer select-none"),
 		onClick: p,
 		role: n ? "button" : void 0,
 		"aria-expanded": n ? !u : void 0,
-		children: [n && /* @__PURE__ */ X("span", {
+		children: [n && /* @__PURE__ */ Y("span", {
 			className: "mt-0.5 text-muted-foreground",
-			children: X(u ? J : ue, { className: "h-4 w-4" })
-		}), /* @__PURE__ */ Z("div", {
+			children: Y(u ? de : q, { className: "h-4 w-4" })
+		}), /* @__PURE__ */ X("div", {
 			className: "flex-1",
-			children: [e && /* @__PURE__ */ X("h3", {
+			children: [e && /* @__PURE__ */ Y("h3", {
 				className: "text-base font-semibold text-foreground",
 				children: e
-			}), t && /* @__PURE__ */ X("p", {
+			}), t && /* @__PURE__ */ Y("p", {
 				className: "text-sm text-muted-foreground mt-0.5",
 				children: t
 			})]
 		})]
-	}) : null, g = u ? null : /* @__PURE__ */ X("div", {
+	}) : null, g = u ? null : /* @__PURE__ */ Y("div", {
 		className: G("grid gap-4", c || f[i]),
 		children: a
 	});
-	return m ? /* @__PURE__ */ Z(k, {
+	return m ? /* @__PURE__ */ X(O, {
 		className: G("form-section", o),
-		children: [h && /* @__PURE__ */ Z(M, {
+		children: [h && /* @__PURE__ */ X(j, {
 			className: "pb-3",
 			children: [
-				e && /* @__PURE__ */ X(N, {
+				e && /* @__PURE__ */ Y(M, {
 					className: "text-base",
 					children: e
 				}),
-				t && /* @__PURE__ */ X(j, { children: t }),
-				n && /* @__PURE__ */ X("button", {
+				t && /* @__PURE__ */ Y(A, { children: t }),
+				n && /* @__PURE__ */ Y("button", {
 					type: "button",
 					className: "absolute right-4 top-4 text-muted-foreground",
 					onClick: p,
 					"aria-expanded": !u,
 					"aria-label": u ? "Expand section" : "Collapse section",
-					children: X(u ? J : ue, { className: "h-4 w-4" })
+					children: Y(u ? de : q, { className: "h-4 w-4" })
 				})
 			]
-		}), g && /* @__PURE__ */ X(A, { children: g })]
-	}) : /* @__PURE__ */ Z("div", {
+		}), g && /* @__PURE__ */ Y(k, { children: g })]
+	}) : /* @__PURE__ */ X("div", {
 		className: G("form-section", o),
 		children: [h, g]
 	});
 };
 //#endregion
 //#region src/sectionFields.ts
-function ve(e, t) {
-	return typeof t == "string" && t.trim() ? {
+function Q(e, t) {
+	return typeof t == "string" && t.trim() || typeof t == "object" && t && typeof t.source == "string" && t.source.trim() ? {
 		...e,
-		visible: (e) => _(t, e)
+		visibleOn: t
 	} : e;
 }
 function ye(e, t) {
@@ -92,7 +93,7 @@ function ye(e, t) {
 	return n ? {
 		name: e,
 		label: t.fieldLabel(t.objectName, e, n.label || e),
-		type: y(n.type),
+		type: v(n.type),
 		required: n.required || !1,
 		disabled: t.readOnly || t.mode === "view" || n.readonly,
 		placeholder: n.placeholder,
@@ -100,7 +101,11 @@ function ye(e, t) {
 		validation: g(n),
 		field: n,
 		options: n.options,
-		multiple: n.multiple
+		multiple: n.multiple,
+		visibleWhen: n.visibleWhen,
+		readonlyWhen: n.readonlyWhen,
+		requiredWhen: n.requiredWhen,
+		conditionalRequired: n.conditionalRequired
 	} : {
 		name: e,
 		label: e,
@@ -110,19 +115,154 @@ function ye(e, t) {
 function be(e, t) {
 	if (typeof e == "string") {
 		let n = t.objectSchema?.fields?.[e];
-		return ve(ye(e, t), n?.visible_on ?? n?.visibleOn);
+		return Q(ye(e, t), n?.visible_on ?? n?.visibleOn);
 	}
 	let n = e;
-	if (typeof n.field != "string") return ve(n, n.visibleOn);
+	if (typeof n.field != "string") return Q(n, n.visibleOn);
 	let r = n.field, i = ye(r, t);
-	return n.type != null && (i.type = y(n.type)), n.widget != null && (i.widget = n.widget), n.label != null && (i.label = n.label), n.placeholder != null && (i.placeholder = n.placeholder), n.helpText != null && (i.description = n.helpText), n.required != null && (i.required = n.required), n.readonly != null && (i.disabled = n.readonly || i.disabled), n.immutable != null && (i.immutable = n.immutable), n.hidden != null && (i.hidden = n.hidden), n.colSpan != null && (i.colSpan = n.colSpan), n.options != null && (i.options = n.options), n.multiple != null && (i.multiple = n.multiple), n.reference != null && (i.reference = n.reference), n.maxLength != null && (i.maxLength = n.maxLength), n.minLength != null && (i.minLength = n.minLength), n.min != null && (i.min = n.min), n.max != null && (i.max = n.max), n.precision != null && (i.precision = n.precision), n.scale != null && (i.scale = n.scale), n.language != null && (i.language = n.language), Array.isArray(n.fields) && (i.fields = n.fields), ve(i, n.visibleOn);
+	return n.type != null && (i.type = v(n.type)), n.widget != null && (i.widget = n.widget), n.label != null && (i.label = n.label), n.placeholder != null && (i.placeholder = n.placeholder), n.helpText != null && (i.description = n.helpText), n.required != null && (i.required = n.required), n.readonly != null && (i.disabled = n.readonly || i.disabled), n.immutable != null && (i.immutable = n.immutable), n.hidden != null && (i.hidden = n.hidden), n.colSpan != null && (i.colSpan = n.colSpan), n.span != null && (i.span = n.span), n.options != null && (i.options = n.options), n.multiple != null && (i.multiple = n.multiple), n.reference != null && (i.reference = n.reference), n.maxLength != null && (i.maxLength = n.maxLength), n.minLength != null && (i.minLength = n.minLength), n.min != null && (i.min = n.min), n.max != null && (i.max = n.max), n.precision != null && (i.precision = n.precision), n.scale != null && (i.scale = n.scale), n.language != null && (i.language = n.language), Array.isArray(n.fields) && (i.fields = n.fields), Q(i, n.visibleOn);
 }
 function xe(e, t) {
 	return (e.fields ?? []).map((e) => be(e, t));
 }
 //#endregion
+//#region src/autoLayout.ts
+var Se = /* @__PURE__ */ new Set([
+	"field:formula",
+	"field:summary",
+	"field:auto_number",
+	"field:autonumber"
+]), Ce = /* @__PURE__ */ new Set([
+	"field:textarea",
+	"field:markdown",
+	"field:html",
+	"field:grid",
+	"field:rich-text",
+	"textarea",
+	"markdown",
+	"html",
+	"grid",
+	"rich-text"
+]), we = /* @__PURE__ */ new Set([
+	"formula",
+	"summary",
+	"auto_number",
+	"autonumber"
+]);
+function Te(e) {
+	return Ce.has(e);
+}
+function Ee(e) {
+	return we.has(e);
+}
+function De(e) {
+	return e <= 3 ? 1 : e <= 8 ? 2 : e <= 15 ? 3 : 4;
+}
+function Oe(e) {
+	return e && e > 0 ? Math.min(Math.floor(e), 4) : 1;
+}
+function ke(e, t, n) {
+	let r = Oe(t);
+	return r <= 1 ? 1 : e.span === "full" ? r : e.colSpan == null ? e.type && Te(e.type) ? r : Math.min(r, Math.max(1, Math.round(r / Math.min(Math.max(1, Math.floor(n || r)), r)))) : Math.min(Math.max(1, Math.floor(e.colSpan)), r);
+}
+function Ae(e, t, n) {
+	let r = Oe(t);
+	return r <= 1 ? e : e.map((e) => {
+		if (e.type === "section-divider") return e;
+		let t = ke(e, r, n);
+		return t > 1 ? {
+			...e,
+			colSpan: t
+		} : e.colSpan != null && e.colSpan !== 1 ? {
+			...e,
+			colSpan: 1
+		} : e;
+	});
+}
+var je = /* @__PURE__ */ new Set([
+	"id",
+	"created_at",
+	"createdAt",
+	"updated_at",
+	"updatedAt",
+	"last_modified_at",
+	"lastModifiedAt",
+	"deleted_at",
+	"deletedAt",
+	"created_by",
+	"createdBy",
+	"updated_by",
+	"updatedBy",
+	"last_modified_by",
+	"lastModifiedBy",
+	"organization_id",
+	"organizationId",
+	"org_id",
+	"orgId",
+	"tenant_id",
+	"tenantId",
+	"owner",
+	"owner_id",
+	"_version",
+	"_rev"
+]);
+function Me(e, t) {
+	return e.filter((e) => {
+		if (je.has(e.name)) return !1;
+		let n = t?.fields?.[e.name];
+		return !(n?.hidden === !0 || n?.readonly === !0);
+	});
+}
+function Ne(e, t) {
+	return e.filter((e) => {
+		if (je.has(e.name) || e.type && Se.has(e.type)) return !1;
+		if (!t?.fields) return !0;
+		let n = t.fields[e.name];
+		return n ? n.readonly === !0 ? !1 : !Ee(n.type) : !0;
+	});
+}
+function Pe(e, t) {
+	return e.filter((e) => {
+		if (e.type && Se.has(e.type)) return !1;
+		let n = t?.fields?.[e.name];
+		return n ? !Ee(n.type) : !0;
+	});
+}
+var Fe = {
+	1: void 0,
+	2: "grid gap-4 grid-cols-1 @md:grid-cols-2",
+	3: "grid gap-4 grid-cols-1 @md:grid-cols-2 @2xl:grid-cols-3",
+	4: "grid gap-4 grid-cols-1 @md:grid-cols-2 @2xl:grid-cols-3 @4xl:grid-cols-4"
+};
+function Ie(e) {
+	return Fe[e && e > 0 ? Math.min(Math.floor(e), 4) : 1];
+}
+function Le(e, t) {
+	let n = t && t > 1 ? Math.min(Math.floor(t), 4) : 1, r = n > 1 ? Ae(e, n) : e, i = Ie(n);
+	return {
+		fields: r,
+		columns: n,
+		...i ? { fieldContainerClass: i } : {}
+	};
+}
+function Re(e) {
+	return e <= 1 ? "default" : e === 2 ? "xl" : "full";
+}
+function ze(e, t, n, r) {
+	let i = [...e];
+	if (i = Me(i, t), r === "create" && (i = Pe(i, t)), n !== void 0) return i = Ae(i, n), {
+		fields: i,
+		columns: n
+	};
+	let a = De(i.length);
+	return i = Ae(i, a), {
+		fields: i,
+		columns: a
+	};
+}
+//#endregion
 //#region src/TabbedForm.tsx
-var Se = ({ schema: n, dataSource: r, className: i }) => {
+var Be = ({ schema: n, dataSource: r, className: i }) => {
 	let { fieldLabel: a } = p(), [o, c] = s(null), [u, d] = s({}), [f, m] = s(!0), [h, g] = s(null), [_, v] = s(n.defaultTab || n.sections[0]?.name || n.sections[0]?.label || "tab-0");
 	e.useEffect(() => {
 		(async () => {
@@ -182,19 +322,19 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 	}, [n, r]), x = t(() => {
 		n.onCancel && n.onCancel();
 	}, [n]), S = (e, t) => e.name || e.label || `tab-${t}`;
-	if (h) return /* @__PURE__ */ Z("div", {
+	if (h) return /* @__PURE__ */ X("div", {
 		className: "p-4 border border-red-300 bg-red-50 rounded-md",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Y("h3", {
 			className: "text-red-800 font-semibold",
 			children: "Error loading form"
-		}), /* @__PURE__ */ X("p", {
+		}), /* @__PURE__ */ Y("p", {
 			className: "text-red-600 text-sm mt-1",
 			children: h.message
 		})]
 	});
-	if (f) return /* @__PURE__ */ Z("div", {
+	if (f) return /* @__PURE__ */ X("div", {
 		className: "p-8 text-center",
-		children: [/* @__PURE__ */ X("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ X("p", {
+		children: [/* @__PURE__ */ Y("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ Y("p", {
 			className: "mt-2 text-sm text-gray-600",
 			children: "Loading form..."
 		})]
@@ -211,31 +351,31 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 		onSubmit: b,
 		onCancel: x
 	}, w = n.tabPosition === "left" || n.tabPosition === "right";
-	return /* @__PURE__ */ X("div", {
+	return /* @__PURE__ */ Y("div", {
 		className: G("w-full", i, n.className),
-		children: /* @__PURE__ */ Z(re, {
+		children: /* @__PURE__ */ X(W, {
 			value: _,
 			onValueChange: v,
 			orientation: w ? "vertical" : "horizontal",
 			className: G(w && "flex gap-4"),
-			children: [/* @__PURE__ */ X(ae, {
+			children: [/* @__PURE__ */ Y(ie, {
 				className: G(w ? "flex-col h-auto" : "", n.tabPosition === "bottom" && "order-last", n.tabPosition === "right" && "order-last"),
-				children: n.sections.map((e, t) => /* @__PURE__ */ X(oe, {
+				children: n.sections.map((e, t) => /* @__PURE__ */ Y(ae, {
 					value: S(e, t),
 					className: w ? "w-full justify-start" : "",
 					children: e.label || `Tab ${t + 1}`
 				}, S(e, t)))
-			}), /* @__PURE__ */ X("div", {
+			}), /* @__PURE__ */ Y("div", {
 				className: "flex-1",
-				children: n.sections.map((e, t) => /* @__PURE__ */ X(ie, {
+				children: n.sections.map((e, t) => /* @__PURE__ */ Y(re, {
 					value: S(e, t),
 					className: "mt-0",
-					children: /* @__PURE__ */ X(_e, {
+					children: /* @__PURE__ */ Y(ve, {
 						description: e.description,
-						columns: e.columns || 1,
-						children: /* @__PURE__ */ X(l, { schema: {
+						columns: 1,
+						children: /* @__PURE__ */ Y(l, { schema: {
 							...C,
-							fields: y(e),
+							...Le(y(e), e.columns || 1),
 							showSubmit: n.showSubmit !== !1 && n.mode !== "view",
 							showCancel: n.showCancel !== !1
 						} })
@@ -244,8 +384,8 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 			})]
 		})
 	});
-}, Ce = ({ schema: n, dataSource: r, className: i }) => {
-	let { fieldLabel: o } = p(), [c, u] = s(null), [d, f] = s({}), [m, h] = s(!0), [g, _] = s(null), [v, y] = s(0), [b, x] = s(/* @__PURE__ */ new Set()), [S, C] = s(!1), w = e.useId(), [T, E] = s(0), D = e.useRef(!1), k = n.sections.length, A = v === 0, j = v === k - 1;
+}, Ve = ({ schema: n, dataSource: r, className: i }) => {
+	let { fieldLabel: o } = p(), [c, u] = s(null), [d, f] = s({}), [m, h] = s(!0), [g, _] = s(null), [v, y] = s(0), [b, x] = s(/* @__PURE__ */ new Set()), [S, C] = s(!1), [w, T] = s(null), E = e.useId(), [O, k] = s(0), A = e.useRef(!1), j = n.sections.length, M = v === 0, N = v === j - 1;
 	e.useEffect(() => {
 		(async () => {
 			if (!r) {
@@ -261,7 +401,7 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 	}, [n.objectName, r]), e.useEffect(() => {
 		(c || !r) && (async () => {
 			if (n.mode === "create" || !n.recordId || !r) {
-				D.current ||= (f(n.initialData || n.initialValues || {}), !0), h(!1);
+				A.current ||= (f(n.initialData || n.initialValues || {}), !0), h(!1);
 				return;
 			}
 			try {
@@ -281,7 +421,7 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 		r,
 		n.objectName
 	]);
-	let M = t((e) => xe(e, {
+	let P = t((e) => xe(e, {
 		objectSchema: c,
 		objectName: n.objectName,
 		readOnly: n.readOnly,
@@ -293,26 +433,44 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 		n.mode,
 		n.objectName,
 		o
-	]), N = a(() => v >= 0 && v < k ? M(n.sections[v]) : [], [
+	]), F = a(() => v >= 0 && v < j ? P(n.sections[v]) : [], [
 		v,
-		k,
+		j,
 		n.sections,
-		M
-	]), P = t(async (e) => {
+		P
+	]), ee = t(async (e) => {
 		let t = {
 			...d,
 			...e
 		};
-		if (f(t), x((e) => new Set(e).add(v)), j) {
+		if (f(t), x((e) => new Set(e).add(v)), N) {
 			C(!0);
 			try {
 				if (!r) return n.onSuccess && await n.onSuccess(t), t;
 				let e;
 				if (n.mode === "create" ? e = await r.create(n.objectName, t) : n.mode === "edit" && n.recordId && (e = await r.update(n.objectName, n.recordId, t)), n.onSuccess) await n.onSuccess(e);
-				else {
-					let t = ge(n.navigateOnSuccess, e);
+				else if (n.submitBehavior) {
+					let e = n.submitBehavior;
+					switch (e.kind) {
+						case "redirect":
+							ge(e.url) && setTimeout(() => window.location.assign(e.url), e.delayMs ?? 0);
+							break;
+						case "continue":
+							f({}), x(/* @__PURE__ */ new Set()), y(0), k((e) => e + 1);
+							break;
+						default: {
+							let t = e.kind === "thank-you" && e.message ? e.message : n.successMessage || (n.mode === "create" ? "Created" : "Saved");
+							K.success(t), T({
+								title: e.kind === "thank-you" ? e.title : void 0,
+								message: t
+							});
+							break;
+						}
+					}
+				} else {
+					let t = _e(n.navigateOnSuccess, e);
 					if (t) return window.location.assign(t), e;
-					se.success(n.successMessage || (n.mode === "create" ? "Created" : "Saved")), n.resetOnSuccess && n.mode === "create" && (f({}), x(/* @__PURE__ */ new Set()), y(0), E((e) => e + 1));
+					K.success(n.successMessage || (n.mode === "create" ? "Created" : "Saved")), n.resetOnSuccess && n.mode === "create" && (f({}), x(/* @__PURE__ */ new Set()), y(0), k((e) => e + 1));
 				}
 				return e;
 			} catch (e) {
@@ -320,72 +478,85 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 			} finally {
 				C(!1);
 			}
-		} else F(v + 1);
+		} else I(v + 1);
 	}, [
 		d,
 		v,
-		j,
+		N,
 		n,
 		r
-	]), F = t((e) => {
-		e >= 0 && e < k && (y(e), n.onStepChange && n.onStepChange(e));
-	}, [k, n]), I = t(() => {
-		F(v - 1);
-	}, [v, F]), L = t(() => {
+	]), I = t((e) => {
+		e >= 0 && e < j && (y(e), n.onStepChange && n.onStepChange(e));
+	}, [j, n]), L = t(() => {
+		I(v - 1);
+	}, [v, I]), R = t(() => {
 		n.onCancel && n.onCancel();
-	}, [n]), R = t((e) => {
-		(n.allowSkip || b.has(e) || e <= v) && F(e);
+	}, [n]), z = t((e) => {
+		(n.allowSkip || b.has(e) || e <= v) && I(e);
 	}, [
 		n.allowSkip,
 		b,
 		v,
-		F
+		I
 	]);
-	if (g) return /* @__PURE__ */ Z("div", {
+	if (g) return /* @__PURE__ */ X("div", {
 		className: "p-4 border border-red-300 bg-red-50 rounded-md",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Y("h3", {
 			className: "text-red-800 font-semibold",
 			children: "Error loading form"
-		}), /* @__PURE__ */ X("p", {
+		}), /* @__PURE__ */ Y("p", {
 			className: "text-red-600 text-sm mt-1",
 			children: g.message
 		})]
 	});
-	if (m) return /* @__PURE__ */ Z("div", {
+	if (m) return /* @__PURE__ */ X("div", {
 		className: "p-8 text-center",
-		children: [/* @__PURE__ */ X("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ X("p", {
+		children: [/* @__PURE__ */ Y("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ Y("p", {
 			className: "mt-2 text-sm text-gray-600",
 			children: "Loading form..."
 		})]
 	});
-	let z = n.sections[v];
-	return /* @__PURE__ */ Z("div", {
+	if (w) return /* @__PURE__ */ Y("div", {
+		className: G("w-full", i, n.className),
+		children: /* @__PURE__ */ X("div", {
+			className: "rounded-md border bg-card p-8 text-center",
+			children: [/* @__PURE__ */ Y("h3", {
+				className: "text-lg font-semibold",
+				children: w.title ?? "Thanks!"
+			}), w.message && /* @__PURE__ */ Y("p", {
+				className: "mt-2 text-sm text-muted-foreground",
+				children: w.message
+			})]
+		})
+	});
+	let B = n.sections[v];
+	return /* @__PURE__ */ X("div", {
 		className: G("w-full", i, n.className),
 		children: [
-			n.showStepIndicator !== !1 && /* @__PURE__ */ X("nav", {
+			n.showStepIndicator !== !1 && /* @__PURE__ */ Y("nav", {
 				"aria-label": "Progress",
 				className: "mb-8",
-				children: /* @__PURE__ */ X("ol", {
+				children: /* @__PURE__ */ Y("ol", {
 					className: "flex items-center",
 					children: n.sections.map((e, t) => {
 						let r = t === v, i = b.has(t), a = n.allowSkip || i || t <= v;
-						return /* @__PURE__ */ Z("li", {
-							className: G("relative flex-1", t !== k - 1 && "pr-8 sm:pr-12"),
-							children: [t !== k - 1 && /* @__PURE__ */ X("div", {
+						return /* @__PURE__ */ X("li", {
+							className: G("relative flex-1", t !== j - 1 && "pr-8 sm:pr-12"),
+							children: [t !== j - 1 && /* @__PURE__ */ Y("div", {
 								className: "absolute top-3 sm:top-4 left-6 -right-4 sm:left-10 sm:-right-2 h-0.5",
 								"aria-hidden": "true",
-								children: /* @__PURE__ */ X("div", { className: G("h-full", i ? "bg-primary" : "bg-muted") })
-							}), /* @__PURE__ */ Z("button", {
+								children: /* @__PURE__ */ Y("div", { className: G("h-full", i ? "bg-primary" : "bg-muted") })
+							}), /* @__PURE__ */ X("button", {
 								type: "button",
 								className: G("group relative flex items-center", a ? "cursor-pointer" : "cursor-not-allowed"),
-								onClick: () => R(t),
+								onClick: () => z(t),
 								disabled: !a,
-								children: [/* @__PURE__ */ X("span", {
+								children: [/* @__PURE__ */ Y("span", {
 									className: G("flex h-6 w-6 sm:h-8 sm:w-8 items-center justify-center rounded-full text-xs sm:text-sm font-medium transition-colors", i && "bg-primary text-primary-foreground", r && !i && "border-2 border-primary bg-background text-primary", !r && !i && "border-2 border-muted bg-background text-muted-foreground"),
-									children: i ? /* @__PURE__ */ X(K, { className: "h-3 w-3 sm:h-4 sm:w-4" }) : t + 1
-								}), /* @__PURE__ */ X("span", {
+									children: i ? /* @__PURE__ */ Y(ce, { className: "h-3 w-3 sm:h-4 sm:w-4" }) : t + 1
+								}), /* @__PURE__ */ Y("span", {
 									className: "ml-2 sm:ml-3 text-xs sm:text-sm font-medium hidden sm:block",
-									children: /* @__PURE__ */ X("span", {
+									children: /* @__PURE__ */ Y("span", {
 										className: G(r ? "text-foreground" : "text-muted-foreground"),
 										children: e.label || `Step ${t + 1}`
 									})
@@ -395,70 +566,70 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 					})
 				})
 			}),
-			/* @__PURE__ */ X("div", {
+			/* @__PURE__ */ Y("div", {
 				className: "min-h-[200px]",
-				children: z && /* @__PURE__ */ X(_e, {
-					label: z.label,
-					description: z.description,
-					columns: z.columns || 1,
-					children: N.length > 0 ? /* @__PURE__ */ X(l, { schema: {
+				children: B && /* @__PURE__ */ Y(ve, {
+					label: B.label,
+					description: B.description,
+					columns: 1,
+					children: F.length > 0 ? /* @__PURE__ */ Y(l, { schema: {
 						type: "form",
 						objectName: n.objectName,
-						id: w,
-						fields: N,
+						id: E,
+						...Le(F, B.columns || 1),
 						layout: "vertical",
 						defaultValues: d,
 						showSubmit: !1,
 						showCancel: !1,
-						onSubmit: P
-					} }, T) : /* @__PURE__ */ X("div", {
+						onSubmit: ee
+					} }, O) : /* @__PURE__ */ Y("div", {
 						className: "text-center py-8 text-muted-foreground",
 						children: "No fields configured for this step"
 					})
 				})
 			}),
-			/* @__PURE__ */ Z("div", {
+			/* @__PURE__ */ X("div", {
 				className: "flex items-center justify-between mt-6 pt-4 border-t",
-				children: [/* @__PURE__ */ X("div", { children: n.showCancel !== !1 && /* @__PURE__ */ X(O, {
+				children: [/* @__PURE__ */ Y("div", { children: n.showCancel !== !1 && /* @__PURE__ */ Y(D, {
 					variant: "ghost",
-					onClick: L,
+					onClick: R,
 					children: n.cancelText || "Cancel"
-				}) }), /* @__PURE__ */ Z("div", {
+				}) }), /* @__PURE__ */ X("div", {
 					className: "flex items-center gap-2",
 					children: [
-						/* @__PURE__ */ Z("span", {
+						/* @__PURE__ */ X("span", {
 							className: "text-sm text-muted-foreground mr-2",
 							children: [
 								"Step ",
 								v + 1,
 								" of ",
-								k
+								j
 							]
 						}),
-						!A && /* @__PURE__ */ Z(O, {
+						!M && /* @__PURE__ */ X(D, {
 							variant: "outline",
-							onClick: I,
-							children: [/* @__PURE__ */ X(de, { className: "h-4 w-4 mr-1" }), n.prevText || "Back"]
+							onClick: L,
+							children: [/* @__PURE__ */ Y(ue, { className: "h-4 w-4 mr-1" }), n.prevText || "Back"]
 						}),
-						j ? /* @__PURE__ */ Z(O, {
+						N ? /* @__PURE__ */ X(D, {
 							type: "submit",
-							form: w,
+							form: E,
 							disabled: S || n.mode === "view",
-							children: [S && /* @__PURE__ */ X(fe, {
+							children: [S && /* @__PURE__ */ Y(fe, {
 								className: "mr-2 h-4 w-4 animate-spin",
 								"aria-hidden": !0
 							}), S ? "Submitting..." : n.submitText || (n.mode === "create" ? "Create" : "Update")]
-						}) : /* @__PURE__ */ Z(O, {
+						}) : /* @__PURE__ */ X(D, {
 							type: "submit",
-							form: w,
-							children: [n.nextText || "Next", /* @__PURE__ */ X(J, { className: "h-4 w-4 ml-1" })]
+							form: E,
+							children: [n.nextText || "Next", /* @__PURE__ */ Y(de, { className: "h-4 w-4 ml-1" })]
 						})
 					]
 				})]
 			})
 		]
 	});
-}, we = ({ schema: e, dataSource: n, className: i }) => {
+}, He = ({ schema: e, dataSource: n, className: i }) => {
 	let { fieldLabel: o } = p(), [c, u] = s(null), [d, f] = s({}), [m, h] = s(!0), [g, _] = s(null);
 	r(() => {
 		(async () => {
@@ -524,19 +695,19 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 	}, [e]), x = a(() => e.sections.slice(0, 1), [e.sections]), S = a(() => e.sections.slice(1), [e.sections]);
 	a(() => e.sections.flatMap((e) => v(e)), [e.sections, v]);
 	let C = e.splitDirection || "horizontal", w = e.splitSize || 50;
-	if (g) return /* @__PURE__ */ Z("div", {
+	if (g) return /* @__PURE__ */ X("div", {
 		className: "p-4 border border-red-300 bg-red-50 rounded-md",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Y("h3", {
 			className: "text-red-800 font-semibold",
 			children: "Error loading form"
-		}), /* @__PURE__ */ X("p", {
+		}), /* @__PURE__ */ Y("p", {
 			className: "text-red-600 text-sm mt-1",
 			children: g.message
 		})]
 	});
-	if (m) return /* @__PURE__ */ Z("div", {
+	if (m) return /* @__PURE__ */ X("div", {
 		className: "p-8 text-center",
-		children: [/* @__PURE__ */ X("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ X("p", {
+		children: [/* @__PURE__ */ Y("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ Y("p", {
 			className: "mt-2 text-sm text-gray-600",
 			children: "Loading form..."
 		})]
@@ -548,15 +719,15 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 		defaultValues: d,
 		onSubmit: y,
 		onCancel: b
-	}, E = (t, n) => /* @__PURE__ */ X("div", {
+	}, E = (t, n) => /* @__PURE__ */ Y("div", {
 		className: "space-y-4 p-4",
-		children: t.map((t, r) => /* @__PURE__ */ X(_e, {
+		children: t.map((t, r) => /* @__PURE__ */ Y(ve, {
 			label: t.label,
 			description: t.description,
-			columns: t.columns || 1,
-			children: /* @__PURE__ */ X(l, { schema: {
+			columns: 1,
+			children: /* @__PURE__ */ Y(l, { schema: {
 				...T,
-				fields: v(t),
+				...Le(v(t), t.columns || 1),
 				showSubmit: n && e.showSubmit !== !1 && e.mode !== "view",
 				showCancel: n && e.showCancel !== !1,
 				submitLabel: e.submitText || (e.mode === "create" ? "Create" : "Update"),
@@ -564,47 +735,81 @@ var Se = ({ schema: n, dataSource: r, className: i }) => {
 			} })
 		}, t.name || t.label || r))
 	});
-	return /* @__PURE__ */ X("div", {
+	return /* @__PURE__ */ Y("div", {
 		className: G("w-full", i, e.className),
-		children: /* @__PURE__ */ Z(V, {
+		children: /* @__PURE__ */ X(z, {
 			orientation: C,
 			className: "min-h-[300px] rounded-lg border",
-			children: [/* @__PURE__ */ X(B, {
+			children: [/* @__PURE__ */ Y(R, {
 				defaultSize: w,
 				minSize: 20,
 				children: E(x, S.length === 0)
-			}), S.length > 0 && /* @__PURE__ */ Z(Y, { children: [/* @__PURE__ */ X(z, { withHandle: e.splitResizable !== !1 }), /* @__PURE__ */ X(B, {
+			}), S.length > 0 && /* @__PURE__ */ X(J, { children: [/* @__PURE__ */ Y(L, { withHandle: e.splitResizable !== !1 }), /* @__PURE__ */ Y(R, {
 				defaultSize: 100 - w,
 				minSize: 20,
 				children: E(S, !0)
 			})] })]
 		})
 	});
-}, $ = (e) => e == null ? void 0 : e.id ?? e._id ?? e.recordId, Te = /* @__PURE__ */ new Set([
+}, Ue = /* @__PURE__ */ new Set([
+	"id",
+	"_id",
+	"created_at",
+	"updated_at",
+	"createdAt",
+	"updatedAt",
+	"organization_id",
+	"organizationId"
+]), We = /* @__PURE__ */ new Set([
+	"formula",
+	"summary",
+	"rollup",
+	"lookup_value",
+	"auto_number",
+	"autonumber",
+	"computed"
+]);
+function Ge(e, t) {
+	if (!e || typeof e != "object") return e;
+	let n = {}, r = t?.fields;
+	for (let [t, i] of Object.entries(e)) if (!Ue.has(t)) {
+		if (r) {
+			let e = r[t];
+			if (!e) continue;
+			let n = String(e.type || "").toLowerCase();
+			if (We.has(n) || e.computed === !0 || e.formula || e.readOnly === !0 || e.readonly === !0) continue;
+		}
+		n[t] = i;
+	}
+	return n;
+}
+//#endregion
+//#region src/masterDetailTx.ts
+var $ = (e) => e == null ? void 0 : e.id ?? e._id ?? e.recordId, Ke = (e, t) => t ? Ge(e, t) : e, qe = /* @__PURE__ */ new Set([
 	"id",
 	"_id",
 	"recordId"
 ]);
-function Ee(e, t) {
-	return e ? Object.entries(e).every(([e, n]) => e === t || Te.has(e) ? !0 : n == null || n === "") : !0;
+function Je(e, t) {
+	return e ? Object.entries(e).every(([e, n]) => e === t || qe.has(e) ? !0 : n == null || n === "") : !0;
 }
-function De(e, t, n) {
+function Ye(e, t, n) {
 	let r = [{
 		object: e,
 		action: "create",
 		data: t
 	}];
-	for (let e of n) for (let t of e.rows) Ee(t, e.relationshipField) || r.push({
+	for (let e of n) for (let t of e.rows) Je(t, e.relationshipField) || r.push({
 		object: e.childObject,
 		action: "create",
 		data: {
-			...t,
+			...Ke(t, e.childSchema),
 			[e.relationshipField]: { $ref: 0 }
 		}
 	});
 	return r;
 }
-function Oe(e, t, n, r) {
+function Xe(e, t, n, r) {
 	let i = [{
 		object: e,
 		action: "update",
@@ -615,21 +820,21 @@ function Oe(e, t, n, r) {
 		let n = (e.rows || []).map((n) => ({
 			...n,
 			[e.relationshipField]: t
-		})), { toCreate: r, toUpdate: a, toDelete: o } = ke(e.original || [], n);
+		})), { toCreate: r, toUpdate: a, toDelete: o } = Ze(e.original || [], n);
 		for (let t of r) {
-			if (Ee(t, e.relationshipField)) continue;
+			if (Je(t, e.relationshipField)) continue;
 			let { id: n, _id: r, recordId: a, ...o } = t;
 			i.push({
 				object: e.childObject,
 				action: "create",
-				data: o
+				data: Ke(o, e.childSchema)
 			});
 		}
 		for (let t of a) i.push({
 			object: e.childObject,
 			action: "update",
 			id: $(t),
-			data: t
+			data: Ke(t, e.childSchema)
 		});
 		for (let t of o) i.push({
 			object: e.childObject,
@@ -639,7 +844,7 @@ function Oe(e, t, n, r) {
 	}
 	return i;
 }
-function ke(e, t) {
+function Ze(e, t) {
 	let n = new Set(t.map($).filter(Boolean));
 	return {
 		toCreate: t.filter((e) => !$(e)),
@@ -647,25 +852,25 @@ function ke(e, t) {
 		toDelete: (e || []).map($).filter((e) => !!e && !n.has(e))
 	};
 }
-function Ae(e, t) {
+function Qe(e, t) {
 	return Array.isArray(e) ? e.reduce((e, n) => {
 		let r = Number(n?.[t]);
 		return e + (Number.isFinite(r) ? r : 0);
 	}, 0) : 0;
 }
-function je(e) {
+function $e(e) {
 	return Array.isArray(e) ? e : e && Array.isArray(e.records) ? e.records : e && Array.isArray(e.data) ? e.data : e && (e.id || e._id) ? [e] : [];
 }
-async function Me(e, t, n) {
-	return n.length === 0 ? [] : typeof e.bulk == "function" ? je(await e.bulk(t, "create", n)) : je(await Promise.all(n.map((n) => e.create(t, n))));
+async function et(e, t, n) {
+	return n.length === 0 ? [] : typeof e.bulk == "function" ? $e(await e.bulk(t, "create", n)) : $e(await Promise.all(n.map((n) => e.create(t, n))));
 }
-async function Ne(e, t, n, r) {
-	let i = [], a = r.rows.filter((e) => $(e) || !Ee(e, r.relationshipField)).map((e) => ({
+async function tt(e, t, n, r) {
+	let i = [], a = r.rows.filter((e) => $(e) || !Je(e, r.relationshipField)).map((e) => ({
 		...e,
 		[r.relationshipField]: n
 	}));
 	if (r.original !== void 0) {
-		let { toCreate: t, toUpdate: n, toDelete: o } = ke(r.original, a), s = await Me(e, r.childObject, t);
+		let { toCreate: t, toUpdate: n, toDelete: o } = Ze(r.original, a), s = await et(e, r.childObject, t.map((e) => Ke(e, r.childSchema)));
 		for (let e of s) {
 			let t = $(e);
 			t && i.push({
@@ -673,9 +878,9 @@ async function Ne(e, t, n, r) {
 				id: t
 			});
 		}
-		await Promise.all(n.map((t) => e.update(r.childObject, $(t), t))), await Promise.all(o.map((t) => e.delete(r.childObject, t)));
+		await Promise.all(n.map((t) => e.update(r.childObject, $(t), Ke(t, r.childSchema)))), await Promise.all(o.map((t) => e.delete(r.childObject, t)));
 	} else {
-		let t = await Me(e, r.childObject, a);
+		let t = await et(e, r.childObject, a.map((e) => Ke(e, r.childSchema)));
 		for (let e of t) {
 			let t = $(e);
 			t && i.push({
@@ -685,14 +890,14 @@ async function Ne(e, t, n, r) {
 		}
 	}
 	if (r.totalField) {
-		let i = Ae(r.rows, r.amountField || "amount");
+		let i = Qe(r.rows, r.amountField || "amount");
 		await e.update(t, n, { [r.totalField]: i });
 	}
 	return { created: i };
 }
 //#endregion
 //#region src/deriveMasterDetail.ts
-var Pe = /* @__PURE__ */ new Set([
+var nt = /* @__PURE__ */ new Set([
 	"id",
 	"_id",
 	"recordId",
@@ -708,14 +913,14 @@ var Pe = /* @__PURE__ */ new Set([
 	"tenant_id",
 	"space",
 	"owner"
-]), Fe = /* @__PURE__ */ new Set([
+]), rt = /* @__PURE__ */ new Set([
 	"position",
 	"sort_order",
 	"sequence",
 	"line_no",
 	"line_number",
 	"sort"
-]), Ie = /* @__PURE__ */ new Set([
+]), it = /* @__PURE__ */ new Set([
 	"formula",
 	"summary",
 	"rollup",
@@ -734,7 +939,7 @@ var Pe = /* @__PURE__ */ new Set([
 	"markdown",
 	"richtext"
 ]);
-function Le(e) {
+function at(e) {
 	switch (e) {
 		case "number":
 		case "percent":
@@ -754,7 +959,7 @@ function Le(e) {
 		default: return "text";
 	}
 }
-function Re(e) {
+function ot(e) {
 	if (e?.type === "boolean" || e?.type === "toggle") return [{
 		label: "Yes",
 		value: "true"
@@ -771,7 +976,7 @@ function Re(e) {
 		value: String(e)
 	});
 }
-function ze(e, t) {
+function st(e, t) {
 	let n = e?.fields;
 	if (!n || typeof n != "object") return;
 	let r;
@@ -784,7 +989,7 @@ function ze(e, t) {
 	}
 	return r;
 }
-var Be = [
+var ct = [
 	"name",
 	"title",
 	"subject",
@@ -792,7 +997,7 @@ var Be = [
 	"full_name",
 	"display_name",
 	"code"
-], Ve = {
+], lt = {
 	select: 0,
 	currency: 1,
 	number: 1,
@@ -800,15 +1005,15 @@ var Be = [
 	date: 3,
 	text: 4
 };
-function He(e, t) {
+function ut(e, t) {
 	if (t <= 0 || e.length <= t) return e;
-	let n = /* @__PURE__ */ new Set(), r = e.find((e) => Be.includes(e.field)) ?? e[0];
+	let n = /* @__PURE__ */ new Set(), r = e.find((e) => ct.includes(e.field)) ?? e[0];
 	r && n.add(r.field);
 	for (let t of e) t.required && n.add(t.field);
 	let i = e.map((e, t) => ({
 		c: e,
 		i: t
-	})).filter(({ c: e }) => !n.has(e.field)).sort((e, t) => (Ve[e.c.type] ?? 5) - (Ve[t.c.type] ?? 5) || e.i - t.i);
+	})).filter(({ c: e }) => !n.has(e.field)).sort((e, t) => (lt[e.c.type] ?? 5) - (lt[t.c.type] ?? 5) || e.i - t.i);
 	for (let { c: e } of i) {
 		if (n.size >= t) break;
 		n.add(e.field);
@@ -818,43 +1023,60 @@ function He(e, t) {
 		defaultHidden: !0
 	});
 }
-function Ue(e, t = {}) {
+function dt(e, t = {}) {
 	let n = e?.fields;
 	if (!n || typeof n != "object") return [];
 	let r = /* @__PURE__ */ new Set([...t.exclude ?? [], ...t.relationshipField ? [t.relationshipField] : []]), i = [];
 	for (let [e, t] of Object.entries(n)) {
 		let n = t;
-		if (Pe.has(e) || r.has(e) || Fe.has(e) || n?.system || n?.readonly || n?.hidden || Ie.has(n?.type)) continue;
+		if (nt.has(e) || r.has(e) || rt.has(e) || n?.system || n?.readonly || n?.hidden || it.has(n?.type)) continue;
 		let a = {
 			field: e,
 			label: n?.label || e,
-			type: Le(n?.type),
+			type: at(n?.type),
 			required: !!n?.required
-		}, o = Re(n);
+		}, o = ot(n);
 		a.type === "select" && o && (a.options = o), a.type === "lookup" && (a.reference = n?.reference, a.displayField = n?.display_field || n?.reference_field), n?.readonlyWhen && (a.readonlyWhen = n.readonlyWhen), (n?.requiredWhen ?? n?.conditionalRequired) && (a.requiredWhen = n.requiredWhen ?? n.conditionalRequired);
 		let s = typeof n?.expression == "string" ? n.expression : n?.expression?.source;
 		s && typeof s == "string" && (a.computed = !0, a.expr = s, a.required = !1, typeof n?.scale == "number" && (a.scale = n.scale)), i.push(a);
 	}
-	return He(i, t.maxColumns ?? 6);
+	return ut(i, t.maxColumns ?? 6);
+}
+function ft(e, t) {
+	let n = e ?? [], r = t?.fields;
+	return !n.length || !r || typeof r != "object" ? n : n.map((e) => {
+		if (e.type) return e;
+		let t = r[e.field];
+		if (!t) return e;
+		let n = at(t?.type), i = {
+			...e,
+			type: n
+		};
+		i.label ??= t?.label || e.field, i.required ??= !!t?.required;
+		let a = ot(t);
+		n === "select" && a && !i.options && (i.options = a), n === "lookup" && (i.reference ??= t?.reference, i.displayField ??= t?.display_field || t?.reference_field), i.readonlyWhen == null && t?.readonlyWhen && (i.readonlyWhen = t.readonlyWhen), i.requiredWhen == null && (t?.requiredWhen ?? t?.conditionalRequired) && (i.requiredWhen = t.requiredWhen ?? t.conditionalRequired);
+		let o = typeof t?.expression == "string" ? t.expression : t?.expression?.source;
+		return !i.computed && o && typeof o == "string" && (i.computed = !0, i.expr = o, i.required = !1, typeof t?.scale == "number" && (i.scale = t.scale)), i;
+	});
 }
-var We = /* @__PURE__ */ new Set([
+var pt = /* @__PURE__ */ new Set([
 	"formula",
 	"summary",
 	"rollup",
 	"autonumber",
 	"auto_number"
 ]);
-function Ge(e, t = {}) {
+function mt(e, t = {}) {
 	let n = e?.fields;
 	if (!n || typeof n != "object") return [];
 	let r = /* @__PURE__ */ new Set([...t.exclude ?? [], ...t.relationshipField ? [t.relationshipField] : []]), i = [];
 	for (let [e, t] of Object.entries(n)) {
 		let n = t;
-		Pe.has(e) || r.has(e) || Fe.has(e) || n?.system || n?.hidden || We.has(n?.type) || i.push(e);
+		nt.has(e) || r.has(e) || rt.has(e) || n?.system || n?.hidden || pt.has(n?.type) || i.push(e);
 	}
 	return i;
 }
-var Ke = /* @__PURE__ */ new Set([
+var ht = /* @__PURE__ */ new Set([
 	"textarea",
 	"richtext",
 	"html",
@@ -868,12 +1090,12 @@ var Ke = /* @__PURE__ */ new Set([
 	"location",
 	"address"
 ]);
-function qe(e, t, n = {}) {
+function gt(e, t, n = {}) {
 	if (t === "grid" || t === "form") return t;
-	let r = e?.fields ?? {}, i = Ge(e, { relationshipField: n.relationshipField });
-	return i.some((e) => Ke.has(r[e]?.type)) || i.length > 8 ? "form" : "grid";
+	let r = e?.fields ?? {}, i = mt(e, { relationshipField: n.relationshipField });
+	return i.some((e) => ht.has(r[e]?.type)) || i.length > 8 ? "form" : "grid";
 }
-var Je = [
+var _t = [
 	"amount",
 	"total",
 	"subtotal",
@@ -881,33 +1103,33 @@ var Je = [
 	"line_amount",
 	"net_amount"
 ];
-function Ye(e) {
+function vt(e) {
 	let t = e.filter((e) => e.type === "number" || e.type === "currency");
 	if (t.length === 0) return;
 	let n = t.find((e) => e.computed);
 	if (n) return n.field;
-	let r = t.find((e) => Je.includes(e.field));
+	let r = t.find((e) => _t.includes(e.field));
 	if (r) return r.field;
 	let i = [...t].reverse().find((e) => e.type === "currency");
 	return i ? i.field : t[t.length - 1].field;
 }
-function Xe(e, t, n, r = {}) {
-	let i = r.relationshipField || ze(t, n);
+function yt(e, t, n, r = {}) {
+	let i = r.relationshipField || st(t, n);
 	if (!i) throw Error(`MasterDetailForm: could not find a lookup/master_detail field on "${e}" referencing "${n}". Set relationshipField explicitly.`);
-	let a = r.columns?.length ? r.columns : Ue(t, { relationshipField: i }), o = r.amountField || Ye(a);
+	let a = r.columns?.length ? ft(r.columns, t) : dt(t, { relationshipField: i }), o = r.amountField || vt(a);
 	return {
 		childObject: e,
 		relationshipField: i,
 		columns: a,
-		formFields: Ge(t, { relationshipField: i }),
-		mode: qe(t, r.inlineEdit ?? (t?.fields)?.[i]?.inlineEdit, { relationshipField: i }),
+		formFields: mt(t, { relationshipField: i }),
+		mode: gt(t, r.inlineEdit ?? (t?.fields)?.[i]?.inlineEdit, { relationshipField: i }),
 		amountField: o,
-		sortField: Object.keys(t?.fields ?? {}).find((e) => Fe.has(e))
+		sortField: Object.keys(t?.fields ?? {}).find((e) => rt.has(e))
 	};
 }
 //#endregion
 //#region src/MasterDetailForm.tsx
-function Ze(e) {
+function bt(e) {
 	if (!e) return {};
 	let t = {};
 	return e.querySelectorAll("[name]").forEach((e) => {
@@ -939,13 +1161,13 @@ function Ze(e) {
 		}
 	}), t;
 }
-var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, formKey: c, onRowExpand: l, onAddViaForm: u }) => {
+var xt = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, formKey: c, onRowExpand: l, onAddViaForm: u }) => {
 	let [d, f] = s({}), p = o("");
 	r(() => {
 		let e = i.current;
 		if (!e) return;
 		let t = () => {
-			let t = Ze(e), n;
+			let t = bt(e), n;
 			try {
 				n = JSON.stringify(t);
 			} catch {
@@ -969,16 +1191,16 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		c,
 		e.length
 	]);
-	let m = d[a], g = m === void 0 ? null : Number.isFinite(Number(m)) ? Number(m) : 0, _ = e.reduce((e, n, r) => e + Ae(t[r]?.rows ?? [], n.amountField || "amount"), 0), v = g !== null && e.some((e) => !!e.amountField), y = g ?? 0, b = y / 100 * _, x = _ + b, S = (e) => `¥${e.toLocaleString(void 0, {
+	let m = d[a], g = m === void 0 ? null : Number.isFinite(Number(m)) ? Number(m) : 0, _ = e.reduce((e, n, r) => e + Qe(t[r]?.rows ?? [], n.amountField || "amount"), 0), v = g !== null && e.some((e) => !!e.amountField), y = g ?? 0, b = y / 100 * _, x = _ + b, S = (e) => `¥${e.toLocaleString(void 0, {
 		minimumFractionDigits: 2,
 		maximumFractionDigits: 2
 	})}`;
-	return /* @__PURE__ */ Z(Y, { children: [e.map((e, r) => /* @__PURE__ */ Z("section", {
+	return /* @__PURE__ */ X(J, { children: [e.map((e, r) => /* @__PURE__ */ X("section", {
 		className: "space-y-2",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Y("h3", {
 			className: "text-sm font-medium text-foreground",
 			children: e.title || "Line Items"
-		}), e.columns?.length ? /* @__PURE__ */ X(h, {
+		}), e.columns?.length ? /* @__PURE__ */ Y(h, {
 			value: t[r]?.rows ?? [],
 			onChange: (e) => n(r, e),
 			contextRecord: d,
@@ -993,45 +1215,45 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 				max_rows: e.maxRows,
 				add_label: e.inlineMode === "form" ? e.addLabel || "Add" : e.addLabel
 			}
-		}) : /* @__PURE__ */ X("p", {
+		}) : /* @__PURE__ */ Y("p", {
 			className: "py-4 text-sm text-muted-foreground",
 			children: "Loading columns…"
 		})]
-	}, `${e.childObject}-${r}`)), v && /* @__PURE__ */ X("div", {
+	}, `${e.childObject}-${r}`)), v && /* @__PURE__ */ Y("div", {
 		className: "flex justify-end",
-		children: /* @__PURE__ */ Z("dl", {
+		children: /* @__PURE__ */ X("dl", {
 			className: "w-64 space-y-1.5 text-sm",
 			"data-testid": "md-totals",
 			children: [
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ X("div", {
 					className: "flex items-center justify-between",
-					children: [/* @__PURE__ */ X("dt", {
+					children: [/* @__PURE__ */ Y("dt", {
 						className: "text-muted-foreground",
 						children: "Subtotal"
-					}), /* @__PURE__ */ X("dd", {
+					}), /* @__PURE__ */ Y("dd", {
 						className: "tabular-nums",
 						"data-testid": "md-subtotal",
 						children: S(_)
 					})]
 				}),
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ X("div", {
 					className: "flex items-center justify-between",
-					children: [/* @__PURE__ */ Z("dt", {
+					children: [/* @__PURE__ */ X("dt", {
 						className: "text-muted-foreground",
 						children: [
 							"Tax (",
 							y,
 							"%)"
 						]
-					}), /* @__PURE__ */ X("dd", {
+					}), /* @__PURE__ */ Y("dd", {
 						className: "tabular-nums",
 						"data-testid": "md-tax",
 						children: S(b)
 					})]
 				}),
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ X("div", {
 					className: "flex items-center justify-between border-t border-border pt-1.5 text-base font-semibold",
-					children: [/* @__PURE__ */ X("dt", { children: "Total" }), /* @__PURE__ */ X("dd", {
+					children: [/* @__PURE__ */ Y("dt", { children: "Total" }), /* @__PURE__ */ Y("dd", {
 						className: "tabular-nums",
 						"data-testid": "md-grand-total",
 						children: S(x)
@@ -1040,8 +1262,8 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 			]
 		})
 	})] });
-}, $e = ({ schema: e, dataSource: n, className: i }) => {
-	let c = e.details || [], l = e.mode === "edit" && !!e.recordId, u = c.some((e) => !e.relationshipField || !e.columns?.length), [d, f] = s(u ? null : c), p = d ?? c;
+}, St = ({ schema: e, dataSource: n, className: i }) => {
+	let c = e.details || [], l = e.mode === "edit" && !!e.recordId, u = c.some((e) => !e.relationshipField || !e.columns?.length || e.columns.some((e) => !e.type)), [d, f] = s(u ? null : c), p = d ?? c;
 	r(() => {
 		if (!u) {
 			f(c);
@@ -1051,9 +1273,15 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		let t = !1;
 		return (async () => {
 			let r = await Promise.all(c.map(async (t) => {
-				if (t.relationshipField && t.columns?.length) return t;
+				let r = t.columns?.length ? t.columns.every((e) => !!e.type) : !1;
+				if (t.relationshipField && r) return t;
 				try {
-					let r = await n.getObjectSchema(t.childObject), i = Xe(t.childObject, r, e.objectName, {
+					let r = await n.getObjectSchema(t.childObject);
+					if (t.relationshipField && t.columns?.length) return {
+						...t,
+						columns: ft(t.columns, r)
+					};
+					let i = yt(t.childObject, r, e.objectName, {
 						relationshipField: t.relationshipField,
 						columns: t.columns,
 						amountField: t.amountField
@@ -1085,8 +1313,33 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		original: []
 	}))), g = o(m);
 	g.current = m;
-	let [_, v] = s(0), [y, b] = s(!1), x = o(!1), S = o(null), C = t(() => {
-		x.current = !1, b(!1), S.current &&= (clearTimeout(S.current), null);
+	let _ = o({});
+	r(() => {
+		let e = n;
+		if (!e || typeof e.getObjectSchema != "function") return;
+		let t = !1, r = Array.from(new Set(c.map((e) => e.childObject).filter(Boolean)));
+		return (async () => {
+			let n = await Promise.all(r.map(async (t) => {
+				try {
+					return [t, await e.getObjectSchema(t)];
+				} catch {
+					return [t, null];
+				}
+			}));
+			if (t) return;
+			let i = {};
+			for (let [e, t] of n) t && (i[e] = t);
+			_.current = i;
+		})(), () => {
+			t = !0;
+		};
+	}, [
+		n,
+		e.objectName,
+		e.details
+	]);
+	let [v, y] = s(0), [b, x] = s(!1), S = o(!1), C = o(null), w = t(() => {
+		S.current = !1, x(!1), C.current &&= (clearTimeout(C.current), null);
 	}, []);
 	r(() => {
 		let t = !1;
@@ -1122,12 +1375,12 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		e.recordId,
 		d
 	]);
-	let w = t((e, t) => {
+	let T = t((e, t) => {
 		h((n) => n.map((n, r) => r === e ? {
 			...n,
 			rows: t
 		} : n));
-	}, []), T = e.taxRateField || "tax_rate", [E, D] = s(null), j = E ? m[E.detailIdx]?.rows?.[E.rowIdx] : void 0, P = E ? p[E.detailIdx] : void 0, F = t((e, t, n) => {
+	}, []), E = e.taxRateField || "tax_rate", [A, N] = s(null), P = A ? m[A.detailIdx]?.rows?.[A.rowIdx] : void 0, F = A ? p[A.detailIdx] : void 0, ee = t((e, t, n) => {
 		h((r) => r.map((r, i) => i === e ? {
 			...r,
 			rows: r.rows.map((e, r) => r === t ? {
@@ -1141,42 +1394,43 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 				...t,
 				rows: [...t.rows, {}]
 			} : t);
-			return D({
+			return N({
 				detailIdx: e,
 				rowIdx: n[e].rows.length - 1,
 				isNew: !0
 			}), n;
 		});
 	}, []), L = t(() => {
-		D((e) => (e?.isNew && h((t) => t.map((t, n) => n === e.detailIdx ? {
+		N((e) => (e?.isNew && h((t) => t.map((t, n) => n === e.detailIdx ? {
 			...t,
 			rows: t.rows.filter((t, n) => n !== e.rowIdx)
 		} : t)), null));
 	}, []), R = t(async (t) => {
-		C(), se.success(l ? e.title ? `${e.title} saved` : "Saved" : "Created"), l || (h(p.map(() => ({
+		w(), e.onSuccess || K.success(l ? e.title ? `${e.title} saved` : "Saved" : "Created"), l || (h(p.map(() => ({
 			rows: [],
 			original: []
-		}))), v((e) => e + 1)), await e.onSuccess?.(t);
+		}))), y((e) => e + 1)), await e.onSuccess?.(t);
 	}, [
 		l,
 		e.onSuccess,
 		e.title,
 		p.length,
-		C
+		w
 	]), z = t((t) => {
-		C(), se.error(t?.message || "Save failed"), e.onError?.(t);
-	}, [e, C]), B = t(async (t) => {
+		w(), K.error(t?.message || "Save failed"), e.onError?.(t);
+	}, [e, w]), B = t(async (t) => {
 		let r = [];
 		for (let i = 0; i < p.length; i++) {
 			let a = p[i], { rows: o, original: s } = g.current[i];
 			if (!a.relationshipField) continue;
-			let { created: c } = await Ne(n, e.objectName, t, {
+			let { created: c } = await tt(n, e.objectName, t, {
 				childObject: a.childObject,
 				relationshipField: a.relationshipField,
 				rows: o,
 				original: l ? s : void 0,
 				amountField: a.amountField,
-				totalField: a.totalField
+				totalField: a.totalField,
+				childSchema: _.current[a.childObject]
 			});
 			r.push(...c);
 		}
@@ -1203,20 +1457,22 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		B,
 		e,
 		R
-	]), ee = typeof n?.batchTransaction == "function", te = t(async (t) => {
+	]), H = typeof n?.batchTransaction == "function", te = t(async (t) => {
 		let r = n, i = { ...t };
 		p.forEach((e, t) => {
-			e.totalField && (i[e.totalField] = Ae(g.current[t]?.rows ?? [], e.amountField || "amount"));
+			e.totalField && (i[e.totalField] = Qe(g.current[t]?.rows ?? [], e.amountField || "amount"));
 		});
-		let a = l ? Oe(e.objectName, e.recordId, i, p.filter((e) => e.relationshipField).map((e, t) => ({
+		let a = l ? Xe(e.objectName, e.recordId, i, p.filter((e) => e.relationshipField).map((e, t) => ({
 			childObject: e.childObject,
 			relationshipField: e.relationshipField,
 			rows: g.current[t]?.rows ?? [],
-			original: g.current[t]?.original ?? []
-		}))) : De(e.objectName, i, p.filter((e) => e.relationshipField).map((e, t) => ({
+			original: g.current[t]?.original ?? [],
+			childSchema: _.current[e.childObject]
+		}))) : Ye(e.objectName, i, p.filter((e) => e.relationshipField).map((e, t) => ({
 			childObject: e.childObject,
 			relationshipField: e.relationshipField,
-			rows: g.current[t]?.rows ?? []
+			rows: g.current[t]?.rows ?? [],
+			childSchema: _.current[e.childObject]
 		})));
 		return (await r.batchTransaction(a))?.results?.[0] ?? {
 			...i,
@@ -1228,7 +1484,7 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		e.objectName,
 		e.recordId,
 		l
-	]), H = a(() => ({
+	]), ne = a(() => ({
 		type: "object-form",
 		objectName: e.objectName,
 		mode: e.mode ?? "create",
@@ -1241,7 +1497,7 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		title: e.title,
 		showSubmit: !1,
 		showCancel: !1,
-		...ee ? {
+		...H ? {
 			submitHandler: te,
 			onSuccess: R
 		} : { onSuccess: V },
@@ -1249,53 +1505,53 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 	}), [
 		e,
 		V,
-		ee,
+		H,
 		te,
 		R,
 		z
-	]), U = o(null), ne = e.submitText ?? (l ? "Save" : "Create"), W = t(() => {
-		x.current || U.current?.querySelector("form") && (x.current = !0, b(!0), setTimeout(() => {
+	]), U = o(null), W = e.submitText ?? (l ? "Save" : "Create"), re = t(() => {
+		S.current || U.current?.querySelector("form") && (S.current = !0, x(!0), setTimeout(() => {
 			(U.current?.querySelector("form"))?.requestSubmit();
-		}, 0), S.current = setTimeout(() => C(), 1500));
-	}, [C]);
+		}, 0), C.current = setTimeout(() => w(), 1500));
+	}, [w]);
 	return r(() => () => {
-		S.current && clearTimeout(S.current);
-	}, []), /* @__PURE__ */ Z("div", {
+		C.current && clearTimeout(C.current);
+	}, []), /* @__PURE__ */ X("div", {
 		className: G("space-y-6", i, e.className),
 		children: [
-			/* @__PURE__ */ X("div", {
+			/* @__PURE__ */ Y("div", {
 				ref: U,
-				children: /* @__PURE__ */ X(Tt, {
-					schema: H,
+				children: /* @__PURE__ */ Y(At, {
+					schema: ne,
 					dataSource: n
-				}, _)
+				}, v)
 			}),
-			/* @__PURE__ */ X(Qe, {
+			/* @__PURE__ */ Y(xt, {
 				details: p,
 				state: m,
-				setRows: w,
+				setRows: T,
 				formHostRef: U,
-				taxRateField: T,
-				formKey: _,
-				onRowExpand: (e, t) => D({
+				taxRateField: E,
+				formKey: v,
+				onRowExpand: (e, t) => N({
 					detailIdx: e,
 					rowIdx: t
 				}),
 				onAddViaForm: I
 			}),
-			E && P && /* @__PURE__ */ Z(k, {
+			A && F && /* @__PURE__ */ X(O, {
 				className: "border-primary/40 shadow-none ring-1 ring-primary/10",
 				"data-testid": "md-row-form",
-				children: [/* @__PURE__ */ Z(M, {
+				children: [/* @__PURE__ */ X(j, {
 					className: "pb-2 flex flex-row items-center justify-between gap-2 space-y-0",
-					children: [/* @__PURE__ */ Z(N, {
+					children: [/* @__PURE__ */ X(M, {
 						className: "text-sm font-medium",
 						children: [
-							P.title || "Line item",
+							F.title || "Line item",
 							" — row ",
-							E.rowIdx + 1
+							A.rowIdx + 1
 						]
-					}), /* @__PURE__ */ X(O, {
+					}), /* @__PURE__ */ Y(D, {
 						type: "button",
 						variant: "ghost",
 						size: "sm",
@@ -1303,190 +1559,54 @@ var Qe = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 						onClick: L,
 						children: "Close"
 					})]
-				}), /* @__PURE__ */ X(A, { children: /* @__PURE__ */ X(Tt, {
+				}), /* @__PURE__ */ Y(k, { children: /* @__PURE__ */ Y(At, {
 					schema: {
 						type: "object-form",
-						objectName: P.childObject,
+						objectName: F.childObject,
 						mode: "edit",
-						initialData: j ?? {},
-						...P.formFields?.length ? { fields: P.formFields } : {},
+						initialData: P ?? {},
+						...F.formFields?.length ? { fields: F.formFields } : {},
 						submitText: "Apply",
 						submitHandler: async (e) => e,
 						onSuccess: (e) => {
-							F(E.detailIdx, E.rowIdx, e), D(null);
+							ee(A.detailIdx, A.rowIdx, e), N(null);
 						},
 						onCancel: L
 					},
 					dataSource: n
-				}, `row-${E.detailIdx}-${E.rowIdx}`) })]
+				}, `row-${A.detailIdx}-${A.rowIdx}`) })]
 			}),
-			e.showSubmit !== !1 && /* @__PURE__ */ Z("div", {
+			e.showSubmit !== !1 && /* @__PURE__ */ X("div", {
 				className: "flex items-center justify-end gap-2 border-t border-border pt-4",
-				children: [e.onCancel && /* @__PURE__ */ X(O, {
+				children: [e.onCancel && /* @__PURE__ */ Y(D, {
 					type: "button",
 					variant: "outline",
 					onClick: e.onCancel,
-					disabled: y,
+					disabled: b,
 					"data-testid": "md-form-cancel",
-					children: "Cancel"
-				}), /* @__PURE__ */ X(O, {
+					children: e.cancelText ?? "Cancel"
+				}), /* @__PURE__ */ Y(D, {
 					type: "button",
-					onClick: W,
-					disabled: y || u && !d,
+					onClick: re,
+					disabled: b || u && !d,
 					"data-testid": "md-form-submit",
-					children: y ? "Saving…" : ne
+					children: b ? "Saving…" : W
 				})]
 			})
 		]
 	});
-}, et = /* @__PURE__ */ new Set([
-	"field:formula",
-	"field:summary",
-	"field:auto_number",
-	"field:autonumber"
-]), tt = /* @__PURE__ */ new Set([
-	"field:textarea",
-	"field:markdown",
-	"field:html",
-	"field:grid",
-	"field:rich-text",
-	"textarea",
-	"markdown",
-	"html",
-	"grid",
-	"rich-text"
-]), nt = /* @__PURE__ */ new Set([
-	"formula",
-	"summary",
-	"auto_number",
-	"autonumber"
-]);
-function rt(e) {
-	return tt.has(e);
-}
-function it(e) {
-	return nt.has(e);
-}
-function at(e) {
-	return e <= 3 ? 1 : 2;
-}
-function ot(e, t) {
-	return t <= 1 ? e : e.map((e) => e.colSpan === void 0 && e.type && rt(e.type) ? {
-		...e,
-		colSpan: t
-	} : e);
-}
-var st = /* @__PURE__ */ new Set([
-	"id",
-	"created_at",
-	"createdAt",
-	"updated_at",
-	"updatedAt",
-	"last_modified_at",
-	"lastModifiedAt",
-	"deleted_at",
-	"deletedAt",
-	"created_by",
-	"createdBy",
-	"updated_by",
-	"updatedBy",
-	"last_modified_by",
-	"lastModifiedBy",
-	"organization_id",
-	"organizationId",
-	"org_id",
-	"orgId",
-	"tenant_id",
-	"tenantId",
-	"owner",
-	"owner_id",
-	"_version",
-	"_rev"
-]);
-function ct(e, t) {
-	return e.filter((e) => {
-		if (st.has(e.name)) return !1;
-		let n = t?.fields?.[e.name];
-		return !(n?.hidden === !0 || n?.readonly === !0);
-	});
-}
-function lt(e, t) {
-	return e.filter((e) => {
-		if (st.has(e.name) || e.type && et.has(e.type)) return !1;
-		if (!t?.fields) return !0;
-		let n = t.fields[e.name];
-		return n ? n.readonly === !0 ? !1 : !it(n.type) : !0;
-	});
-}
-function ut(e, t) {
-	return e.filter((e) => {
-		if (e.type && et.has(e.type)) return !1;
-		let n = t?.fields?.[e.name];
-		return n ? !it(n.type) : !0;
-	});
-}
-function dt(e) {
-	return e <= 1 ? "default" : e === 2 ? "xl" : "full";
-}
-function ft(e, t, n, r) {
-	let i = [...e];
-	if (i = ct(i, t), r === "create" && (i = ut(i, t)), n !== void 0) return i = ot(i, n), {
-		fields: i,
-		columns: n
-	};
-	let a = at(i.length);
-	return i = ot(i, a), {
-		fields: i,
-		columns: a
-	};
-}
-//#endregion
-//#region src/sanitize.ts
-var pt = /* @__PURE__ */ new Set([
-	"id",
-	"_id",
-	"created_at",
-	"updated_at",
-	"createdAt",
-	"updatedAt",
-	"organization_id",
-	"organizationId"
-]), mt = /* @__PURE__ */ new Set([
-	"formula",
-	"rollup",
-	"lookup_value",
-	"auto_number",
-	"autonumber",
-	"computed"
-]);
-function ht(e, t) {
-	if (!e || typeof e != "object") return e;
-	let n = {}, r = t?.fields;
-	for (let [t, i] of Object.entries(e)) if (!pt.has(t)) {
-		if (r) {
-			let e = r[t];
-			if (!e) continue;
-			let n = String(e.type || "").toLowerCase();
-			if (mt.has(n) || e.computed === !0 || e.formula || e.readOnly === !0 || e.readonly === !0) continue;
-		}
-		n[t] = i;
-	}
-	return n;
-}
-//#endregion
-//#region src/DrawerForm.tsx
-var gt = {
+}, Ct = {
 	1: void 0,
 	2: "grid gap-4 grid-cols-1 @md:grid-cols-2",
 	3: "grid gap-4 grid-cols-1 @md:grid-cols-2 @2xl:grid-cols-3",
 	4: "grid gap-4 grid-cols-1 @md:grid-cols-2 @2xl:grid-cols-3 @4xl:grid-cols-4"
-}, _t = Q({
+}, wt = Z({
 	"form.discardTitle": "Discard changes?",
 	"form.discardMessage": "You have unsaved changes. If you close this form now, your edits will be lost.",
 	"form.keepEditing": "Keep editing",
 	"form.discard": "Discard"
-}, "form.discardTitle"), vt = ({ schema: e, dataSource: n, className: c }) => {
-	let { fieldLabel: u } = p(), { t: f } = _t(), m = d(), [h, _] = s(null), [v, k] = s([]), [A, j] = s({}), [M, N] = s(!0), [P, F] = s(null), [I, L] = s(!1), [R, z] = s(!1), [B, V] = s(!1), W = o(!1), re = e.confirmOnDiscard !== !1, ie = e.open !== !1, ae = e.drawerSide || "right", oe = i(), [se, ce] = s(() => {
+}, "form.discardTitle"), Tt = ({ schema: e, dataSource: n, className: c }) => {
+	let { fieldLabel: u } = p(), { t: f } = wt(), m = d(), [h, _] = s(null), [O, k] = s([]), [A, j] = s({}), [M, N] = s(!0), [P, F] = s(null), [ee, I] = s(!1), [L, R] = s(!1), [z, U] = s(!1), W = o(!1), re = e.confirmOnDiscard !== !1, ie = e.open !== !1, ae = e.drawerSide || "right", K = i(), [oe, se] = s(() => {
 		let t = {};
 		return e.sections?.forEach((e, n) => {
 			let r = e.name || String(n);
@@ -1532,7 +1652,7 @@ var gt = {
 		n,
 		e.objectName
 	]);
-	let le = t((t) => xe(t, {
+	let ce = t((t) => xe(t, {
 		objectSchema: h,
 		objectName: e.objectName,
 		readOnly: e.readOnly,
@@ -1564,7 +1684,7 @@ var gt = {
 			i && r.push({
 				name: t,
 				label: u(e.objectName, t, i.label || t),
-				type: y(i.type),
+				type: v(i.type),
 				required: i.required || !1,
 				disabled: e.readOnly || e.mode === "view" || i.readonly,
 				placeholder: i.placeholder,
@@ -1585,32 +1705,32 @@ var gt = {
 		e.mode,
 		n
 	]);
-	let K = t(async (t) => {
-		V(!0);
+	let le = t(async (t) => {
+		U(!0);
 		try {
 			if (!n) return e.onSuccess && await e.onSuccess(t), e.onOpenChange?.(!1), t;
-			let r, i = ht(t, h);
+			let r, i = Ge(t, h);
 			return e.mode === "create" ? r = await n.create(e.objectName, i) : e.mode === "edit" && e.recordId && (r = await n.update(e.objectName, e.recordId, i)), e.onSuccess && await e.onSuccess(r), e.onOpenChange?.(!1), r;
 		} catch (t) {
 			throw e.onError && e.onError(t), t;
 		} finally {
-			V(!1);
+			U(!1);
 		}
 	}, [
 		e,
 		n,
 		h
 	]), q = t(() => {
-		z(!1), W.current && (W.current = !1, e.onCancel?.()), e.onOpenChange?.(!1);
+		R(!1), W.current && (W.current = !1, e.onCancel?.()), e.onOpenChange?.(!1);
 	}, [e]), ue = t((e) => {
-		W.current = e, re && I ? z(!0) : q();
+		W.current = e, re && ee ? R(!0) : q();
 	}, [
 		re,
-		I,
+		ee,
 		q
 	]), de = t(() => {
 		W.current = !0, q();
-	}, [q]), J = a(() => {
+	}, [q]), pe = a(() => {
 		if (e.drawerWidth) return ae === "left" || ae === "right" ? {
 			width: e.drawerWidth,
 			maxWidth: e.drawerWidth
@@ -1618,34 +1738,34 @@ var gt = {
 			height: e.drawerWidth,
 			maxHeight: e.drawerWidth
 		};
-	}, [e.drawerWidth, ae]), pe = e.layout === "vertical" || e.layout === "horizontal" ? e.layout : "vertical", me = e.showSubmit !== !1 && e.mode !== "view", Y = e.showCancel !== !1, Q = e.submitText || (e.mode === "create" ? "Create" : "Update"), he = e.cancelText || "Cancel", ge = {
+	}, [e.drawerWidth, ae]), me = e.layout === "vertical" || e.layout === "horizontal" ? e.layout : "vertical", J = e.showSubmit !== !1 && e.mode !== "view", Z = e.showCancel !== !1, he = e.submitText || (e.mode === "create" ? "Create" : "Update"), ge = e.cancelText || "Cancel", _e = {
 		type: "form",
 		objectName: e.objectName,
-		layout: pe,
+		layout: me,
 		defaultValues: A,
-		submitLabel: Q,
-		cancelLabel: he,
-		showSubmit: me,
-		showCancel: Y,
-		onSubmit: K,
+		submitLabel: he,
+		cancelLabel: ge,
+		showSubmit: J,
+		showCancel: Z,
+		onSubmit: le,
 		onCancel: de,
-		onDirtyChange: L,
+		onDirtyChange: I,
 		showActions: !1,
-		id: oe
-	}, _e = () => {
-		if (P) return /* @__PURE__ */ Z("div", {
+		id: K
+	}, ve = () => {
+		if (P) return /* @__PURE__ */ X("div", {
 			className: "p-4 border border-red-300 bg-red-50 rounded-md",
-			children: [/* @__PURE__ */ X("h3", {
+			children: [/* @__PURE__ */ Y("h3", {
 				className: "text-red-800 font-semibold",
 				children: "Error loading form"
-			}), /* @__PURE__ */ X("p", {
+			}), /* @__PURE__ */ Y("p", {
 				className: "text-red-600 text-sm mt-1",
 				children: P.message
 			})]
 		});
-		if (M) return /* @__PURE__ */ Z("div", {
+		if (M) return /* @__PURE__ */ X("div", {
 			className: "p-8 text-center",
-			children: [/* @__PURE__ */ X("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ X("p", {
+			children: [/* @__PURE__ */ Y("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ Y("p", {
 				className: "mt-2 text-sm text-gray-600",
 				children: "Loading form..."
 			})]
@@ -1653,7 +1773,7 @@ var gt = {
 		if (e.sections?.length) {
 			let t = [];
 			return e.sections.forEach((e, n) => {
-				let r = e.name || String(n), i = se[r] ?? e.collapsed ?? !1;
+				let r = e.name || String(n), i = oe[r] ?? e.collapsed ?? !1;
 				t.push({
 					name: `__section_${r}`,
 					label: e.label || "",
@@ -1661,29 +1781,29 @@ var gt = {
 					colSpan: 4,
 					collapsible: e.collapsible,
 					collapsed: i,
-					onToggle: e.collapsible ? () => ce((e) => ({
+					onToggle: e.collapsible ? () => se((e) => ({
 						...e,
 						[r]: !i
 					})) : void 0
 				});
-				let a = le(e);
+				let a = ce(e);
 				i ? t.push(...a.map((e) => ({
 					...e,
 					hidden: !0
 				}))) : t.push(...a);
-			}), /* @__PURE__ */ X(l, { schema: {
-				...ge,
+			}), /* @__PURE__ */ Y(l, { schema: {
+				..._e,
 				fields: t
 			} });
 		}
-		let t = ft(v, h, e.columns, e.mode), n = gt[t.columns || 1];
-		return /* @__PURE__ */ X(l, { schema: {
-			...ge,
+		let t = ze(O, h, e.columns, e.mode), n = Ct[t.columns || 1];
+		return /* @__PURE__ */ Y(l, { schema: {
+			..._e,
 			fields: t.fields,
 			columns: t.columns,
 			...n ? { fieldContainerClass: n } : {}
 		} });
-	}, ve = e.subforms, ye = ve?.length && e.mode !== "view" ? /* @__PURE__ */ X($e, {
+	}, Q = e.subforms, ye = Q?.length && e.mode !== "view" ? /* @__PURE__ */ Y(St, {
 		schema: {
 			type: "object-master-detail-form",
 			objectName: e.objectName,
@@ -1692,7 +1812,8 @@ var gt = {
 			fields: e.fields,
 			sections: e.sections,
 			submitText: e.submitText,
-			details: ve,
+			cancelText: ge,
+			details: Q,
 			onSuccess: async (t) => {
 				await e.onSuccess?.(t), e.onOpenChange?.(!1);
 			},
@@ -1700,20 +1821,20 @@ var gt = {
 			onCancel: () => e.onOpenChange?.(!1)
 		},
 		dataSource: n
-	}) : _e();
-	return m ? /* @__PURE__ */ Z("div", {
+	}) : ve();
+	return m ? /* @__PURE__ */ X("div", {
 		className: "@container rounded-md border bg-card p-4",
-		children: [(e.title || e.description) && /* @__PURE__ */ Z("div", {
+		children: [(e.title || e.description) && /* @__PURE__ */ X("div", {
 			className: "mb-3 space-y-0.5",
-			children: [e.title && /* @__PURE__ */ X("div", {
+			children: [e.title && /* @__PURE__ */ Y("div", {
 				className: "text-sm font-semibold",
 				children: e.title
-			}), e.description && /* @__PURE__ */ X("p", {
+			}), e.description && /* @__PURE__ */ Y("p", {
 				className: "text-xs text-muted-foreground",
 				children: e.description
 			})]
 		}), ye]
-	}) : /* @__PURE__ */ X(ee, {
+	}) : /* @__PURE__ */ Y(B, {
 		open: ie,
 		onOpenChange: (t) => {
 			if (t) {
@@ -1722,49 +1843,49 @@ var gt = {
 			}
 			ue(!1);
 		},
-		children: /* @__PURE__ */ Z(te, {
+		children: /* @__PURE__ */ X(V, {
 			side: ae,
 			className: G("overflow-y-auto", c, e.className),
-			style: J,
+			style: pe,
 			children: [
-				(e.title || e.description) && /* @__PURE__ */ Z(U, { children: [e.title && /* @__PURE__ */ X(ne, { children: e.title }), e.description ? /* @__PURE__ */ X(H, { children: e.description }) : /* @__PURE__ */ X(H, {
+				(e.title || e.description) && /* @__PURE__ */ X(te, { children: [e.title && /* @__PURE__ */ Y(ne, { children: e.title }), e.description ? /* @__PURE__ */ Y(H, { children: e.description }) : /* @__PURE__ */ Y(H, {
 					className: "sr-only",
 					children: "Complete the form fields, then submit or cancel."
 				})] }),
-				/* @__PURE__ */ X("div", {
+				/* @__PURE__ */ Y("div", {
 					className: "@container py-4",
 					children: ye
 				}),
-				!P && !M && !(ve?.length && e.mode !== "view") && (me || Y) && /* @__PURE__ */ X("div", {
+				!P && !M && !(Q?.length && e.mode !== "view") && (J || Z) && /* @__PURE__ */ Y("div", {
 					className: "shrink-0 border-t px-4 py-3 bg-background",
 					"data-testid": "drawer-form-footer",
-					children: /* @__PURE__ */ Z("div", {
+					children: /* @__PURE__ */ X("div", {
 						className: "flex flex-col sm:flex-row gap-2 sm:justify-end",
-						children: [Y && /* @__PURE__ */ X(O, {
+						children: [Z && /* @__PURE__ */ Y(D, {
 							type: "button",
 							variant: "outline",
 							onClick: de,
-							disabled: B,
+							disabled: z,
 							className: "w-full sm:w-auto",
-							children: he
-						}), me && /* @__PURE__ */ Z(O, {
+							children: ge
+						}), J && /* @__PURE__ */ X(D, {
 							type: "submit",
-							form: oe,
-							disabled: B,
+							form: K,
+							disabled: z,
 							className: "w-full sm:w-auto",
-							children: [B && /* @__PURE__ */ X(fe, { className: "mr-2 h-4 w-4 animate-spin" }), Q]
+							children: [z && /* @__PURE__ */ Y(fe, { className: "mr-2 h-4 w-4 animate-spin" }), he]
 						})]
 					})
 				}),
-				/* @__PURE__ */ X(b, {
-					open: R,
-					onOpenChange: z,
-					children: /* @__PURE__ */ Z(C, { children: [/* @__PURE__ */ Z(E, { children: [/* @__PURE__ */ X(D, { children: f("form.discardTitle") }), /* @__PURE__ */ X(w, { children: f("form.discardMessage") })] }), /* @__PURE__ */ Z(T, { children: [/* @__PURE__ */ X(S, {
+				/* @__PURE__ */ Y(y, {
+					open: L,
+					onOpenChange: R,
+					children: /* @__PURE__ */ X(S, { children: [/* @__PURE__ */ X(T, { children: [/* @__PURE__ */ Y(E, { children: f("form.discardTitle") }), /* @__PURE__ */ Y(C, { children: f("form.discardMessage") })] }), /* @__PURE__ */ X(w, { children: [/* @__PURE__ */ Y(x, {
 						onClick: () => {
 							W.current = !1;
 						},
 						children: f("form.keepEditing")
-					}), /* @__PURE__ */ X(x, {
+					}), /* @__PURE__ */ Y(b, {
 						onClick: q,
 						children: f("form.discard")
 					})] })] })
@@ -1772,32 +1893,51 @@ var gt = {
 			]
 		})
 	});
-}, yt = Q({
+};
+//#endregion
+//#region src/fieldGroups.ts
+function Et(e, t) {
+	let n = he({
+		fieldGroups: t,
+		fields: Object.fromEntries(e.map((e) => [e.name, { group: e.group }]))
+	});
+	if (!n) return null;
+	let r = new Set(n.flatMap((e) => e.fields)), i = e.map((e) => e.name).filter((e) => !r.has(e)), a = n.map((e) => ({
+		...e.key === void 0 ? {} : { name: e.key },
+		...e.key === void 0 ? {} : { label: e.label ?? e.key },
+		fields: [...e.fields],
+		...e.collapse === "none" ? {} : { collapsible: !0 },
+		...e.collapse === "collapsed" ? { collapsed: !0 } : {}
+	}));
+	if (i.length > 0) {
+		let e = a[a.length - 1];
+		e && e.name === void 0 ? e.fields = [...e.fields ?? [], ...i] : a.push({ fields: i });
+	}
+	return a;
+}
+//#endregion
+//#region src/ModalForm.tsx
+var Dt = Z({
 	"form.discardTitle": "Discard changes?",
 	"form.discardMessage": "You have unsaved changes. If you close this form now, your edits will be lost.",
 	"form.keepEditing": "Keep editing",
 	"form.discard": "Discard"
-}, "form.discardTitle"), bt = {
+}, "form.discardTitle"), Ot = {
 	sm: "sm:max-w-sm",
 	default: "sm:max-w-lg",
 	lg: "sm:max-w-2xl",
 	xl: "sm:max-w-5xl",
 	full: "sm:max-w-[95vw] sm:w-full"
-}, xt = {
-	1: void 0,
-	2: "grid gap-4 grid-cols-1 @md:grid-cols-2",
-	3: "grid gap-4 grid-cols-1 @md:grid-cols-2 @2xl:grid-cols-3",
-	4: "grid gap-4 grid-cols-1 @md:grid-cols-2 @2xl:grid-cols-3 @4xl:grid-cols-4"
-}, St = ({ schema: e, dataSource: n, className: c }) => {
-	let { fieldLabel: u } = p(), { t: f } = yt(), m = d(), h = le(), _ = t((t) => {
-		if (!h?.isLoaded) return t;
+}, kt = ({ schema: e, dataSource: n, className: c }) => {
+	let { fieldLabel: u, sectionLabel: f } = p(), { t: m } = Dt(), h = d(), _ = se(), O = t((t) => {
+		if (!_?.isLoaded) return t;
 		let n = [];
 		for (let r of t) {
 			if (!r?.name) {
 				n.push(r);
 				continue;
 			}
-			h.checkField(e.objectName, r.name, "read") && (!h.checkField(e.objectName, r.name, "write") && e.mode !== "view" ? n.push({
+			_.checkField(e.objectName, r.name, "read") && (!_.checkField(e.objectName, r.name, "write") && e.mode !== "view" ? n.push({
 				...r,
 				readOnly: !0,
 				disabled: !0
@@ -1805,29 +1945,47 @@ var gt = {
 		}
 		return n;
 	}, [
-		h,
+		_,
 		e.objectName,
 		e.mode
-	]), [v, k] = s(null), [A, j] = s([]), [M, N] = s({}), [z, B] = s(!0), [V, ee] = s(null), [te, H] = s(!1), [U, ne] = s(!1), [se, ce] = s(!1), K = o(!1), q = e.confirmOnDiscard !== !1, ue = e.open !== !1, de = i(), J = a(() => e.sections?.length || e.customFields?.length ? null : ft(A, v, e.columns, e.mode), [
-		A,
-		v,
+	]), [k, A] = s(null), [j, M] = s([]), [L, R] = s({}), [z, B] = s(!0), [V, H] = s(null), [te, ne] = s(!1), [K, oe] = s(!1), [ce, le] = s(!1), q = o(!1), ue = e.confirmOnDiscard !== !1, de = e.open !== !1, pe = i(), me = a(() => {
+		if (e.sections?.length || e.customFields?.length) return null;
+		let t = Me(j, k);
+		e.mode === "create" && (t = Pe(t, k));
+		let n = Et(t, k?.fieldGroups);
+		if (!n) return null;
+		let r = e.columns && e.columns > 0 ? Math.min(Math.floor(e.columns), 4) : De(t.length);
+		return n.map((e) => ({
+			...e,
+			columns: r
+		}));
+	}, [
+		e.sections,
+		e.customFields,
 		e.columns,
 		e.mode,
-		e.sections,
+		j,
+		k
+	]), J = e.sections?.length ? e.sections : me ?? void 0, Z = a(() => J?.length || e.customFields?.length ? null : ze(j, k, e.columns, e.mode), [
+		j,
+		k,
+		e.columns,
+		e.mode,
+		J,
 		e.customFields
-	]), pe = bt[a(() => {
+	]), he = Ot[a(() => {
 		if (e.modalSize) return e.modalSize;
-		if (J?.columns && J.columns > 1) return dt(J.columns);
-		if (e.sections?.length) {
-			let t = Math.max(...e.sections.map((e) => Number(e.columns) || 1));
-			if (t > 1) return dt(t);
+		if (Z?.columns && Z.columns > 1) return Re(Z.columns);
+		if (J?.length) {
+			let e = Math.max(...J.map((e) => Number(e.columns) || 1));
+			if (e > 1) return Re(e);
 		}
 		return "default";
 	}, [
 		e.modalSize,
-		J,
-		e.sections
-	])] || bt.default;
+		Z,
+		J
+	])] || Ot.default;
 	r(() => {
 		(async () => {
 			if (!n) {
@@ -1835,31 +1993,31 @@ var gt = {
 				return;
 			}
 			try {
-				k(await n.getObjectSchema(e.objectName));
+				A(await n.getObjectSchema(e.objectName));
 			} catch (e) {
-				ee(e), B(!1);
+				H(e), B(!1);
 			}
 		})();
 	}, [e.objectName, n]), r(() => {
-		(v || !n) && (async () => {
+		(k || !n) && (async () => {
 			if (e.mode === "create" || !e.recordId) {
-				N(e.initialData || e.initialValues || {}), B(!1);
+				R(e.initialData || e.initialValues || {}), B(!1);
 				return;
 			}
 			if (!n) {
-				N(e.initialData || e.initialValues || {}), B(!1);
+				R(e.initialData || e.initialValues || {}), B(!1);
 				return;
 			}
 			try {
-				N(await n.findOne(e.objectName, e.recordId) || {});
+				R(await n.findOne(e.objectName, e.recordId) || {});
 			} catch (e) {
-				ee(e);
+				H(e);
 			} finally {
 				B(!1);
 			}
 		})();
 	}, [
-		v,
+		k,
 		e.mode,
 		e.recordId,
 		e.initialData,
@@ -1867,39 +2025,39 @@ var gt = {
 		n,
 		e.objectName
 	]);
-	let me = t((t) => xe(t, {
-		objectSchema: v,
+	let ge = t((t) => xe(t, {
+		objectSchema: k,
 		objectName: e.objectName,
 		readOnly: e.readOnly,
 		mode: e.mode,
 		fieldLabel: u
 	}), [
-		v,
+		k,
 		e.readOnly,
 		e.mode,
 		e.objectName,
 		u
 	]);
 	r(() => {
-		if (!v && n) return;
+		if (!k && n) return;
 		if (e.customFields?.length) {
-			j(e.customFields), B(!1);
+			M(e.customFields), B(!1);
 			return;
 		}
 		if (e.sections?.length) {
 			B(!1);
 			return;
 		}
-		if (!v) return;
-		let t = e.fields || Object.keys(v.fields || {}), r = [];
+		if (!k) return;
+		let t = e.fields || Object.keys(k.fields || {}), r = [];
 		for (let n of t) {
 			let t = typeof n == "string" ? n : n.name;
 			if (!t) continue;
-			let i = v.fields?.[t];
+			let i = k.fields?.[t];
 			i && r.push({
 				name: t,
 				label: u(e.objectName, t, i.label || t),
-				type: y(i.type),
+				type: v(i.type),
 				required: i.required || !1,
 				disabled: e.readOnly || e.mode === "view" || i.readonly,
 				placeholder: i.placeholder,
@@ -1907,12 +2065,16 @@ var gt = {
 				validation: g(i),
 				field: i,
 				options: i.options,
-				multiple: i.multiple
+				multiple: i.multiple,
+				visibleWhen: i.visibleWhen,
+				readonlyWhen: i.readonlyWhen,
+				requiredWhen: i.requiredWhen ?? i.conditionalRequired,
+				group: i.group
 			});
 		}
-		j(r), B(!1);
+		M(r), B(!1);
 	}, [
-		v,
+		k,
 		e.fields,
 		e.customFields,
 		e.sections,
@@ -1920,143 +2082,161 @@ var gt = {
 		e.mode,
 		n
 	]);
-	let Y = t(async (t) => {
-		H(!0);
+	let _e = t(async (t) => {
+		ne(!0);
 		try {
 			if (!n) return e.onSuccess && await e.onSuccess(t), e.onOpenChange?.(!1), t;
-			let r, i = ht(t, v);
-			if (h?.isLoaded) {
+			let r, i = Ge(t, k);
+			if (_?.isLoaded) {
 				let t = {};
-				for (let n of Object.keys(i)) h.checkField(e.objectName, n, "write") && (t[n] = i[n]);
+				for (let n of Object.keys(i)) _.checkField(e.objectName, n, "write") && (t[n] = i[n]);
 				i = t;
 			}
 			return e.mode === "create" ? r = await n.create(e.objectName, i) : e.mode === "edit" && e.recordId && (r = await n.update(e.objectName, e.recordId, i)), e.onSuccess && await e.onSuccess(r), e.onOpenChange?.(!1), r;
 		} catch (t) {
 			throw e.onError && e.onError(t), t;
 		} finally {
-			H(!1);
+			ne(!1);
 		}
 	}, [
 		e,
 		n,
-		v,
-		h
+		k,
+		_
 	]), Q = t(() => {
-		ce(!1), K.current && (K.current = !1, e.onCancel?.()), e.onOpenChange?.(!1);
-	}, [e]), he = t((e) => {
-		K.current = e, q && U ? ce(!0) : Q();
+		le(!1), q.current && (q.current = !1, e.onCancel?.()), e.onOpenChange?.(!1);
+	}, [e]), ye = t((e) => {
+		q.current = e, ue && K ? le(!0) : Q();
 	}, [
-		q,
-		U,
+		ue,
+		K,
 		Q
-	]), ge = t(() => {
-		K.current = !0, Q();
-	}, [Q]), ve = e.layout === "vertical" || e.layout === "horizontal" ? e.layout : "vertical", ye = e.showSubmit !== !1 && e.mode !== "view", be = e.showCancel !== !1, Se = e.submitText || (e.mode === "create" ? "Create" : "Update"), Ce = e.cancelText || "Cancel", we = {
+	]), be = t(() => {
+		q.current = !0, Q();
+	}, [Q]), Se = e.layout === "vertical" || e.layout === "horizontal" ? e.layout : "vertical", Ce = e.showSubmit !== !1 && e.mode !== "view", we = e.showCancel !== !1, Te = e.submitText || (e.mode === "create" ? "Create" : "Update"), Ee = e.cancelText || "Cancel", Oe = {
 		type: "form",
 		objectName: e.objectName,
-		layout: ve,
-		defaultValues: M,
-		submitLabel: Se,
-		cancelLabel: Ce,
-		showSubmit: ye,
-		showCancel: be,
-		onSubmit: Y,
-		onCancel: ge,
-		onDirtyChange: ne,
+		layout: Se,
+		defaultValues: L,
+		submitLabel: Te,
+		cancelLabel: Ee,
+		showSubmit: Ce,
+		showCancel: we,
+		onSubmit: _e,
+		onCancel: be,
+		onDirtyChange: oe,
 		showActions: !1,
-		id: de
-	}, $ = () => {
-		if (V) return /* @__PURE__ */ Z("div", {
+		id: pe
+	}, ke = () => {
+		if (V) return /* @__PURE__ */ X("div", {
 			className: "p-4 border border-red-300 bg-red-50 rounded-md",
-			children: [/* @__PURE__ */ X("h3", {
+			children: [/* @__PURE__ */ Y("h3", {
 				className: "text-red-800 font-semibold",
 				children: "Error loading form"
-			}), /* @__PURE__ */ X("p", {
+			}), /* @__PURE__ */ Y("p", {
 				className: "text-red-600 text-sm mt-1",
 				children: V.message
 			})]
 		});
-		if (z) return /* @__PURE__ */ X("div", {
+		if (z) return /* @__PURE__ */ Y("div", {
 			className: "space-y-4",
 			"data-testid": "modal-form-skeleton",
 			children: [
 				1,
 				2,
 				3
-			].map((e) => /* @__PURE__ */ Z("div", {
+			].map((e) => /* @__PURE__ */ X("div", {
 				className: "space-y-2",
-				children: [/* @__PURE__ */ X(W, { className: "h-4 w-24" }), /* @__PURE__ */ X(W, { className: "h-10 w-full" })]
+				children: [/* @__PURE__ */ Y(U, { className: "h-4 w-24" }), /* @__PURE__ */ Y(U, { className: "h-10 w-full" })]
 			}, e))
 		});
 		if (e.sections?.length) {
-			let t = e.sections, n = (e, t) => e.name || e.label || String(t), r = (e) => /* @__PURE__ */ X(l, { schema: {
-				...we,
-				fields: _(me(e))
+			let t = e.sections, n = (e, t) => e.name || e.label || String(t), r = (t) => t.name ? f(e.objectName, t.name, t.label || t.name) : t.label, i = (e) => /* @__PURE__ */ Y(l, { schema: {
+				...Oe,
+				...Le(O(ge(e)), e.columns || 1)
 			} });
-			return e.contentLayout === "tabbed" && t.length > 1 ? /* @__PURE__ */ Z(re, {
+			return e.contentLayout === "tabbed" && t.length > 1 ? /* @__PURE__ */ X(W, {
 				defaultValue: n(t[0], 0),
 				className: "w-full",
-				children: [/* @__PURE__ */ X(ae, {
+				children: [/* @__PURE__ */ Y(ie, {
 					className: "mb-4",
-					children: t.map((e, t) => /* @__PURE__ */ X(oe, {
+					children: t.map((e, t) => /* @__PURE__ */ Y(ae, {
 						value: n(e, t),
-						children: e.label || `Section ${t + 1}`
+						children: r(e) || `Section ${t + 1}`
 					}, n(e, t)))
-				}), t.map((e, t) => /* @__PURE__ */ X(ie, {
+				}), t.map((e, t) => /* @__PURE__ */ Y(re, {
 					value: n(e, t),
-					children: /* @__PURE__ */ X(_e, {
+					children: /* @__PURE__ */ Y(ve, {
 						description: e.description,
-						columns: e.columns || 1,
-						gridClassName: xt[e.columns || 1],
-						children: r(e)
+						columns: 1,
+						children: i(e)
 					})
 				}, n(e, t)))]
-			}) : /* @__PURE__ */ X("div", {
+			}) : /* @__PURE__ */ Y("div", {
 				className: "space-y-6",
-				children: t.map((e, t) => /* @__PURE__ */ X(_e, {
-					label: e.label,
+				children: t.map((e, t) => /* @__PURE__ */ Y(ve, {
+					label: r(e),
 					description: e.description,
-					columns: e.columns || 1,
-					gridClassName: xt[e.columns || 1],
-					children: r(e)
+					columns: 1,
+					children: i(e)
 				}, n(e, t)))
 			});
 		}
-		let t = J ?? ft(A, v, e.columns, e.mode), n = xt[t.columns || 1];
-		return /* @__PURE__ */ X(l, { schema: {
-			...we,
-			fields: _(t.fields),
+		if (me?.length) {
+			let t = Number(me[0]?.columns) || 1, n = [];
+			me.forEach((r, i) => {
+				let a = O(ge(r));
+				if (!a.length) return;
+				let o = r.name ? f(e.objectName, r.name, r.label || r.name) : r.label;
+				o && n.push({
+					name: `__section_${r.name || i}`,
+					label: o,
+					type: "section-divider"
+				}), n.push(...t > 1 ? Ae(a, t) : a);
+			});
+			let r = Fe[t];
+			return /* @__PURE__ */ Y(l, { schema: {
+				...Oe,
+				fields: n,
+				columns: t,
+				...r ? { fieldContainerClass: r } : {}
+			} });
+		}
+		let t = Z ?? ze(j, k, e.columns, e.mode), n = Fe[t.columns || 1];
+		return /* @__PURE__ */ Y(l, { schema: {
+			...Oe,
+			fields: O(t.fields),
 			columns: t.columns,
 			...n ? { fieldContainerClass: n } : {}
 		} });
-	}, Te = e.subforms;
-	if (m) return /* @__PURE__ */ Z("div", {
+	}, je = e.subforms;
+	if (h) return /* @__PURE__ */ X("div", {
 		className: "@container rounded-md border bg-card p-4",
-		children: [(e.title || e.description) && /* @__PURE__ */ Z("div", {
+		children: [(e.title || e.description) && /* @__PURE__ */ X("div", {
 			className: "mb-3 space-y-0.5",
-			children: [e.title && /* @__PURE__ */ X("div", {
+			children: [e.title && /* @__PURE__ */ Y("div", {
 				className: "text-sm font-semibold",
 				children: e.title
-			}), e.description && /* @__PURE__ */ X("p", {
+			}), e.description && /* @__PURE__ */ Y("p", {
 				className: "text-xs text-muted-foreground",
 				children: e.description
 			})]
-		}), $()]
+		}), ke()]
 	});
-	if (Te?.length && e.mode !== "view") return /* @__PURE__ */ X(P, {
-		open: ue,
+	if (je?.length && e.mode !== "view") return /* @__PURE__ */ Y(N, {
+		open: de,
 		onOpenChange: e.onOpenChange,
-		children: /* @__PURE__ */ Z(R, {
-			className: G(pe, "flex flex-col h-[100dvh] sm:h-auto sm:max-h-[90vh] overflow-hidden p-0", c, e.className),
-			children: [(e.title || e.description) && /* @__PURE__ */ Z(I, {
+		children: /* @__PURE__ */ X(I, {
+			className: G(he, "flex flex-col h-[100dvh] sm:h-auto sm:max-h-[90vh] overflow-hidden p-0", c, e.className),
+			children: [(e.title || e.description) && /* @__PURE__ */ X(F, {
 				className: "shrink-0 px-4 pt-4 sm:px-6 sm:pt-6 pb-2 border-b",
-				children: [e.title && /* @__PURE__ */ X(L, { children: e.title }), e.description ? /* @__PURE__ */ X(F, { children: e.description }) : /* @__PURE__ */ X(F, {
+				children: [e.title && /* @__PURE__ */ Y(ee, { children: e.title }), e.description ? /* @__PURE__ */ Y(P, { children: e.description }) : /* @__PURE__ */ Y(P, {
 					className: "sr-only",
 					children: "Enter the record and its line items, then save."
 				})]
-			}), /* @__PURE__ */ X("div", {
+			}), /* @__PURE__ */ Y("div", {
 				className: "@container flex-1 overflow-y-auto px-4 sm:px-6 py-4",
-				children: /* @__PURE__ */ X($e, {
+				children: /* @__PURE__ */ Y(St, {
 					schema: {
 						type: "object-master-detail-form",
 						objectName: e.objectName,
@@ -2064,8 +2244,11 @@ var gt = {
 						recordId: e.recordId,
 						fields: e.fields,
 						sections: e.sections,
-						submitText: Se,
-						details: Te,
+						initialValues: e.initialValues,
+						initialData: e.initialData,
+						submitText: Te,
+						cancelText: Ee,
+						details: je,
 						onSuccess: async (t) => {
 							await e.onSuccess?.(t), e.onOpenChange?.(!1);
 						},
@@ -2077,110 +2260,69 @@ var gt = {
 			})]
 		})
 	});
-	let Ee = !z && !V && (ye || be);
-	return /* @__PURE__ */ X(P, {
-		open: ue,
+	let Ne = !z && !V && (Ce || we);
+	return /* @__PURE__ */ Y(N, {
+		open: de,
 		onOpenChange: (t) => {
 			if (t) {
 				e.onOpenChange?.(!0);
 				return;
 			}
-			he(!1);
+			ye(!1);
 		},
-		children: /* @__PURE__ */ Z(R, {
-			className: G(pe, "flex flex-col h-[100dvh] sm:h-auto sm:max-h-[90vh] overflow-hidden p-0", c, e.className),
+		children: /* @__PURE__ */ X(I, {
+			className: G(he, "flex flex-col h-[100dvh] sm:h-auto sm:max-h-[90vh] overflow-hidden p-0", c, e.className),
 			children: [
-				(e.title || e.description) && /* @__PURE__ */ Z(I, {
+				(e.title || e.description) && /* @__PURE__ */ X(F, {
 					className: "shrink-0 px-4 pt-4 sm:px-6 sm:pt-6 pb-2 border-b",
-					children: [e.title && /* @__PURE__ */ X(L, { children: e.title }), e.description ? /* @__PURE__ */ X(F, { children: e.description }) : /* @__PURE__ */ X(F, {
+					children: [e.title && /* @__PURE__ */ Y(ee, { children: e.title }), e.description ? /* @__PURE__ */ Y(P, { children: e.description }) : /* @__PURE__ */ Y(P, {
 						className: "sr-only",
 						children: "Complete the form fields, then submit or cancel."
 					})]
 				}),
-				/* @__PURE__ */ X("div", {
+				/* @__PURE__ */ Y("div", {
 					className: "@container flex-1 overflow-y-auto px-4 sm:px-6 py-4",
-					children: $()
+					children: ke()
 				}),
-				Ee && /* @__PURE__ */ X("div", {
+				Ne && /* @__PURE__ */ Y("div", {
 					className: "shrink-0 border-t px-4 sm:px-6 py-3 bg-background",
 					"data-testid": "modal-form-footer",
-					children: /* @__PURE__ */ Z("div", {
+					children: /* @__PURE__ */ X("div", {
 						className: "flex flex-col sm:flex-row gap-2 sm:justify-end",
-						children: [be && /* @__PURE__ */ X(O, {
+						children: [we && /* @__PURE__ */ Y(D, {
 							type: "button",
 							variant: "outline",
-							onClick: ge,
+							onClick: be,
 							disabled: te,
 							className: "w-full sm:w-auto",
-							children: Ce
-						}), ye && /* @__PURE__ */ Z(O, {
+							children: Ee
+						}), Ce && /* @__PURE__ */ X(D, {
 							type: "submit",
-							form: de,
+							form: pe,
 							disabled: te,
 							className: "w-full sm:w-auto",
-							children: [te && /* @__PURE__ */ X(fe, { className: "mr-2 h-4 w-4 animate-spin" }), Se]
+							children: [te && /* @__PURE__ */ Y(fe, { className: "mr-2 h-4 w-4 animate-spin" }), Te]
 						})]
 					})
 				}),
-				/* @__PURE__ */ X(b, {
-					open: se,
-					onOpenChange: ce,
-					children: /* @__PURE__ */ Z(C, { children: [/* @__PURE__ */ Z(E, { children: [/* @__PURE__ */ X(D, { children: f("form.discardTitle") }), /* @__PURE__ */ X(w, { children: f("form.discardMessage") })] }), /* @__PURE__ */ Z(T, { children: [/* @__PURE__ */ X(S, {
+				/* @__PURE__ */ Y(y, {
+					open: ce,
+					onOpenChange: le,
+					children: /* @__PURE__ */ X(S, { children: [/* @__PURE__ */ X(T, { children: [/* @__PURE__ */ Y(E, { children: m("form.discardTitle") }), /* @__PURE__ */ Y(C, { children: m("form.discardMessage") })] }), /* @__PURE__ */ X(w, { children: [/* @__PURE__ */ Y(x, {
 						onClick: () => {
-							K.current = !1;
+							q.current = !1;
 						},
-						children: f("form.keepEditing")
-					}), /* @__PURE__ */ X(x, {
+						children: m("form.keepEditing")
+					}), /* @__PURE__ */ Y(b, {
 						onClick: Q,
-						children: f("form.discard")
+						children: m("form.discard")
 					})] })] })
 				})
 			]
 		})
 	});
-};
-//#endregion
-//#region src/fieldGroups.ts
-function Ct(e) {
-	return Array.isArray(e) ? e.filter((e) => !!e && typeof e == "object").map((e) => ({
-		key: typeof e.key == "string" ? e.key : "",
-		label: typeof e.label == "string" ? e.label : void 0,
-		collapsible: typeof e.collapsible == "boolean" ? e.collapsible : void 0,
-		collapsed: typeof e.collapsed == "boolean" ? e.collapsed : void 0
-	})).filter((e) => e.key) : [];
-}
-function wt(e, t) {
-	let n = Ct(t);
-	if (n.length === 0) return null;
-	let r = new Set(n.map((e) => e.key)), i = (e) => {
-		let t = e.group;
-		return typeof t == "string" && r.has(t) ? t : null;
-	};
-	if (!e.some((e) => i(e) !== null)) return null;
-	let a = /* @__PURE__ */ new Map();
-	for (let e of n) a.set(e.key, []);
-	let o = [];
-	for (let t of e) {
-		let e = i(t);
-		e ? a.get(e).push(t) : o.push(t);
-	}
-	let s = [];
-	for (let e of n) {
-		let t = a.get(e.key);
-		t.length !== 0 && s.push({
-			name: e.key,
-			label: e.label ?? e.key,
-			fields: t.map((e) => e.name),
-			...e.collapsible === void 0 ? {} : { collapsible: e.collapsible },
-			...e.collapsed === void 0 ? {} : { collapsed: e.collapsed }
-		});
-	}
-	return o.length > 0 && s.push({ fields: o.map((e) => e.name) }), s;
-}
-//#endregion
-//#region src/ObjectForm.tsx
-var Tt = ({ schema: e, dataSource: t }) => {
-	let n = le(), r = a(() => {
+}, At = ({ schema: e, dataSource: t }) => {
+	let n = se(), r = a(() => {
 		if (!n?.isLoaded) return e;
 		let t = (t) => t?.name ? n.checkField(e.objectName, t.name, "read") ? !n.checkField(e.objectName, t.name, "write") && e.mode !== "view" ? {
 			...t,
@@ -2196,7 +2338,7 @@ var Tt = ({ schema: e, dataSource: t }) => {
 			}))
 		};
 	}, [e, n]), { sectionLabel: i } = p(), o = (e) => e?.name ? i(r.objectName, e.name, e.label || e.name) : e?.label;
-	if (r.subforms?.length && r.mode !== "view" && r.formType !== "drawer" && r.formType !== "modal") return /* @__PURE__ */ X($e, {
+	if (r.subforms?.length && r.mode !== "view" && r.formType !== "drawer" && r.formType !== "modal") return /* @__PURE__ */ Y(St, {
 		schema: {
 			type: "object-master-detail-form",
 			objectName: r.objectName,
@@ -2209,6 +2351,7 @@ var Tt = ({ schema: e, dataSource: t }) => {
 			fields: r.fields,
 			title: r.title,
 			submitText: r.submitText,
+			cancelText: r.cancelText,
 			showSubmit: r.showSubmit,
 			details: r.subforms,
 			onSuccess: r.onSuccess,
@@ -2218,7 +2361,7 @@ var Tt = ({ schema: e, dataSource: t }) => {
 		},
 		dataSource: t
 	});
-	if (r.formType === "tabbed" && r.sections?.length) return /* @__PURE__ */ X(Se, {
+	if (r.formType === "tabbed" && r.sections?.length) return /* @__PURE__ */ Y(Be, {
 		schema: {
 			...r,
 			formType: "tabbed",
@@ -2235,7 +2378,7 @@ var Tt = ({ schema: e, dataSource: t }) => {
 		dataSource: t,
 		className: r.className
 	});
-	if (r.formType === "wizard" && r.sections?.length) return /* @__PURE__ */ X(Ce, {
+	if (r.formType === "wizard" && r.sections?.length) return /* @__PURE__ */ Y(Ve, {
 		schema: {
 			...r,
 			formType: "wizard",
@@ -2255,7 +2398,7 @@ var Tt = ({ schema: e, dataSource: t }) => {
 		dataSource: t,
 		className: r.className
 	});
-	if (r.formType === "split" && r.sections?.length) return /* @__PURE__ */ X(we, {
+	if (r.formType === "split" && r.sections?.length) return /* @__PURE__ */ Y(He, {
 		schema: {
 			...r,
 			formType: "split",
@@ -2275,7 +2418,7 @@ var Tt = ({ schema: e, dataSource: t }) => {
 	});
 	if (r.formType === "drawer") {
 		let { layout: e, ...n } = r, i = r.layout === "vertical" || r.layout === "horizontal" ? r.layout : void 0;
-		return /* @__PURE__ */ X(vt, {
+		return /* @__PURE__ */ Y(Tt, {
 			schema: {
 				...n,
 				layout: i,
@@ -2300,7 +2443,7 @@ var Tt = ({ schema: e, dataSource: t }) => {
 	}
 	if (r.formType === "modal") {
 		let { layout: e, ...n } = r, i = r.layout === "vertical" || r.layout === "horizontal" ? r.layout : void 0;
-		return /* @__PURE__ */ X(St, {
+		return /* @__PURE__ */ Y(kt, {
 			schema: {
 				...n,
 				layout: i,
@@ -2321,12 +2464,12 @@ var Tt = ({ schema: e, dataSource: t }) => {
 			className: r.className
 		});
 	}
-	return /* @__PURE__ */ X(Et, {
+	return /* @__PURE__ */ Y(jt, {
 		schema: r,
 		dataSource: t
 	});
-}, Et = ({ schema: n, dataSource: i }) => {
-	let { fieldLabel: a, sectionLabel: o } = p(), c = ce(), u = le(), d = t((e) => {
+}, jt = ({ schema: n, dataSource: i }) => {
+	let { fieldLabel: a, sectionLabel: o } = p(), c = oe(), u = se(), d = t((e) => {
 		if (!u?.isLoaded) return e;
 		let t = [];
 		for (let r of e) u.checkField(n.objectName, r.name, "read") && (!u.checkField(n.objectName, r.name, "write") && n.mode !== "view" ? t.push({
@@ -2340,15 +2483,15 @@ var Tt = ({ schema: e, dataSource: t }) => {
 		u,
 		n.objectName,
 		n.mode
-	]), [f, m] = s(null), [h, b] = s([]), [x, S] = s(null), [C, w] = s(!0), [T, E] = s(null), D = n.customFields && n.customFields.length > 0;
+	]), [f, m] = s(null), [h, y] = s([]), [b, x] = s(null), [S, C] = s(!0), [w, T] = s(null), [E, D] = s(null), O = n.customFields && n.customFields.length > 0;
 	r(() => {
-		D && (S(n.initialData || n.initialValues || {}), w(!1));
+		O && (x(n.initialData || n.initialValues || {}), C(!1));
 	}, [
-		D,
+		O,
 		n.initialData,
 		n.initialValues
 	]), r(() => {
-		D ? m({
+		O ? m({
 			name: n.objectName,
 			fields: {}
 		}) : n.objectName && i ? (async () => {
@@ -2358,31 +2501,31 @@ var Tt = ({ schema: e, dataSource: t }) => {
 				if (!e) throw Error(`No schema found for object "${n.objectName}"`);
 				m(e);
 			} catch (e) {
-				E(e), w(!1);
+				T(e), C(!1);
 			}
-		})() : D || w(!1);
+		})() : O || C(!1);
 	}, [
 		n.objectName,
 		i,
-		D
+		O
 	]), r(() => {
-		f && !D && (async () => {
+		f && !O && (async () => {
 			if (!n.recordId || n.mode === "create") {
-				S(n.initialData || n.initialValues || {}), w(!1);
+				x(n.initialData || n.initialValues || {}), C(!1);
 				return;
 			}
-			if (!D) {
+			if (!O) {
 				if (!i) {
-					E(/* @__PURE__ */ Error("DataSource is required for fetching record data (inline data not provided)")), w(!1);
+					T(/* @__PURE__ */ Error("DataSource is required for fetching record data (inline data not provided)")), C(!1);
 					return;
 				}
-				w(!0);
+				C(!0);
 				try {
-					S(await i.findOne(n.objectName, n.recordId));
+					x(await i.findOne(n.objectName, n.recordId));
 				} catch (e) {
-					console.error("Failed to fetch record:", e), E(e);
+					console.error("Failed to fetch record:", e), T(e);
 				} finally {
-					w(!1);
+					C(!1);
 				}
 			}
 		})();
@@ -2394,19 +2537,12 @@ var Tt = ({ schema: e, dataSource: t }) => {
 		n.initialData,
 		i,
 		f,
-		D
+		O
 	]);
-	let O = t((e) => {
-		if (!e || typeof e.visible == "function") return e;
-		let t = e.visibleOn;
-		return typeof t == "string" && t.trim() ? {
-			...e,
-			visible: (e) => _(t, e)
-		} : e;
-	}, []);
+	let k = t((e) => e, []);
 	r(() => {
-		if (D && n.customFields) {
-			b(n.customFields.map(O)), w(!1);
+		if (O && n.customFields) {
+			y(n.customFields.map(k)), C(!1);
 			return;
 		}
 		if (!f) return;
@@ -2415,16 +2551,16 @@ var Tt = ({ schema: e, dataSource: t }) => {
 			let r = typeof t == "string" ? t : t.name;
 			if (!r) return;
 			let i = f.fields?.[r];
-			if (!i && !D) return;
+			if (!i && !O) return;
 			let o = !i?.permissions || i?.permissions.write !== !1;
 			if (n.mode !== "view" && !o) return;
 			let s = n.customFields?.find((e) => e.name === r);
-			if (s) e.push(O(s));
+			if (s) e.push(k(s));
 			else if (i) {
 				let o = {
 					name: r,
 					label: a(n.objectName, r, i.label || t),
-					type: y(i.type),
+					type: v(i.type),
 					required: i.required || !1,
 					disabled: n.readOnly || n.mode === "view" || i.readonly || f?.managedBy && f.managedBy !== "platform",
 					placeholder: i.placeholder,
@@ -2437,29 +2573,30 @@ var Tt = ({ schema: e, dataSource: t }) => {
 					field: i
 				};
 				if ((i.type === "select" || i.type === "lookup" || i.type === "master_detail") && (o.options = i.options || [], o.multiple = i.multiple), (i.type === "number" || i.type === "currency" || i.type === "percent") && (o.inputType = "number", o.min = i.min, o.max = i.max, o.step = i.precision ? 10 ** -i.precision : void 0), i.type === "date" && (o.inputType = "date"), i.type === "datetime" && (o.inputType = "datetime-local"), (i.type === "text" || i.type === "textarea" || i.type === "markdown" || i.type === "html") && (o.maxLength = i.max_length, o.minLength = i.min_length), (i.type === "file" || i.type === "image") && (o.inputType = "file", o.multiple = i.multiple, o.accept = i.accept ? i.accept.join(",") : void 0, i.max_size)) {
-					let e = `Max size: ${v(i.max_size)}`;
+					let e = `Max size: ${_(i.max_size)}`;
 					o.description = o.description ? `${o.description} (${e})` : e;
 				}
-				i.type === "email" && (o.inputType = "email"), i.type === "phone" && (o.inputType = "tel"), i.type === "url" && (o.inputType = "url"), i.type === "password" && (o.inputType = "password"), i.type === "time" && (o.inputType = "time"), (i.type === "formula" || i.type === "summary" || i.type === "auto_number") && (o.disabled = !0), i.visible_on && (o.visible = (e) => _(i.visible_on, e)), e.push(o);
+				i.type === "email" && (o.inputType = "email"), i.type === "phone" && (o.inputType = "tel"), i.type === "url" && (o.inputType = "url"), i.type === "password" && (o.inputType = "password"), i.type === "time" && (o.inputType = "time"), (i.type === "formula" || i.type === "summary" || i.type === "auto_number") && (o.disabled = !0), i.visible_on && (o.visibleOn = i.visible_on), e.push(o);
 			}
-		}), b(e), !D && n.recordId && n.mode !== "create" && i || w(!1);
+		}), y(e), !O && n.recordId && n.mode !== "create" && i || C(!1);
 	}, [
 		f,
 		n.fields,
 		n.customFields,
 		n.readOnly,
 		n.mode,
-		D,
+		O,
 		n.recordId,
 		i
 	]);
-	let k = t(async (e, t) => {
-		if (e && (e.nativeEvent || e._reactName === "onSubmit") && (console.warn("ObjectForm: Received Event instead of data in handleSubmit! This suggests a Form renderer issue."), t === void 0 && (e = {})), D && !i) return n.onSuccess && await n.onSuccess(e), e;
+	let A = t(async (e, t) => {
+		if (e && (e.nativeEvent || e._reactName === "onSubmit") && (console.warn("ObjectForm: Received Event instead of data in handleSubmit! This suggests a Form renderer issue."), t === void 0 && (e = {})), O && !i) return n.onSuccess && await n.onSuccess(e), e;
 		if (!i) throw Error("DataSource is required for form submission (inline mode not configured)");
-		let r = e;
-		if (u?.isLoaded && e && typeof e == "object") {
-			r = {};
-			for (let t of Object.keys(e)) u.checkField(n.objectName, t, "write") && (r[t] = e[t]);
+		let r = Ge(e, O ? null : f);
+		if (u?.isLoaded && r && typeof r == "object") {
+			let e = {};
+			for (let t of Object.keys(r)) u.checkField(n.objectName, t, "write") && (e[t] = r[t]);
+			r = e;
 		}
 		try {
 			let e;
@@ -2468,10 +2605,26 @@ var Tt = ({ schema: e, dataSource: t }) => {
 			else if (n.mode === "edit" && n.recordId) e = await i.update(n.objectName, n.recordId, r);
 			else throw Error("Invalid form mode or missing record ID");
 			if (n.onSuccess) await n.onSuccess(e);
-			else if (!n.submitHandler) {
-				let t = ge(n.navigateOnSuccess, e);
+			else if (!n.submitHandler && n.submitBehavior) {
+				let e = n.submitBehavior;
+				switch (e.kind) {
+					case "redirect":
+						ge(e.url) && setTimeout(() => window.location.assign(e.url), e.delayMs ?? 0);
+						break;
+					case "continue": break;
+					default: {
+						let t = e.kind === "thank-you" && e.message ? e.message : n.successMessage || (n.mode === "create" ? "Created" : "Saved");
+						K.success(t), D({
+							title: e.kind === "thank-you" ? e.title : void 0,
+							message: t
+						});
+						break;
+					}
+				}
+			} else if (!n.submitHandler) {
+				let t = _e(n.navigateOnSuccess, e);
 				if (t) return window.location.assign(t), e;
-				se.success(n.successMessage || (n.mode === "create" ? "Created" : "Saved"));
+				K.success(n.successMessage || (n.mode === "create" ? "Created" : "Saved"));
 			}
 			return e;
 		} catch (e) {
@@ -2480,11 +2633,12 @@ var Tt = ({ schema: e, dataSource: t }) => {
 	}, [
 		n,
 		i,
-		D,
-		u
-	]), A = t(() => {
+		O,
+		u,
+		f
+	]), j = t(() => {
 		n.onCancel && n.onCancel();
-	}, [n]), j = {
+	}, [n]), M = {
 		...e.useMemo(() => {
 			if (!f?.fields) return {};
 			let e = {};
@@ -2493,89 +2647,117 @@ var Tt = ({ schema: e, dataSource: t }) => {
 				n.defaultValue !== void 0 && (e[t] = n.defaultValue);
 			}), e;
 		}, [f]),
-		...x
-	}, M = e.useMemo(() => n.sections?.length ? null : wt(h, f?.fieldGroups), [
-		n.sections,
+		...b
+	}, N = e.useMemo(() => {
+		let e = Me(h, f);
+		return n.mode === "create" && (e = Pe(e, f)), e;
+	}, [
 		h,
+		f,
+		n.mode
+	]), P = e.useMemo(() => n.sections?.length ? null : Et(N, f?.fieldGroups), [
+		n.sections,
+		N,
 		f
-	]), N = n.sections?.length ? n.sections : M, [P, F] = s({});
-	if (T) return /* @__PURE__ */ Z("div", {
+	]), F = n.sections?.length ? n.sections : P, [ee, I] = s({});
+	if (w) return /* @__PURE__ */ X("div", {
 		className: "p-3 sm:p-4 border border-red-300 bg-red-50 rounded-md",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Y("h3", {
 			className: "text-red-800 font-semibold",
 			children: "Error loading form"
-		}), /* @__PURE__ */ X("p", {
+		}), /* @__PURE__ */ Y("p", {
 			className: "text-red-600 text-sm mt-1",
-			children: T.message
+			children: w.message
 		})]
 	});
-	if (C) return /* @__PURE__ */ Z("div", {
+	if (S) return /* @__PURE__ */ X("div", {
 		className: "p-4 sm:p-8 text-center",
-		children: [/* @__PURE__ */ X("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ X("p", {
+		children: [/* @__PURE__ */ Y("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ Y("p", {
 			className: "mt-2 text-sm text-gray-600",
 			children: "Loading form..."
 		})]
 	});
-	let I = n.layout === "vertical" || n.layout === "horizontal" ? n.layout : "vertical";
-	if (N?.length && (!n.formType || n.formType === "simple")) {
-		let e = [];
-		return N.forEach((t, r) => {
-			let i = t.fields.map((e) => typeof e == "string" ? e : e.field ?? e.name), a = d(h.filter((e) => i.includes(e.name)));
-			if (a.length === 0) return;
-			let s = t.name || t.label || String(r), c = t.name ? o(n.objectName, t.name, t.label || t.name) : t.label, l = P[s] ?? t.collapsed ?? !1;
-			c && e.push({
-				name: `__section_${s}`,
-				label: c,
+	if (E) return /* @__PURE__ */ X("div", {
+		className: "rounded-md border bg-card p-6 sm:p-8 text-center",
+		children: [/* @__PURE__ */ Y("h3", {
+			className: "text-lg font-semibold",
+			children: E.title ?? "Thanks!"
+		}), E.message && /* @__PURE__ */ Y("p", {
+			className: "mt-2 text-sm text-muted-foreground",
+			children: E.message
+		})]
+	});
+	let L = n.layout === "vertical" || n.layout === "horizontal" ? n.layout : "vertical";
+	if (F?.length && (!n.formType || n.formType === "simple")) {
+		let e = P ? N : h, t = (e) => typeof e == "number" && e > 0 ? Math.min(Math.floor(e), 4) : void 0, r = F.map((e) => t(e.columns)).filter((e) => e != null), i = F.reduce((e, t) => e + (Array.isArray(t.fields) ? t.fields.length : 0), 0), a = t(n.columns) ?? (r.length ? Math.max(...r) : De(i)), s = [];
+		F.forEach((r, i) => {
+			let c = new Map(r.fields.map((e) => [typeof e == "string" ? e : e.field ?? e.name, e])), l = Array.from(c.keys()), u = d(e.filter((e) => l.includes(e.name))).map((e) => {
+				let t = c.get(e.name);
+				if (!t || typeof t != "object") return e;
+				let n = t, r = { ...e };
+				return n.visibleOn != null && (r.visibleOn = n.visibleOn), n.colSpan != null && (r.colSpan = n.colSpan), n.span != null && (r.span = n.span), r;
+			});
+			if (u.length === 0) return;
+			let f = r.name || r.label || String(i), p = r.name ? o(n.objectName, r.name, r.label || r.name) : r.label, m = ee[f] ?? r.collapsed ?? !1;
+			p && s.push({
+				name: `__section_${f}`,
+				label: p,
 				type: "section-divider",
 				colSpan: 4,
-				collapsible: t.collapsible,
-				collapsed: l,
-				onToggle: t.collapsible ? () => F((e) => ({
+				collapsible: r.collapsible,
+				collapsed: m,
+				onToggle: r.collapsible ? () => I((e) => ({
 					...e,
-					[s]: !l
+					[f]: !m
 				})) : void 0
-			}), c && l ? e.push(...a.map((e) => ({
+			});
+			let h = t(r.columns), g = a > 1 ? Ae(u, a, h) : u;
+			p && m ? s.push(...g.map((e) => ({
 				...e,
 				hidden: !0
-			}))) : e.push(...a);
-		}), /* @__PURE__ */ X("div", {
-			className: "w-full",
-			children: /* @__PURE__ */ X(l, { schema: {
+			}))) : s.push(...g);
+		});
+		let c = s, u = Ie(a);
+		return /* @__PURE__ */ Y("div", {
+			className: "w-full @container",
+			children: /* @__PURE__ */ Y(l, { schema: {
 				type: "form",
 				objectName: n.objectName,
-				fields: e,
-				layout: I,
-				defaultValues: j,
+				fields: c,
+				layout: L,
+				columns: a,
+				...u ? { fieldContainerClass: u } : {},
+				defaultValues: M,
 				showSubmit: n.showSubmit !== !1 && n.mode !== "view",
 				showCancel: n.showCancel !== !1,
 				submitLabel: n.submitText || (n.mode === "create" ? "Create" : "Update"),
 				cancelLabel: n.cancelText,
-				onSubmit: k,
-				onCancel: A
+				onSubmit: A,
+				onCancel: j
 			} })
 		});
 	}
-	let L = n.sections?.length, R = d(h), z = L ? {
-		fields: R,
+	let R = n.sections?.length, z = d(h), B = R ? {
+		fields: z,
 		columns: n.columns
-	} : ft(R, f, n.columns, n.mode), B = n.mobile, V = B?.fullscreenLongText ? z.fields.map((e) => {
+	} : ze(z, f, n.columns, n.mode), V = n.mobile, H = V?.fullscreenLongText ? B.fields.map((e) => {
 		let t = e.type;
 		return t === "textarea" || t === "field:textarea" || t === "string-multiline" || t === "field:markdown" || t === "field:html" ? {
 			...e,
 			mobile_fullscreen: !0
 		} : e;
-	}) : z.fields, ee = B?.stepper, te = B?.stepperMinFields ?? 8, H = Math.max(1, B?.stepperFieldsPerStep ?? 1);
-	if (!n.formType && !L && V.length >= 2 && (ee === !0 || ee === "auto" && c && V.length >= te)) {
-		let e = V, t = [];
-		for (let n = 0; n < e.length; n += H) {
-			let r = e.slice(n, n + H);
+	}) : B.fields, te = V?.stepper, ne = V?.stepperMinFields ?? 8, U = Math.max(1, V?.stepperFieldsPerStep ?? 1);
+	if (!n.formType && !R && H.length >= 2 && (te === !0 || te === "auto" && c && H.length >= ne)) {
+		let e = H, t = [];
+		for (let n = 0; n < e.length; n += U) {
+			let r = e.slice(n, n + U);
 			t.push({
-				name: `step-${Math.floor(n / H) + 1}`,
-				label: r[0]?.label || r[0]?.name || `Step ${Math.floor(n / H) + 1}`,
+				name: `step-${Math.floor(n / U) + 1}`,
+				label: r[0]?.label || r[0]?.name || `Step ${Math.floor(n / U) + 1}`,
 				fields: r
 			});
 		}
-		return /* @__PURE__ */ X(Ce, {
+		return /* @__PURE__ */ Y(Ve, {
 			schema: {
 				...n,
 				formType: "wizard",
@@ -2586,29 +2768,29 @@ var Tt = ({ schema: e, dataSource: t }) => {
 			className: n.className
 		});
 	}
-	let U = {
+	let W = {
 		type: "form",
 		objectName: n.objectName,
-		fields: V,
-		layout: I,
-		columns: z.columns,
+		fields: H,
+		layout: L,
+		columns: B.columns,
 		submitLabel: n.submitText || (n.mode === "create" ? "Create" : "Update"),
 		cancelLabel: n.cancelText,
 		showSubmit: n.showSubmit !== !1 && n.mode !== "view",
 		showCancel: n.showCancel !== !1,
-		resetOnSubmit: n.showReset || n.resetOnSuccess && n.mode === "create",
-		defaultValues: j,
-		onSubmit: k,
-		onCancel: A,
+		resetOnSubmit: n.showReset || n.submitBehavior?.kind === "continue" || !n.submitBehavior && n.resetOnSuccess && n.mode === "create",
+		defaultValues: M,
+		onSubmit: A,
+		onCancel: j,
 		className: n.className,
-		mobileStickyActions: !!B?.stickyActions
+		mobileStickyActions: !!V?.stickyActions
 	};
-	return /* @__PURE__ */ X("div", {
-		className: B?.stickyActions ? "w-full pb-20 md:pb-0" : "w-full",
-		"data-mobile-form": B ? "true" : void 0,
-		children: /* @__PURE__ */ X(l, { schema: U })
+	return /* @__PURE__ */ Y("div", {
+		className: V?.stickyActions ? "w-full pb-20 md:pb-0" : "w-full",
+		"data-mobile-form": V ? "true" : void 0,
+		children: /* @__PURE__ */ Y(l, { schema: W })
 	});
-}, Dt = {
+}, Mt = {
 	text: 200,
 	email: 254,
 	url: 2048,
@@ -2616,8 +2798,8 @@ var Tt = ({ schema: e, dataSource: t }) => {
 	textarea: 5e3,
 	markdown: 5e3,
 	html: 5e3
-}, Ot = "_company_website_2", kt = 1500;
-function At(e, t = []) {
+}, Nt = "_company_website_2", Pt = 1500;
+function Ft(e, t = []) {
 	try {
 		let n = new URL(e, typeof window < "u" ? window.location.href : "http://localhost");
 		return typeof window < "u" && n.origin === window.location.origin ? !0 : n.protocol !== "https:" && n.protocol !== "http:" ? !1 : t.some((e) => {
@@ -2632,21 +2814,21 @@ function At(e, t = []) {
 		return !1;
 	}
 }
-function jt(e) {
+function It(e) {
 	return e && e.map((e) => {
-		let t = Dt[String(e.type || "").toLowerCase()];
+		let t = Mt[String(e.type || "").toLowerCase()];
 		return !t || (e.maxLength ?? e.max_length) ? e : {
 			...e,
 			maxLength: t
 		};
 	});
 }
-var Mt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
+var Lt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 	let [l, u] = s(!1), [d, f] = s(!1), [p, m] = s(null), [h, g] = s(!(e.consent?.required ?? !!e.consent)), [_, v] = s(null), y = o(null), b = o(0);
 	r(() => {
 		l || (b.current = Date.now());
 	}, [l]);
-	let x = e.honeypot === !1 ? null : e.honeypot || Ot, S = e.minFillTime ?? kt, C = a(() => jt(e.customFields), [e.customFields]), w = a(() => {
+	let x = e.honeypot === !1 ? null : e.honeypot || Nt, S = e.minFillTime ?? Pt, C = a(() => It(e.customFields), [e.customFields]), w = a(() => {
 		if (!n || C && C.length > 0 || !e.fields || e.fields.length === 0) return;
 		let t = async (e, t) => t;
 		return {
@@ -2687,7 +2869,7 @@ var Mt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 		try {
 			n && await n.create(e.objectName, r), u(!0);
 			let t = e.thankYouPage?.redirectUrl;
-			if (t) if (At(t, e.allowedRedirectHosts)) {
+			if (t) if (Ft(t, e.allowedRedirectHosts)) {
 				let n = e.thankYouPage?.redirectDelay ?? 3e3;
 				setTimeout(() => {
 					window.location.href = t;
@@ -2704,7 +2886,7 @@ var Mt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 		h,
 		x,
 		S
-	]), D = t(() => {
+	]), O = t(() => {
 		u(!1), m(null);
 	}, []), k = a(() => {
 		let t = {};
@@ -2712,35 +2894,35 @@ var Mt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 	}, [e.branding]);
 	if (l) {
 		let t = e.thankYouPage, n = e.texts ?? {}, r = Math.ceil((t?.redirectDelay ?? 3e3) / 1e3), i = (n.redirecting ?? "Redirecting in {{seconds}} seconds…").replace("{{seconds}}", String(r));
-		return /* @__PURE__ */ X("div", {
+		return /* @__PURE__ */ Y("div", {
 			className: `min-h-screen flex items-center justify-center p-4 bg-gradient-to-b from-muted/40 via-background to-background ${c || ""}`,
 			style: k,
-			children: /* @__PURE__ */ Z("div", {
+			children: /* @__PURE__ */ X("div", {
 				className: "max-w-md w-full bg-card border rounded-xl shadow-sm p-8 text-center space-y-4",
 				children: [
-					/* @__PURE__ */ X("div", {
+					/* @__PURE__ */ Y("div", {
 						className: "mx-auto inline-flex h-14 w-14 items-center justify-center rounded-full bg-emerald-50 text-emerald-600 dark:bg-emerald-500/10 dark:text-emerald-400",
-						children: /* @__PURE__ */ X(q, {
+						children: /* @__PURE__ */ Y(le, {
 							className: "h-8 w-8",
 							"aria-hidden": "true"
 						})
 					}),
-					/* @__PURE__ */ X("h2", {
+					/* @__PURE__ */ Y("h2", {
 						className: "text-xl font-semibold text-foreground",
 						children: t?.title || n.thankYouTitle || "Thank You!"
 					}),
-					/* @__PURE__ */ X("p", {
+					/* @__PURE__ */ Y("p", {
 						className: "text-sm text-muted-foreground",
 						children: t?.message || n.thankYouMessage || "Your submission has been received successfully."
 					}),
-					e.allowMultiple && /* @__PURE__ */ X(O, {
+					e.allowMultiple && /* @__PURE__ */ Y(D, {
 						variant: "outline",
 						size: "sm",
-						onClick: D,
+						onClick: O,
 						className: "mt-2",
 						children: n.submitAnother ?? "Submit Another Response"
 					}),
-					t?.redirectUrl && /* @__PURE__ */ X("p", {
+					t?.redirectUrl && /* @__PURE__ */ Y("p", {
 						className: "text-xs text-muted-foreground",
 						children: i
 					})
@@ -2749,51 +2931,51 @@ var Mt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 		});
 	}
 	let A = e.texts ?? {}, j = !!e.consent?.required, M = `${e.formId}-consent`;
-	return /* @__PURE__ */ X("div", {
+	return /* @__PURE__ */ Y("div", {
 		className: `min-h-screen flex items-center justify-center p-4 sm:p-6 bg-gradient-to-b from-muted/40 via-background to-background ${c || ""}`,
 		style: k,
-		children: /* @__PURE__ */ Z("div", {
+		children: /* @__PURE__ */ X("div", {
 			className: "max-w-2xl w-full bg-card border rounded-xl shadow-sm overflow-hidden",
 			children: [
-				e.branding?.coverImage && /* @__PURE__ */ X("div", {
+				e.branding?.coverImage && /* @__PURE__ */ Y("div", {
 					className: "h-28 sm:h-32 w-full bg-cover bg-center",
 					style: { backgroundImage: `url(${JSON.stringify(e.branding.coverImage)})` },
 					role: "presentation"
 				}),
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ X("div", {
 					className: "px-6 sm:px-8 pt-7 pb-5 border-b bg-muted/20",
 					style: e.branding?.primaryColor ? { borderBottomColor: e.branding.primaryColor } : void 0,
 					children: [
-						e.branding?.logo && /* @__PURE__ */ X("img", {
+						e.branding?.logo && /* @__PURE__ */ Y("img", {
 							src: e.branding.logo,
 							alt: "",
 							className: "h-8 mb-4"
 						}),
-						e.title && /* @__PURE__ */ X("h1", {
+						e.title && /* @__PURE__ */ Y("h1", {
 							className: "text-2xl font-semibold tracking-tight text-foreground",
 							children: e.title
 						}),
-						e.description && /* @__PURE__ */ X("p", {
+						e.description && /* @__PURE__ */ Y("p", {
 							className: "text-sm text-muted-foreground mt-2 leading-relaxed",
 							children: e.description
 						}),
-						/* @__PURE__ */ X("p", {
+						/* @__PURE__ */ Y("p", {
 							className: "text-[11px] text-muted-foreground/70 mt-3",
 							"aria-hidden": "true",
 							children: A.requiredHint ?? "* Required field"
 						})
 					]
 				}),
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ X("div", {
 					className: "relative px-6 sm:px-8 py-6",
 					children: [
-						p && /* @__PURE__ */ X("div", {
+						p && /* @__PURE__ */ Y("div", {
 							role: "alert",
 							"aria-live": "assertive",
 							className: "mb-4 p-3 bg-destructive/10 border border-destructive/30 rounded-md text-sm text-destructive",
 							children: p
 						}),
-						/* @__PURE__ */ X(Tt, {
+						/* @__PURE__ */ Y(At, {
 							schema: {
 								type: "object-form",
 								objectName: e.objectName,
@@ -2806,13 +2988,13 @@ var Mt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 							},
 							dataSource: w
 						}),
-						x && /* @__PURE__ */ Z("div", {
+						x && /* @__PURE__ */ X("div", {
 							"aria-hidden": "true",
 							className: "absolute left-[-10000px] top-auto h-px w-px overflow-hidden",
-							children: [/* @__PURE__ */ X("label", {
+							children: [/* @__PURE__ */ Y("label", {
 								htmlFor: `${e.formId}-${x}`,
 								children: "Do not fill this field"
-							}), /* @__PURE__ */ X("input", {
+							}), /* @__PURE__ */ Y("input", {
 								ref: y,
 								id: `${e.formId}-${x}`,
 								type: "text",
@@ -2822,11 +3004,11 @@ var Mt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 								defaultValue: ""
 							})]
 						}),
-						e.consent && /* @__PURE__ */ Z("div", {
+						e.consent && /* @__PURE__ */ X("div", {
 							className: "mt-4",
-							children: [/* @__PURE__ */ Z("label", {
+							children: [/* @__PURE__ */ X("label", {
 								className: "flex items-start gap-2 text-sm text-foreground cursor-pointer select-none",
-								children: [/* @__PURE__ */ X("input", {
+								children: [/* @__PURE__ */ Y("input", {
 									type: "checkbox",
 									id: M,
 									checked: h,
@@ -2837,16 +3019,16 @@ var Mt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 									"aria-invalid": _ ? "true" : void 0,
 									"aria-describedby": _ ? `${M}-error` : void 0,
 									className: "mt-0.5 h-4 w-4 rounded border-input accent-primary"
-								}), /* @__PURE__ */ Z("span", {
+								}), /* @__PURE__ */ X("span", {
 									className: "leading-relaxed",
 									children: [
 										e.consent.label ?? A.consentLabelDefault ?? "I agree to the privacy policy.",
-										j && /* @__PURE__ */ X("span", {
+										j && /* @__PURE__ */ Y("span", {
 											"aria-hidden": "true",
 											className: "text-destructive ml-0.5",
 											children: "*"
 										}),
-										e.consent.privacyUrl && /* @__PURE__ */ Z(Y, { children: [" ", /* @__PURE__ */ X("a", {
+										e.consent.privacyUrl && /* @__PURE__ */ X(J, { children: [" ", /* @__PURE__ */ Y("a", {
 											href: e.consent.privacyUrl,
 											target: "_blank",
 											rel: "noopener noreferrer",
@@ -2855,42 +3037,42 @@ var Mt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 										})] })
 									]
 								})]
-							}), _ && /* @__PURE__ */ X("p", {
+							}), _ && /* @__PURE__ */ Y("p", {
 								id: `${M}-error`,
 								role: "alert",
 								className: "mt-1.5 text-xs text-destructive",
 								children: _
 							})]
 						}),
-						d && /* @__PURE__ */ Z("div", {
+						d && /* @__PURE__ */ X("div", {
 							className: "mt-3 flex items-center gap-2 text-xs text-muted-foreground",
-							children: [/* @__PURE__ */ X(fe, {
+							children: [/* @__PURE__ */ Y(fe, {
 								className: "h-3.5 w-3.5 animate-spin",
 								"aria-hidden": "true"
-							}), /* @__PURE__ */ X("span", { children: A.submitting ?? "Submitting…" })]
+							}), /* @__PURE__ */ Y("span", { children: A.submitting ?? "Submitting…" })]
 						})
 					]
 				}),
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ X("div", {
 					className: "px-6 sm:px-8 py-4 border-t bg-muted/20 flex flex-col sm:flex-row items-center justify-between gap-2",
-					children: [/* @__PURE__ */ Z("p", {
+					children: [/* @__PURE__ */ X("p", {
 						className: "inline-flex items-center gap-1.5 text-xs text-muted-foreground",
-						children: [/* @__PURE__ */ X(pe, {
+						children: [/* @__PURE__ */ Y(pe, {
 							className: "h-3 w-3",
 							"aria-hidden": "true"
-						}), /* @__PURE__ */ X("span", { children: A.secureNotice ?? "Your information is transmitted securely and only used to respond to your request." })]
-					}), /* @__PURE__ */ Z("div", {
+						}), /* @__PURE__ */ Y("span", { children: A.secureNotice ?? "Your information is transmitted securely and only used to respond to your request." })]
+					}), /* @__PURE__ */ X("div", {
 						className: "flex items-center gap-3 text-xs text-muted-foreground/80",
-						children: [e.privacyPolicyUrl && /* @__PURE__ */ Z("a", {
+						children: [e.privacyPolicyUrl && /* @__PURE__ */ X("a", {
 							href: e.privacyPolicyUrl,
 							target: "_blank",
 							rel: "noopener noreferrer",
 							className: "inline-flex items-center gap-1 underline hover:text-foreground",
-							children: [/* @__PURE__ */ X(me, {
+							children: [/* @__PURE__ */ Y(me, {
 								className: "h-3 w-3",
 								"aria-hidden": "true"
 							}), A.consentLink ?? "Privacy policy"]
-						}), /* @__PURE__ */ X("span", { children: A.poweredBy ?? "Powered by ObjectStack" })]
+						}), /* @__PURE__ */ Y("span", { children: A.poweredBy ?? "Powered by ObjectStack" })]
 					})]
 				})
 			]
@@ -2899,96 +3081,96 @@ var Mt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 };
 //#endregion
 //#region src/FormAnalytics.tsx
-function Nt(e) {
+function Rt(e) {
 	return e < 60 ? `${Math.round(e)}s` : e < 3600 ? `${Math.floor(e / 60)}m ${Math.round(e % 60)}s` : `${Math.floor(e / 3600)}h ${Math.floor(e % 3600 / 60)}m`;
 }
-var Pt = ({ formId: e, formTitle: t, metrics: n, className: r }) => {
+var zt = ({ formId: e, formTitle: t, metrics: n, className: r }) => {
 	let i = a(() => {
 		if (!n.abandonedSubmissions) return 100;
 		let e = n.totalSubmissions + n.abandonedSubmissions;
 		return e === 0 ? 0 : Math.round(n.totalSubmissions / e * 100);
 	}, [n.totalSubmissions, n.abandonedSubmissions]), o = a(() => n.dailySubmissions?.length ? Math.max(...n.dailySubmissions.map((e) => e.count), 1) : 1, [n.dailySubmissions]);
-	return /* @__PURE__ */ Z("div", {
+	return /* @__PURE__ */ X("div", {
 		className: `space-y-4 ${r || ""}`,
 		children: [
-			/* @__PURE__ */ Z("div", { children: [/* @__PURE__ */ X("h2", {
+			/* @__PURE__ */ X("div", { children: [/* @__PURE__ */ Y("h2", {
 				className: "text-lg font-semibold text-foreground",
 				children: t || "Form Analytics"
-			}), /* @__PURE__ */ Z("p", {
+			}), /* @__PURE__ */ X("p", {
 				className: "text-sm text-muted-foreground",
 				children: ["Form ID: ", e]
 			})] }),
-			/* @__PURE__ */ Z("div", {
+			/* @__PURE__ */ X("div", {
 				className: "grid grid-cols-1 sm:grid-cols-3 gap-4",
 				children: [
-					/* @__PURE__ */ X(k, { children: /* @__PURE__ */ Z(M, {
+					/* @__PURE__ */ Y(O, { children: /* @__PURE__ */ X(j, {
 						className: "pb-2",
-						children: [/* @__PURE__ */ X(j, { children: "Total Submissions" }), /* @__PURE__ */ X(N, {
+						children: [/* @__PURE__ */ Y(A, { children: "Total Submissions" }), /* @__PURE__ */ Y(M, {
 							className: "text-2xl",
 							children: n.totalSubmissions.toLocaleString()
 						})]
 					}) }),
-					/* @__PURE__ */ Z(k, { children: [/* @__PURE__ */ Z(M, {
+					/* @__PURE__ */ X(O, { children: [/* @__PURE__ */ X(j, {
 						className: "pb-2",
-						children: [/* @__PURE__ */ X(j, { children: "Fill Rate" }), /* @__PURE__ */ Z(N, {
+						children: [/* @__PURE__ */ Y(A, { children: "Fill Rate" }), /* @__PURE__ */ X(M, {
 							className: "text-2xl",
 							children: [i, "%"]
 						})]
-					}), /* @__PURE__ */ X(A, { children: /* @__PURE__ */ X("div", {
+					}), /* @__PURE__ */ Y(k, { children: /* @__PURE__ */ Y("div", {
 						className: "w-full bg-muted rounded-full h-2",
-						children: /* @__PURE__ */ X("div", {
+						children: /* @__PURE__ */ Y("div", {
 							className: "bg-primary rounded-full h-2 transition-all",
 							style: { width: `${i}%` }
 						})
 					}) })] }),
-					/* @__PURE__ */ X(k, { children: /* @__PURE__ */ Z(M, {
+					/* @__PURE__ */ Y(O, { children: /* @__PURE__ */ X(j, {
 						className: "pb-2",
-						children: [/* @__PURE__ */ X(j, { children: "Avg. Completion Time" }), /* @__PURE__ */ X(N, {
+						children: [/* @__PURE__ */ Y(A, { children: "Avg. Completion Time" }), /* @__PURE__ */ Y(M, {
 							className: "text-2xl",
-							children: n.avgCompletionTime ? Nt(n.avgCompletionTime) : "—"
+							children: n.avgCompletionTime ? Rt(n.avgCompletionTime) : "—"
 						})]
 					}) })
 				]
 			}),
-			n.dailySubmissions && n.dailySubmissions.length > 0 && /* @__PURE__ */ Z(k, { children: [/* @__PURE__ */ X(M, { children: /* @__PURE__ */ X(N, {
+			n.dailySubmissions && n.dailySubmissions.length > 0 && /* @__PURE__ */ X(O, { children: [/* @__PURE__ */ Y(j, { children: /* @__PURE__ */ Y(M, {
 				className: "text-sm font-medium",
 				children: "Daily Submissions"
-			}) }), /* @__PURE__ */ X(A, { children: /* @__PURE__ */ X("div", {
+			}) }), /* @__PURE__ */ Y(k, { children: /* @__PURE__ */ Y("div", {
 				className: "flex items-end gap-1 h-32",
-				children: n.dailySubmissions.map((e, t) => /* @__PURE__ */ Z("div", {
+				children: n.dailySubmissions.map((e, t) => /* @__PURE__ */ X("div", {
 					className: "flex-1 flex flex-col items-center gap-1",
-					children: [/* @__PURE__ */ X("div", {
+					children: [/* @__PURE__ */ Y("div", {
 						className: "w-full bg-primary/80 rounded-t transition-all hover:bg-primary",
 						style: {
 							height: `${e.count / o * 100}%`,
 							minHeight: e.count > 0 ? "4px" : "0"
 						},
 						title: `${e.date}: ${e.count} submissions`
-					}), /* @__PURE__ */ X("span", {
+					}), /* @__PURE__ */ Y("span", {
 						className: "text-[10px] text-muted-foreground truncate w-full text-center",
 						children: e.date.slice(-5)
 					})]
 				}, t))
 			}) })] }),
-			n.fieldDropOff && n.fieldDropOff.length > 0 && /* @__PURE__ */ Z(k, { children: [/* @__PURE__ */ Z(M, { children: [/* @__PURE__ */ X(N, {
+			n.fieldDropOff && n.fieldDropOff.length > 0 && /* @__PURE__ */ X(O, { children: [/* @__PURE__ */ X(j, { children: [/* @__PURE__ */ Y(M, {
 				className: "text-sm font-medium",
 				children: "Field Completion Rates"
-			}), /* @__PURE__ */ X(j, { children: "Percentage of users who completed each field" })] }), /* @__PURE__ */ X(A, { children: /* @__PURE__ */ X("div", {
+			}), /* @__PURE__ */ Y(A, { children: "Percentage of users who completed each field" })] }), /* @__PURE__ */ Y(k, { children: /* @__PURE__ */ Y("div", {
 				className: "space-y-3",
-				children: n.fieldDropOff.map((e, t) => /* @__PURE__ */ Z("div", {
+				children: n.fieldDropOff.map((e, t) => /* @__PURE__ */ X("div", {
 					className: "space-y-1",
-					children: [/* @__PURE__ */ Z("div", {
+					children: [/* @__PURE__ */ X("div", {
 						className: "flex justify-between text-sm",
-						children: [/* @__PURE__ */ X("span", {
+						children: [/* @__PURE__ */ Y("span", {
 							className: "text-foreground",
 							children: e.label
-						}), /* @__PURE__ */ Z("span", {
+						}), /* @__PURE__ */ X("span", {
 							className: "text-muted-foreground",
 							children: [e.completionRate, "%"]
 						})]
-					}), /* @__PURE__ */ X("div", {
+					}), /* @__PURE__ */ Y("div", {
 						className: "w-full bg-muted rounded-full h-1.5",
-						children: /* @__PURE__ */ X("div", {
+						children: /* @__PURE__ */ Y("div", {
 							className: `rounded-full h-1.5 transition-all ${e.completionRate >= 80 ? "bg-green-500" : e.completionRate >= 50 ? "bg-yellow-500" : "bg-destructive"}`,
 							style: { width: `${e.completionRate}%` }
 						})
@@ -2997,8 +3179,21 @@ var Pt = ({ formId: e, formTitle: t, metrics: n, className: r }) => {
 			}) })] })
 		]
 	});
-}, Ft = ({ schema: e }) => {
-	let n = m()?.dataSource, i = f(), o = e.parentObject || i?.objectName, c = e.parentId || e.recordId || i?.recordId, [l, u] = s([]), [d, p] = s([]), [g, _] = s(!0), [v, y] = s(!1), [b, x] = s(!1), [S, C] = s(null), w = t(async () => {
+}, Bt = ({ schema: e }) => {
+	let n = m()?.dataSource, i = f(), o = e.parentObject || i?.objectName, c = e.parentId || e.recordId || i?.recordId, [l, u] = s([]), [d, p] = s([]), [g, _] = s(!0), [v, y] = s(!1), [b, x] = s(!1), [S, C] = s(null), [w, T] = s(null);
+	r(() => {
+		let t = n;
+		if (!t || typeof t.getObjectSchema != "function") return;
+		let r = !1;
+		return t.getObjectSchema(e.childObject).then((e) => {
+			r || T(e ?? null);
+		}).catch(() => {
+			r || T(null);
+		}), () => {
+			r = !0;
+		};
+	}, [n, e.childObject]);
+	let E = t(async () => {
 		if (!n || !c) {
 			_(!1);
 			return;
@@ -3022,22 +3217,23 @@ var Pt = ({ formId: e, formTitle: t, metrics: n, className: r }) => {
 		e.relationshipField
 	]);
 	r(() => {
-		w();
-	}, [w]);
-	let T = t((e) => {
+		E();
+	}, [E]);
+	let A = t((e) => {
 		u(e), x(!0);
-	}, []), E = t(async () => {
+	}, []), N = t(async () => {
 		if (!(!n || !c)) {
 			y(!0), C(null);
 			try {
-				await Ne(n, o || e.childObject, c, {
+				await tt(n, o || e.childObject, c, {
 					childObject: e.childObject,
 					relationshipField: e.relationshipField,
 					rows: l,
 					original: d,
 					amountField: e.amountField,
-					totalField: o ? e.totalField : void 0
-				}), await w();
+					totalField: o ? e.totalField : void 0,
+					childSchema: w
+				}), await E();
 			} catch (e) {
 				C(e?.message || "Failed to save line items");
 			} finally {
@@ -3051,8 +3247,9 @@ var Pt = ({ formId: e, formTitle: t, metrics: n, className: r }) => {
 		d,
 		e,
 		o,
+		E,
 		w
-	]), D = a(() => ({
+	]), P = a(() => ({
 		columns: e.columns,
 		total_field: e.totalField ? e.amountField || "amount" : void 0,
 		min_rows: e.minRows,
@@ -3060,41 +3257,41 @@ var Pt = ({ formId: e, formTitle: t, metrics: n, className: r }) => {
 		allow_add: !e.readonly,
 		allow_delete: !e.readonly
 	}), [e]);
-	return /* @__PURE__ */ Z(k, {
+	return /* @__PURE__ */ X(O, {
 		className: G("shadow-none"),
-		children: [/* @__PURE__ */ Z(M, {
+		children: [/* @__PURE__ */ X(j, {
 			className: "flex-row items-center justify-between gap-2 pb-2",
-			children: [/* @__PURE__ */ X(N, {
+			children: [/* @__PURE__ */ Y(M, {
 				className: "text-sm font-medium",
 				children: e.title || "Line Items"
-			}), !e.readonly && /* @__PURE__ */ X(O, {
+			}), !e.readonly && /* @__PURE__ */ Y(D, {
 				type: "button",
 				size: "sm",
-				onClick: E,
+				onClick: N,
 				disabled: v || g || !b || !c,
 				children: v ? "Saving…" : "Save"
 			})]
-		}), /* @__PURE__ */ Z(A, { children: [S && /* @__PURE__ */ X("p", {
+		}), /* @__PURE__ */ X(k, { children: [S && /* @__PURE__ */ Y("p", {
 			className: "mb-2 text-sm text-destructive",
 			children: S
-		}), g ? /* @__PURE__ */ X("p", {
+		}), g ? /* @__PURE__ */ Y("p", {
 			className: "py-6 text-center text-sm text-muted-foreground",
 			children: "Loading…"
-		}) : c ? /* @__PURE__ */ X(h, {
+		}) : c ? /* @__PURE__ */ Y(h, {
 			value: l,
-			onChange: T,
-			field: D,
+			onChange: A,
+			field: P,
 			readonly: e.readonly
-		}) : /* @__PURE__ */ X("p", {
+		}) : /* @__PURE__ */ Y("p", {
 			className: "py-6 text-center text-sm text-muted-foreground",
 			children: "Save the record first to add line items."
 		})] })]
 	});
-}, It = ({ schema: e }) => /* @__PURE__ */ X(Tt, {
+}, Vt = ({ schema: e }) => /* @__PURE__ */ Y(At, {
 	schema: e,
 	dataSource: n(u)?.dataSource ?? void 0
 });
-c.register("object-form", It, {
+c.register("object-form", Vt, {
 	namespace: "plugin-form",
 	label: "Object Form",
 	category: "plugin",
@@ -3235,7 +3432,7 @@ c.register("object-form", It, {
 			]
 		}
 	]
-}), c.register("form", It, {
+}), c.register("form", Vt, {
 	namespace: "view",
 	skipFallback: !0,
 	label: "Data Form View",
@@ -3263,7 +3460,7 @@ c.register("object-form", It, {
 			]
 		}
 	]
-}), c.register("embeddable-form", ({ schema: e }) => /* @__PURE__ */ X(Mt, { config: e }), {
+}), c.register("embeddable-form", ({ schema: e }) => /* @__PURE__ */ Y(Lt, { config: e }), {
 	namespace: "plugin-form",
 	label: "Embeddable Form",
 	category: "plugin",
@@ -3301,7 +3498,7 @@ c.register("object-form", It, {
 			label: "Allow Multiple Submissions"
 		}
 	]
-}), c.register("form-analytics", ({ schema: e }) => /* @__PURE__ */ X(Pt, {
+}), c.register("form-analytics", ({ schema: e }) => /* @__PURE__ */ Y(zt, {
 	formId: e.formId,
 	formTitle: e.formTitle,
 	metrics: e.metrics || { totalSubmissions: 0 }
@@ -3327,7 +3524,7 @@ c.register("object-form", It, {
 			label: "Submission Metrics"
 		}
 	]
-}), c.register("object-master-detail-form", ({ schema: e }) => /* @__PURE__ */ X($e, {
+}), c.register("object-master-detail-form", ({ schema: e }) => /* @__PURE__ */ Y(St, {
 	schema: e,
 	dataSource: n(u)?.dataSource ?? void 0
 }), {
@@ -3359,7 +3556,7 @@ c.register("object-form", It, {
 			required: !0
 		}
 	]
-}), c.register("line_items", ({ schema: e }) => /* @__PURE__ */ X(Ft, { schema: e }), {
+}), c.register("line_items", ({ schema: e }) => /* @__PURE__ */ Y(Bt, { schema: e }), {
 	namespace: "record",
 	skipFallback: !0,
 	label: "Line Items",
@@ -3396,4 +3593,4 @@ c.register("object-form", It, {
 	]
 });
 //#endregion
-export { vt as DrawerForm, Mt as EmbeddableForm, Pt as FormAnalytics, _e as FormSection, Ft as LineItemsPanel, $e as MasterDetailForm, St as ModalForm, Tt as ObjectForm, we as SplitForm, Se as TabbedForm, Ce as WizardForm, ot as applyAutoColSpan, ft as applyAutoLayout, Ue as deriveColumns, Xe as deriveDetail, Ge as deriveFormFields, ut as filterAutoGeneratedFields, lt as filterCreateModeFields, ct as filterSystemFields, ze as findRelationshipField, at as inferColumns, dt as inferModalSize, it as isAutoGeneratedFieldType, rt as isWideFieldType, qe as resolveInlineMode };
+export { Tt as DrawerForm, Lt as EmbeddableForm, zt as FormAnalytics, ve as FormSection, Bt as LineItemsPanel, St as MasterDetailForm, kt as ModalForm, At as ObjectForm, He as SplitForm, Be as TabbedForm, Ve as WizardForm, Ae as applyAutoColSpan, ze as applyAutoLayout, dt as deriveColumns, yt as deriveDetail, mt as deriveFormFields, Pe as filterAutoGeneratedFields, Ne as filterCreateModeFields, Me as filterSystemFields, st as findRelationshipField, De as inferColumns, Re as inferModalSize, Ee as isAutoGeneratedFieldType, Te as isWideFieldType, gt as resolveInlineMode };