fix(schema): Allow any type in resolver hooks (#3006)

feathersjs · Jan 24, 2023 · f01281f · f01281f
1 parent 5aecc59
commit f01281f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/schema/src/hooks/resolve.ts b/packages/schema/src/hooks/resolve.ts
@@ -39,7 +39,7 @@ const runResolvers = async <T, H extends HookContext>(
 export type ResolverSetting<H extends HookContext> = Resolver<any, H> | Resolver<any, H>[]
 
 export const resolveQuery =
-  <T, H extends HookContext>(...resolvers: Resolver<T, H>[]) =>
+  <H extends HookContext>(...resolvers: Resolver<any, H>[]) =>
   async (context: H, next?: NextFunction) => {
     const ctx = getContext(context)
     const data = context?.params?.query || {}
@@ -56,7 +56,7 @@ export const resolveQuery =
   }
 
 export const resolveData =
-  <T, H extends HookContext>(...resolvers: Resolver<T, H>[]) =>
+  <H extends HookContext>(...resolvers: Resolver<any, H>[]) =>
   async (context: H, next?: NextFunction) => {
     if (context.data !== undefined) {
       const ctx = getContext(context)
@@ -78,10 +78,8 @@ export const resolveData =
     }
   }
 
-export const resolveResult = <T, H extends HookContext>(...resolvers: Resolver<T, H>[]) => {
-  const virtualProperties = new Set(
-    resolvers.reduce((acc, current) => acc.concat(current.virtualNames), [] as (keyof T)[])
-  )
+export const resolveResult = <H extends HookContext>(...resolvers: Resolver<any, H>[]) => {
+  const virtualProperties = new Set(resolvers.reduce((acc, current) => acc.concat(current.virtualNames), []))
 
   return async (context: H, next?: NextFunction) => {
     if (typeof next === 'function') {
@@ -127,7 +125,7 @@ export const getDispatch = (value: any, fallback = value) =>
   typeof value === 'object' && value !== null && value[DISPATCH] !== undefined ? value[DISPATCH] : fallback
 
 export const resolveDispatch =
-  <T, H extends HookContext>(...resolvers: Resolver<T, H>[]) =>
+  <H extends HookContext>(...resolvers: Resolver<any, H>[]) =>
   async (context: H, next?: NextFunction) => {
     if (typeof next === 'function') {
       await next()

diff --git a/packages/schema/test/fixture.ts b/packages/schema/test/fixture.ts
@@ -143,6 +143,8 @@ export const messageResolver = resolve<Message, HookContext<Application>>({
   })
 })
 
+export const otherMessageResolver = resolve<{ text: string }, HookContext<Application>>({})
+
 export const messageQuerySchema = {
   $id: 'MessageQuery',
   type: 'object',
@@ -240,7 +242,7 @@ app
   .service('paginatedMessages')
   .hooks([
     resolveDispatch(),
-    resolveResult(messageResolver),
+    resolveResult(messageResolver, otherMessageResolver),
     validateQuery(messageQueryValidator),
     resolveQuery(messageQueryResolver)
   ])