From 269fdecc5961092dc8608b3cbe16f433c80bfa96 Mon Sep 17 00:00:00 2001
From: David Luecke <daff@neyeon.com>
Date: Tue, 17 May 2022 17:59:06 -0700
Subject: [PATCH] fix(typescript): Make additional types generic to work with
 extended types (#2625)

---
 packages/mongodb/src/adapter.ts |  2 +-
 packages/schema/src/hooks.ts    | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/mongodb/src/adapter.ts b/packages/mongodb/src/adapter.ts
index 8ee888dd3a..0748e58912 100644
--- a/packages/mongodb/src/adapter.ts
+++ b/packages/mongodb/src/adapter.ts
@@ -19,7 +19,7 @@ export interface MongoDBAdapterParams<Q = AdapterQuery> extends AdapterParams<Q,
 }
 
 // Create the service.
-export class MongoDbAdapter<T, D = Partial<T>, P extends MongoDBAdapterParams = MongoDBAdapterParams>
+export class MongoDbAdapter<T, D = Partial<T>, P extends MongoDBAdapterParams<any> = MongoDBAdapterParams>
     extends AdapterBase<T, D, P, MongoDBAdapterOptions> {
   constructor (options: MongoDBAdapterOptions) {
     if (!options) {
diff --git a/packages/schema/src/hooks.ts b/packages/schema/src/hooks.ts
index 5e48894d5a..4f890d5be6 100644
--- a/packages/schema/src/hooks.ts
+++ b/packages/schema/src/hooks.ts
@@ -3,7 +3,7 @@ import { BadRequest } from '../../errors/lib';
 import { Resolver, ResolverStatus } from './resolver';
 import { Schema } from './schema';
 
-const getContext = (context: HookContext) => {
+const getContext = <H extends HookContext> (context: H) => {
   return {
     ...context,
     params: {
@@ -13,11 +13,11 @@ const getContext = (context: HookContext) => {
   }
 }
 
-const runResolvers = async <T> (
-  resolvers: Resolver<T, HookContext>[],
+const runResolvers = async <T, H extends HookContext> (
+  resolvers: Resolver<T, H>[],
   data: any,
-  ctx: HookContext,
-  status?: Partial<ResolverStatus<T, HookContext>>
+  ctx: H,
+  status?: Partial<ResolverStatus<T, H>>
 ) => {
   let current: any = data;
 
@@ -28,8 +28,8 @@ const runResolvers = async <T> (
   return current as T;
 }
 
-export const resolveQuery = <T> (...resolvers: Resolver<T, HookContext>[]) =>
-  async (context: HookContext, next?: NextFunction) => {
+export const resolveQuery = <T, H extends HookContext> (...resolvers: Resolver<T, H>[]) =>
+  async (context: H, next?: NextFunction) => {
     const ctx = getContext(context);
     const data = context?.params?.query || {};
     const query = await runResolvers(resolvers, data, ctx);
@@ -44,8 +44,8 @@ export const resolveQuery = <T> (...resolvers: Resolver<T, HookContext>[]) =>
     }
   };
 
-export const resolveData = <T> (...resolvers: Resolver<T, HookContext>[]) =>
-  async (context: HookContext, next?: NextFunction) => {
+export const resolveData = <T, H extends HookContext> (...resolvers: Resolver<T, H>[]) =>
+  async (context: H, next?: NextFunction) => {
     const ctx = getContext(context);
     const data = context.data;
     const status = {
@@ -65,8 +65,8 @@ export const resolveData = <T> (...resolvers: Resolver<T, HookContext>[]) =>
     }
   };
 
-export const resolveResult = <T> (...resolvers: Resolver<T, HookContext>[]) =>
-  async (context: HookContext, next?: NextFunction) => {
+export const resolveResult = <T, H extends HookContext> (...resolvers: Resolver<T, H>[]) =>
+  async (context: H, next?: NextFunction) => {
     if (typeof next === 'function') {
       const { $resolve: properties, ...query } = context.params?.query || {};
       const resolve = {
@@ -101,8 +101,8 @@ export const resolveResult = <T> (...resolvers: Resolver<T, HookContext>[]) =>
     }
   };
 
-export const validateQuery = (schema: Schema<any>) =>
-  async (context: HookContext, next?: NextFunction) => {
+export const validateQuery = <H extends HookContext> (schema: Schema<any>) =>
+  async (context: H, next?: NextFunction) => {
     const data = context?.params?.query || {};
 
     try {
@@ -121,8 +121,8 @@ export const validateQuery = (schema: Schema<any>) =>
     }
   };
 
-export const validateData = (schema: Schema<any>) =>
-  async (context: HookContext, next?: NextFunction) => {
+export const validateData = <H extends HookContext> (schema: Schema<any>) =>
+  async (context: H, next?: NextFunction) => {
     const data = context.data;
 
     try {