create-kuckit-app 0.3.5 → 0.4.0

package/templates/base/apps/server/src/rest-router-registry.ts

@@ -0,0 +1,32 @@
+import type { Router } from 'express'
+import type { ApiRegistration } from '@kuckit/sdk'
+
+interface RestRouterEntry {
+	name: string
+	router: Router
+	basePath: string
+}
+
+const restRouters: RestRouterEntry[] = []
+
+/**
+ * Collect REST routers from module registrations.
+ * Called from the SDK loader's onApiRegistrations callback.
+ */
+export const collectModuleRestRouters = (registrations: ApiRegistration[]): void => {
+	for (const reg of registrations) {
+		if (reg.type !== 'rest-router') continue
+
+		const basePath = reg.prefix ?? `/${reg.name}`
+		restRouters.push({
+			name: reg.name,
+			router: reg.router as Router,
+			basePath,
+		})
+	}
+}
+
+/**
+ * Get all collected REST routers for wiring to Express app.
+ */
+export const getRestRouters = (): readonly RestRouterEntry[] => restRouters

package/templates/base/apps/server/src/rpc.ts

@@ -1,6 +1,6 @@
 import { RPCHandler } from '@orpc/server/node'
 import { onError } from '@orpc/server'
-import { createContext } from '@__APP_NAME_KEBAB__/api'
+import { createContext } from '@kuckit/api/context'
 import type { Express } from 'express'
 import { rootRpcRouter } from './rpc-router-registry'
 

package/templates/base/apps/server/src/server.ts

@@ -3,6 +3,7 @@ import { createApp } from './app'
 import { setupContainerMiddleware, getRootContainer } from './middleware/container'
 import { setupAuth } from './auth'
 import { setupRPC } from './rpc'
+import { setupModuleRestRouters } from './module-rest-routes'
 import { setupHealth } from './health'
 import { disposeContainer } from './container'
 
@@ -17,6 +18,7 @@ const bootstrap = async () => {
 
 	setupAuth(app)
 	setupRPC(app)
+	setupModuleRestRouters(app)
 	setupHealth(app, rootContainer)
 
 	const port = process.env.PORT || 3000

package/templates/base/apps/web/package.json

@@ -9,7 +9,8 @@
 		"check-types": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@kuckit/sdk-react": "^1.0.0",
+		"@kuckit/sdk-react": "^2.0.0",
+		"@kuckit/auth": "^2.0.0",
 		"@orpc/client": "^1.10.0",
 		"@orpc/tanstack-query": "^1.10.0",
 		"@radix-ui/react-avatar": "^1.1.10",
@@ -19,17 +20,16 @@
 		"@radix-ui/react-separator": "^1.1.7",
 		"@radix-ui/react-slot": "^1.2.3",
 		"@radix-ui/react-tooltip": "^1.2.7",
-		"@tanstack/react-query": "^5.85.5",
-		"@tanstack/react-router": "^1.114.25",
-		"better-auth": "^1.3.28",
+		"@tanstack/react-query": "^5.0.0",
+		"@tanstack/react-router": "^1.114.0",
+		"better-auth": "^1.3.0",
 		"class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
 		"lucide-react": "^0.511.0",
-		"react": "^19.1.0",
-		"react-dom": "^19.1.0",
-		"tailwind-merge": "^3.3.0",
-		"zod": "^4.1.11",
-		"@__APP_NAME_KEBAB__/auth": "workspace:*"
+		"react": "^19.0.0",
+		"react-dom": "^19.0.0",
+		"tailwind-merge": "^3.0.0",
+		"zod": "^3.23.0"
 	},
 	"devDependencies": {
 		"@tailwindcss/vite": "^4.0.15",

package/templates/base/apps/web/src/services/auth-client.ts

@@ -1,4 +1,4 @@
-import type { auth } from '@__APP_NAME_KEBAB__/auth'
+import type { auth } from '@kuckit/auth'
 import { createAuthClient } from 'better-auth/react'
 import { inferAdditionalFields } from 'better-auth/client/plugins'
 

package/templates/base/{packages/db/src/migrations → drizzle}/0000_init.sql

@@ -1,19 +1,20 @@
--- Initial migration: Auth tables
--- This migration is generated by drizzle-kit
--- Run: bun run db:migrate
-
-CREATE TABLE IF NOT EXISTS "user" (
+CREATE TABLE "account" (
 	"id" text PRIMARY KEY NOT NULL,
-	"name" text NOT NULL,
-	"email" text NOT NULL,
-	"email_verified" boolean NOT NULL,
-	"image" text,
+	"account_id" text NOT NULL,
+	"provider_id" text NOT NULL,
+	"user_id" text NOT NULL,
+	"access_token" text,
+	"refresh_token" text,
+	"id_token" text,
+	"access_token_expires_at" timestamp,
+	"refresh_token_expires_at" timestamp,
+	"scope" text,
+	"password" text,
 	"created_at" timestamp NOT NULL,
-	"updated_at" timestamp NOT NULL,
-	CONSTRAINT "user_email_unique" UNIQUE("email")
+	"updated_at" timestamp NOT NULL
 );
-
-CREATE TABLE IF NOT EXISTS "session" (
+--> statement-breakpoint
+CREATE TABLE "session" (
 	"id" text PRIMARY KEY NOT NULL,
 	"expires_at" timestamp NOT NULL,
 	"token" text NOT NULL,
@@ -24,24 +25,19 @@ CREATE TABLE IF NOT EXISTS "session" (
 	"user_id" text NOT NULL,
 	CONSTRAINT "session_token_unique" UNIQUE("token")
 );
-
-CREATE TABLE IF NOT EXISTS "account" (
+--> statement-breakpoint
+CREATE TABLE "user" (
 	"id" text PRIMARY KEY NOT NULL,
-	"account_id" text NOT NULL,
-	"provider_id" text NOT NULL,
-	"user_id" text NOT NULL,
-	"access_token" text,
-	"refresh_token" text,
-	"id_token" text,
-	"access_token_expires_at" timestamp,
-	"refresh_token_expires_at" timestamp,
-	"scope" text,
-	"password" text,
+	"name" text NOT NULL,
+	"email" text NOT NULL,
+	"email_verified" boolean NOT NULL,
+	"image" text,
 	"created_at" timestamp NOT NULL,
-	"updated_at" timestamp NOT NULL
+	"updated_at" timestamp NOT NULL,
+	CONSTRAINT "user_email_unique" UNIQUE("email")
 );
-
-CREATE TABLE IF NOT EXISTS "verification" (
+--> statement-breakpoint
+CREATE TABLE "verification" (
 	"id" text PRIMARY KEY NOT NULL,
 	"identifier" text NOT NULL,
 	"value" text NOT NULL,
@@ -49,16 +45,15 @@ CREATE TABLE IF NOT EXISTS "verification" (
 	"created_at" timestamp,
 	"updated_at" timestamp
 );
-
-ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;
-ALTER TABLE "account" ADD CONSTRAINT "account_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;
-
--- Items module table
-CREATE TABLE IF NOT EXISTS "items" (
+--> statement-breakpoint
+CREATE TABLE "items" (
 	"id" text PRIMARY KEY NOT NULL,
 	"name" text NOT NULL,
 	"description" text,
-	"created_at" timestamp NOT NULL DEFAULT now(),
-	"updated_at" timestamp NOT NULL DEFAULT now(),
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
 	"user_id" text NOT NULL
 );
+--> statement-breakpoint
+ALTER TABLE "account" ADD CONSTRAINT "account_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;

package/templates/base/{packages/db/src/migrations → drizzle}/meta/_journal.json

@@ -5,7 +5,7 @@
 		{
 			"idx": 0,
 			"version": "7",
-			"when": 1734000000000,
+			"when": 1734620400000,
 			"tag": "0000_init",
 			"breakpoints": true
 		}

package/templates/base/drizzle.config.ts

@@ -0,0 +1,38 @@
+import { defineConfig } from 'drizzle-kit'
+import dotenv from 'dotenv'
+import { dirname, resolve } from 'path'
+import { fileURLToPath } from 'url'
+
+const currentFilePath = fileURLToPath(import.meta.url)
+const currentDirPath = dirname(currentFilePath)
+
+dotenv.config({
+	path: resolve(currentDirPath, './apps/server/.env'),
+})
+
+function buildDatabaseUrl(): string {
+	if (process.env.DATABASE_URL) {
+		return process.env.DATABASE_URL
+	}
+
+	const { DB_HOST, DB_USER, DB_PASSWORD, DB_NAME } = process.env
+	if (DB_HOST && DB_USER && DB_PASSWORD && DB_NAME) {
+		return `postgresql://${DB_USER}:${encodeURIComponent(DB_PASSWORD)}@/${DB_NAME}?host=${DB_HOST}`
+	}
+
+	throw new Error(
+		'Missing database configuration: provide DATABASE_URL or DB_HOST, DB_USER, DB_PASSWORD, DB_NAME'
+	)
+}
+
+export default defineConfig({
+	schema: [
+		// Auth schema from @kuckit/db (resolved from node_modules)
+		'./node_modules/@kuckit/db/dist/schema/auth.js',
+		// Local module schemas
+		resolve(currentDirPath, './packages/items-module/src/adapters'),
+	],
+	out: './drizzle',
+	dialect: 'postgresql',
+	dbCredentials: { url: buildDatabaseUrl() },
+})

package/templates/base/package.json

@@ -14,9 +14,10 @@
 		"lint:fix": "eslint apps packages --fix",
 		"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md,yml,yaml}\"",
 		"format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,json,md,yml,yaml}\"",
-		"db:generate": "turbo -F @__APP_NAME_KEBAB__/db db:generate",
-		"db:migrate": "turbo -F @__APP_NAME_KEBAB__/db db:migrate",
-		"db:studio": "turbo -F @__APP_NAME_KEBAB__/db db:studio",
+		"db:push": "drizzle-kit push",
+		"db:generate": "drizzle-kit generate",
+		"db:migrate": "drizzle-kit migrate",
+		"db:studio": "drizzle-kit studio",
 		"prepare": "husky"
 	},
 	"lint-staged": {
@@ -29,21 +30,25 @@
 		]
 	},
 	"dependencies": {
-		"@kuckit/sdk": "^1.0.0",
+		"@kuckit/sdk": "^2.0.0",
+		"@kuckit/api": "^2.0.0",
+		"@kuckit/auth": "^2.0.0",
+		"@kuckit/db": "^2.0.0",
 		"awilix": "^12.0.5",
-		"dotenv": "^17.2.2",
-		"zod": "^4.1.11"
+		"dotenv": "^17.0.0",
+		"zod": "^3.23.0"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.17.0",
+		"drizzle-kit": "^0.31.0",
 		"eslint": "^9.17.0",
 		"eslint-config-prettier": "^10.0.1",
 		"husky": "^9.1.7",
 		"lint-staged": "^16.0.0",
 		"prettier": "^3.4.2",
-		"turbo": "^2.5.4",
-		"typescript": "^5.8.2",
-		"typescript-eslint": "^8.18.2"
+		"turbo": "^2.5.0",
+		"typescript": "^5.8.0",
+		"typescript-eslint": "^8.18.0"
 	},
 	"packageManager": "bun@1.2.21"
 }

package/templates/base/packages/items-module/package.json

@@ -23,14 +23,14 @@
 		"typescript": "^5"
 	},
 	"dependencies": {
-		"@kuckit/sdk": "^1.0.0",
-		"@kuckit/sdk-react": "^1.0.0",
+		"@kuckit/sdk": "^2.0.0",
+		"@kuckit/sdk-react": "^2.0.0",
+		"@kuckit/api": "^2.0.0",
 		"@orpc/server": "^1.10.0",
 		"@orpc/zod": "^1.10.0",
-		"drizzle-orm": "^0.44.2",
-		"zod": "^4.1.11",
-		"react": "^19.1.0",
-		"@__APP_NAME_KEBAB__/api": "workspace:*",
-		"@__APP_NAME_KEBAB__/db": "workspace:*"
+		"drizzle-orm": "^0.44.0",
+		"zod": "^3.23.0",
+		"react": "^19.0.0",
+		"@tanstack/react-query": "^5.0.0"
 	}
 }

package/templates/base/packages/items-module/src/api/items.router.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { protectedProcedure } from '@__APP_NAME_KEBAB__/api'
+import { protectedProcedure } from '@kuckit/api'
 import { CreateItemInputSchema } from '../domain/item.entity'
 import type { ItemRepository } from '../ports/item.repository'
 

package/templates/base/packages/api/AGENTS.md

@@ -1,66 +0,0 @@
-# AGENTS.md - API Package
-
-> See root [AGENTS.md](../../AGENTS.md) for SDK Module System patterns
-
-## Purpose
-
-Shared API context, types, and procedure definitions for oRPC.
-
-## Key Files
-
-| File         | Purpose                          |
-| ------------ | -------------------------------- |
-| `context.ts` | Request context type definitions |
-| `index.ts`   | Public exports                   |
-
-## Procedure Types
-
-```typescript
-import { publicProcedure, protectedProcedure } from '@__APP_NAME_KEBAB__/api'
-
-// Public - no authentication required
-export const healthRouter = {
-	ping: publicProcedure.handler(() => 'pong'),
-}
-
-// Protected - requires authenticated user
-export const itemsRouter = {
-	list: protectedProcedure.handler(async ({ context }) => {
-		const userId = context.session?.user?.id
-		// ...
-	}),
-}
-```
-
-## Context Structure
-
-The API context provides:
-
-- `di` - Scoped DI container for the request
-- `session` - Current user session (when using `protectedProcedure`)
-
-## Typing DI Access in Routers
-
-Use a module-local interface to type `context.di.cradle`:
-
-```typescript
-// In your module's router file
-interface ItemsCradle {
-	itemRepository: ItemRepository
-	createItem: (input: CreateItemInput) => Promise<Item>
-}
-
-export const itemsRouter = {
-	create: protectedProcedure.input(createItemSchema).handler(async ({ input, context }) => {
-		const { createItem } = context.di.cradle as ItemsCradle
-		return createItem(input)
-	}),
-}
-```
-
-**Why module-local interfaces:**
-
-- Type assertion stays within the module
-- Module remains self-contained
-- Server app doesn't need to know about module internals
-- Scales to any number of modules without server changes

package/templates/base/packages/api/package.json

@@ -1,35 +0,0 @@
-{
-	"name": "@__APP_NAME_KEBAB__/api",
-	"version": "0.0.1",
-	"private": true,
-	"type": "module",
-	"main": "src/index.ts",
-	"types": "src/index.ts",
-	"exports": {
-		".": {
-			"types": "./src/index.ts",
-			"default": "./src/index.ts"
-		},
-		"./*": {
-			"types": "./src/*.ts",
-			"default": "./src/*.ts"
-		}
-	},
-	"devDependencies": {
-		"@types/express": "^5.0.1"
-	},
-	"peerDependencies": {
-		"typescript": "^5"
-	},
-	"dependencies": {
-		"@orpc/server": "^1.10.0",
-		"@orpc/client": "^1.10.0",
-		"@orpc/zod": "^1.10.0",
-		"better-auth": "^1.3.28",
-		"dotenv": "^17.2.2",
-		"zod": "^4.1.11",
-		"awilix": "^12.0.5",
-		"@__APP_NAME_KEBAB__/auth": "workspace:*",
-		"@__APP_NAME_KEBAB__/db": "workspace:*"
-	}
-}

package/templates/base/packages/api/src/context.ts

@@ -1,48 +0,0 @@
-import type { Request } from 'express'
-import { fromNodeHeaders } from 'better-auth/node'
-import { auth } from '@__APP_NAME_KEBAB__/auth'
-import { asValue, type AwilixContainer } from 'awilix'
-
-declare global {
-	// eslint-disable-next-line @typescript-eslint/no-namespace
-	namespace Express {
-		interface Request {
-			scope?: AwilixContainer
-		}
-	}
-}
-
-export interface CreateContextOptions {
-	req: Request
-}
-
-/**
- * Create per-request context with DI container
- */
-export async function createContext(opts: CreateContextOptions) {
-	let session
-	try {
-		session = await auth.api.getSession({
-			headers: fromNodeHeaders(opts.req.headers),
-		})
-	} catch (error) {
-		console.error('[Auth] Failed to get session:', error)
-		session = null
-	}
-
-	const requestId = crypto.randomUUID()
-
-	if (opts.req.scope) {
-		opts.req.scope.register({
-			session: asValue(session),
-			requestId: asValue(requestId),
-		})
-	}
-
-	return {
-		session,
-		di: opts.req.scope!,
-	}
-}
-
-export type Context = Awaited<ReturnType<typeof createContext>>

package/templates/base/packages/api/src/index.ts

@@ -1,22 +0,0 @@
-import { ORPCError, os } from '@orpc/server'
-import type { Context } from './context'
-
-export const o = os.$context<Context>()
-
-export const publicProcedure = o
-
-const requireAuth = o.middleware(async ({ context, next }) => {
-	if (!context.session?.user) {
-		throw new ORPCError('UNAUTHORIZED')
-	}
-	return next({
-		context: {
-			session: context.session,
-		},
-	})
-})
-
-export const protectedProcedure = publicProcedure.use(requireAuth)
-
-export { createContext } from './context'
-export type { Context } from './context'

package/templates/base/packages/api/tsconfig.json

@@ -1,8 +0,0 @@
-{
-	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "dist",
-		"rootDir": "src"
-	},
-	"include": ["src/**/*"]
-}

package/templates/base/packages/auth/AGENTS.md

@@ -1,61 +0,0 @@
-# AGENTS.md - Auth Package
-
-> See root [AGENTS.md](../../AGENTS.md) for SDK Module System patterns
-
-## Purpose
-
-Better-Auth configuration shared between server and web apps.
-
-## Key Files
-
-| File       | Purpose                                |
-| ---------- | -------------------------------------- |
-| `index.ts` | Auth configuration and client creation |
-
-## Server Usage
-
-```typescript
-import { auth } from '@__APP_NAME_KEBAB__/auth'
-
-// In Express
-app.all('/api/auth/*', auth.handler)
-```
-
-## Client Usage
-
-```typescript
-import { authClient } from '@__APP_NAME_KEBAB__/auth'
-
-// Sign in
-await authClient.signIn.email({ email, password })
-
-// Sign out
-await authClient.signOut()
-
-// Get session
-const session = await authClient.getSession()
-```
-
-## Session in oRPC Context
-
-The current user session is available in `protectedProcedure` handlers:
-
-```typescript
-import { protectedProcedure } from '@__APP_NAME_KEBAB__/api'
-
-export const myRouter = {
-	getProfile: protectedProcedure.handler(async ({ context }) => {
-		const userId = context.session?.user?.id
-		const userEmail = context.session?.user?.email
-		// ... use session data
-	}),
-}
-```
-
-## Configuration
-
-Auth requires these environment variables:
-
-- `BETTER_AUTH_SECRET` - Session encryption key
-- `BETTER_AUTH_URL` - Callback URL for OAuth
-- `DATABASE_URL` - For session storage

package/templates/base/packages/auth/package.json

@@ -1,27 +0,0 @@
-{
-	"name": "@__APP_NAME_KEBAB__/auth",
-	"version": "0.0.1",
-	"private": true,
-	"type": "module",
-	"main": "src/index.ts",
-	"types": "src/index.ts",
-	"exports": {
-		".": {
-			"types": "./src/index.ts",
-			"default": "./src/index.ts"
-		},
-		"./*": {
-			"types": "./src/*.ts",
-			"default": "./src/*.ts"
-		}
-	},
-	"peerDependencies": {
-		"typescript": "^5"
-	},
-	"dependencies": {
-		"better-auth": "^1.3.28",
-		"dotenv": "^17.2.2",
-		"zod": "^4.1.11",
-		"@__APP_NAME_KEBAB__/db": "workspace:*"
-	}
-}

package/templates/base/packages/auth/src/index.ts

@@ -1,22 +0,0 @@
-import { betterAuth, type BetterAuthOptions } from 'better-auth'
-import { drizzleAdapter } from 'better-auth/adapters/drizzle'
-import { db } from '@__APP_NAME_KEBAB__/db'
-import * as schema from '@__APP_NAME_KEBAB__/db/schema/auth'
-
-export const auth = betterAuth<BetterAuthOptions>({
-	database: drizzleAdapter(db, {
-		provider: 'pg',
-		schema: schema,
-	}),
-	trustedOrigins: [process.env.CORS_ORIGIN || ''],
-	emailAndPassword: {
-		enabled: true,
-	},
-	advanced: {
-		defaultCookieAttributes: {
-			sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax',
-			secure: process.env.NODE_ENV === 'production',
-			httpOnly: true,
-		},
-	},
-})

package/templates/base/packages/auth/tsconfig.json

@@ -1,8 +0,0 @@
-{
-	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "dist",
-		"rootDir": "src"
-	},
-	"include": ["src/**/*"]
-}