@feathersjs/schema 5.0.0-pre.20 → 5.0.0-pre.21

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+
+### Bug Fixes
+
+* **schema:** Add Combine helper to allow merging schema types that use ([#2637](https://github.com/feathersjs/feathers/issues/2637)) ([06d03e9](https://github.com/feathersjs/feathers/commit/06d03e91abb1347576c2351c12322d01c58473e5))
+* **typescript:** Make additional types generic to work with extended types ([#2625](https://github.com/feathersjs/feathers/issues/2625)) ([269fdec](https://github.com/feathersjs/feathers/commit/269fdecc5961092dc8608b3cbe16f433c80bfa96))
+
+
+### Features
+
+* **schema:** Add resolveAll hook ([#2643](https://github.com/feathersjs/feathers/issues/2643)) ([85527d7](https://github.com/feathersjs/feathers/commit/85527d71cb78852880696e5d96abdcdf24593934))
+* **schema:** Add resolver for safe external data dispatching ([#2641](https://github.com/feathersjs/feathers/issues/2641)) ([72b980e](https://github.com/feathersjs/feathers/commit/72b980e05631136d30c8f1468dee45ec6a8d2503))
+* **schema:** Add schema resolver converter functionality ([#2640](https://github.com/feathersjs/feathers/issues/2640)) ([26d9e05](https://github.com/feathersjs/feathers/commit/26d9e05327d6e0144466cd57d6fcc11ac7ecb06a))
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 

package/lib/hooks/index.d.ts

@@ -0,0 +1,2 @@
+export * from './resolve';
+export * from './validate';

package/lib/hooks/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./resolve"), exports);
+__exportStar(require("./validate"), exports);
+//# sourceMappingURL=index.js.map

package/lib/hooks/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,6CAA2B"}

package/lib/hooks/resolve.d.ts

@@ -0,0 +1,14 @@
+import { HookContext, NextFunction } from '@feathersjs/feathers';
+import { Resolver } from '../resolver';
+export declare const DISPATCH: unique symbol;
+export declare const resolveQuery: <T, H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<T, H>[]) => (context: H, next?: NextFunction) => Promise<any>;
+export declare const resolveData: <T, H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<T, H>[]) => (context: H, next?: NextFunction) => Promise<any>;
+export declare const resolveResult: <T, H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<T, H>[]) => (context: H, next?: NextFunction) => Promise<void>;
+export declare const resolveDispatch: <T, H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<T, H>[]) => (context: H, next?: NextFunction) => Promise<void>;
+export declare type ResolveAllSettings<H extends HookContext> = {
+    data?: Resolver<any, H> | Resolver<any, H>[];
+    query?: Resolver<any, H> | Resolver<any, H>[];
+    result?: Resolver<any, H> | Resolver<any, H>[];
+    dispatch?: Resolver<any, H> | Resolver<any, H>[];
+};
+export declare const resolveAll: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(map: ResolveAllSettings<H>) => (this: any, context: H, next?: import("@feathersjs/hooks").AsyncMiddleware<H>) => Promise<any>;

package/lib/{hooks.js → hooks/resolve.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateData = exports.validateQuery = exports.resolveResult = exports.resolveData = exports.resolveQuery = void 0;
-const lib_1 = require("../../errors/lib");
+exports.resolveAll = exports.resolveDispatch = exports.resolveResult = exports.resolveData = exports.resolveQuery = exports.DISPATCH = void 0;
+const hooks_1 = require("@feathersjs/hooks");
 const getContext = (context) => {
     return {
         ...context,
@@ -11,6 +11,11 @@ const getContext = (context) => {
         }
     };
 };
+const getData = (context) => {
+    const isPaginated = context.method === 'find' && context.result.data;
+    const data = isPaginated ? context.result.data : context.result;
+    return { isPaginated, data };
+};
 const runResolvers = async (resolvers, data, ctx, status) => {
     let current = data;
     for (const resolver of resolvers) {
@@ -18,6 +23,7 @@ const runResolvers = async (resolvers, data, ctx, status) => {
     }
     return current;
 };
+exports.DISPATCH = Symbol('@feathersjs/schema/dispatch');
 const resolveQuery = (...resolvers) => async (context, next) => {
     var _a;
     const ctx = getContext(context);
@@ -33,16 +39,18 @@ const resolveQuery = (...resolvers) => async (context, next) => {
 };
 exports.resolveQuery = resolveQuery;
 const resolveData = (...resolvers) => async (context, next) => {
-    const ctx = getContext(context);
-    const data = context.data;
-    const status = {
-        originalContext: context
-    };
-    if (Array.isArray(data)) {
-        context.data = await Promise.all(data.map(current => runResolvers(resolvers, current, ctx, status)));
-    }
-    else {
-        context.data = await runResolvers(resolvers, data, ctx, status);
+    if (context.method === 'create' || context.method === 'patch' || context.method === 'update') {
+        const ctx = getContext(context);
+        const data = context.data;
+        const status = {
+            originalContext: context
+        };
+        if (Array.isArray(data)) {
+            context.data = await Promise.all(data.map(current => runResolvers(resolvers, current, ctx, status)));
+        }
+        else {
+            context.data = await runResolvers(resolvers, data, ctx, status);
+        }
     }
     if (typeof next === 'function') {
         return next();
@@ -67,8 +75,7 @@ const resolveResult = (...resolvers) => async (context, next) => {
     }
     const ctx = getContext(context);
     const status = context.params.resolve;
-    const isPaginated = context.method === 'find' && context.result.data;
-    const data = isPaginated ? context.result.data : context.result;
+    const { isPaginated, data } = getData(context);
     const result = Array.isArray(data) ?
         await Promise.all(data.map(async (current) => runResolvers(resolvers, current, ctx, status))) :
         await runResolvers(resolvers, data, ctx, status);
@@ -80,40 +87,44 @@ const resolveResult = (...resolvers) => async (context, next) => {
     }
 };
 exports.resolveResult = resolveResult;
-const validateQuery = (schema) => async (context, next) => {
-    var _a;
-    const data = ((_a = context === null || context === void 0 ? void 0 : context.params) === null || _a === void 0 ? void 0 : _a.query) || {};
-    try {
-        const query = await schema.validate(data);
-        context.params = {
-            ...context.params,
-            query
-        };
-        if (typeof next === 'function') {
-            return next();
-        }
-    }
-    catch (error) {
-        throw (error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error);
-    }
-};
-exports.validateQuery = validateQuery;
-const validateData = (schema) => async (context, next) => {
-    const data = context.data;
-    try {
-        if (Array.isArray(data)) {
-            context.data = await Promise.all(data.map(current => schema.validate(current)));
-        }
-        else {
-            context.data = await schema.validate(data);
-        }
-    }
-    catch (error) {
-        throw (error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error);
-    }
+const resolveDispatch = (...resolvers) => async (context, next) => {
     if (typeof next === 'function') {
-        return next();
+        await next();
     }
+    const ctx = getContext(context);
+    const status = context.params.resolve;
+    const { isPaginated, data } = getData(context);
+    const resolveDispatch = async (current) => {
+        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[exports.DISPATCH] !== undefined;
+            res[key] = hasDispatch ? value[exports.DISPATCH] : value;
+            return res;
+        }, {});
+    };
+    const result = await (Array.isArray(data) ? Promise.all(data.map(resolveDispatch)) : resolveDispatch(data));
+    const dispatch = isPaginated ? {
+        ...context.result,
+        data: result
+    } : result;
+    context.dispatch = dispatch;
+    Object.defineProperty(context.result, exports.DISPATCH, {
+        value: dispatch,
+        enumerable: false,
+        configurable: false
+    });
+};
+exports.resolveDispatch = resolveDispatch;
+const getResolvers = (map, name) => {
+    const value = map[name];
+    return Array.isArray(value) ? value : (value !== undefined ? [value] : []);
 };
-exports.validateData = validateData;
-//# sourceMappingURL=hooks.js.map
+const resolveAll = (map) => (0, hooks_1.compose)([
+    (0, exports.resolveDispatch)(...getResolvers(map, 'dispatch')),
+    (0, exports.resolveResult)(...getResolvers(map, 'result')),
+    (0, exports.resolveQuery)(...getResolvers(map, 'query')),
+    (0, exports.resolveData)(...getResolvers(map, 'data'))
+]);
+exports.resolveAll = resolveAll;
+//# sourceMappingURL=resolve.js.map

package/lib/hooks/resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/hooks/resolve.ts"],"names":[],"mappings":"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"}

package/lib/hooks/validate.d.ts

@@ -0,0 +1,4 @@
+import { HookContext, NextFunction } from '@feathersjs/feathers';
+import { Schema } from '../schema';
+export declare const validateQuery: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(schema: Schema<any>) => (context: H, next?: NextFunction) => Promise<any>;
+export declare const validateData: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(schema: Schema<any>) => (context: H, next?: NextFunction) => Promise<any>;

package/lib/hooks/validate.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateData = exports.validateQuery = void 0;
+const lib_1 = require("../../../errors/lib");
+const validateQuery = (schema) => async (context, next) => {
+    var _a;
+    const data = ((_a = context === null || context === void 0 ? void 0 : context.params) === null || _a === void 0 ? void 0 : _a.query) || {};
+    try {
+        const query = await schema.validate(data);
+        context.params = {
+            ...context.params,
+            query
+        };
+        if (typeof next === 'function') {
+            return next();
+        }
+    }
+    catch (error) {
+        throw (error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error);
+    }
+};
+exports.validateQuery = validateQuery;
+const validateData = (schema) => async (context, next) => {
+    const data = context.data;
+    try {
+        if (Array.isArray(data)) {
+            context.data = await Promise.all(data.map(current => schema.validate(current)));
+        }
+        else {
+            context.data = await schema.validate(data);
+        }
+    }
+    catch (error) {
+        throw (error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error);
+    }
+    if (typeof next === 'function') {
+        return next();
+    }
+};
+exports.validateData = validateData;
+//# sourceMappingURL=validate.js.map

package/lib/hooks/validate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/hooks/validate.ts"],"names":[],"mappings":";;;AACA,6CAAiD;AAG1C,MAAM,aAAa,GAAG,CAAyB,MAAmB,EAAE,EAAE,CAC3E,KAAK,EAAE,OAAU,EAAE,IAAmB,EAAE,EAAE;;IACxC,MAAM,IAAI,GAAG,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,KAAK,KAAI,EAAE,CAAC;IAE1C,IAAI;QACF,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE1C,OAAO,CAAC,MAAM,GAAG;YACf,GAAG,OAAO,CAAC,MAAM;YACjB,KAAK;SACN,CAAA;QAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YAC9B,OAAO,IAAI,EAAE,CAAC;SACf;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,gBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;KACzE;AACH,CAAC,CAAC;AAlBS,QAAA,aAAa,iBAkBtB;AAEK,MAAM,YAAY,GAAG,CAAyB,MAAmB,EAAE,EAAE,CAC5E,KAAK,EAAE,OAAU,EAAE,IAAmB,EAAE,EAAE;IACxC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAE1B,IAAI;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,CAAC,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAClD,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CACzB,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SAC5C;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,gBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;KACzE;IAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;QAC9B,OAAO,IAAI,EAAE,CAAC;KACf;AACH,CAAC,CAAC;AAnBW,QAAA,YAAY,gBAmBvB"}

package/lib/index.d.ts

@@ -6,6 +6,9 @@ export * from './query';
 export declare type Infer<S extends {
     _type: any;
 }> = S['_type'];
+export declare type Combine<S extends {
+    _type: any;
+}, U> = Pick<Infer<S>, Exclude<keyof Infer<S>, keyof U>> & U;
 declare module '@feathersjs/feathers/lib/declarations' {
     interface Params {
         resolve?: ResolverStatus<any, HookContext>;

package/lib/resolver.d.ts

@@ -3,10 +3,12 @@ export declare type PropertyResolver<T, V, C> = (value: V | undefined, obj: T, c
 export declare type PropertyResolverMap<T, C> = {
     [key in keyof T]?: PropertyResolver<T, T[key], C>;
 };
+export declare type ResolverConverter<T, C> = (obj: any, context: C, status: ResolverStatus<T, C>) => Promise<T | undefined>;
 export interface ResolverConfig<T, C> {
     schema?: Schema<T>;
     validate?: 'before' | 'after' | false;
     properties: PropertyResolverMap<T, C>;
+    converter?: ResolverConverter<T, C>;
 }
 export interface ResolverStatus<T, C> {
     path: string[];
@@ -19,6 +21,7 @@ export declare class Resolver<T, C> {
     readonly _type: T;
     constructor(options: ResolverConfig<T, C>);
     resolveProperty<D, K extends keyof T>(name: K, data: D, context: C, status?: Partial<ResolverStatus<T, C>>): Promise<T[K]>;
+    convert<D>(data: D, context: C, status?: Partial<ResolverStatus<T, C>>): Promise<T | D>;
     resolve<D>(_data: D, context: C, status?: Partial<ResolverStatus<T, C>>): Promise<T>;
 }
 export declare function resolve<T, C>(options: ResolverConfig<T, C>): Resolver<T, C>;

package/lib/resolver.js

@@ -21,9 +21,17 @@ class Resolver {
         };
         return resolver(value, data, context, resolverStatus);
     }
+    async convert(data, context, status) {
+        if (this.options.converter) {
+            const { path = [], stack = [] } = status || {};
+            return this.options.converter(data, context, { ...status, path, stack });
+        }
+        return data;
+    }
     async resolve(_data, context, status) {
         const { properties: resolvers, schema, validate } = this.options;
-        const data = schema && validate === 'before' ? await schema.validate(_data) : _data;
+        const payload = await this.convert(_data, context, status);
+        const data = schema && validate === 'before' ? await schema.validate(payload) : payload;
         const propertyList = (Array.isArray(status === null || status === void 0 ? void 0 : status.properties)
             ? status === null || status === void 0 ? void 0 : status.properties
             // By default get all data and resolver keys but remove duplicates
@@ -56,7 +64,7 @@ class Resolver {
         }));
         if (hasErrors) {
             const propertyName = (status === null || status === void 0 ? void 0 : status.properties) ? ` ${status.properties.join('.')}` : '';
-            throw new errors_1.BadRequest('Error resolving data' + propertyName, errors);
+            throw new errors_1.BadRequest('Error resolving data' + (propertyName ? ` ${propertyName}` : ''), errors);
         }
         return schema && validate === 'after'
             ? await schema.validate(result)

package/lib/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/schema",
   "description": "A common data schema definition format",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -53,15 +53,16 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
+    "@feathersjs/hooks": "^0.7.4",
     "@types/json-schema": "^7.0.11",
     "ajv": "^8.11.0",
     "json-schema": "^0.4.0",
     "json-schema-to-ts": "^2.3.0"
   },
   "devDependencies": {
-    "@feathersjs/memory": "^5.0.0-pre.20",
+    "@feathersjs/memory": "^5.0.0-pre.21",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
     "ajv-formats": "^2.1.1",
@@ -69,5 +70,5 @@
     "shx": "^0.3.4",
     "typescript": "^4.6.4"
   },
-  "gitHead": "54de749a0b392c7da726c668002b50cafaca530c"
+  "gitHead": "ac3baed231f72370a80a06c5944538915479b96e"
 }

package/src/hooks/index.ts

@@ -0,0 +1,2 @@
+export * from './resolve';
+export * from './validate';

package/src/hooks/resolve.ts

@@ -0,0 +1,170 @@
+import { HookContext, NextFunction } from '@feathersjs/feathers';
+import { compose } from '@feathersjs/hooks';
+import { Resolver, ResolverStatus } from '../resolver';
+
+const getContext = <H extends HookContext> (context: H) => {
+  return {
+    ...context,
+    params: {
+      ...context.params,
+      query: {}
+    }
+  }
+}
+
+const getData = <H extends HookContext> (context: H) => {
+  const isPaginated = context.method === 'find' && context.result.data;
+  const data = isPaginated ? context.result.data : context.result;
+
+  return { isPaginated, data };
+}
+
+const runResolvers = async <T, H extends HookContext> (
+  resolvers: Resolver<T, H>[],
+  data: any,
+  ctx: H,
+  status?: Partial<ResolverStatus<T, H>>
+) => {
+  let current: any = data;
+
+  for (const resolver of resolvers) {
+    current = await resolver.resolve(current, ctx, status);
+  }
+
+  return current as T;
+}
+
+export const DISPATCH = Symbol('@feathersjs/schema/dispatch');
+
+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);
+
+    context.params = {
+      ...context.params,
+      query
+    }
+
+    if (typeof next === 'function') {
+      return next();
+    }
+  };
+
+export const resolveData = <T, H extends HookContext> (...resolvers: Resolver<T, H>[]) =>
+  async (context: H, next?: NextFunction) => {
+    if (context.method === 'create' || context.method === 'patch' || context.method === 'update') {
+      const ctx = getContext(context);
+      const data = context.data;
+
+      const status = {
+        originalContext: context
+      };
+
+      if (Array.isArray(data)) {
+        context.data = await Promise.all(data.map(current =>
+          runResolvers(resolvers, current, ctx, status)
+        ));
+      } else {
+        context.data = await runResolvers(resolvers, data, ctx, status);
+      }
+    }
+
+    if (typeof next === 'function') {
+      return next();
+    }
+  };
+
+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 = {
+        originalContext: context,
+        ...context.params.resolve,
+        properties
+      };
+
+      context.params = {
+        ...context.params,
+        resolve,
+        query
+      }
+
+      await next();
+    }
+
+    const ctx = getContext(context);
+    const status = context.params.resolve;
+    const { isPaginated, data } = getData(context);
+
+    const result = Array.isArray(data) ?
+      await Promise.all(data.map(async current => runResolvers(resolvers, current, ctx, status))) :
+      await runResolvers(resolvers, data, ctx, status);
+
+    if (isPaginated) {
+      context.result.data = result;
+    } else {
+      context.result = result;
+    }
+  };
+
+export const resolveDispatch = <T, H extends HookContext> (...resolvers: Resolver<T, H>[]) =>
+  async (context: H, next?: NextFunction) => {
+    if (typeof next === 'function') {
+      await next();
+    }
+
+    const ctx = getContext(context);
+    const status = context.params.resolve;
+    const { isPaginated, data } = getData(context);
+    const resolveDispatch = 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;
+
+        return res
+      }, {} as any)
+    }
+
+    const result = await (Array.isArray(data) ? Promise.all(data.map(resolveDispatch)) : resolveDispatch(data));
+    const dispatch = isPaginated ? {
+      ...context.result,
+      data: result
+    } : result;
+
+    context.dispatch = dispatch;
+    Object.defineProperty(context.result, DISPATCH, {
+      value: dispatch,
+      enumerable: false,
+      configurable: false
+    });
+  };
+
+export type ResolveAllSettings<H extends HookContext> = {
+  data?: Resolver<any, H>|Resolver<any, H>[]
+  query?: Resolver<any, H>|Resolver<any, H>[]
+  result?: Resolver<any, H>|Resolver<any, H>[]
+  dispatch?: Resolver<any, H>|Resolver<any, H>[]
+}
+
+const getResolvers = <H extends HookContext> (
+  map: ResolveAllSettings<H>,
+  name: keyof ResolveAllSettings<H>
+) => {
+  const value = map[name];
+
+  return Array.isArray(value) ? value : (value !== undefined ? [ value ] : []);
+}
+
+export const resolveAll = <H extends HookContext> (map: ResolveAllSettings<H>) => compose([
+  resolveDispatch(...getResolvers(map, 'dispatch')),
+  resolveResult(...getResolvers(map, 'result')),
+  resolveQuery(...getResolvers(map, 'query')),
+  resolveData(...getResolvers(map, 'data'))
+])

package/src/hooks/validate.ts

@@ -0,0 +1,44 @@
+import { HookContext, NextFunction } from '@feathersjs/feathers';
+import { BadRequest } from '../../../errors/lib';
+import { Schema } from '../schema';
+
+export const validateQuery = <H extends HookContext> (schema: Schema<any>) =>
+  async (context: H, next?: NextFunction) => {
+    const data = context?.params?.query || {};
+
+    try {
+      const query = await schema.validate(data);
+
+      context.params = {
+        ...context.params,
+        query
+      }
+
+      if (typeof next === 'function') {
+        return next();
+      }
+    } catch (error: any) {
+      throw (error.ajv ? new BadRequest(error.message, error.errors) : error);
+    }
+  };
+
+  export const validateData = <H extends HookContext> (schema: Schema<any>) =>
+  async (context: H, next?: NextFunction) => {
+    const data = context.data;
+
+    try {
+      if (Array.isArray(data)) {
+        context.data = await Promise.all(data.map(current =>
+          schema.validate(current)
+        ));
+      } else {
+        context.data = await schema.validate(data);
+      }
+    } catch (error: any) {
+      throw (error.ajv ? new BadRequest(error.message, error.errors) : error);
+    }
+
+    if (typeof next === 'function') {
+      return next();
+    }
+  };

package/src/index.ts

@@ -7,6 +7,8 @@ export * from './query';
 
 export type Infer<S extends { _type: any }> = S['_type'];
 
+export type Combine<S extends { _type: any }, U> = Pick<Infer<S>, Exclude<keyof Infer<S>, keyof U>> & U;
+
 declare module '@feathersjs/feathers/lib/declarations' {
   interface Params {
     resolve?: ResolverStatus<any, HookContext>;

package/src/resolver.ts

@@ -12,17 +12,21 @@ export type PropertyResolverMap<T, C> = {
   [key in keyof T]?: PropertyResolver<T, T[key], C>
 }
 
+export type ResolverConverter<T, C> = (obj: any, context: C, status: ResolverStatus<T, C>)
+  => Promise<T|undefined>
+
 export interface ResolverConfig<T, C> {
   schema?: Schema<T>,
   validate?: 'before'|'after'|false,
   properties: PropertyResolverMap<T, C>
+  converter?: ResolverConverter<T, C>
 }
 
 export interface ResolverStatus<T, C> {
-  path: string[];
-  originalContext?: C;
-  properties?: string[];
-  stack: PropertyResolver<T, any, C>[];
+  path: string[]
+  originalContext?: C
+  properties?: string[]
+  stack: PropertyResolver<T, any, C>[]
 }
 
 export class Resolver<T, C> {
@@ -55,9 +59,20 @@ export class Resolver<T, C> {
     return resolver(value, data as any, context, resolverStatus);
   }
 
+  async convert <D> (data: D, context: C, status?: Partial<ResolverStatus<T, C>>) {
+    if (this.options.converter) {
+      const { path = [], stack = [] } = status || {}
+
+      return this.options.converter(data, context, { ...status, path, stack })
+    }
+
+    return data
+  }
+
   async resolve<D> (_data: D, context: C, status?: Partial<ResolverStatus<T, C>>): Promise<T> {
     const { properties: resolvers, schema, validate } = this.options;
-    const data = schema && validate === 'before' ? await schema.validate(_data) : _data;
+    const payload = await this.convert(_data, context, status);
+    const data = schema && validate === 'before' ? await schema.validate(payload) : payload;
     const propertyList = (Array.isArray(status?.properties)
       ? status?.properties
       // By default get all data and resolver keys but remove duplicates
@@ -96,7 +111,7 @@ export class Resolver<T, C> {
     if (hasErrors) {
       const propertyName = status?.properties ? ` ${status.properties.join('.')}` : '';
 
-      throw new BadRequest('Error resolving data' + propertyName, errors);
+      throw new BadRequest('Error resolving data' + (propertyName ? ` ${propertyName}` : ''), errors);
     }
 
     return schema && validate === 'after'

package/lib/hooks.d.ts

@@ -1,8 +0,0 @@
-import { HookContext, NextFunction } from '@feathersjs/feathers';
-import { Resolver } from './resolver';
-import { Schema } from './schema';
-export declare const resolveQuery: <T>(...resolvers: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>[]) => (context: HookContext, next?: NextFunction) => Promise<any>;
-export declare const resolveData: <T>(...resolvers: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>[]) => (context: HookContext, next?: NextFunction) => Promise<any>;
-export declare const resolveResult: <T>(...resolvers: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>[]) => (context: HookContext, next?: NextFunction) => Promise<void>;
-export declare const validateQuery: (schema: Schema<any>) => (context: HookContext, next?: NextFunction) => Promise<any>;
-export declare const validateData: (schema: Schema<any>) => (context: HookContext, next?: NextFunction) => Promise<any>;

package/lib/hooks.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"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"}

package/src/hooks.ts

@@ -1,143 +0,0 @@
-import { HookContext, NextFunction } from '@feathersjs/feathers';
-import { BadRequest } from '../../errors/lib';
-import { Resolver, ResolverStatus } from './resolver';
-import { Schema } from './schema';
-
-const getContext = (context: HookContext) => {
-  return {
-    ...context,
-    params: {
-      ...context.params,
-      query: {}
-    }
-  }
-}
-
-const runResolvers = async <T> (
-  resolvers: Resolver<T, HookContext>[],
-  data: any,
-  ctx: HookContext,
-  status?: Partial<ResolverStatus<T, HookContext>>
-) => {
-  let current: any = data;
-
-  for (const resolver of resolvers) {
-    current = await resolver.resolve(current, ctx, status);
-  }
-
-  return current as T;
-}
-
-export const resolveQuery = <T> (...resolvers: Resolver<T, HookContext>[]) =>
-  async (context: HookContext, next?: NextFunction) => {
-    const ctx = getContext(context);
-    const data = context?.params?.query || {};
-    const query = await runResolvers(resolvers, data, ctx);
-
-    context.params = {
-      ...context.params,
-      query
-    }
-
-    if (typeof next === 'function') {
-      return next();
-    }
-  };
-
-export const resolveData = <T> (...resolvers: Resolver<T, HookContext>[]) =>
-  async (context: HookContext, next?: NextFunction) => {
-    const ctx = getContext(context);
-    const data = context.data;
-    const status = {
-      originalContext: context
-    };
-
-    if (Array.isArray(data)) {
-      context.data = await Promise.all(data.map(current =>
-        runResolvers(resolvers, current, ctx, status)
-      ));
-    } else {
-      context.data = await runResolvers(resolvers, data, ctx, status);
-    }
-
-    if (typeof next === 'function') {
-      return next();
-    }
-  };
-
-export const resolveResult = <T> (...resolvers: Resolver<T, HookContext>[]) =>
-  async (context: HookContext, next?: NextFunction) => {
-    if (typeof next === 'function') {
-      const { $resolve: properties, ...query } = context.params?.query || {};
-      const resolve = {
-        originalContext: context,
-        ...context.params.resolve,
-        properties
-      };
-
-      context.params = {
-        ...context.params,
-        resolve,
-        query
-      }
-
-      await next();
-    }
-
-    const ctx = getContext(context);
-    const status = context.params.resolve;
-
-    const isPaginated = context.method === 'find' && context.result.data;
-    const data = isPaginated ? context.result.data : context.result;
-
-    const result = Array.isArray(data) ?
-      await Promise.all(data.map(async current => runResolvers(resolvers, current, ctx, status))) :
-      await runResolvers(resolvers, data, ctx, status);
-
-    if (isPaginated) {
-      context.result.data = result;
-    } else {
-      context.result = result;
-    }
-  };
-
-export const validateQuery = (schema: Schema<any>) =>
-  async (context: HookContext, next?: NextFunction) => {
-    const data = context?.params?.query || {};
-
-    try {
-      const query = await schema.validate(data);
-
-      context.params = {
-        ...context.params,
-        query
-      }
-
-      if (typeof next === 'function') {
-        return next();
-      }
-    } catch (error: any) {
-      throw (error.ajv ? new BadRequest(error.message, error.errors) : error);
-    }
-  };
-
-export const validateData = (schema: Schema<any>) =>
-  async (context: HookContext, next?: NextFunction) => {
-    const data = context.data;
-
-    try {
-      if (Array.isArray(data)) {
-        context.data = await Promise.all(data.map(current =>
-          schema.validate(current)
-        ));
-      } else {
-        context.data = await schema.validate(data);
-      }
-    } catch (error: any) {
-      throw (error.ajv ? new BadRequest(error.message, error.errors) : error);
-    }
-
-    if (typeof next === 'function') {
-      return next();
-    }
-  };