create-questpie 2.0.0 → 2.0.2

package/templates/tanstack-start/src/questpie/server/.generated/index.ts

@@ -2,36 +2,34 @@
 // AUTO-GENERATED by questpie codegen — DO NOT EDIT
 // Regenerate with: questpie generate
 
-import {
-	type AppContext,
-	createApp,
-	createContextFactory,
-	type Questpie,
-	type QuestpieConfig,
-} from "questpie";
-// ── Module type extraction (inline, no recursive types) ───
-import type { UnionToIntersection } from "questpie";
+import { createApp, createContextFactory, extractAppServices, type AppDefinition, type ModuleDefinition, type AppContext, type Registry, type QueueClient, type CollectionAPI } from "questpie";
 
-// ── Plugin Singles ─────────────────────────────────────────
-import _branding from "../branding";
-// ── Collections ────────────────────────────────────────────
-import { posts as _coll_posts_collection } from "../collections/posts.collection";
-import _dashboard from "../dashboard";
-// ── Globals ────────────────────────────────────────────────
-import { siteSettings as _glob_siteSettings_global } from "../globals/site-settings.global";
-// ── Modules ────────────────────────────────────────────────
-import _modules from "../modules";
 // ── Runtime ────────────────────────────────────────────────
 import _runtime from "../questpie.config";
+
+// ── Modules ────────────────────────────────────────────────
+import _modules from "../modules";
+
+// ── Collections ────────────────────────────────────────────
+import { posts as _coll_posts } from "../collections/posts.collection";
+
+// ── Globals ────────────────────────────────────────────────
+import { siteSettings as _glob_siteSettings } from "../globals/site-settings.global";
+
+// ── Core Singles ───────────────────────────────────────────
+import _authConfig from "../config/auth";
+
+// ── Plugin Singles ─────────────────────────────────────────
+import _adminConfig from "../config/admin";
+import _openapi from "../config/openapi";
+
 // ════════════════════════════════════════════════════════════
 // TYPES — composed from typeof references (zero inference cost)
 // ════════════════════════════════════════════════════════════
-import _sidebar from "../sidebar";
 
+import type { ServiceCustomNamespaceInstances, ServiceInstanceOf, ServiceInstancesInNamespace, ServiceTopLevelInstances, UnionToIntersection } from "questpie";
 type _Module = (typeof _modules)[number];
-type _MPRaw<K extends string> = UnionToIntersection<
-	_Module extends infer M ? (M extends Record<K, infer V> ? V : never) : never
->;
+type _MPRaw<K extends string> = UnionToIntersection<_Module extends infer M ? M extends Record<K, infer V> ? V : never : never>;
 type _MP<K extends string> = [_MPRaw<K>] extends [never] ? {} : _MPRaw<K>;
 
 type _ModuleCollections = _MP<"collections">;
@@ -39,15 +37,35 @@ type _ModuleGlobals = _MP<"globals">;
 type _ModuleJobs = _MP<"jobs">;
 type _ModuleRoutes = _MP<"routes">;
 type _ModuleServices = _MP<"services">;
+type _ModuleFieldTypes = _MP<"fieldTypes">;
+type _ModuleViews = _MP<"views">;
+type _ModuleComponents = _MP<"components">;
+type _ModuleBlocks = _MP<"blocks">;
+// Registry category extraction from modules
+type _Registry_Collections = _MP<"collections">;
+type _Registry_Globals = _MP<"globals">;
+type _Registry_Jobs = _MP<"jobs">;
+type _Registry_Routes = _MP<"routes">;
+type _Registry_Services = _MP<"services">;
+type _Registry_Emails = _MP<"emails">;
+type _Registry_FieldTypes = _MP<"fieldTypes">;
+type _Registry_Views = _MP<"views">;
+type _Registry_Components = _MP<"components">;
+type _Registry_Blocks = _MP<"blocks">;
+
+// Recursive module property extraction (for fields contributed at each level)
+import type { ExtractModuleProp } from "questpie";
+
+type _AllModuleFields = ExtractModuleProp<{ modules: typeof _modules }, "fields">;
 
 /** All collections in the app (modules + user, user overrides) */
 export type AppCollections = _ModuleCollections & {
-	"posts.collection": typeof _coll_posts_collection;
+	posts: typeof _coll_posts;
 };
 
 /** All globals in the app (modules + user, user overrides) */
 export type AppGlobals = _ModuleGlobals & {
-	"siteSettings.global": typeof _glob_siteSettings_global;
+	siteSettings: typeof _glob_siteSettings;
 };
 
 /** All jobs in the app (modules + user, user overrides) */
@@ -56,51 +74,75 @@ export type AppJobs = _ModuleJobs;
 /** All routes in the app (modules + user, user overrides) */
 export type AppRoutes = _ModuleRoutes;
 
-/** All services in the app (modules + user, user overrides). Values are service instances. */
-export type AppServices = _ModuleServices;
+/** All service definitions in the app (modules + user, user overrides). */
+type _AppServiceDefinitions = _ModuleServices;
 
-/**
- * The fully-typed app instance type.
- * Use `typeof app` or this alias when you need to reference the app type.
- *
- * **Note:** Do NOT import `app` inside framework-defined files (collections,
- * globals, routes, hooks, blocks) — it creates circular dependencies with
- * the generated index. Use the context parameters provided to handlers instead.
- */
-export type App = Questpie<
-	QuestpieConfig & {
-		collections: AppCollections;
-		globals: AppGlobals;
-		jobs: AppJobs;
-		routes: AppRoutes;
-		services: AppServices;
-	}
->;
+/** All services in the app as resolved service instances. */
+export type AppServices = {
+	[K in keyof _AppServiceDefinitions]: ServiceInstanceOf<_AppServiceDefinitions[K]>;
+};
+type _AppDefaultServices = ServiceInstancesInNamespace<_AppServiceDefinitions, "services">;
+type _AppTopLevelServices = ServiceTopLevelInstances<_AppServiceDefinitions>;
+type _AppCustomServiceNamespaces = ServiceCustomNamespaceInstances<_AppServiceDefinitions>;
+
+/** All email templates in the app — use with email.sendTemplate() */
+export type AppEmailTemplates = Record<string, never>;
+
+/** All fieldtypes in the app (modules + user, user overrides) */
+export type AppFieldTypes = _ModuleFieldTypes;
+
+/** All views in the app (modules + user, user overrides) */
+export type AppViews = _ModuleViews;
+
+/** All components in the app (modules + user, user overrides) */
+export type AppComponents = _ModuleComponents;
+
+/** All blocks in the app (modules + user, user overrides) */
+export type AppBlocks = _ModuleBlocks;
+
+type _CollectionsAPI = { [K in keyof AppCollections]: CollectionAPI<AppCollections[K], AppCollections> };
 
 // ── AppContext augmentation — auto-types ALL handlers ──────
-declare module "questpie" {
-	interface AppContext {
-		// Infrastructure
-		db: App["db"];
-		email: App["email"];
-		queue: App["queue"];
-		storage: App["storage"];
-		kv: App["kv"];
-		logger: App["logger"];
-		search: App["search"];
-		realtime: App["realtime"];
-
-		// Entity APIs
-		collections: App["collections"];
-		globals: App["globals"];
-
-		// Request-scoped
-		session: Awaited<ReturnType<App["auth"]["api"]["getSession"]>> | null;
-		t: (
-			key: string,
-			params?: Record<string, unknown>,
-			locale?: string,
-		) => string;
+declare global {
+	namespace Questpie {
+		interface AppContext extends _AppTopLevelServices, _AppCustomServiceNamespaces {
+			// Infrastructure
+			db: (typeof app)['db'];
+			email: (typeof app)['email'];
+			queue: QueueClient<AppJobs>;
+			storage: (typeof app)['storage'];
+			kv: (typeof app)['kv'];
+			logger: (typeof app)['logger'];
+			search: (typeof app)['search'];
+			realtime: (typeof app)['realtime'];
+
+			// Entity APIs
+			collections: _CollectionsAPI;
+			globals: (typeof app)['globals'];
+			tables: (typeof app)['tables'];
+
+			// Request-scoped
+			session: (typeof app)['auth'] extends { api: { getSession: (...args: any[]) => Promise<infer TSession> } } ? NonNullable<TSession> | null : null;
+			t: (key: string, params?: Record<string, unknown>, locale?: string) => string;
+
+			// User services
+			services: _AppDefaultServices;
+		}
+
+		interface ServiceCreateContext extends AppContext {}
+
+		interface Registry {
+			collections: _Registry_Collections;
+			globals: _Registry_Globals;
+			jobs: _Registry_Jobs;
+			routes: _Registry_Routes;
+			services: _Registry_Services;
+			emails: _Registry_Emails;
+			"~fieldTypes": _Registry_FieldTypes & _AllModuleFields;
+			views: _Registry_Views;
+			components: _Registry_Components;
+			blocks: _Registry_Blocks;
+		}
 	}
 }
 
@@ -110,32 +152,36 @@ declare module "questpie" {
  * For handler context, use `AppContext` (auto-typed via module augmentation).
  */
 export type AppConfig = {
-	collections: AppCollections;
-	globals: AppGlobals;
+	collections: AppCollections & Record<string, any>;
+	globals: AppGlobals & Record<string, any>;
+	routes: AppRoutes;
+	auth: typeof _authConfig;
 };
 
 // ════════════════════════════════════════════════════════════
 // RUNTIME — create the app instance
 // ════════════════════════════════════════════════════════════
 
-export const app = (await createApp(
-	{
-		modules: _modules as any,
+export const app = await createApp(
+	({
+		modules: _modules as ModuleDefinition[],
 		collections: {
-			"posts.collection": _coll_posts_collection,
+			posts: _coll_posts,
 		},
 		globals: {
-			"siteSettings.global": _glob_siteSettings_global,
+			siteSettings: _glob_siteSettings,
+		},
+		config: {
+			auth: _authConfig as any,
+			admin: _adminConfig as any,
+			openapi: _openapi as any,
 		},
-		branding: _branding as any,
-		dashboard: _dashboard as any,
-		sidebar: _sidebar as any,
-	},
+	}) satisfies AppDefinition,
 	_runtime,
-)) as unknown as AppConfig & {
-	waitForInit(): Promise<void>;
-	destroy(): Promise<void>;
-};
+);
+
+/** Fully typed QUESTPIE app instance. */
+export type App = typeof app;
 
 // ── createContext — typed context for scripts ──────────────
 /**
@@ -151,3 +197,5 @@ export const app = (await createApp(
  * ```
  */
 export const createContext = createContextFactory(app);
+
+// Factories: import { collection, global, ... } from '#questpie/factories';

package/templates/tanstack-start/src/questpie/server/app.ts

@@ -7,4 +7,4 @@
  * If .generated/ does not exist yet, run: bun questpie generate
  */
 
-export { type App, app } from "./.generated/index";
+export { type App, type AppConfig, app } from "./.generated/index";

package/templates/tanstack-start/src/questpie/server/config/admin.ts

@@ -9,23 +9,40 @@ export default adminConfig({
 			{
 				id: "main",
 				title: "Content",
-				items: [
-					{
-						type: "link",
-						label: "Dashboard",
-						href: "/admin",
-						icon: { type: "icon", props: { name: "ph:house" } },
-					},
-					{ type: "collection", collection: "posts" },
-					{ type: "global", global: "siteSettings" },
-				],
 			},
 		],
+		items: [
+			{
+				sectionId: "main",
+				type: "link",
+				label: "Dashboard",
+				href: "/admin",
+				icon: { type: "icon", props: { name: "ph:house" } },
+			},
+			{ sectionId: "main", type: "collection", collection: "posts" },
+			{ sectionId: "main", type: "global", global: "siteSettings" },
+		],
 	},
 	dashboard: {
 		title: "Dashboard",
 		description: "Overview of your content",
 		columns: 4,
+		actions: [
+			{
+				id: "new-post",
+				label: "New Post",
+				href: "/admin/collections/posts/create",
+				icon: { type: "icon", props: { name: "ph:article" } },
+				variant: "primary",
+			},
+			{
+				id: "site-settings",
+				label: "Site Settings",
+				href: "/admin/globals/siteSettings",
+				icon: { type: "icon", props: { name: "ph:gear" } },
+				variant: "outline",
+			},
+		],
 		sections: [
 			{ id: "content", label: "Content", layout: "grid", columns: 2 },
 			{ id: "recent", label: "Recent", layout: "grid", columns: 4 },
@@ -58,26 +75,6 @@ export default adminConfig({
 				limit: 5,
 				span: 2,
 			},
-			{
-				sectionId: "recent",
-				id: "quick-actions",
-				type: "quickActions",
-				label: "Quick Actions",
-				actions: [
-					{
-						label: "New Post",
-						action: { type: "create", collection: "posts" },
-					},
-					{
-						label: "Site Settings",
-						action: {
-							type: "link",
-							href: "/admin/globals/siteSettings",
-						},
-					},
-				],
-				span: 2,
-			},
 		],
 	},
 });

package/templates/tanstack-start/src/questpie/server/globals/site-settings.global.ts

@@ -1,6 +1,6 @@
 import { global } from "#questpie/factories";
 
-export const siteSettings = global("site_settings")
+export const siteSettings = global("siteSettings")
 	.fields(({ f }) => ({
 		siteName: f.text().label("Site Name").required().default("{{projectName}}"),
 		description: f

package/templates/tanstack-start/src/questpie/server/questpie.config.ts

@@ -3,7 +3,7 @@
  *
  * Runtime-only configuration: database, adapters, secrets.
  * Entity definitions (collections, globals, etc.) are codegen-generated.
- * Sidebar, dashboard, branding are file conventions.
+ * Admin sidebar, dashboard, and branding live in config/admin.ts.
  */
 
 import { ConsoleAdapter, runtimeConfig } from "questpie";

package/templates/tanstack-start/src/routeTree.gen.ts

@@ -0,0 +1,138 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as AdminRouteImport } from './routes/admin'
+import { Route as AdminIndexRouteImport } from './routes/admin/index'
+import { Route as ApiSplatRouteImport } from './routes/api/$'
+import { Route as AdminLoginRouteImport } from './routes/admin/login'
+import { Route as AdminSplatRouteImport } from './routes/admin/$'
+
+const AdminRoute = AdminRouteImport.update({
+  id: '/admin',
+  path: '/admin',
+  getParentRoute: () => rootRouteImport,
+} as any)
+const AdminIndexRoute = AdminIndexRouteImport.update({
+  id: '/',
+  path: '/',
+  getParentRoute: () => AdminRoute,
+} as any)
+const ApiSplatRoute = ApiSplatRouteImport.update({
+  id: '/api/$',
+  path: '/api/$',
+  getParentRoute: () => rootRouteImport,
+} as any)
+const AdminLoginRoute = AdminLoginRouteImport.update({
+  id: '/login',
+  path: '/login',
+  getParentRoute: () => AdminRoute,
+} as any)
+const AdminSplatRoute = AdminSplatRouteImport.update({
+  id: '/$',
+  path: '/$',
+  getParentRoute: () => AdminRoute,
+} as any)
+
+export interface FileRoutesByFullPath {
+  '/admin': typeof AdminRouteWithChildren
+  '/admin/$': typeof AdminSplatRoute
+  '/admin/login': typeof AdminLoginRoute
+  '/api/$': typeof ApiSplatRoute
+  '/admin/': typeof AdminIndexRoute
+}
+export interface FileRoutesByTo {
+  '/admin/$': typeof AdminSplatRoute
+  '/admin/login': typeof AdminLoginRoute
+  '/api/$': typeof ApiSplatRoute
+  '/admin': typeof AdminIndexRoute
+}
+export interface FileRoutesById {
+  __root__: typeof rootRouteImport
+  '/admin': typeof AdminRouteWithChildren
+  '/admin/$': typeof AdminSplatRoute
+  '/admin/login': typeof AdminLoginRoute
+  '/api/$': typeof ApiSplatRoute
+  '/admin/': typeof AdminIndexRoute
+}
+export interface FileRouteTypes {
+  fileRoutesByFullPath: FileRoutesByFullPath
+  fullPaths: '/admin' | '/admin/$' | '/admin/login' | '/api/$' | '/admin/'
+  fileRoutesByTo: FileRoutesByTo
+  to: '/admin/$' | '/admin/login' | '/api/$' | '/admin'
+  id: '__root__' | '/admin' | '/admin/$' | '/admin/login' | '/api/$' | '/admin/'
+  fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+  AdminRoute: typeof AdminRouteWithChildren
+  ApiSplatRoute: typeof ApiSplatRoute
+}
+
+declare module '@tanstack/react-router' {
+  interface FileRoutesByPath {
+    '/admin': {
+      id: '/admin'
+      path: '/admin'
+      fullPath: '/admin'
+      preLoaderRoute: typeof AdminRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+    '/admin/': {
+      id: '/admin/'
+      path: '/'
+      fullPath: '/admin/'
+      preLoaderRoute: typeof AdminIndexRouteImport
+      parentRoute: typeof AdminRoute
+    }
+    '/api/$': {
+      id: '/api/$'
+      path: '/api/$'
+      fullPath: '/api/$'
+      preLoaderRoute: typeof ApiSplatRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+    '/admin/login': {
+      id: '/admin/login'
+      path: '/login'
+      fullPath: '/admin/login'
+      preLoaderRoute: typeof AdminLoginRouteImport
+      parentRoute: typeof AdminRoute
+    }
+    '/admin/$': {
+      id: '/admin/$'
+      path: '/$'
+      fullPath: '/admin/$'
+      preLoaderRoute: typeof AdminSplatRouteImport
+      parentRoute: typeof AdminRoute
+    }
+  }
+}
+
+interface AdminRouteChildren {
+  AdminSplatRoute: typeof AdminSplatRoute
+  AdminLoginRoute: typeof AdminLoginRoute
+  AdminIndexRoute: typeof AdminIndexRoute
+}
+
+const AdminRouteChildren: AdminRouteChildren = {
+  AdminSplatRoute: AdminSplatRoute,
+  AdminLoginRoute: AdminLoginRoute,
+  AdminIndexRoute: AdminIndexRoute,
+}
+
+const AdminRouteWithChildren = AdminRoute._addFileChildren(AdminRouteChildren)
+
+const rootRouteChildren: RootRouteChildren = {
+  AdminRoute: AdminRouteWithChildren,
+  ApiSplatRoute: ApiSplatRoute,
+}
+export const routeTree = rootRouteImport
+  ._addFileChildren(rootRouteChildren)
+  ._addFileTypes<FileRouteTypes>()

package/templates/tanstack-start/src/routes/__root.tsx

@@ -1,5 +1,3 @@
-import "virtual:iconify-preload";
-
 import { createRootRoute } from "@tanstack/react-router";
 
 export const Route = createRootRoute({

package/templates/tanstack-start/src/routes/admin.tsx

@@ -20,14 +20,21 @@ function AdminLink({
 	className,
 	children,
 	activeProps,
+	activeOptions,
 }: {
 	to: string;
 	className?: string;
 	children: React.ReactNode;
 	activeProps?: { className?: string };
+	activeOptions?: { exact?: boolean };
 }) {
 	return (
-		<Link to={to} className={className} activeProps={activeProps}>
+		<Link
+			to={to}
+			className={className}
+			activeProps={activeProps}
+			activeOptions={activeOptions}
+		>
 			{children}
 		</Link>
 	);

package/templates/tanstack-start/src/tanstack-start.d.ts

@@ -0,0 +1 @@
+import "@tanstack/react-start";

package/templates/tanstack-start/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

package/templates/tanstack-start/vite.config.ts

@@ -1,4 +1,3 @@
-import { iconifyPreload } from "@questpie/vite-plugin-iconify";
 import tailwindcss from "@tailwindcss/vite";
 import { devtools } from "@tanstack/devtools-vite";
 import { tanstackStart } from "@tanstack/react-start/plugin/vite";
@@ -9,7 +8,6 @@ import viteTsConfigPaths from "vite-tsconfig-paths";
 
 export default defineConfig({
 	plugins: [
-		iconifyPreload(),
 		devtools(),
 		nitro({ preset: "bun" }) as any,
 		viteTsConfigPaths({ projects: ["./tsconfig.json"] }),
@@ -22,7 +20,7 @@ export default defineConfig({
 	},
 	build: {
 		rollupOptions: {
-			external: ["bun", /^drizzle-kit/],
+			external: ["bun", /^drizzle-kit/, /^@aws-sdk\//],
 		},
 	},
 });