@feathersjs/feathers 5.0.0-pre.20 → 5.0.0-pre.23

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 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.23](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.22...v5.0.0-pre.23) (2022-06-06)
+
+
+### Features
+
+* **client:** Improve client side custom method support ([#2654](https://github.com/feathersjs/feathers/issues/2654)) ([c138acf](https://github.com/feathersjs/feathers/commit/c138acf50affbe6b66177d084d3c7a3e9220f09f))
+* **core:** Rename async hooks to around hooks, allow usual registration format ([#2652](https://github.com/feathersjs/feathers/issues/2652)) ([2a485a0](https://github.com/feathersjs/feathers/commit/2a485a07929184261f27437fc0fdfe5a44694834))
+
+
+
+
+
+# [5.0.0-pre.22](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.21...v5.0.0-pre.22) (2022-05-24)
+
+
+### Bug Fixes
+
+* **schema:** Allows resolveData with different resolvers based on method ([#2644](https://github.com/feathersjs/feathers/issues/2644)) ([be71fa2](https://github.com/feathersjs/feathers/commit/be71fa2fe260e05b7dcc0d5f439e33f2e9ec2434))
+
+
+
+
+
+# [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
+
+* **core:** Do not throw missing method error for regular hook methods ([#2636](https://github.com/feathersjs/feathers/issues/2636)) ([afe9a3b](https://github.com/feathersjs/feathers/commit/afe9a3b3d49897eff045ee237ca2937a6b975291))
+
+
+
+
+
 # [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/application.d.ts

@@ -1,14 +1,13 @@
 /// <reference types="node" />
-import { EventEmitter } from './dependencies';
-import { FeathersApplication, ServiceMixin, Service, ServiceOptions, ServiceInterface, Application, FeathersService, HookMap, ApplicationHookOptions } from './declarations';
+import { EventEmitter } from 'events';
+import { FeathersApplication, ServiceMixin, Service, ServiceOptions, ServiceInterface, Application, FeathersService, ApplicationHookOptions } from './declarations';
 export declare class Feathers<Services, Settings> extends EventEmitter implements FeathersApplication<Services, Settings> {
     services: Services;
     settings: Settings;
     mixins: ServiceMixin<Application<Services, Settings>>[];
     version: string;
     _isSetup: boolean;
-    appHooks: HookMap<Application<Services, Settings>, any>;
-    private regularHooks;
+    protected registerHooks: (this: any, allHooks: any) => any;
     constructor();
     get<L extends keyof Settings & string>(name: L): Settings[L];
     set<L extends keyof Settings & string>(name: L, value: Settings[L]): this;

package/lib/application.js

@@ -5,32 +5,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Feathers = void 0;
 const version_1 = __importDefault(require("./version"));
-const dependencies_1 = require("./dependencies");
-const events_1 = require("./events");
-const index_1 = require("./hooks/index");
+const events_1 = require("events");
+const commons_1 = require("@feathersjs/commons");
+const hooks_1 = require("@feathersjs/hooks");
+const events_2 = require("./events");
+const hooks_2 = require("./hooks");
 const service_1 = require("./service");
-const regular_1 = require("./hooks/regular");
-const debug = (0, dependencies_1.createDebug)('@feathersjs/feathers');
-class Feathers extends dependencies_1.EventEmitter {
+const hooks_3 = require("./hooks");
+const debug = (0, commons_1.createDebug)('@feathersjs/feathers');
+class Feathers extends events_1.EventEmitter {
     constructor() {
         super();
         this.services = {};
         this.settings = {};
-        this.mixins = [index_1.hookMixin, events_1.eventMixin];
+        this.mixins = [hooks_2.hookMixin, events_2.eventMixin];
         this.version = version_1.default;
         this._isSetup = false;
-        this.appHooks = {
-            [dependencies_1.HOOKS]: [events_1.eventHook]
-        };
-        this.regularHooks = (0, regular_1.enableRegularHooks)(this);
-        (0, dependencies_1.hooks)(this, {
-            setup: (0, dependencies_1.middleware)().params('server').props({
+        (0, hooks_1.hooks)(this, {
+            setup: (0, hooks_1.middleware)().params('server').props({
                 app: this
             }),
-            teardown: (0, dependencies_1.middleware)().params('server').props({
+            teardown: (0, hooks_1.middleware)().params('server').props({
                 app: this
             })
         });
+        this.registerHooks = (0, hooks_3.enableHooks)(this);
+        this.registerHooks({
+            around: [events_2.eventHook]
+        });
     }
     get(name) {
         return this.settings[name];
@@ -47,7 +49,7 @@ class Feathers extends dependencies_1.EventEmitter {
         throw new Error(`Can not find service '${location}'`);
     }
     service(location) {
-        const path = ((0, dependencies_1.stripSlashes)(location) || '/');
+        const path = ((0, commons_1.stripSlashes)(location) || '/');
         const current = this.services[path];
         if (typeof current === 'undefined') {
             this.use(path, this.defaultService(path));
@@ -59,11 +61,11 @@ class Feathers extends dependencies_1.EventEmitter {
         if (typeof path !== 'string') {
             throw new Error(`'${path}' is not a valid service path.`);
         }
-        const location = ((0, dependencies_1.stripSlashes)(path) || '/');
+        const location = ((0, commons_1.stripSlashes)(path) || '/');
         const subApp = service;
         const isSubApp = typeof subApp.service === 'function' && subApp.services;
         if (isSubApp) {
-            Object.keys(subApp.services).forEach(subPath => this.use(`${location}/${subPath}`, subApp.service(subPath)));
+            Object.keys(subApp.services).forEach((subPath) => this.use(`${location}/${subPath}`, subApp.service(subPath)));
             return this;
         }
         const protoService = (0, service_1.wrapService)(location, service, options);
@@ -75,7 +77,7 @@ class Feathers extends dependencies_1.EventEmitter {
         }
         debug(`Registering new service at \`${location}\``);
         // Add all the mixins
-        this.mixins.forEach(fn => fn.call(this, protoService, location, serviceOptions));
+        this.mixins.forEach((fn) => fn.call(this, protoService, location, serviceOptions));
         this.services[location] = protoService;
         // If we ran setup already, set this service up explicitly, this will not `await`
         if (this._isSetup && typeof protoService.setup === 'function') {
@@ -86,45 +88,45 @@ class Feathers extends dependencies_1.EventEmitter {
     }
     hooks(hookMap) {
         const untypedMap = hookMap;
-        if (untypedMap.before || untypedMap.after || untypedMap.error) {
-            this.regularHooks(untypedMap);
+        if (untypedMap.before || untypedMap.after || untypedMap.error || untypedMap.around) {
+            // regular hooks for all service methods
+            this.registerHooks(untypedMap);
         }
         else if (untypedMap.setup || untypedMap.teardown) {
-            (0, dependencies_1.hooks)(this, untypedMap);
-        }
-        else if (Array.isArray(hookMap)) {
-            this.appHooks[dependencies_1.HOOKS].push(...hookMap);
+            // .setup and .teardown application hooks
+            (0, hooks_1.hooks)(this, untypedMap);
         }
         else {
-            const methodHookMap = hookMap;
-            Object.keys(methodHookMap).forEach(key => {
-                const methodHooks = this.appHooks[key] || [];
-                this.appHooks[key] = methodHooks.concat(methodHookMap[key]);
+            // Other registration formats are just `around` hooks
+            this.registerHooks({
+                around: untypedMap
             });
         }
         return this;
     }
     setup() {
         this._isSetup = true;
-        return Object.keys(this.services).reduce((current, path) => current
-            .then(() => {
+        return Object.keys(this.services)
+            .reduce((current, path) => current.then(() => {
             const service = this.service(path);
             if (typeof service.setup === 'function') {
                 debug(`Setting up service for \`${path}\``);
                 return service.setup(this, path);
             }
-        }), Promise.resolve()).then(() => this);
+        }), Promise.resolve())
+            .then(() => this);
     }
     teardown() {
         this._isSetup = false;
-        return Object.keys(this.services).reduce((current, path) => current
-            .then(() => {
+        return Object.keys(this.services)
+            .reduce((current, path) => current.then(() => {
             const service = this.service(path);
             if (typeof service.teardown === 'function') {
                 debug(`Tearing down service for \`${path}\``);
                 return service.teardown(this, path);
             }
-        }), Promise.resolve()).then(() => this);
+        }), Promise.resolve())
+            .then(() => this);
     }
 }
 exports.Feathers = Feathers;

package/lib/application.js.map

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

package/lib/declarations.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
-import { EventEmitter, NextFunction, HookContext as BaseHookContext } from './dependencies';
+import { EventEmitter } from 'events';
+import { NextFunction, HookContext as BaseHookContext } from '@feathersjs/hooks';
 declare type SelfOrArray<S> = S | S[];
 declare type OptionalPick<T, K extends PropertyKey> = Pick<T, Extract<keyof T, K>>;
 export type { NextFunction };
@@ -56,6 +57,7 @@ export declare type CustomMethods<T extends {
 }> = {
     [K in keyof T]: (data: T[K][0], params?: Params) => Promise<T[K][1]>;
 };
+export declare type CustomMethod<T = any, R = T, P extends Params = Params> = (data: T, params?: P) => Promise<R>;
 export declare type ServiceMixin<A> = (service: FeathersService<A>, path: string, options: ServiceOptions) => void;
 export declare type ServiceGenericType<S> = S extends ServiceInterface<infer T> ? T : any;
 export declare type ServiceGenericData<S> = S extends ServiceInterface<infer _T, infer D> ? D : any;
@@ -85,10 +87,6 @@ export interface FeathersApplication<Services = any, Settings = any> {
      * A private-ish indicator if `app.setup()` has been called already
      */
     _isSetup: boolean;
-    /**
-     * Contains all registered application level hooks.
-     */
-    appHooks: HookMap<Application<Services, Settings>, any>;
     /**
      * Retrieve an application setting by name
      *
@@ -270,24 +268,27 @@ export interface HookContext<A = Application, S = any> extends BaseHookContext<S
      */
     event: string | null;
 }
-export declare type RegularHookFunction<A = Application, S = Service> = (this: S, context: HookContext<A, S>) => (Promise<HookContext<Application, S> | void> | HookContext<Application, S> | void);
-export declare type Hook<A = Application, S = Service> = RegularHookFunction<A, S>;
-declare type RegularHookMethodMap<A, S> = {
-    [L in keyof S]?: SelfOrArray<RegularHookFunction<A, S>>;
+export declare type HookFunction<A = Application, S = Service> = (this: S, context: HookContext<A, S>) => Promise<HookContext<Application, S> | void> | HookContext<Application, S> | void;
+export declare type Hook<A = Application, S = Service> = HookFunction<A, S>;
+declare type HookMethodMap<A, S> = {
+    [L in keyof S]?: SelfOrArray<HookFunction<A, S>>;
 } & {
-    all?: SelfOrArray<RegularHookFunction<A, S>>;
+    all?: SelfOrArray<HookFunction<A, S>>;
 };
-declare type RegularHookTypeMap<A, S> = SelfOrArray<RegularHookFunction<A, S>> | RegularHookMethodMap<A, S>;
-export declare type RegularHookMap<A, S> = {
-    before?: RegularHookTypeMap<A, S>;
-    after?: RegularHookTypeMap<A, S>;
-    error?: RegularHookTypeMap<A, S>;
+declare type HookTypeMap<A, S> = SelfOrArray<HookFunction<A, S>> | HookMethodMap<A, S>;
+export declare type AroundHookFunction<A = Application, S = Service> = (context: HookContext<A, S>, next: NextFunction) => Promise<void>;
+export declare type AroundHookMap<A, S> = {
+    [L in keyof S]?: AroundHookFunction<A, S>[];
+} & {
+    all?: AroundHookFunction<A, S>[];
 };
-export declare type HookFunction<A = Application, S = Service> = (context: HookContext<A, S>, next: NextFunction) => Promise<void>;
 export declare type HookMap<A, S> = {
-    [L in keyof S]?: HookFunction<A, S>[];
+    around?: AroundHookMap<A, S>;
+    before?: HookTypeMap<A, S>;
+    after?: HookTypeMap<A, S>;
+    error?: HookTypeMap<A, S>;
 };
-export declare type HookOptions<A, S> = HookMap<A, S> | HookFunction<A, S>[] | RegularHookMap<A, S>;
+export declare type HookOptions<A, S> = AroundHookMap<A, S> | AroundHookFunction<A, S>[] | HookMap<A, S>;
 export interface ApplicationHookContext<A = Application> extends BaseHookContext {
     app: A;
     server: any;

package/lib/events.d.ts

@@ -1,4 +1,4 @@
-import { NextFunction } from './dependencies';
+import { NextFunction } from '@feathersjs/hooks';
 import { HookContext, FeathersService } from './declarations';
 export declare function eventHook(context: HookContext, next: NextFunction): Promise<void>;
 export declare function eventMixin<A>(service: FeathersService<A>): FeathersService<A, import("./declarations").Service<any, Partial<any>, import("./declarations").Params<import("./declarations").Query>>>;

package/lib/events.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eventMixin = exports.eventHook = void 0;
-const dependencies_1 = require("./dependencies");
+const events_1 = require("events");
 const service_1 = require("./service");
 function eventHook(context, next) {
     const { events } = (0, service_1.getServiceOptions)(context.self);
@@ -12,16 +12,15 @@ function eventHook(context, next) {
         // This is used for custom events and for client services receiving event from the server
         if (typeof context.event === 'string' && !events.includes(context.event)) {
             const results = Array.isArray(context.result) ? context.result : [context.result];
-            results.forEach(element => context.self.emit(context.event, element, context));
+            results.forEach((element) => context.self.emit(context.event, element, context));
         }
     });
 }
 exports.eventHook = eventHook;
 function eventMixin(service) {
-    const isEmitter = typeof service.on === 'function' &&
-        typeof service.emit === 'function';
+    const isEmitter = typeof service.on === 'function' && typeof service.emit === 'function';
     if (!isEmitter) {
-        Object.assign(service, dependencies_1.EventEmitter.prototype);
+        Object.assign(service, events_1.EventEmitter.prototype);
     }
     return service;
 }

package/lib/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":";;;AAAA,iDAA4D;AAE5D,uCAA+D;AAE/D,SAAgB,SAAS,CAAE,OAAoB,EAAE,IAAkB;IACjE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAE,OAAe,CAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,YAAY,GAAI,yBAAuB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;IAEtE,OAAO,CAAC,KAAK,GAAG,YAAY,CAAC;IAE7B,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;QACtB,+FAA+F;QAC/F,yFAAyF;QACzF,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,OAAO,CAAC,MAAM,CAAE,CAAC;YAEpF,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAE,OAAe,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;SACzF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAfD,8BAeC;AAED,SAAgB,UAAU,CAAK,OAA2B;IACxD,MAAM,SAAS,GAAG,OAAO,OAAO,CAAC,EAAE,KAAK,UAAU;QAChD,OAAO,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC;IAErC,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,2BAAY,CAAC,SAAS,CAAC,CAAC;KAChD;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AATD,gCASC"}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AAGrC,uCAA8D;AAE9D,SAAgB,SAAS,CAAC,OAAoB,EAAE,IAAkB;IAChE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAE,OAAe,CAAC,IAAI,CAAC,CAAA;IAC3D,MAAM,YAAY,GAAI,yBAAuB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAA;IAErE,OAAO,CAAC,KAAK,GAAG,YAAY,CAAA;IAE5B,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;QACtB,+FAA+F;QAC/F,yFAAyF;QACzF,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAEjF,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAE,OAAe,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;SAC1F;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAfD,8BAeC;AAED,SAAgB,UAAU,CAAI,OAA2B;IACvD,MAAM,SAAS,GAAG,OAAO,OAAO,CAAC,EAAE,KAAK,UAAU,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,UAAU,CAAA;IAExF,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,qBAAY,CAAC,SAAS,CAAC,CAAA;KAC/C;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AARD,gCAQC"}

package/lib/hooks.d.ts

@@ -0,0 +1,17 @@
+import { HookContextData, HookManager, Middleware } from '@feathersjs/hooks';
+import { Service, ServiceOptions, HookContext, FeathersService, HookMap, AroundHookFunction, HookFunction } from './declarations';
+export declare function collectHooks(target: any, method: string): any;
+export declare function convertHookData(input: any): {
+    [method: string]: HookFunction<import("./declarations").Application<any, any>, Service<any, Partial<any>, import("./declarations").Params<import("./declarations").Query>>>[] | AroundHookFunction<import("./declarations").Application<any, any>, Service<any, Partial<any>, import("./declarations").Params<import("./declarations").Query>>>[];
+};
+export declare function enableHooks(object: any, methods?: string[]): (this: any, input: HookMap<any, any>) => any;
+export declare function createContext(service: Service, method: string, data?: HookContextData): HookContext<import("./declarations").Application<any, any>, any>;
+export declare class FeathersHookManager<A> extends HookManager {
+    app: A;
+    method: string;
+    constructor(app: A, method: string);
+    collectMiddleware(self: any, args: any[]): Middleware[];
+    initializeContext(self: any, args: any[], context: HookContext): import("@feathersjs/hooks").HookContext<any, any>;
+    middleware(mw: Middleware[]): this;
+}
+export declare function hookMixin<A>(this: A, service: FeathersService<A>, path: string, options: ServiceOptions): FeathersService<A, Service<any, Partial<any>, import("./declarations").Params<import("./declarations").Query>>>;

package/lib/hooks.js

@@ -0,0 +1,169 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hookMixin = exports.FeathersHookManager = exports.createContext = exports.enableHooks = exports.convertHookData = exports.collectHooks = void 0;
+const hooks_1 = require("@feathersjs/hooks");
+const service_1 = require("./service");
+function collectHooks(target, method) {
+    return target.__hooks.hooks[method] || [];
+}
+exports.collectHooks = collectHooks;
+// Converts different hook registration formats into the
+// same internal format
+function convertHookData(input) {
+    const result = {};
+    if (Array.isArray(input)) {
+        result.all = input;
+    }
+    else if (typeof input !== 'object') {
+        result.all = [input];
+    }
+    else {
+        for (const key of Object.keys(input)) {
+            const value = input[key];
+            result[key] = Array.isArray(value) ? value : [value];
+        }
+    }
+    return result;
+}
+exports.convertHookData = convertHookData;
+const types = ['before', 'after', 'error', 'around'];
+const isType = (value) => types.includes(value);
+const createMap = (input, methods) => {
+    const map = {};
+    Object.keys(input).forEach((type) => {
+        if (!isType(type)) {
+            throw new Error(`'${type}' is not a valid hook type`);
+        }
+        const data = convertHookData(input[type]);
+        Object.keys(data).forEach((method) => {
+            if (method !== 'all' && !methods.includes(method) && !service_1.defaultServiceMethods.includes(method)) {
+                throw new Error(`'${method}' is not a valid hook method`);
+            }
+        });
+        map[type] = data;
+    });
+    return map;
+};
+const updateStore = (store, map) => Object.keys(store.hooks).forEach((method) => {
+    Object.keys(map).forEach((key) => {
+        var _a;
+        const type = key;
+        const allHooks = map[type].all || [];
+        const methodHooks = map[type][method] || [];
+        if (allHooks.length || methodHooks.length) {
+            const list = [...allHooks, ...methodHooks];
+            const hooks = ((_a = store[type])[method] || (_a[method] = []));
+            hooks.push(...list);
+        }
+    });
+    const collected = (0, hooks_1.collect)({
+        before: store.before[method] || [],
+        after: store.after[method] || [],
+        error: store.error[method] || []
+    });
+    store.hooks[method] = [...(store.around[method] || []), collected];
+});
+// Add `.hooks` functionality to an object
+function enableHooks(object, methods = service_1.defaultServiceMethods) {
+    const store = {
+        around: {},
+        before: {},
+        after: {},
+        error: {},
+        hooks: {}
+    };
+    for (const method of methods) {
+        store.hooks[method] = [];
+    }
+    Object.defineProperty(object, '__hooks', {
+        configurable: true,
+        value: store,
+        writable: true
+    });
+    return function registerHooks(input) {
+        const store = this.__hooks;
+        const map = createMap(input, methods);
+        updateStore(store, map);
+        return this;
+    };
+}
+exports.enableHooks = enableHooks;
+function createContext(service, method, data = {}) {
+    const createContext = service[method].createContext;
+    if (typeof createContext !== 'function') {
+        throw new Error(`Can not create context for method ${method}`);
+    }
+    return createContext(data);
+}
+exports.createContext = createContext;
+class FeathersHookManager extends hooks_1.HookManager {
+    constructor(app, method) {
+        super();
+        this.app = app;
+        this.method = method;
+        this._middleware = [];
+    }
+    collectMiddleware(self, args) {
+        const appHooks = collectHooks(this.app, this.method);
+        const middleware = super.collectMiddleware(self, args);
+        const methodHooks = collectHooks(self, this.method);
+        return [...appHooks, ...middleware, ...methodHooks];
+    }
+    initializeContext(self, args, context) {
+        const ctx = super.initializeContext(self, args, context);
+        ctx.params = ctx.params || {};
+        return ctx;
+    }
+    middleware(mw) {
+        this._middleware.push(...mw);
+        return this;
+    }
+}
+exports.FeathersHookManager = FeathersHookManager;
+function hookMixin(service, path, options) {
+    if (typeof service.hooks === 'function') {
+        return service;
+    }
+    const hookMethods = (0, service_1.getHookMethods)(service, options);
+    const serviceMethodHooks = hookMethods.reduce((res, method) => {
+        const params = service_1.defaultServiceArguments[method] || ['data', 'params'];
+        res[method] = new FeathersHookManager(this, method).params(...params).props({
+            app: this,
+            path,
+            method,
+            service,
+            event: null,
+            type: null,
+            get statusCode() {
+                var _a;
+                return (_a = this.http) === null || _a === void 0 ? void 0 : _a.status;
+            },
+            set statusCode(value) {
+                this.http = this.http || {};
+                this.http.status = value;
+            }
+        });
+        return res;
+    }, {});
+    const registerHooks = enableHooks(service, hookMethods);
+    (0, hooks_1.hooks)(service, serviceMethodHooks);
+    service.hooks = function (hookOptions) {
+        if (hookOptions.before || hookOptions.after || hookOptions.error || hookOptions.around) {
+            return registerHooks.call(this, hookOptions);
+        }
+        if (Array.isArray(hookOptions)) {
+            return (0, hooks_1.hooks)(this, hookOptions);
+        }
+        Object.keys(hookOptions).forEach((method) => {
+            const manager = (0, hooks_1.getManager)(this[method]);
+            if (!(manager instanceof FeathersHookManager)) {
+                throw new Error(`Method ${method} is not a Feathers hooks enabled service method`);
+            }
+            manager.middleware(hookOptions[method]);
+        });
+        return this;
+    };
+    return service;
+}
+exports.hookMixin = hookMixin;
+//# sourceMappingURL=hooks.js.map

package/lib/hooks.js.map

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

package/lib/index.d.ts

@@ -3,9 +3,9 @@ import { Feathers } from './application';
 import { Application } from './declarations';
 export declare function feathers<T = any, S = any>(): Application<T, S>;
 export declare namespace feathers {
-    var setDebug: typeof import("@feathersjs/commons/lib/debug").setDebug;
+    var setDebug: typeof import("@feathersjs/commons").setDebug;
 }
 export { version, Feathers };
-export * from './hooks/index';
+export * from './hooks';
 export * from './declarations';
 export * from './service';

package/lib/index.js

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Feathers = exports.version = exports.feathers = void 0;
-const dependencies_1 = require("./dependencies");
+const commons_1 = require("@feathersjs/commons");
 const version_1 = __importDefault(require("./version"));
 exports.version = version_1.default;
 const application_1 = require("./application");
@@ -27,8 +27,8 @@ function feathers() {
     return new application_1.Feathers();
 }
 exports.feathers = feathers;
-feathers.setDebug = dependencies_1.setDebug;
-__exportStar(require("./hooks/index"), exports);
+feathers.setDebug = commons_1.setDebug;
+__exportStar(require("./hooks"), exports);
 __exportStar(require("./declarations"), exports);
 __exportStar(require("./service"), exports);
 if (typeof module !== 'undefined') {

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,iDAA0C;AAC1C,wDAAgC;AAUvB,kBAVF,iBAAO,CAUE;AAThB,+CAAyC;AASvB,yFATT,sBAAQ,OASS;AAN1B,SAAgB,QAAQ;IACtB,OAAO,IAAI,sBAAQ,EAA6B,CAAC;AACnD,CAAC;AAFD,4BAEC;AAED,QAAQ,CAAC,QAAQ,GAAG,uBAAQ,CAAC;AAG7B,gDAA8B;AAC9B,iDAA+B;AAC/B,4CAA0B;AAE1B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;CAC1D"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,iDAA8C;AAE9C,wDAA+B;AAUtB,kBAVF,iBAAO,CAUE;AAThB,+CAAwC;AAStB,yFATT,sBAAQ,OASS;AAN1B,SAAgB,QAAQ;IACtB,OAAO,IAAI,sBAAQ,EAA6B,CAAA;AAClD,CAAC;AAFD,4BAEC;AAED,QAAQ,CAAC,QAAQ,GAAG,kBAAQ,CAAA;AAG5B,0CAAuB;AACvB,iDAA8B;AAC9B,4CAAyB;AAEzB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;CACzD"}

package/lib/service.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrapService = exports.getServiceOptions = exports.getHookMethods = exports.protectedMethods = exports.defaultEventMap = exports.defaultServiceMethods = exports.defaultServiceArguments = exports.SERVICE = void 0;
-const dependencies_1 = require("./dependencies");
-exports.SERVICE = (0, dependencies_1.createSymbol)('@feathersjs/service');
+const events_1 = require("events");
+const commons_1 = require("@feathersjs/commons");
+exports.SERVICE = (0, commons_1.createSymbol)('@feathersjs/service');
 exports.defaultServiceArguments = {
     find: ['params'],
     get: ['id', 'params'],
@@ -19,20 +20,13 @@ exports.defaultEventMap = {
     remove: 'removed'
 };
 exports.protectedMethods = Object.keys(Object.prototype)
-    .concat(Object.keys(dependencies_1.EventEmitter.prototype))
-    .concat([
-    'all',
-    'before',
-    'after',
-    'error',
-    'hooks',
-    'setup',
-    'teardown',
-    'publish'
-]);
+    .concat(Object.keys(events_1.EventEmitter.prototype))
+    .concat(['all', 'around', 'before', 'after', 'error', 'hooks', 'setup', 'teardown', 'publish']);
 function getHookMethods(service, options) {
     const { methods } = options;
-    return exports.defaultServiceMethods.filter(m => typeof service[m] === 'function' && !methods.includes(m)).concat(methods);
+    return exports.defaultServiceMethods
+        .filter((m) => typeof service[m] === 'function' && !methods.includes(m))
+        .concat(methods);
 }
 exports.getHookMethods = getHookMethods;
 function getServiceOptions(service, options = {}) {
@@ -40,7 +34,7 @@ function getServiceOptions(service, options = {}) {
     if (existingOptions) {
         return existingOptions;
     }
-    const { methods = exports.defaultServiceMethods.filter(method => typeof service[method] === 'function'), events = service.events || [] } = options;
+    const { methods = exports.defaultServiceMethods.filter((method) => typeof service[method] === 'function'), events = service.events || [] } = options;
     const { serviceEvents = Object.values(exports.defaultEventMap).concat(events) } = options;
     return {
         ...options,