@questpie/admin 3.0.9 → 3.2.0

package/dist/server/modules/admin/routes/reactive.mjs

@@ -179,6 +179,49 @@ function getReactiveHandler(app, entityName, fieldPath, handlerType, type = "col
 	return null;
 }
 /**
+* Coerce a `function | { handler }` config-like value to the underlying
+* handler function. Returns `null` for static values.
+*/
+function unwrapHandler(value) {
+	if (typeof value === "function") return value;
+	if (value !== null && typeof value === "object" && "handler" in value && typeof value.handler === "function") return value.handler;
+	return null;
+}
+/**
+* Get a reactive prop handler. Resolution chain (first hit wins):
+*
+*  1. **Layout-level** `state.adminForm.fields[*].props[propPath]`
+*     (per-instance `.form()` override)
+*  2. **Field-level** `state.fieldDefinitions[fieldPath]._state.extensions.admin[propPath]`
+*     (default attached to the field via `f.<x>().admin({ ... })`)
+*
+* The wire-side counterpart is the `ReactivePropPlaceholder` introspection
+* emits for function values in either location.
+*/
+function getReactivePropHandler(app, entityName, fieldPath, propPath, type = "collection") {
+	const formConfig = getEntity(app, entityName, type).state.adminForm;
+	const fieldEntry = findReactiveFieldEntry(formConfig, fieldPath);
+	if (fieldEntry) {
+		const props = fieldEntry.props;
+		if (props && typeof props === "object") {
+			const layoutHandler = unwrapHandler(props[propPath]);
+			if (layoutHandler) return layoutHandler;
+		}
+	}
+	let fieldDef;
+	try {
+		fieldDef = getFieldDefinition(app, entityName, fieldPath, type);
+	} catch {
+		return null;
+	}
+	const adminMeta = fieldDef._state?.extensions?.admin;
+	if (adminMeta && typeof adminMeta === "object") {
+		const fieldHandler = unwrapHandler(adminMeta[propPath]);
+		if (fieldHandler) return fieldHandler;
+	}
+	return null;
+}
+/**
 * Get options handler from field config.
 */
 function getOptionsHandler(fieldDef) {
@@ -196,8 +239,10 @@ const reactiveRequestSchema = z.object({
 		"hidden",
 		"readOnly",
 		"disabled",
-		"compute"
+		"compute",
+		"prop"
 	]),
+	propPath: z.string().optional(),
 	formData: z.record(z.string(), z.unknown()).optional(),
 	siblingData: z.record(z.string(), z.unknown()).nullable().optional(),
 	prevData: z.record(z.string(), z.unknown()).nullable().optional(),
@@ -222,8 +267,10 @@ const reactiveResultSchema = z.object({
 		"hidden",
 		"readOnly",
 		"disabled",
-		"compute"
+		"compute",
+		"prop"
 	]),
+	propPath: z.string().optional(),
 	value: z.unknown(),
 	error: z.string().optional()
 });
@@ -264,27 +311,44 @@ const batchReactive = route().post().schema(batchReactiveInputSchema).outputSche
 	const { collection: entityName, type: entityType, requests, formData: sharedFormData, prevData: sharedPrevData } = ctx.input;
 	const serverCtx = buildServerContext(ctx);
 	return { results: await Promise.all(requests.map(async (request) => {
-		const { field: field$1, type, formData, siblingData, prevData, prevSiblingData } = request;
+		const { field: field$1, type, propPath, formData, siblingData, prevData, prevSiblingData } = request;
 		const resolvedFormData = formData ?? sharedFormData ?? {};
 		const resolvedPrevData = prevData ?? sharedPrevData ?? null;
 		try {
 			getFieldDefinition(app, entityName, field$1, entityType);
-			const handler = getReactiveHandler(app, entityName, field$1, type, entityType);
-			if (!handler) return {
-				field: field$1,
-				type,
-				value: void 0,
-				error: `No ${type} handler found for field '${field$1}'`
-			};
+			let handler;
+			if (type === "prop") {
+				if (!propPath) return {
+					field: field$1,
+					type,
+					value: void 0,
+					error: "propPath is required when type === 'prop'"
+				};
+				handler = getReactivePropHandler(app, entityName, field$1, propPath, entityType);
+			} else handler = getReactiveHandler(app, entityName, field$1, type, entityType);
+			if (!handler) {
+				const what = type === "prop" ? `prop '${propPath}'` : `${type} handler`;
+				return {
+					field: field$1,
+					type,
+					...propPath ? { propPath } : {},
+					value: void 0,
+					error: `No ${what} found for field '${field$1}'`
+				};
+			}
+			const reactiveCtx = buildReactiveContext(resolvedFormData, siblingData, resolvedPrevData, prevSiblingData, serverCtx);
+			const value = await handler(reactiveCtx);
 			return {
 				field: field$1,
 				type,
-				value: await handler(buildReactiveContext(resolvedFormData, siblingData, resolvedPrevData, prevSiblingData, serverCtx))
+				...propPath ? { propPath } : {},
+				value
 			};
 		} catch (error) {
 			return {
 				field: field$1,
 				type,
+				...propPath ? { propPath } : {},
 				value: void 0,
 				error: error instanceof Error ? error.message : String(error)
 			};

package/dist/server/modules/admin/routes/setup.d.mts

@@ -1,4 +1,4 @@
-import * as questpie143 from "questpie";
+import * as questpie139 from "questpie";
 
 //#region src/server/modules/admin/routes/setup.d.ts
 
@@ -20,7 +20,7 @@ import * as questpie143 from "questpie";
  * }
  * ```
  */
-declare const isSetupRequired: questpie143.JsonRouteDefinition<Record<string, never>, any, questpie143.JsonRouteParams>;
+declare const isSetupRequired: questpie139.JsonRouteDefinition<Record<string, never>, any, questpie139.JsonRouteParams>;
 /**
  * Create the first admin user in the system.
  * This function only works when no admin users exist (setup mode).
@@ -43,21 +43,21 @@ declare const isSetupRequired: questpie143.JsonRouteDefinition<Record<string, ne
  * }
  * ```
  */
-declare const createFirstAdmin: questpie143.JsonRouteDefinition<{
+declare const createFirstAdmin: questpie139.JsonRouteDefinition<{
   email: string;
   password: string;
   name: string;
-}, any, questpie143.JsonRouteParams>;
+}, any, questpie139.JsonRouteParams>;
 /**
  * Bundle of setup-related functions.
  */
 declare const setupFunctions: {
-  readonly isSetupRequired: questpie143.JsonRouteDefinition<Record<string, never>, any, questpie143.JsonRouteParams>;
-  readonly createFirstAdmin: questpie143.JsonRouteDefinition<{
+  readonly isSetupRequired: questpie139.JsonRouteDefinition<Record<string, never>, any, questpie139.JsonRouteParams>;
+  readonly createFirstAdmin: questpie139.JsonRouteDefinition<{
     email: string;
     password: string;
     name: string;
-  }, any, questpie143.JsonRouteParams>;
+  }, any, questpie139.JsonRouteParams>;
 };
 //#endregion
 export { createFirstAdmin, isSetupRequired, setupFunctions };

package/dist/server/modules/admin/routes/widget-data.d.mts

@@ -1,4 +1,4 @@
-import * as questpie131 from "questpie";
+import * as questpie147 from "questpie";
 
 //#region src/server/modules/admin/routes/widget-data.d.ts
 
@@ -20,13 +20,13 @@ import * as questpie131 from "questpie";
  * const data = await client.routes.fetchWidgetData({ widgetId: "my-widget" });
  * ```
  */
-declare const fetchWidgetData: questpie131.JsonRouteDefinition<{
+declare const fetchWidgetData: questpie147.JsonRouteDefinition<{
   widgetId: string;
-}, any, questpie131.JsonRouteParams>;
+}, any, questpie147.JsonRouteParams>;
 declare const widgetDataFunctions: {
-  readonly fetchWidgetData: questpie131.JsonRouteDefinition<{
+  readonly fetchWidgetData: questpie147.JsonRouteDefinition<{
     widgetId: string;
-  }, any, questpie131.JsonRouteParams>;
+  }, any, questpie147.JsonRouteParams>;
 };
 //#endregion
 export { fetchWidgetData, widgetDataFunctions };

package/dist/server/modules/admin-preferences/collections/saved-views.d.mts

@@ -1,8 +1,8 @@
 import { FilterOperator, FilterRule, SortConfig, ViewConfiguration } from "../../../../shared/types/saved-views.types.mjs";
 import * as questpie_shared15 from "questpie/shared";
-import * as questpie93 from "questpie";
-import * as questpie_src_server_modules_core_fields_email_js2 from "questpie/src/server/modules/core/fields/email.js";
-import * as questpie_src_server_modules_core_fields_json_js2 from "questpie/src/server/modules/core/fields/json.js";
+import * as questpie69 from "questpie";
+import * as questpie_src_server_modules_core_fields_email_js1 from "questpie/src/server/modules/core/fields/email.js";
+import * as questpie_src_server_modules_core_fields_json_js1 from "questpie/src/server/modules/core/fields/json.js";
 import * as drizzle_orm_pg_core22 from "drizzle-orm/pg-core";
 import * as drizzle_orm5 from "drizzle-orm";
 
@@ -33,22 +33,22 @@ import * as drizzle_orm5 from "drizzle-orm";
  * });
  * ```
  */
-declare const savedViewsCollection: questpie93.CollectionBuilder<questpie_shared15.Override<questpie_shared15.Override<questpie93.EmptyCollectionState<"admin_saved_views", undefined, {
-  readonly text: typeof questpie93.text;
-  readonly textarea: typeof questpie93.textarea;
-  readonly email: typeof questpie_src_server_modules_core_fields_email_js2.email;
-  readonly url: typeof questpie93.url;
-  readonly number: typeof questpie93.number;
-  readonly boolean: typeof questpie93.boolean;
-  readonly date: typeof questpie93.date;
-  readonly datetime: typeof questpie93.datetime;
-  readonly time: typeof questpie93.time;
-  readonly select: typeof questpie93.select;
-  readonly upload: typeof questpie93.upload;
-  readonly relation: typeof questpie93.relation;
-  readonly object: typeof questpie93.object;
-  readonly json: typeof questpie_src_server_modules_core_fields_json_js2.json;
-  readonly from: typeof questpie93.from;
+declare const savedViewsCollection: questpie69.CollectionBuilder<questpie_shared15.Override<questpie_shared15.Override<questpie69.EmptyCollectionState<"admin_saved_views", undefined, {
+  readonly text: typeof questpie69.text;
+  readonly textarea: typeof questpie69.textarea;
+  readonly email: typeof questpie_src_server_modules_core_fields_email_js1.email;
+  readonly url: typeof questpie69.url;
+  readonly number: typeof questpie69.number;
+  readonly boolean: typeof questpie69.boolean;
+  readonly date: typeof questpie69.date;
+  readonly datetime: typeof questpie69.datetime;
+  readonly time: typeof questpie69.time;
+  readonly select: typeof questpie69.select;
+  readonly upload: typeof questpie69.upload;
+  readonly relation: typeof questpie69.relation;
+  readonly object: typeof questpie69.object;
+  readonly json: typeof questpie_src_server_modules_core_fields_json_js1.json;
+  readonly from: typeof questpie69.from;
 }>, {
   fields: {
     readonly userId: drizzle_orm5.NotNull<drizzle_orm_pg_core22.PgVarcharBuilder<[string, ...string[]]>>;
@@ -59,31 +59,31 @@ declare const savedViewsCollection: questpie93.CollectionBuilder<questpie_shared
   };
   localized: readonly string[];
   fieldDefinitions: {
-    readonly userId: questpie93.FieldWithMethods<Omit<questpie93.TextFieldState, "notNull" | "column"> & {
+    readonly userId: questpie69.FieldWithMethods<Omit<questpie69.TextFieldState, "notNull" | "column"> & {
       notNull: true;
       column: drizzle_orm5.NotNull<drizzle_orm_pg_core22.PgVarcharBuilder<[string, ...string[]]>>;
     } & {
       label: questpie_shared15.I18nText;
-    }, questpie93.TextFieldMethods>;
-    readonly collectionName: questpie93.FieldWithMethods<Omit<questpie93.TextFieldState, "notNull" | "column"> & {
+    }, questpie69.TextFieldMethods>;
+    readonly collectionName: questpie69.FieldWithMethods<Omit<questpie69.TextFieldState, "notNull" | "column"> & {
       notNull: true;
       column: drizzle_orm5.NotNull<drizzle_orm_pg_core22.PgVarcharBuilder<[string, ...string[]]>>;
     } & {
       label: questpie_shared15.I18nText;
-    }, questpie93.TextFieldMethods>;
-    readonly name: questpie93.FieldWithMethods<Omit<questpie93.TextFieldState, "notNull" | "column"> & {
+    }, questpie69.TextFieldMethods>;
+    readonly name: questpie69.FieldWithMethods<Omit<questpie69.TextFieldState, "notNull" | "column"> & {
       notNull: true;
       column: drizzle_orm5.NotNull<drizzle_orm_pg_core22.PgVarcharBuilder<[string, ...string[]]>>;
     } & {
       label: questpie_shared15.I18nText;
-    }, questpie93.TextFieldMethods>;
-    readonly configuration: questpie93.Field<Omit<questpie93.JsonFieldState, "notNull" | "column"> & {
+    }, questpie69.TextFieldMethods>;
+    readonly configuration: questpie69.Field<Omit<questpie69.JsonFieldState, "notNull" | "column"> & {
       notNull: true;
       column: drizzle_orm5.NotNull<drizzle_orm_pg_core22.PgJsonbBuilder>;
     } & {
       label: questpie_shared15.I18nText;
     }>;
-    readonly isDefault: questpie93.Field<Omit<questpie93.BooleanFieldState, "column" | "hasDefault"> & {
+    readonly isDefault: questpie69.Field<Omit<questpie69.BooleanFieldState, "column" | "hasDefault"> & {
       hasDefault: true;
       column: drizzle_orm5.HasDefault<drizzle_orm_pg_core22.PgBooleanBuilder>;
     } & {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@questpie/admin",
-	"version": "3.0.9",
+	"version": "3.2.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/questpie/questpie.git",
@@ -49,7 +49,7 @@
 		"dev": "tsdown --watch",
 		"build": "tsdown",
 		"check-types": "tsc --noEmit",
-		"test": "bun test test/",
+		"test": "bun test --max-concurrency=1 test/",
 		"test:watch": "bun test --watch test/",
 		"questpie:generate": "bun x questpie generate --verbose"
 	},
@@ -62,7 +62,7 @@
 		"@fontsource-variable/jetbrains-mono": "^5.2.8",
 		"@hookform/resolvers": "^5.1.0",
 		"@iconify/react": "^6.0.2",
-		"@questpie/tanstack-query": "^3.0.9",
+		"@questpie/tanstack-query": "^3.2.0",
 		"@tailwindcss/vite": "^4.0.6",
 		"@tiptap/core": "^2.x",
 		"@tiptap/extension-character-count": "^2.x",
@@ -88,7 +88,7 @@
 		"date-fns": "^4.1.0",
 		"lowlight": "^3.x",
 		"next-themes": "^0.4.6",
-		"questpie": "^3.0.9",
+		"questpie": "^3.2.0",
 		"react-day-picker": "^9.12.0",
 		"react-hook-form": "^7.54.0",
 		"react-resizable-panels": "^4.4.2",