fix: object key type and getHeadersObject

Author: miello

packages/core/src/context.ts

@@ -14,7 +14,7 @@ export class Context<TContext extends Record<string, unknown> = Record<string, u
     this.db = ctx.db as any
   }
 
-  get<TName extends keyof TContext>(name: TName): TContext[TName] {
+  get<TName extends Exclude<keyof TContext, 'db'>>(name: TName): TContext[TName] {
     const value = this.ctx[name]
     if (value === undefined) {
       throw new Error(`Key "${String(name)}" not found in context.`)
@@ -28,12 +28,6 @@ export class Context<TContext extends Record<string, unknown> = Record<string, u
   ): RequestContext<TContext> {
     return new RequestContext<TContext>(ctx.ctx, ctx.authContext, headers)
   }
-
-  static getCtx<TContext extends Record<string, unknown> = Record<string, unknown>>(
-    ctx: Context<TContext>
-  ): TContext {
-    return ctx.ctx
-  }
 }
 
 export class RequestContext<
@@ -67,19 +61,18 @@ export class RequestContext<
     return this._headers
   }
 
-  override get<
-    TKey extends string | number | symbol,
-    TValue extends TKey extends keyof TContext ? TContext[TKey] : any,
-  >(name: TKey): TValue {
+  override get<TKey extends Exclude<keyof TContext, 'db'>>(name: TKey): TContext[TKey]
+  override get(name: string): unknown
+  override get(name: string): unknown {
     try {
-      const value = this.ctx[name as keyof TContext]
-      return value as TValue
+      const value = super.get(name as any)
+      return value
     } catch {
       const value = this._state[name as string]
       if (value === undefined) {
         throw new Error(`Key "${String(name)}" not found in context.`)
       }
-      return value as TValue
+      return value
     }
   }
 

packages/next/src/utils/get-user.ts

@@ -2,15 +2,9 @@ import { cache } from 'react'
 
 import { headers } from 'next/headers'
 
-import type { ServerFunction } from '../server-function'
+import { getHeadersObject } from './headers'
 
-function getHeadersObject(headers: Headers) {
-  const headersObject: Record<string, string> = {}
-  headers.forEach((value, key) => {
-    headersObject[key] = value
-  })
-  return headersObject
-}
+import type { ServerFunction } from '../server-function'
 
 // TODO: Add type for user
 async function _getUser(serverFunction: ServerFunction): Promise<any | null> {

packages/next/src/utils/headers.ts

@@ -0,0 +1,7 @@
+export const getHeadersObject = (headers: Headers): Record<string, string> => {
+  const headersRecord: Record<string, string> = {}
+  headers.forEach((value, key) => {
+    headersRecord[key] = value
+  })
+  return headersRecord
+}