fix(schema): Always resolve dispatch in resolveAll and add getDispatch method (#2645)

daffl · web-flow · commit 145b36643569 · 2022-05-28T09:22:13.000-07:00
diff --git a/packages/schema/src/hooks/resolve.ts b/packages/schema/src/hooks/resolve.ts
@@ -28,7 +28,9 @@ const runResolvers = async <T, H extends HookContext>(
   let current: any = data
 
   for (const resolver of resolvers) {
-    current = await resolver.resolve(current, ctx, status)
+    if (resolver && typeof resolver.resolve === 'function') {
+      current = await resolver.resolve(current, ctx, status)
+    }
   }
 
   return current as T
@@ -51,6 +53,9 @@ export type ResolveAllSettings<H extends HookContext> = {
 
 export const DISPATCH = Symbol('@feathersjs/schema/dispatch')
 
+export const getDispatch = (value: any) =>
+  typeof value === 'object' && value !== null && value[DISPATCH] !== undefined ? value[DISPATCH] : value
+
 export const resolveQuery =
   <T, H extends HookContext>(...resolvers: Resolver<T, H>[]) =>
   async (context: H, next?: NextFunction) => {
@@ -137,20 +142,19 @@ export const resolveDispatch =
     const ctx = getContext(context)
     const status = context.params.resolve
     const { isPaginated, data } = getData(context)
-    const resolveDispatch = async (current: any) => {
+    const resolveAndGetDispatch = async (current: any) => {
       const resolved = await runResolvers(resolvers, current, ctx, status)
 
       return Object.keys(resolved).reduce((res, key) => {
-        const value = current[key]
-        const hasDispatch = typeof value === 'object' && value !== null && value[DISPATCH] !== undefined
-
-        res[key] = hasDispatch ? value[DISPATCH] : value
+        res[key] = getDispatch(current[key])
 
         return res
       }, {} as any)
     }
 
-    const result = await (Array.isArray(data) ? Promise.all(data.map(resolveDispatch)) : resolveDispatch(data))
+    const result = await (Array.isArray(data)
+      ? Promise.all(data.map(resolveAndGetDispatch))
+      : resolveAndGetDispatch(data))
     const dispatch = isPaginated
       ? {
           ...context.result,
@@ -169,9 +173,7 @@ export const resolveDispatch =
 export const resolveAll = <H extends HookContext>(map: ResolveAllSettings<H>) => {
   const middleware = []
 
-  if (map.dispatch) {
-    middleware.push(resolveDispatch(map.dispatch))
-  }
+  middleware.push(resolveDispatch(map.dispatch))
 
   if (map.result) {
     middleware.push(resolveResult(map.result))
diff --git a/packages/schema/test/fixture.ts b/packages/schema/test/fixture.ts
@@ -81,8 +81,7 @@ export const messageSchema = schema({
   required: ['text', 'userId'],
   properties: {
     text: { type: 'string' },
-    userId: { type: 'number' },
-    secret: { type: 'boolean' }
+    userId: { type: 'number' }
   }
 } as const)
 
@@ -121,12 +120,6 @@ export const messageResultResolver = resolve<MessageResult, HookContext<Applicat
   }
 })
 
-export const messageDispatchResolver = resolve<MessageResult, HookContext<Application>>({
-  properties: {
-    secret: () => undefined
-  }
-})
-
 export const messageQuerySchema = schema({
   $id: 'MessageQuery',
   type: 'object',
@@ -182,7 +175,6 @@ app.use('paginatedMessages', memory({ paginate: { default: 10 } }))
 
 app.service('messages').hooks([
   resolveAll({
-    dispatch: messageDispatchResolver,
     result: messageResultResolver,
     query: messageQueryResolver
   }),
diff --git a/packages/schema/test/hooks.test.ts b/packages/schema/test/hooks.test.ts
@@ -20,8 +20,7 @@ describe('@feathersjs/schema/hooks', () => {
     )[0]
     message = await app.service('messages').create({
       text,
-      userId: user.id,
-      secret: true
+      userId: user.id
     })
     messageOnPaginatedService = await app.service('paginatedMessages').create({
       text,
@@ -42,7 +41,6 @@ describe('@feathersjs/schema/hooks', () => {
   it('resolves results and handles resolver errors (#2534)', async () => {
     const payload = {
       userId: user.id,
-      secret: true,
       text
     }
 
@@ -92,7 +90,6 @@ describe('@feathersjs/schema/hooks', () => {
   it('resolves get result with the object on result', async () => {
     const payload = {
       userId: user.id,
-      secret: true,
       text
     }
 
@@ -155,7 +152,6 @@ describe('@feathersjs/schema/hooks', () => {
     const service = app.service('messages')
     const context = await service.get(0, {}, createContext(service as any, 'get'))
 
-    assert.ok(context.result.secret)
     assert.strictEqual(context.result.user.password, 'hashed')
 
     assert.deepStrictEqual(context.dispatch, {
