@questpie/admin 3.5.0 → 3.5.2

package/dist/client/views/layout/admin-router.mjs

@@ -16,7 +16,7 @@ import { DashboardGrid } from "../dashboard/dashboard-grid.mjs";
 import { Icon } from "@iconify/react";
 import * as React from "react";
 import { useQueryClient } from "@tanstack/react-query";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/client/views/layout/admin-router.tsx
 /**
@@ -201,16 +201,30 @@ function UnknownViewState({ viewKind, viewId }) {
 */
 function RouterSkeleton() {
 	return /* @__PURE__ */ jsxs("div", {
-		className: "qa-router-skeleton container space-y-4 py-6",
+		className: "qa-router-skeleton min-w-0 space-y-4",
+		"aria-busy": "true",
 		children: [
-			/* @__PURE__ */ jsx(Skeleton, { className: "h-8 w-48" }),
-			/* @__PURE__ */ jsx(Skeleton, { className: "h-10 w-full" }),
+			/* @__PURE__ */ jsx("span", {
+				className: "sr-only",
+				children: "Loading admin view"
+			}),
+			/* @__PURE__ */ jsx(AdminViewHeader, {
+				title: /* @__PURE__ */ jsx(Skeleton, {
+					variant: "text",
+					className: "h-7 w-44 max-w-full"
+				}),
+				description: /* @__PURE__ */ jsx(Skeleton, {
+					variant: "text",
+					className: "h-4 w-64 max-w-full"
+				}),
+				actions: /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Skeleton, { className: "size-8" }), /* @__PURE__ */ jsx(Skeleton, { className: "size-8" })] })
+			}),
 			/* @__PURE__ */ jsxs("div", {
-				className: "space-y-2",
+				className: "grid gap-3",
 				children: [
-					/* @__PURE__ */ jsx(Skeleton, { className: "h-12 w-full" }),
-					/* @__PURE__ */ jsx(Skeleton, { className: "h-12 w-full" }),
-					/* @__PURE__ */ jsx(Skeleton, { className: "h-12 w-full" })
+					/* @__PURE__ */ jsx(Skeleton, { className: "h-24 w-full" }),
+					/* @__PURE__ */ jsx(Skeleton, { className: "h-24 w-full" }),
+					/* @__PURE__ */ jsx(Skeleton, { className: "h-24 w-full" })
 				]
 			})
 		]
@@ -363,7 +377,7 @@ function DefaultDashboard() {
 				children: /* @__PURE__ */ jsxs("div", { children: [
 					/* @__PURE__ */ jsxs("div", {
 						className: "mb-4 flex items-center gap-3",
-						children: [/* @__PURE__ */ jsx("div", { className: "bg-primary h-2 w-2 rounded-full" }), /* @__PURE__ */ jsx("h3", {
+						children: [/* @__PURE__ */ jsx("div", { className: "bg-primary size-2 rounded-full" }), /* @__PURE__ */ jsx("h3", {
 							className: "text-muted-foreground font-chrome chrome-meta text-xs font-medium",
 							children: t("dashboard.systemStatus")
 						})]
@@ -386,7 +400,7 @@ function DefaultNotFound() {
 	return /* @__PURE__ */ jsxs("div", {
 		className: "qa-not-found container",
 		children: [/* @__PURE__ */ jsx("h1", {
-			className: "mb-4 text-2xl font-bold",
+			className: "mb-4 text-2xl font-semibold",
 			children: t("error.pageNotFound")
 		}), /* @__PURE__ */ jsx("p", {
 			className: "text-muted-foreground",
@@ -402,10 +416,10 @@ function RestrictedAccess({ type, name, navigate, basePath }) {
 			className: "mx-auto max-w-lg p-8 text-center",
 			children: /* @__PURE__ */ jsxs("div", { children: [
 				/* @__PURE__ */ jsx("div", {
-					className: "bg-muted mx-auto mb-6 flex h-16 w-16 items-center justify-center rounded-full",
+					className: "bg-muted mx-auto mb-6 flex size-16 items-center justify-center rounded-full",
 					children: /* @__PURE__ */ jsx(Icon, {
 						icon: "ph:lock-simple",
-						className: "text-muted-foreground h-8 w-8"
+						className: "text-muted-foreground size-8"
 					})
 				}),
 				/* @__PURE__ */ jsx("h1", {
@@ -424,7 +438,7 @@ function RestrictedAccess({ type, name, navigate, basePath }) {
 					onClick: () => navigate(basePath),
 					children: [/* @__PURE__ */ jsx(Icon, {
 						icon: "ph:arrow-left",
-						className: "h-4 w-4"
+						className: "size-4"
 					}), t("error.backToDashboard")]
 				})
 			] })
@@ -434,26 +448,35 @@ function RestrictedAccess({ type, name, navigate, basePath }) {
 function LazyPageRenderer({ config }) {
 	const { t } = useTranslation();
 	const component = config.component;
-	const [Component, setComponent] = React.useState(() => getCachedComponent(component) ?? null);
-	const [loading, setLoading] = React.useState(() => Component == null);
-	const [error, setError] = React.useState(null);
+	const [pageState, setPageState] = React.useState(() => {
+		const Component = getCachedComponent(component) ?? null;
+		return {
+			source: component,
+			Component,
+			loading: Component == null,
+			error: null
+		};
+	});
 	React.useEffect(() => {
 		let mounted = true;
 		async function load() {
 			try {
 				const cachedComponent = getCachedComponent(component);
 				if (cachedComponent) {
-					if (mounted) {
-						setComponent(() => cachedComponent);
-						setLoading(false);
-						setError(null);
-					}
+					if (mounted) setPageState({
+						source: component,
+						Component: cachedComponent,
+						loading: false,
+						error: null
+					});
 					return;
 				}
-				if (mounted) {
-					setLoading(true);
-					setError(null);
-				}
+				if (mounted) setPageState({
+					source: component,
+					Component: null,
+					loading: true,
+					error: null
+				});
 				if (typeof component === "function") {
 					const result = component();
 					let isThenable = false;
@@ -467,21 +490,44 @@ function LazyPageRenderer({ config }) {
 							if (mod.default) resolved = mod.default;
 							else resolved = mod;
 							cacheComponent(component, resolved);
-							setComponent(() => resolved);
+							setPageState({
+								source: component,
+								Component: resolved,
+								loading: false,
+								error: null
+							});
 						}
-					} else if (mounted) setComponent(() => component);
+					} else if (mounted) setPageState({
+						source: component,
+						Component: component,
+						loading: false,
+						error: null
+					});
 				} else if (component) {
-					if (mounted) setComponent(() => component);
-				}
-				if (mounted) setLoading(false);
+					if (mounted) setPageState({
+						source: component,
+						Component: component,
+						loading: false,
+						error: null
+					});
+				} else if (mounted) setPageState({
+					source: component,
+					Component: null,
+					loading: false,
+					error: null
+				});
 			} catch (err) {
 				if (mounted) {
 					let resolvedError;
 					if (err instanceof Error) resolvedError = err;
 					else resolvedError = new Error(t("error.failedToLoad"));
-					setError(resolvedError);
+					setPageState({
+						source: component,
+						Component: null,
+						loading: false,
+						error: resolvedError
+					});
 				}
-				if (mounted) setLoading(false);
 			}
 		}
 		load();
@@ -489,21 +535,22 @@ function LazyPageRenderer({ config }) {
 			mounted = false;
 		};
 	}, [component, t]);
-	if (loading) {
+	if (!(pageState.source === component) || pageState.loading) {
 		const path = config.path?.replace(/^\//, "") ?? "";
 		return AUTH_ROUTE_SEGMENTS.has(path) ? /* @__PURE__ */ jsx(AuthPageSkeleton, {}) : /* @__PURE__ */ jsx(RouterSkeleton, {});
 	}
-	if (error) return /* @__PURE__ */ jsxs("div", {
+	if (pageState.error) return /* @__PURE__ */ jsxs("div", {
 		className: "container",
 		children: [/* @__PURE__ */ jsx("h1", {
-			className: "text-destructive mb-4 text-2xl font-bold",
+			className: "text-destructive mb-4 text-2xl font-semibold",
 			children: t("error.unexpectedError")
 		}), /* @__PURE__ */ jsx("p", {
 			className: "text-muted-foreground",
-			children: error.message
+			children: pageState.error.message
 		})]
 	});
-	return Component ? /* @__PURE__ */ jsx(Component, {}) : /* @__PURE__ */ jsx(DefaultNotFound, {});
+	const PageComponent = pageState.Component;
+	return PageComponent ? /* @__PURE__ */ jsx(PageComponent, {}) : /* @__PURE__ */ jsx(DefaultNotFound, {});
 }
 /**
 * AdminRouter Component

package/dist/client/views/layout/admin-sidebar.mjs

@@ -5,7 +5,7 @@ import { useSafeContentLocales } from "../../runtime/content-locales-provider.mj
 import { ComponentRenderer } from "../../components/component-renderer.mjs";
 import { Button } from "../../components/ui/button.mjs";
 import { getFlagUrl } from "../../utils/locale-to-flag.mjs";
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger } from "../../components/ui/dropdown-menu.mjs";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSeparator, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger } from "../../components/ui/dropdown-menu.mjs";
 import { Tooltip, TooltipContent, TooltipTrigger } from "../../components/ui/tooltip.mjs";
 import { useAdminConfig } from "../../hooks/use-admin-config.mjs";
 import { useLazyComponent } from "../../utils/use-lazy-component.mjs";
@@ -222,7 +222,7 @@ function isRouteActive(activeRoute, itemHref, basePath, exact = false) {
 /**
 * Menu button styles - QUESTPIE design: clean, technical look
 */
-const menuButtonStyles = cn("item-surface font-chrome flex w-full items-center gap-2 px-2 py-2 text-[13px] font-medium transition-[background-color,color,border-color,transform] duration-[var(--motion-duration-base)] ease-[var(--motion-ease-standard)] active:scale-[0.96] motion-reduce:transition-none motion-reduce:active:scale-100", "text-sidebar-foreground/75 hover:bg-sidebar-accent hover:text-sidebar-foreground", "focus-visible:ring-sidebar-ring focus-visible:ring-1 focus-visible:outline-none", "group-data-[collapsible=icon]:size-8 group-data-[collapsible=icon]:justify-center group-data-[collapsible=icon]:px-2");
+const menuButtonStyles = cn("item-surface font-chrome flex w-full items-center gap-2 p-2 text-[13px] font-medium transition-[background-color,color,border-color,transform] duration-[var(--motion-duration-base)] ease-[var(--motion-ease-standard)] active:scale-[0.96] motion-reduce:transition-none motion-reduce:active:scale-100", "text-sidebar-foreground/75 hover:bg-sidebar-accent hover:text-sidebar-foreground", "focus-visible:ring-sidebar-ring focus-visible:ring-1 focus-visible:outline-none", "group-data-[collapsible=icon]:size-8 group-data-[collapsible=icon]:justify-center group-data-[collapsible=icon]:px-2");
 const menuButtonActiveStyles = cn("border-transparent bg-[var(--sidebar-active-background)] text-[var(--sidebar-active-foreground)]");
 function NavItem({ item, isActive, LinkComponent, renderNavItem, useActiveProps, className, depth = 0 }) {
 	const { state, isMobile, setOpenMobile } = useSidebar();
@@ -423,7 +423,7 @@ function UserFooter({ theme = "system", setTheme, showThemeToggle }) {
 	const setContentLocale = useAdminStore(selectSetContentLocale);
 	const hasMultipleContentLocales = (contentLocales?.locales?.length ?? 0) > 1;
 	const shouldShowThemeToggle = !!setTheme && showThemeToggle !== false;
-	const themeOptions = [
+	const themeOptions = React.useMemo(() => [
 		{
 			value: "light",
 			label: t("ui.themeLight"),
@@ -439,7 +439,10 @@ function UserFooter({ theme = "system", setTheme, showThemeToggle }) {
 			label: t("ui.themeSystem"),
 			icon: "ph:monitor"
 		}
-	];
+	], [t]);
+	const handleThemeChange = React.useCallback((value) => {
+		setTheme?.(value);
+	}, [setTheme]);
 	const closeSidebarOnMobile = React.useCallback(() => {
 		if (isMobile) setOpenMobile(false);
 	}, [isMobile, setOpenMobile]);
@@ -527,23 +530,21 @@ function UserFooter({ theme = "system", setTheme, showThemeToggle }) {
 						className: "size-4"
 					}), t("auth.myAccount")]
 				}),
-				shouldShowThemeToggle && /* @__PURE__ */ jsxs(DropdownMenuSub, { children: [/* @__PURE__ */ jsxs(DropdownMenuSubTrigger, { children: [/* @__PURE__ */ jsx(Icon, { icon: "ph:circle-half" }), t("ui.toggleTheme")] }), /* @__PURE__ */ jsx(DropdownMenuSubContent, { children: themeOptions.map((option) => /* @__PURE__ */ jsxs(DropdownMenuItem, {
-					onClick: () => setTheme(option.value),
-					children: [
-						/* @__PURE__ */ jsx(Icon, {
-							icon: option.icon,
-							className: "size-4"
-						}),
-						/* @__PURE__ */ jsx("span", {
-							className: "flex-1",
-							children: option.label
-						}),
-						theme === option.value && /* @__PURE__ */ jsx(Icon, {
-							icon: "ph:check",
-							className: "text-foreground size-4"
-						})
-					]
-				}, option.value)) })] }),
+				shouldShowThemeToggle && /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(DropdownMenuSeparator, {}),
+					/* @__PURE__ */ jsx(DropdownMenuLabel, { children: t("ui.toggleTheme") }),
+					/* @__PURE__ */ jsx(DropdownMenuRadioGroup, {
+						value: theme,
+						onValueChange: handleThemeChange,
+						children: themeOptions.map((option) => /* @__PURE__ */ jsxs(DropdownMenuRadioItem, {
+							value: option.value,
+							children: [/* @__PURE__ */ jsx(Icon, {
+								icon: option.icon,
+								className: "size-4"
+							}), /* @__PURE__ */ jsx("span", { children: option.label })]
+						}, option.value))
+					})
+				] }),
 				hasMultipleUiLocales && /* @__PURE__ */ jsxs(DropdownMenuSub, { children: [/* @__PURE__ */ jsxs(DropdownMenuSubTrigger, { children: [/* @__PURE__ */ jsx(Icon, { icon: "ph:globe" }), t("locale.uiLanguage")] }), /* @__PURE__ */ jsx(DropdownMenuSubContent, { children: uiLocaleOptions.map((locale) => /* @__PURE__ */ jsxs(DropdownMenuItem, {
 					onClick: () => setUiLocale(locale.code),
 					children: [

package/dist/components/rich-text/rich-text-renderer.d.mts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime20 from "react/jsx-runtime";
+import * as react_jsx_runtime19 from "react/jsx-runtime";
 
 //#region src/components/rich-text/rich-text-renderer.d.ts
 /**
@@ -98,6 +98,6 @@ declare function RichTextRenderer({
   content,
   styles: customStyles,
   className
-}: RichTextRendererProps): react_jsx_runtime20.JSX.Element | null;
+}: RichTextRendererProps): react_jsx_runtime19.JSX.Element | null;
 //#endregion
 export { RichTextRenderer, RichTextStyles, TipTapDoc, TipTapNode };

package/dist/server/codegen/admin-client-template.mjs

@@ -1,5 +1,47 @@
+import { categoryRecordEntry, importStatement, sortedValues } from "questpie/codegen";
+
 //#region src/server/codegen/admin-client-template.ts
 /**
+* Admin Client Template Generator
+*
+* Custom generator for the `admin-client` codegen target.
+* Produces `questpie/admin/.generated/client.ts` — a plain admin config
+* object that merges module defaults with user-discovered files.
+*
+* ## Architecture
+*
+* The admin-client target works identically to the server target:
+*
+* 1. **Package mode** (`generatePackageModules`): discovers files from
+*    `modules/admin/client/` → generates `modules/admin/client/.generated/module.ts`
+*    using the standard `generateModuleTemplate()` primitive.
+*
+* 2. **Root app mode** (`runAllTargets`): user has `admin/modules.ts` that imports
+*    module packages → this template imports `_mod` and merges generically with
+*    user-discovered files from `admin/{blocks,views,fields,...}/`.
+*
+* ## How to create an admin-client module (for third-party packages)
+*
+* 1. Create wrapper files in `modules/<name>/client/{fields,views,...}/`
+* 2. Run `questpie generate` — generates `client/.generated/module.ts`
+* 3. Create `client/index.ts` that re-exports the generated module
+* 4. Add `"./client/module"` to `package.json` exports
+*
+* ## How users extend admin
+*
+* Add files in `questpie/admin/{views,fields,pages,widgets,blocks,components}/`.
+* They are discovered automatically and merged over module defaults.
+*
+* ## Category key strategies
+*
+* - Default: use file key — `"bookingCta": _block_bookingCta`
+* - `keyFromProperty: "name"`: use runtime key — `[_view_kanban.name]: _view_kanban`
+*
+* The strategy is declared per-category in `CategoryDeclaration.keyFromProperty`.
+*
+* @see PLAN-PLUGIN-CONSISTENCY.md §6.2 (admin-client target)
+*/
+/**
 * Generate the admin client config file.
 *
 * Called by `runAllTargets()` for the `admin-client` target.
@@ -18,7 +60,7 @@ function generateAdminClientTemplate(ctx) {
 	lines.push(" */");
 	lines.push("");
 	if (modulesFile) {
-		lines.push(generateImportLine(modulesFile));
+		lines.push(importStatement(modulesFile));
 		lines.push(`const _mergedModules = Array.isArray(${modulesFile.varName})`);
 		lines.push(`\t? ${modulesFile.varName}.reduce((acc: any, m: any) => {`);
 		lines.push("		for (const [k, v] of Object.entries(m)) acc[k] = typeof v === \"object\" && v !== null && !Array.isArray(v) ? { ...acc[k], ...v } : v;");
@@ -27,15 +69,15 @@ function generateAdminClientTemplate(ctx) {
 	}
 	const categoryFiles = /* @__PURE__ */ new Map();
 	for (const [cat, fileMap] of ctx.discovered.categories) if (fileMap.size > 0) {
-		const sorted = [...fileMap.values()].sort((a, b) => a.key.localeCompare(b.key));
+		const sorted = sortedValues(fileMap);
 		categoryFiles.set(cat, sorted);
-		for (const file of sorted) lines.push(generateImportLine(file));
+		for (const file of sorted) lines.push(importStatement(file));
 	}
 	const singleFiles = /* @__PURE__ */ new Map();
 	for (const [key, file] of ctx.discovered.singles) {
 		if (key === "modules") continue;
 		singleFiles.set(key, file);
-		lines.push(generateImportLine(file));
+		lines.push(importStatement(file));
 	}
 	for (const imp of ctx.extraImports) lines.push(`import ${imp.name} from "${imp.path}";`);
 	lines.push("");
@@ -52,11 +94,11 @@ function generateAdminClientTemplate(ctx) {
 			const files = categoryFiles.get(cat);
 			const catDecl = ctx.target.categories?.[cat];
 			if (modulesFile && files && files.length > 0) {
-				const entries = generateCategoryEntries(files, catDecl);
+				const entries = files.map((f) => categoryRecordEntry(f, catDecl)).join(", ");
 				lines.push(`\t${cat}: { ..._mergedModules.${cat}, ${entries} },`);
 			} else if (modulesFile && (!files || files.length === 0)) lines.push(`\t${cat}: { ..._mergedModules.${cat} },`);
 			else if (files && files.length > 0) {
-				const entries = generateCategoryEntries(files, catDecl);
+				const entries = files.map((f) => categoryRecordEntry(f, catDecl)).join(", ");
 				lines.push(`\t${cat}: { ${entries} },`);
 			}
 		}
@@ -73,32 +115,6 @@ function generateAdminClientTemplate(ctx) {
 	lines.push("");
 	return { code: lines.join("\n") };
 }
-/**
-* Generate category entries string based on the category's key strategy.
-*
-* When `keyFromProperty` is set (e.g., views with `keyFromProperty: "name"`),
-* uses runtime property as key: `[_view_kanban.name]: _view_kanban`.
-*
-* Otherwise uses the file-derived key: `"bookingCta": _block_bookingCta`.
-*/
-function generateCategoryEntries(files, catDecl) {
-	const keyProp = catDecl?.keyFromProperty;
-	return files.map((f) => {
-		if (keyProp) return `[${f.varName}.${keyProp}]: ${f.varName}`;
-		if (catDecl?.keyFromSource === "basename") return `${JSON.stringify(getSourceBasename(f))}: ${f.varName}`;
-		return `${JSON.stringify(f.key)}: ${f.varName}`;
-	}).join(", ");
-}
-function getSourceBasename(file) {
-	return (file.source.replaceAll("\\", "/").split("/").pop() ?? file.key).replace(/\.[^.]+$/, "");
-}
-/**
-* Generate an import line for a discovered file.
-*/
-function generateImportLine(file) {
-	if (file.exportType === "named" && file.namedExportName) return `import { ${file.namedExportName} as ${file.varName} } from "${file.importPath}";`;
-	return `import ${file.varName} from "${file.importPath}";`;
-}
 
 //#endregion
 export { generateAdminClientTemplate };

package/dist/server/modules/admin/collections/account.d.mts

@@ -1,71 +1,71 @@
-import * as questpie_shared23 from "questpie/shared";
-import * as questpie152 from "questpie";
-import * as questpie_src_server_modules_core_fields_email_js3 from "questpie/src/server/modules/core/fields/email.js";
-import * as questpie_src_server_modules_core_fields_json_js3 from "questpie/src/server/modules/core/fields/json.js";
-import * as drizzle_orm_pg_core32 from "drizzle-orm/pg-core";
-import * as drizzle_orm15 from "drizzle-orm";
+import * as questpie_shared40 from "questpie/shared";
+import * as questpie242 from "questpie";
+import * as questpie_src_server_modules_core_fields_email_js6 from "questpie/src/server/modules/core/fields/email.js";
+import * as questpie_src_server_modules_core_fields_json_js6 from "questpie/src/server/modules/core/fields/json.js";
+import * as drizzle_orm_pg_core61 from "drizzle-orm/pg-core";
+import * as drizzle_orm43 from "drizzle-orm";
 
 //#region src/server/modules/admin/collections/account.d.ts
-declare const _default: questpie152.CollectionBuilder<questpie_shared23.Override<questpie152.EmptyCollectionState<"account", undefined, {
-  readonly text: typeof questpie152.text;
-  readonly textarea: typeof questpie152.textarea;
-  readonly email: typeof questpie_src_server_modules_core_fields_email_js3.email;
-  readonly url: typeof questpie152.url;
-  readonly number: typeof questpie152.number;
-  readonly boolean: typeof questpie152.boolean;
-  readonly date: typeof questpie152.date;
-  readonly datetime: typeof questpie152.datetime;
-  readonly time: typeof questpie152.time;
-  readonly select: typeof questpie152.select;
-  readonly upload: typeof questpie152.upload;
-  readonly relation: typeof questpie152.relation;
-  readonly object: typeof questpie152.object;
-  readonly json: typeof questpie_src_server_modules_core_fields_json_js3.json;
-  readonly from: typeof questpie152.from;
+declare const _default: questpie242.CollectionBuilder<questpie_shared40.Override<questpie242.EmptyCollectionState<"account", undefined, {
+  readonly text: typeof questpie242.text;
+  readonly textarea: typeof questpie242.textarea;
+  readonly email: typeof questpie_src_server_modules_core_fields_email_js6.email;
+  readonly url: typeof questpie242.url;
+  readonly number: typeof questpie242.number;
+  readonly boolean: typeof questpie242.boolean;
+  readonly date: typeof questpie242.date;
+  readonly datetime: typeof questpie242.datetime;
+  readonly time: typeof questpie242.time;
+  readonly select: typeof questpie242.select;
+  readonly upload: typeof questpie242.upload;
+  readonly relation: typeof questpie242.relation;
+  readonly object: typeof questpie242.object;
+  readonly json: typeof questpie_src_server_modules_core_fields_json_js6.json;
+  readonly from: typeof questpie242.from;
 }>, {
   name: "account";
   fields: Record<string, any> & {
-    readonly userId: drizzle_orm15.NotNull<drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>>;
-    readonly accountId: drizzle_orm15.NotNull<drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>>;
-    readonly providerId: drizzle_orm15.NotNull<drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>>;
-    readonly accessToken: drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>;
-    readonly refreshToken: drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>;
-    readonly accessTokenExpiresAt: drizzle_orm_pg_core32.PgTimestampBuilder;
-    readonly refreshTokenExpiresAt: drizzle_orm_pg_core32.PgTimestampBuilder;
-    readonly scope: drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>;
-    readonly idToken: drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>;
-    readonly password: drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>;
+    readonly userId: drizzle_orm43.NotNull<drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>>;
+    readonly accountId: drizzle_orm43.NotNull<drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>>;
+    readonly providerId: drizzle_orm43.NotNull<drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>>;
+    readonly accessToken: drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>;
+    readonly refreshToken: drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>;
+    readonly accessTokenExpiresAt: drizzle_orm_pg_core61.PgTimestampBuilder;
+    readonly refreshTokenExpiresAt: drizzle_orm_pg_core61.PgTimestampBuilder;
+    readonly scope: drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>;
+    readonly idToken: drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>;
+    readonly password: drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>;
   };
   virtuals: undefined;
-  relations: Record<string, questpie152.RelationConfig>;
+  relations: Record<string, questpie242.RelationConfig>;
   indexes: Record<string, any>;
   title: "providerId";
-  options: questpie152.CollectionOptions & {
+  options: questpie242.CollectionOptions & {
     timestamps: true;
   };
   hooks: Record<string, any>;
   access: Record<string, any>;
   searchable: undefined;
   fieldDefinitions: {
-    readonly userId: questpie152.FieldWithMethods<Omit<questpie152.TextFieldState, "notNull" | "column"> & {
+    readonly userId: questpie242.FieldWithMethods<Omit<questpie242.TextFieldState, "notNull" | "column"> & {
       notNull: true;
-      column: drizzle_orm15.NotNull<drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>>;
-    }, questpie152.TextFieldMethods>;
-    readonly accountId: questpie152.FieldWithMethods<Omit<questpie152.TextFieldState, "notNull" | "column"> & {
+      column: drizzle_orm43.NotNull<drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>>;
+    }, questpie242.TextFieldMethods>;
+    readonly accountId: questpie242.FieldWithMethods<Omit<questpie242.TextFieldState, "notNull" | "column"> & {
       notNull: true;
-      column: drizzle_orm15.NotNull<drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>>;
-    }, questpie152.TextFieldMethods>;
-    readonly providerId: questpie152.FieldWithMethods<Omit<questpie152.TextFieldState, "notNull" | "column"> & {
+      column: drizzle_orm43.NotNull<drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>>;
+    }, questpie242.TextFieldMethods>;
+    readonly providerId: questpie242.FieldWithMethods<Omit<questpie242.TextFieldState, "notNull" | "column"> & {
       notNull: true;
-      column: drizzle_orm15.NotNull<drizzle_orm_pg_core32.PgVarcharBuilder<[string, ...string[]]>>;
-    }, questpie152.TextFieldMethods>;
-    readonly accessToken: questpie152.FieldWithMethods<questpie152.TextFieldState, questpie152.TextFieldMethods>;
-    readonly refreshToken: questpie152.FieldWithMethods<questpie152.TextFieldState, questpie152.TextFieldMethods>;
-    readonly accessTokenExpiresAt: questpie152.FieldWithMethods<questpie152.DatetimeFieldState, questpie152.DatetimeFieldMethods>;
-    readonly refreshTokenExpiresAt: questpie152.FieldWithMethods<questpie152.DatetimeFieldState, questpie152.DatetimeFieldMethods>;
-    readonly scope: questpie152.FieldWithMethods<questpie152.TextFieldState, questpie152.TextFieldMethods>;
-    readonly idToken: questpie152.FieldWithMethods<questpie152.TextFieldState, questpie152.TextFieldMethods>;
-    readonly password: questpie152.FieldWithMethods<questpie152.TextFieldState, questpie152.TextFieldMethods>;
+      column: drizzle_orm43.NotNull<drizzle_orm_pg_core61.PgVarcharBuilder<[string, ...string[]]>>;
+    }, questpie242.TextFieldMethods>;
+    readonly accessToken: questpie242.FieldWithMethods<questpie242.TextFieldState, questpie242.TextFieldMethods>;
+    readonly refreshToken: questpie242.FieldWithMethods<questpie242.TextFieldState, questpie242.TextFieldMethods>;
+    readonly accessTokenExpiresAt: questpie242.FieldWithMethods<questpie242.DatetimeFieldState, questpie242.DatetimeFieldMethods>;
+    readonly refreshTokenExpiresAt: questpie242.FieldWithMethods<questpie242.DatetimeFieldState, questpie242.DatetimeFieldMethods>;
+    readonly scope: questpie242.FieldWithMethods<questpie242.TextFieldState, questpie242.TextFieldMethods>;
+    readonly idToken: questpie242.FieldWithMethods<questpie242.TextFieldState, questpie242.TextFieldMethods>;
+    readonly password: questpie242.FieldWithMethods<questpie242.TextFieldState, questpie242.TextFieldMethods>;
   };
   upload: undefined;
   output: {};