@questpie/admin 3.0.0 → 3.0.1

package/README.md

@@ -19,15 +19,13 @@ bun add @questpie/admin questpie @questpie/tanstack-query @tanstack/react-query
 
 ## Server Setup
 
-The admin plugin is registered in `questpie.config.ts`, and the admin module is added to `modules.ts`:
+Add the admin module to `modules.ts`:
 
 ```ts
 // questpie.config.ts
 import { runtimeConfig } from "questpie";
-import { adminPlugin } from "@questpie/admin/plugin";
 
 export default runtimeConfig({
-	plugins: [adminPlugin()],
 	app: { url: process.env.APP_URL! },
 	db: { url: process.env.DATABASE_URL! },
 	secret: process.env.AUTH_SECRET!,
@@ -41,7 +39,25 @@ import { adminModule } from "@questpie/admin/server";
 export default [adminModule] as const;
 ```
 
-Branding, sidebar, and dashboard are configured via the file convention (e.g. `branding.ts`, `sidebar.ts`, `dashboard.ts`) and auto-discovered by codegen.
+Branding, sidebar, dashboard, and admin locale are configured via `config/admin.ts`:
+
+```ts
+// config/admin.ts
+import { adminConfig } from "#questpie/factories";
+
+export default adminConfig({
+	branding: { name: "My Admin" },
+	sidebar: {
+		sections: [
+			{
+				id: "main",
+				title: "Content",
+				items: [{ type: "collection", collection: "posts" }],
+			},
+		],
+	},
+});
+```
 
 Collections, globals, routes, and jobs are auto-discovered via file convention. Codegen produces a `.generated/index.ts` with the fully-typed `App` and runtime `app` instance.
 
@@ -54,7 +70,12 @@ const posts = collection("posts")
 	.fields(({ f }) => ({
 		title: f.text(255).required().label("Title"),
 		content: f.richText().label("Content"),
-		status: f.select(["draft", "published"]).label("Status"),
+		status: f
+			.select([
+				{ value: "draft", label: "Draft" },
+				{ value: "published", label: "Published" },
+			])
+			.label("Status"),
 		cover: f.upload({ to: "assets", mimeTypes: ["image/*"] }),
 		publishedAt: f.date(),
 	}))
@@ -147,35 +168,51 @@ Server-evaluated reactive behaviors in form config:
 ### Dashboard Actions
 
 ```ts
-.dashboard(({ d, c, a }) => d.dashboard({
-  actions: [
-    a.create({ collection: "posts", label: { en: "New Post" }, icon: c.icon("ph:plus"), variant: "primary" }),
-    a.global({ global: "siteSettings", label: { en: "Settings" }, icon: c.icon("ph:gear-six") }),
-    a.link({ href: "/", label: { en: "Open Site" }, icon: c.icon("ph:arrow-square-out"), variant: "outline" }),
-  ],
-  items: [
-    { type: "section", items: [
-      { type: "stats", collection: "posts", label: "Posts" },
-    ]},
-  ],
-}))
+export default adminConfig({
+	dashboard: {
+		title: "Dashboard",
+		items: [
+			{
+				id: "posts",
+				type: "stats",
+				collection: "posts",
+				label: "Posts",
+			},
+			{
+				id: "quick-actions",
+				type: "quickActions",
+				label: "Quick Actions",
+				actions: [
+					{
+						label: "New Post",
+						action: { type: "create", collection: "posts" },
+					},
+					{
+						label: "Open Site",
+						action: { type: "link", href: "/" },
+					},
+				],
+			},
+		],
+	},
+});
 ```
 
 ## Client Setup
 
-The client creates a typed admin builder and mounts the admin UI in React:
+Codegen creates a typed admin config from the client module registry and the server projection:
 
-### 1. Admin Builder
+### 1. Admin Client Modules
 
 ```ts
-// questpie/admin/builder.ts
-import { qa, adminModule } from "@questpie/admin/client";
-import type { App } from "#questpie";
-
-export const admin = qa<App>().use(adminModule);
+// questpie/admin/modules.ts
+export { default } from "@questpie/admin/client-module";
 ```
 
-> **Note:** The old `.toNamespace()` call has been removed. `qa<App>().use(adminModule)` is the complete builder.
+```ts
+// questpie/admin/admin.ts
+export { default as admin } from "./.generated/client";
+```
 
 ### 2. Typed Hooks
 
@@ -200,7 +237,7 @@ export const {
 ```tsx
 // routes/admin.tsx
 import { AdminRouter } from "@questpie/admin/client";
-import { admin } from "@/questpie/admin/builder";
+import { admin } from "@/questpie/admin/admin";
 import { appClient } from "@/lib/client";
 import { queryClient } from "@/lib/query-client";
 
@@ -208,7 +245,7 @@ export default function AdminRoute() {
 	return (
 		<AdminRouter
 			admin={admin}
-			client={client}
+			client={appClient}
 			queryClient={queryClient}
 			basePath="/admin"
 		/>
@@ -239,7 +276,7 @@ const heroBlock = block("hero")
 		category: { label: "Sections", icon: c.icon("ph:layout") },
 	}))
 	.fields(({ f }) => ({
-		title: f.text({ required: true }),
+		title: f.text().required(),
 		subtitle: f.textarea(),
 		backgroundImage: f.upload({ to: "assets", mimeTypes: ["image/*"] }),
 	}))
@@ -249,19 +286,19 @@ const heroBlock = block("hero")
 Render blocks on the client with `BlockRenderer`:
 
 ```tsx
-import { BlockRenderer, createBlockRegistry } from "@questpie/admin/client";
+import { BlockRenderer } from "@questpie/admin/client";
 
-const registry = createBlockRegistry({
-	hero: ({ block }) => (
-		<section style={{ backgroundImage: `url(${block.backgroundImage?.url})` }}>
-			<h1>{block.title}</h1>
-			<p>{block.subtitle}</p>
+const renderers = {
+	hero: ({ values }) => (
+		<section>
+			<h1>{values.title}</h1>
+			<p>{values.subtitle}</p>
 		</section>
 	),
-});
+};
 
-function Page({ blocks }) {
-	return <BlockRenderer blocks={blocks} registry={registry} />;
+function Page({ content }) {
+	return <BlockRenderer content={content} renderers={renderers} />;
 }
 ```
 
@@ -305,19 +342,15 @@ Legacy params (`history`, `viewOptions`, and `sidebar=preview`) are still read f
 ## Package Exports
 
 ```ts
-// Client (React components, builder, hooks)
+// Client (React components, generated admin config, hooks)
 import {
-	qa,
-	adminModule,
 	AdminRouter,
 	createTypedHooks,
 	BlockRenderer,
-	createBlockRegistry,
 } from "@questpie/admin/client";
 
-// Server (admin module + plugin for QUESTPIE config)
+// Server (admin module + server factories/config)
 import { adminModule, auditModule } from "@questpie/admin/server";
-import { adminPlugin } from "@questpie/admin/plugin";
 
 // Styles
 import "@questpie/admin/styles/index.css";

package/dist/client/blocks/block-renderer.d.mts

@@ -1,6 +1,6 @@
 import { BlockContent } from "./types.mjs";
 import * as React from "react";
-import * as react_jsx_runtime23 from "react/jsx-runtime";
+import * as react_jsx_runtime22 from "react/jsx-runtime";
 
 //#region src/client/blocks/block-renderer.d.ts
 
@@ -40,6 +40,6 @@ declare function BlockRenderer({
   selectedBlockId,
   onBlockClick,
   className
-}: BlockRendererProps): react_jsx_runtime23.JSX.Element | null;
+}: BlockRendererProps): react_jsx_runtime22.JSX.Element | null;
 //#endregion
 export { BlockRenderer, BlockRendererProps };

package/dist/client/preview/block-scope-context.d.mts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as react_jsx_runtime22 from "react/jsx-runtime";
+import * as react_jsx_runtime17 from "react/jsx-runtime";
 
 //#region src/client/preview/block-scope-context.d.ts
 
@@ -35,7 +35,7 @@ declare function BlockScopeProvider({
   blockId,
   basePath,
   children
-}: BlockScopeProviderProps): react_jsx_runtime22.JSX.Element;
+}: BlockScopeProviderProps): react_jsx_runtime17.JSX.Element;
 /**
  * Get current block scope context.
  *

package/dist/client/preview/preview-banner.d.mts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime21 from "react/jsx-runtime";
+import * as react_jsx_runtime18 from "react/jsx-runtime";
 
 //#region src/client/preview/preview-banner.d.ts
 
@@ -40,6 +40,6 @@ declare function PreviewBanner({
   isPreviewMode,
   className,
   exitPreviewUrl
-}: PreviewBannerProps): react_jsx_runtime21.JSX.Element | null;
+}: PreviewBannerProps): react_jsx_runtime18.JSX.Element | null;
 //#endregion
 export { PreviewBanner, PreviewBannerProps };

package/dist/client/preview/preview-field.d.mts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as react_jsx_runtime18 from "react/jsx-runtime";
+import * as react_jsx_runtime19 from "react/jsx-runtime";
 
 //#region src/client/preview/preview-field.d.ts
 
@@ -45,7 +45,7 @@ declare function PreviewProvider({
     fieldType?: "regular" | "block" | "relation";
   }) => void;
   children: React.ReactNode;
-}): react_jsx_runtime18.JSX.Element;
+}): react_jsx_runtime19.JSX.Element;
 /**
  * Hook to access preview context.
  */
@@ -81,7 +81,7 @@ declare function PreviewField({
   as: Component,
   className,
   onClick
-}: PreviewFieldProps): react_jsx_runtime18.JSX.Element;
+}: PreviewFieldProps): react_jsx_runtime19.JSX.Element;
 /**
  * Standalone PreviewField that works without context.
  * Useful when you can't use PreviewProvider.
@@ -102,6 +102,6 @@ declare function StandalonePreviewField({
     blockId?: string;
     fieldType?: "regular" | "block" | "relation";
   }) => void;
-}): react_jsx_runtime18.JSX.Element;
+}): react_jsx_runtime19.JSX.Element;
 //#endregion
 export { PreviewField, PreviewFieldProps, PreviewProvider, StandalonePreviewField, usePreviewContext };

package/dist/client/views/auth/auth-layout.d.mts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as react_jsx_runtime0 from "react/jsx-runtime";
+import * as react_jsx_runtime2 from "react/jsx-runtime";
 
 //#region src/client/views/auth/auth-layout.d.ts
 type AuthLayoutProps = {
@@ -38,6 +38,6 @@ declare function AuthLayout({
   footer,
   children,
   className
-}: AuthLayoutProps): react_jsx_runtime0.JSX.Element;
+}: AuthLayoutProps): react_jsx_runtime2.JSX.Element;
 //#endregion
 export { AuthLayout };

package/dist/client/views/auth/forgot-password-form.d.mts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime1 from "react/jsx-runtime";
+import * as react_jsx_runtime0 from "react/jsx-runtime";
 
 //#region src/client/views/auth/forgot-password-form.d.ts
 /**
@@ -53,6 +53,6 @@ declare function ForgotPasswordForm({
   defaultValues,
   className,
   error
-}: ForgotPasswordFormProps): react_jsx_runtime1.JSX.Element;
+}: ForgotPasswordFormProps): react_jsx_runtime0.JSX.Element;
 //#endregion
 export { ForgotPasswordForm };

package/dist/client/views/auth/login-form.d.mts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime2 from "react/jsx-runtime";
+import * as react_jsx_runtime1 from "react/jsx-runtime";
 
 //#region src/client/views/auth/login-form.d.ts
 /**
@@ -70,6 +70,6 @@ declare function LoginForm({
   className,
   error,
   minPasswordLength
-}: LoginFormProps): react_jsx_runtime2.JSX.Element;
+}: LoginFormProps): react_jsx_runtime1.JSX.Element;
 //#endregion
 export { LoginForm };

package/dist/client/views/auth/setup-form.d.mts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime4 from "react/jsx-runtime";
+import * as react_jsx_runtime6 from "react/jsx-runtime";
 
 //#region src/client/views/auth/setup-form.d.ts
 /**
@@ -55,6 +55,6 @@ declare function SetupForm({
   className,
   error,
   minPasswordLength
-}: SetupFormProps): react_jsx_runtime4.JSX.Element;
+}: SetupFormProps): react_jsx_runtime6.JSX.Element;
 //#endregion
 export { SetupForm, SetupFormValues };

package/dist/client/views/pages/accept-invite-page.d.mts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as react_jsx_runtime5 from "react/jsx-runtime";
+import * as react_jsx_runtime4 from "react/jsx-runtime";
 
 //#region src/client/views/pages/accept-invite-page.d.ts
 
@@ -61,6 +61,6 @@ declare function AcceptInvitePage({
   redirectTo,
   loginPath,
   minPasswordLength
-}: AcceptInvitePageProps): react_jsx_runtime5.JSX.Element;
+}: AcceptInvitePageProps): react_jsx_runtime4.JSX.Element;
 //#endregion
 export { AcceptInvitePage };

package/dist/client/views/pages/dashboard-page.d.mts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime6 from "react/jsx-runtime";
+import * as react_jsx_runtime5 from "react/jsx-runtime";
 
 //#region src/client/views/pages/dashboard-page.d.ts
 
@@ -38,6 +38,6 @@ declare function DashboardPage({
   title,
   description,
   className
-}: DashboardPageProps): react_jsx_runtime6.JSX.Element;
+}: DashboardPageProps): react_jsx_runtime5.JSX.Element;
 //#endregion
 export { DashboardPage };

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

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime17 from "react/jsx-runtime";
+import * as react_jsx_runtime23 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_runtime17.JSX.Element | null;
+}: RichTextRendererProps): react_jsx_runtime23.JSX.Element | null;
 //#endregion
 export { RichTextRenderer, RichTextStyles, TipTapDoc, TipTapNode };

package/dist/server/modules/admin/block/prefetch.d.mts

@@ -14,6 +14,10 @@ interface BlocksPrefetchContext {
   db: unknown;
   /** Current locale */
   locale?: string;
+  /** Collections accessor */
+  collections?: unknown;
+  /** Globals accessor */
+  globals?: unknown;
 }
 /**
  * Process blocks data for a single blocks document.

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

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