refactor: remove normal context from handler

Author: miello

packages/core/src/builder.handler.spec.ts

@@ -24,6 +24,7 @@ import type {
   InferFields,
 } from './collection'
 import type { MinimalContext } from './config'
+import type { RequestContext } from './context'
 import type { Field, Fields } from './field'
 import {
   createDrizzleQuery,
@@ -63,7 +64,7 @@ export function createDefaultApiHandlers<
   }
 
   const findOne: ApiFindOneHandler<TContext, TFields> = async (args) => {
-    const db = args.context.db
+    const db = args.requestContext.db
     const query = db.query[tableName as keyof typeof db.query] as RelationalQueryBuilder<any, any>
 
     const result = await query.findFirst({
@@ -86,7 +87,7 @@ export function createDefaultApiHandlers<
   }
 
   const findMany: ApiFindManyHandler<TContext, TFields> = async (args) => {
-    const db = args.context.db
+    const db = args.requestContext.db
     const query = db.query[tableName as keyof typeof db.query] as RelationalQueryBuilder<any, any>
 
     const orderType = args.orderType ?? 'asc'
@@ -118,14 +119,14 @@ export function createDefaultApiHandlers<
   }
 
   const create: ApiCreateHandler<TContext, TFields> = async (args) => {
-    const db = args.context.db
+    const db = args.requestContext.db
     // TODO: Please reuse findOne instead of duplicate logic
     const query = db.query[tableName as keyof typeof db.query] as RelationalQueryBuilder<any, any>
 
     const pk = await db.transaction(async (tx) => {
       const apiHandler = new ApiHandler(tableTsKey, fields, {
         schema,
-        context: args.context,
+        requestContext: args.requestContext,
         tableRelationalConfigByTableTsName: tables,
         tableTsNameByTableDbName: tableNamesMap,
       })
@@ -150,14 +151,14 @@ export function createDefaultApiHandlers<
   }
 
   const update: ApiUpdateHandler<TContext, TFields> = async (args) => {
-    const db = args.context.db
+    const db = args.requestContext.db
     // TODO: Please reuse findOne instead of duplicate logic
     const query = db.query[tableName as keyof typeof db.query] as RelationalQueryBuilder<any, any>
 
     const result = await db.transaction(async (tx) => {
       const apiHandler = new ApiHandler(tableTsKey, fields, {
         schema,
-        context: args.context,
+        requestContext: args.requestContext,
         tableRelationalConfigByTableTsName: tables,
         tableTsNameByTableDbName: tableNamesMap,
       })
@@ -183,7 +184,7 @@ export function createDefaultApiHandlers<
 
   // why not just delete? why _delete?
   const _delete: ApiDeleteHandler<TContext, TFields> = async (args) => {
-    const db = args.context.db
+    const db = args.requestContext.db
 
     await db
       .delete(tableSchema)
@@ -211,7 +212,7 @@ class ApiHandler {
     private readonly fields: Fields<any>,
     private readonly config: {
       schema: Record<string, unknown>
-      context: MinimalContext
+      requestContext: RequestContext<MinimalContext>
       tableTsNameByTableDbName: Record<string, string>
       tableRelationalConfigByTableTsName: Record<string, TableRelationalConfig>
     }

packages/core/src/builder.handler.ts

@@ -3,6 +3,7 @@ import type { ConditionalExcept, Simplify, UnionToIntersection, ValueOf } from '
 import z from 'zod'
 
 import type { MinimalContext } from './config'
+import type { RequestContext } from './context'
 import type {
   ApiRoute,
   ApiRouteHandler,
@@ -309,7 +310,7 @@ export type ServerApiHandlerArgs<
 > = {
   slug: string
   fields: TFields
-  context: TContext
+  requestContext: RequestContext<TContext>
 }
 
 export type ApiArgs<
@@ -718,7 +719,7 @@ export function getAllCollectionEndpoints<
               const response = await (fn as ApiCreateHandler<any, any>)({
                 slug: collection.slug,
                 fields: collection.fields,
-                context: args.context,
+                requestContext: args.requestContext,
                 data: args.body,
               })
               return { status: 200, body: response }
@@ -746,7 +747,7 @@ export function getAllCollectionEndpoints<
               const response = await (fn as ApiFindOneHandler<any, any>)({
                 slug: collection.slug,
                 fields: collection.fields,
-                context: args.context,
+                requestContext: args.requestContext,
                 id: args.pathParams.id,
               })
               return { status: 200, body: response }
@@ -777,7 +778,7 @@ export function getAllCollectionEndpoints<
               const response = await (fn as ApiFindManyHandler<any, any>)({
                 slug: collection.slug,
                 fields: collection.fields,
-                context: args.context,
+                requestContext: args.requestContext,
                 limit: args.query.limit,
                 offset: args.query.offset,
                 orderBy: args.query.orderBy,
@@ -813,7 +814,7 @@ export function getAllCollectionEndpoints<
               const response = await (fn as ApiUpdateHandler<any, any>)({
                 slug: collection.slug,
                 fields: collection.fields,
-                context: args.context,
+                requestContext: args.requestContext,
                 id: args.pathParams.id,
                 data: args.body as any, // TODO: Fix this
               })
@@ -840,7 +841,7 @@ export function getAllCollectionEndpoints<
               await (fn as ApiDeleteHandler<any, any>)({
                 slug: collection.slug,
                 fields: collection.fields,
-                context: args.context,
+                requestContext: args.requestContext,
                 ids: args.body.ids,
               })
               return { status: 200, body: { message: 'ok' } }

packages/core/src/collection.ts

@@ -4,7 +4,7 @@ import type { z, ZodType } from 'zod'
 import zodToJsonSchema from 'zod-to-json-schema'
 
 import type { MaybePromise } from './collection'
-import type { Context, RequestContext } from './context'
+import type { RequestContext } from './context'
 
 export type ApiHttpStatus = 200 | 201 | 204 | 301 | 302 | 400 | 401 | 403 | 404 | 409 | 422 | 500
 
@@ -56,7 +56,6 @@ export type ApiRouteHandlerPayloadWithContext<
   TApiRouteSchema extends ApiRouteSchema,
   TContext extends Record<string, unknown> = Record<string, unknown>,
 > = ApiRouteHandlerPayload<TApiRouteSchema> & {
-  context: Context<TContext>
   requestContext: RequestContext<TContext>
 }
 

packages/core/src/endpoint.ts

@@ -10,7 +10,7 @@ import type { Simplify } from 'type-fest'
 import type { ZodObject } from 'zod'
 import z from 'zod'
 
-import type { Context } from './context'
+import type { RequestContext } from './context'
 import {
   appendFieldNameToFields,
   type GetPrimaryColumn,
@@ -21,7 +21,7 @@ import {
 export type OptionCallback<
   TType extends string | number,
   TContext extends Record<string, unknown> = {},
-> = (args: Context<TContext>) => Promise<Array<{ label: string; value: TType }>>
+> = (args: RequestContext<TContext>) => Promise<Array<{ label: string; value: TType }>>
 
 export type FieldsWithFieldName<TFields extends Record<string, FieldBase>> = {
   [TKey in keyof TFields]: TFields[TKey] & { fieldName: string }

packages/core/src/field.ts

@@ -1,4 +1,4 @@
-export type { AuthHandlers } from './auth'
+export { type AuthHandlers, createAuth } from './auth'
 export { Builder } from './builder'
 export type {
   ApiReturnType,

packages/core/src/index.ts

@@ -151,7 +151,7 @@ export const postCollection = builder.collection('posts', {
             }),
           },
         },
-        ({ context, body }) => {
+        ({ requestContext, body }) => {
           const name = body.name
           return {
             status: 200 as const,
@@ -174,7 +174,7 @@ export const postCollection = builder.collection('posts', {
             }),
           },
         },
-        ({ context, body }) => {
+        ({ requestContext, body }) => {
           const name = body.name
           return {
             status: 200 as const,
@@ -207,7 +207,7 @@ export const serverConfig = defineServerConfig(baseConfig, {
           }),
         },
       },
-      ({ context, body }) => {
+      ({ requestContext, body }) => {
         const name = body.name
         return {
           status: 200 as const,

packages/core/src/spec.ts

@@ -1,9 +1,12 @@
-import { Context, type Field, type ServerConfig } from '@kivotos/core'
+import { headers } from 'next/headers'
+
+import { Context, createAuth, type Field, type ServerConfig } from '@kivotos/core'
 
 import { Checkbox } from '../intentui/ui/checkbox'
 import { Select, SelectList, SelectOption, SelectTrigger } from '../intentui/ui/select'
 import { Switch } from '../intentui/ui/switch'
 import { TextField } from '../intentui/ui/text-field'
+import { getHeadersObject } from '../utils/headers'
 
 interface AutoFieldProps<TServerConfig extends ServerConfig> {
   name: string
@@ -15,6 +18,10 @@ export async function AutoField<TServerConfig extends ServerConfig>(
   props: AutoFieldProps<TServerConfig>
 ) {
   const { field, name } = props
+  const headersValue = getHeadersObject(await headers())
+  const { context } = createAuth(props.serverConfig.auth, props.serverConfig.context)
+
+  const requestContext = Context.toRequestContext(context, headersValue)
 
   switch (field.type) {
     case 'text':
@@ -36,7 +43,7 @@ export async function AutoField<TServerConfig extends ServerConfig>(
     case 'switch':
       return <Switch name={name} children={field.label ?? name} />
     case 'selectText': {
-      const options = await field.options(new Context({ db: props.serverConfig.db }))
+      const options = await field.options(requestContext)
       return (
         <Select name={name} placeholder={field.placeholder ?? name} label={field.label ?? name}>
           <SelectTrigger />
@@ -51,7 +58,7 @@ export async function AutoField<TServerConfig extends ServerConfig>(
       )
     }
     case 'selectNumber': {
-      const options = await field.options(new Context({ db: props.serverConfig.db }))
+      const options = await field.options(requestContext)
       return (
         <Select name={name} placeholder={field.placeholder ?? name} label={field.label ?? name}>
           <SelectTrigger />
@@ -66,7 +73,7 @@ export async function AutoField<TServerConfig extends ServerConfig>(
       )
     }
     case 'comboboxText': {
-      const options = await field.options(new Context({ db: props.serverConfig.db }))
+      const options = await field.options(requestContext)
       return (
         <select name={name}>
           {options.map((option) => (
@@ -78,7 +85,7 @@ export async function AutoField<TServerConfig extends ServerConfig>(
       )
     }
     case 'comboboxNumber': {
-      const options = await field.options(new Context({ db: props.serverConfig.db }))
+      const options = await field.options(requestContext)
       return (
         <select name={name}>
           {options.map((option) => (

packages/next/src/components/auto-field.tsx

@@ -1,7 +1,13 @@
 import { type NextRequest } from 'next/server'
 import { createRouter } from 'radix3'
 
-import { type ApiRoute, type ApiRouter, Context, type ServerConfig } from '@kivotos/core'
+import {
+  type ApiRoute,
+  type ApiRouter,
+  Context,
+  createAuth,
+  type ServerConfig,
+} from '@kivotos/core'
 
 function extractHeaders(headers: Headers) {
   const headersRecord: Record<string, string> = {}
@@ -21,7 +27,7 @@ function extractSearchParams(searchParams: URLSearchParams) {
 
 async function makeApiRoute(
   req: NextRequest,
-  context: Record<string, unknown>,
+  serverConfig: ServerConfig<any, any, any, ApiRouter<any>>,
   route: ApiRoute,
   pathParams: Record<string, string> | undefined
 ) {
@@ -41,11 +47,11 @@ async function makeApiRoute(
     // This is useful for file uploads or plain text requests
   }
 
-  const wrappedContext = new Context(context)
+  const { context } = createAuth(serverConfig.auth, serverConfig.context)
+  const requestContext = Context.toRequestContext(context, reqHeaders)
 
   const rawResponse = await route.handler({
-    context: wrappedContext,
-    requestContext: Context.toRequestContext(wrappedContext, reqHeaders),
+    requestContext,
     headers: reqHeaders,
     pathParams: pathParams,
     query: reqSearchParams,
@@ -64,13 +70,13 @@ async function makeApiRoute(
 async function lookupRoute(
   radixRouter: ReturnType<typeof createRouter>,
   req: NextRequest,
-  context: Record<string, unknown>
+  serverConfig: ServerConfig<any, any, any, ApiRouter<any>>
 ) {
   const match = radixRouter.lookup(req.nextUrl.pathname)
   if (!match) return Response.json({ message: 'Not Found' }, { status: 404 })
   const pathParams = match.params
   const route = match.route as ApiRoute<any>
-  return makeApiRoute(req, context, route, pathParams)
+  return makeApiRoute(req, serverConfig, route, pathParams)
 }
 
 export function createApiResourceRouter(serverConfig: ServerConfig<any, any, any, ApiRouter<any>>) {
@@ -136,19 +142,19 @@ export function createApiResourceRouter(serverConfig: ServerConfig<any, any, any
 
   return {
     GET: async (req: NextRequest) => {
-      return lookupRoute(radixGetRouter, req, serverConfig.context)
+      return lookupRoute(radixGetRouter, req, serverConfig)
     },
     POST: async (req: NextRequest) => {
-      return lookupRoute(radixPostRouter, req, serverConfig.context)
+      return lookupRoute(radixPostRouter, req, serverConfig)
     },
     PUT: async (req: NextRequest) => {
-      return lookupRoute(radixPutRouter, req, serverConfig.context)
+      return lookupRoute(radixPutRouter, req, serverConfig)
     },
     DELETE: async (req: NextRequest) => {
-      return lookupRoute(radixDeleteRouter, req, serverConfig.context)
+      return lookupRoute(radixDeleteRouter, req, serverConfig)
     },
     PATCH: async (req: NextRequest) => {
-      return lookupRoute(radixPatchRouter, req, serverConfig.context)
+      return lookupRoute(radixPatchRouter, req, serverConfig)
     },
   }
 }

packages/next/src/resource.ts

@@ -9,6 +9,7 @@ import {
   type ApiRouteResponse,
   type ApiRouteSchema,
   Context,
+  createAuth,
   type ServerConfig,
 } from '@kivotos/core'
 
@@ -46,12 +47,12 @@ export async function handleServerFunction<
     if (!apiRoute) {
       throw new Error(`No API route found for method: ${args.method as string}`)
     }
-    const context = new Context(serverConfig.context)
+    const { context } = createAuth(serverConfig.auth, serverConfig.context)
+    const requestContext = Context.toRequestContext(context, args.headers)
 
     const response = await apiRoute.handler({
       ...args,
-      context,
-      requestContext: Context.toRequestContext(context, args.headers),
+      requestContext,
     })
 
     if (response.headers?.['Set-Cookie']) {