@feathersjs/feathers 5.0.0-pre.3 → 5.0.0-pre.31

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Feathers
+Copyright (c) 2022 Feathers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/{readme.md → README.md}

@@ -2,14 +2,11 @@
 
 ## A framework for real-time applications and REST APIs with JavaScript and TypeScript
 
-[![Greenkeeper badge](https://badges.greenkeeper.io/feathersjs/feathers.svg)](https://greenkeeper.io/)
 [![CI](https://github.com/feathersjs/feathers/workflows/CI/badge.svg)](https://github.com/feathersjs/feathers/actions?query=workflow%3ACI)
 [![Maintainability](https://api.codeclimate.com/v1/badges/cb5ec42a2d0cc1a47a02/maintainability)](https://codeclimate.com/github/feathersjs/feathers/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/cb5ec42a2d0cc1a47a02/test_coverage)](https://codeclimate.com/github/feathersjs/feathers/test_coverage)
 [![Download Status](https://img.shields.io/npm/dm/@feathersjs/feathers.svg?style=flat-square)](https://www.npmjs.com/package/@feathersjs/feathers)
-
-[![Slack Status](http://slack.feathersjs.com/badge.svg)](http://slack.feathersjs.com)
-[![Telegram Status](https://img.shields.io/badge/Telegram_RU_chat:-Feathers-216bc1.svg?style=flat)](https://t.me/featherjs)
+[![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/qa8kez8QBx)
 
 Feathers is a lightweight web-framework for creating real-time applications and REST APIs using JavaScript or TypeScript.
 
@@ -35,6 +32,6 @@ The [Feathers docs](http://docs.feathersjs.com) are loaded with awesome stuff an
 
 ## License
 
-Copyright (c) 2021 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
+Copyright (c) 2022 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
 
 Licensed under the [MIT license](LICENSE).

package/lib/application.d.ts

@@ -1,21 +1,26 @@
 /// <reference types="node" />
-import { EventEmitter } from './dependencies';
-import { FeathersApplication, ServiceMixin, Service, ServiceOptions, ServiceInterface, Application, HookOptions, FeathersService, HookMap } from './declarations';
-export declare class Feathers<ServiceTypes, AppSettings> extends EventEmitter implements FeathersApplication<ServiceTypes, AppSettings> {
-    services: ServiceTypes;
-    settings: AppSettings;
-    mixins: ServiceMixin<Application<ServiceTypes, AppSettings>>[];
+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<ServiceTypes, AppSettings>, any>;
-    private legacyHooks;
+    protected registerHooks: (this: any, allHooks: any) => any;
     constructor();
-    get<L extends keyof AppSettings & string>(name: L): AppSettings[L];
-    set<L extends keyof AppSettings & string>(name: L, value: AppSettings[L]): this;
+    get<L extends keyof Settings & string>(name: L): Settings[L];
+    set<L extends keyof Settings & string>(name: L, value: Settings[L]): this;
     configure(callback: (this: this, app: this) => void): this;
-    defaultService(location: string): ServiceInterface<any>;
-    service<L extends keyof ServiceTypes & string>(location: L): FeathersService<this, keyof any extends keyof ServiceTypes ? Service<any> : ServiceTypes[L]>;
-    use<L extends keyof ServiceTypes & string>(path: L, service: keyof any extends keyof ServiceTypes ? ServiceInterface<any> | Application : ServiceTypes[L], options?: ServiceOptions): this;
-    hooks(hookMap: HookOptions<this, any>): any;
-    setup(): Promise<this>;
+    defaultService(location: string): ServiceInterface;
+    service<L extends keyof Services & string>(location: L): FeathersService<this, keyof any extends keyof Services ? Service : Services[L]>;
+    protected _setup(): Promise<this>;
+    get setup(): () => Promise<this>;
+    set setup(value: () => Promise<this>);
+    protected _teardown(): Promise<this>;
+    get teardown(): () => Promise<this>;
+    set teardown(value: () => Promise<this>);
+    use<L extends keyof Services & string>(path: L, service: keyof any extends keyof Services ? ServiceInterface | Application : Services[L], options?: ServiceOptions): this;
+    unuse<L extends keyof Services & string>(location: L): Promise<FeathersService<this, keyof any extends keyof Services ? Service : Services[L]>>;
+    hooks(hookMap: ApplicationHookOptions<this>): this;
 }

package/lib/application.js

@@ -5,24 +5,26 @@ 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 legacy_1 = require("./hooks/legacy");
-const debug = 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.legacyHooks = legacy_1.enableLegacyHooks(this);
+        this.registerHooks = (0, hooks_3.enableHooks)(this);
+        this.registerHooks({
+            around: [events_2.eventHook]
+        });
     }
     get(name) {
         return this.settings[name];
@@ -39,7 +41,7 @@ class Feathers extends dependencies_1.EventEmitter {
         throw new Error(`Can not find service '${location}'`);
     }
     service(location) {
-        const path = (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));
@@ -47,64 +49,106 @@ class Feathers extends dependencies_1.EventEmitter {
         }
         return current;
     }
+    _setup() {
+        this._isSetup = true;
+        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);
+    }
+    get setup() {
+        return this._setup;
+    }
+    set setup(value) {
+        this._setup = value[hooks_1.HOOKS]
+            ? value
+            : (0, hooks_1.hooks)(value, (0, hooks_1.middleware)().params('server').props({
+                app: this
+            }));
+    }
+    _teardown() {
+        this._isSetup = false;
+        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);
+    }
+    get teardown() {
+        return this._teardown;
+    }
+    set teardown(value) {
+        this._teardown = value[hooks_1.HOOKS]
+            ? value
+            : (0, hooks_1.hooks)(value, (0, hooks_1.middleware)().params('server').props({
+                app: this
+            }));
+    }
     use(path, service, options) {
         if (typeof path !== 'string') {
             throw new Error(`'${path}' is not a valid service path.`);
         }
-        const location = (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 = service_1.wrapService(location, service, options);
-        const serviceOptions = service_1.getServiceOptions(service, options);
+        const protoService = (0, service_1.wrapService)(location, service, options);
+        const serviceOptions = (0, service_1.getServiceOptions)(protoService);
+        for (const name of service_1.protectedMethods) {
+            if (serviceOptions.methods.includes(name)) {
+                throw new Error(`'${name}' on service '${location}' is not allowed as a custom method name`);
+            }
+        }
         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') {
             debug(`Setting up service for \`${location}\``);
             protoService.setup(this, location);
         }
-        this.services[location] = protoService;
         return this;
     }
+    async unuse(location) {
+        const path = ((0, commons_1.stripSlashes)(location) || '/');
+        const service = this.services[path];
+        if (service && typeof service.teardown === 'function') {
+            await service.teardown(this, path);
+        }
+        delete this.services[path];
+        return service;
+    }
     hooks(hookMap) {
-        const legacyMap = hookMap;
-        if (legacyMap.before || legacyMap.after || legacyMap.error) {
-            return this.legacyHooks(legacyMap);
+        const untypedMap = hookMap;
+        if (untypedMap.before || untypedMap.after || untypedMap.error || untypedMap.around) {
+            // regular hooks for all service methods
+            this.registerHooks(untypedMap);
         }
-        if (Array.isArray(hookMap)) {
-            this.appHooks[dependencies_1.HOOKS].push(...hookMap);
+        else if (untypedMap.setup || untypedMap.teardown) {
+            // .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() {
-        let promise = Promise.resolve();
-        // Setup each service (pass the app so that they can look up other services etc.)
-        for (const path of Object.keys(this.services)) {
-            promise = promise.then(() => {
-                const service = this.service(path);
-                if (typeof service.setup === 'function') {
-                    debug(`Setting up service for \`${path}\``);
-                    return service.setup(this, path);
-                }
-            });
-        }
-        return promise.then(() => {
-            this._isSetup = true;
-            return this;
-        });
-    }
 }
 exports.Feathers = Feathers;
 //# sourceMappingURL=application.js.map

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,53 +1,101 @@
 /// <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 };
+/**
+ * The object returned from `.find` call by standard database adapters
+ */
+export interface Paginated<T> {
+    total: number;
+    limit: number;
+    skip: number;
+    data: T[];
+}
+/**
+ * Options that can be passed when registering a service via `app.use(name, service, options)`
+ */
 export interface ServiceOptions {
-    events?: string[];
-    methods?: string[];
-    serviceEvents?: string[];
+    events?: string[] | readonly string[];
+    methods?: string[] | readonly string[];
+    serviceEvents?: string[] | readonly string[];
+    routeParams?: {
+        [key: string]: any;
+    };
 }
-export interface ServiceMethods<T, D = Partial<T>> {
-    find(params?: Params): Promise<T | T[]>;
-    get(id: Id, params?: Params): Promise<T>;
-    create(data: D, params?: Params): Promise<T>;
-    update(id: NullableId, data: D, params?: Params): Promise<T | T[]>;
-    patch(id: NullableId, data: D, params?: Params): Promise<T | T[]>;
-    remove(id: NullableId, params?: Params): Promise<T | T[]>;
-    setup(app: Application, path: string): Promise<void>;
+export interface ClientService<Result = any, Data = Partial<Result>, PatchData = Data, FindResult = Paginated<Result>, P = Params> {
+    find(params?: P): Promise<FindResult>;
+    get(id: Id, params?: P): Promise<Result>;
+    create(data: Data[], params?: P): Promise<Result[]>;
+    create(data: Data, params?: P): Promise<Result>;
+    update(id: Id, data: Data, params?: P): Promise<Result>;
+    update(id: NullableId, data: Data, params?: P): Promise<Result | Result[]>;
+    update(id: null, data: Data, params?: P): Promise<Result[]>;
+    patch(id: NullableId, data: PatchData, params?: P): Promise<Result | Result[]>;
+    patch(id: Id, data: PatchData, params?: P): Promise<Result>;
+    patch(id: null, data: PatchData, params?: P): Promise<Result[]>;
+    remove(id: NullableId, params?: P): Promise<Result | Result[]>;
+    remove(id: Id, params?: P): Promise<Result>;
+    remove(id: null, params?: P): Promise<Result[]>;
 }
-export interface ServiceOverloads<T, D> {
-    create?(data: D[], params?: Params): Promise<T[]>;
-    update?(id: Id, data: D, params?: Params): Promise<T>;
-    update?(id: null, data: D, params?: Params): Promise<T[]>;
-    patch?(id: Id, data: D, params?: Params): Promise<T>;
-    patch?(id: null, data: D, params?: Params): Promise<T[]>;
-    remove?(id: Id, params?: Params): Promise<T>;
-    remove?(id: null, params?: Params): Promise<T[]>;
+export interface ServiceMethods<T = any, D = Partial<T>, P = Params> {
+    find(params?: P): Promise<T | T[]>;
+    get(id: Id, params?: P): Promise<T>;
+    create(data: D, params?: P): Promise<T>;
+    update(id: NullableId, data: D, params?: P): Promise<T | T[]>;
+    patch(id: NullableId, data: D, params?: P): Promise<T | T[]>;
+    remove(id: NullableId, params?: P): Promise<T | T[]>;
+    setup?(app: Application, path: string): Promise<void>;
+    teardown?(app: Application, path: string): Promise<void>;
 }
-export declare type Service<T, D = Partial<T>> = ServiceMethods<T, D> & ServiceOverloads<T, D>;
-export declare type ServiceInterface<T, D = Partial<T>> = Partial<ServiceMethods<T, D>>;
-export interface ServiceAddons<A = Application, S = Service<any, any>> extends EventEmitter {
+export interface ServiceOverloads<T = any, D = Partial<T>, P = Params> {
+    create?(data: D[], params?: P): Promise<T[]>;
+    update?(id: Id, data: D, params?: P): Promise<T>;
+    update?(id: null, data: D, params?: P): Promise<T[]>;
+    patch?(id: Id, data: D, params?: P): Promise<T>;
+    patch?(id: null, data: D, params?: P): Promise<T[]>;
+    remove?(id: Id, params?: P): Promise<T>;
+    remove?(id: null, params?: P): Promise<T[]>;
+}
+export declare type Service<T = any, D = Partial<T>, P = Params> = ServiceMethods<T, D, P> & ServiceOverloads<T, D, P>;
+export declare type ServiceInterface<T = any, D = Partial<T>, P = Params> = Partial<ServiceMethods<T, D, P>>;
+export interface ServiceAddons<A = Application, S = Service> extends EventEmitter {
     id?: string;
     hooks(options: HookOptions<A, S>): this;
 }
-export interface ServiceHookOverloads<S> {
-    find(params: Params, context: HookContext): Promise<HookContext>;
-    get(id: Id, params: Params, context: HookContext): Promise<HookContext>;
-    create(data: ServiceGenericData<S> | ServiceGenericData<S>[], params: Params, context: HookContext): Promise<HookContext>;
-    update(id: NullableId, data: ServiceGenericData<S>, params: Params, context: HookContext): Promise<HookContext>;
-    patch(id: NullableId, data: ServiceGenericData<S>, params: Params, context: HookContext): Promise<HookContext>;
-    remove(id: NullableId, params: Params, context: HookContext): Promise<HookContext>;
+export interface ServiceHookOverloads<S, P = Params> {
+    find(params: P, context: HookContext): Promise<HookContext>;
+    get(id: Id, params: P, context: HookContext): Promise<HookContext>;
+    create(data: ServiceGenericData<S> | ServiceGenericData<S>[], params: P, context: HookContext): Promise<HookContext>;
+    update(id: NullableId, data: ServiceGenericData<S>, params: P, context: HookContext): Promise<HookContext>;
+    patch(id: NullableId, data: ServiceGenericData<S>, params: P, context: HookContext): Promise<HookContext>;
+    remove(id: NullableId, params: P, context: HookContext): Promise<HookContext>;
 }
-export declare type FeathersService<A = FeathersApplication, S = Service<any>> = S & ServiceAddons<A, S> & OptionalPick<ServiceHookOverloads<S>, keyof S>;
-export declare type CustomMethod<Methods extends string> = {
-    [k in Methods]: <X = any>(data: any, params?: Params) => Promise<X>;
+export declare type FeathersService<A = FeathersApplication, S = Service> = S & ServiceAddons<A, S> & OptionalPick<ServiceHookOverloads<S>, keyof S>;
+export declare type CustomMethods<T extends {
+    [key: string]: [any, any];
+}> = {
+    [K in keyof T]: (data: T[K][0], params?: Params) => Promise<T[K][1]>;
+};
+/**
+ * An interface usually use by transport clients that represents a e.g. HTTP or websocket
+ * connection that can be configured on the application.
+ */
+export declare type TransportConnection<Services = any> = {
+    (app: Application<Services>): void;
+    Service: any;
+    service: <L extends keyof Services & string>(name: L) => keyof any extends keyof Services ? ServiceInterface : Services[L];
 };
-export declare type ServiceMixin<A> = (service: FeathersService<A>, path: string, options?: ServiceOptions) => void;
+/**
+ * The interface for a custom service method. Can e.g. be used to type client side services.
+ */
+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;
-export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
+export declare type ServiceGenericParams<S> = S extends ServiceInterface<infer _T, infer _D, infer P> ? P : any;
+export interface FeathersApplication<Services = any, Settings = any> {
     /**
      * The Feathers application version
      */
@@ -55,40 +103,36 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
     /**
      * A list of callbacks that run when a new service is registered
      */
-    mixins: ServiceMixin<Application<ServiceTypes, AppSettings>>[];
+    mixins: ServiceMixin<Application<Services, Settings>>[];
     /**
      * The index of all services keyed by their path.
      *
      * __Important:__ Services should always be retrieved via `app.service('name')`
      * not via `app.services`.
      */
-    services: ServiceTypes;
+    services: Services;
     /**
      * The application settings that can be used via
      * `app.get` and `app.set`
      */
-    settings: AppSettings;
+    settings: Settings;
     /**
      * A private-ish indicator if `app.setup()` has been called already
      */
     _isSetup: boolean;
-    /**
-     * Contains all registered application level hooks.
-     */
-    appHooks: HookMap<Application<ServiceTypes, AppSettings>, any>;
     /**
      * Retrieve an application setting by name
      *
      * @param name The setting name
      */
-    get<L extends keyof AppSettings & string>(name: L): AppSettings[L];
+    get<L extends keyof Settings & string>(name: L): Settings[L];
     /**
      * Set an application setting
      *
      * @param name The setting name
      * @param value The setting value
      */
-    set<L extends keyof AppSettings & string>(name: L, value: AppSettings[L]): this;
+    set<L extends keyof Settings & string>(name: L, value: Settings[L]): this;
     /**
      * Runs a callback configure function with the current application instance.
      *
@@ -102,7 +146,7 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
      *
      * @param location The path of the service
      */
-    defaultService(location: string): ServiceInterface<any>;
+    defaultService(location: string): ServiceInterface;
     /**
      * Register a new service or a sub-app. When passed another
      * Feathers application, all its services will be re-registered
@@ -113,7 +157,13 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
      * Feathers application to use a sub-app under the `path` prefix.
      * @param options The options for this service
      */
-    use<L extends keyof ServiceTypes & string>(path: L, service: keyof any extends keyof ServiceTypes ? ServiceInterface<any> | Application : ServiceTypes[L], options?: ServiceOptions): this;
+    use<L extends keyof Services & string>(path: L, service: keyof any extends keyof Services ? ServiceInterface | Application : Services[L], options?: ServiceOptions): this;
+    /**
+     * Unregister an existing service.
+     *
+     * @param path The name of the service to unregister
+     */
+    unuse<L extends keyof Services & string>(path: L): Promise<FeathersService<this, keyof any extends keyof Services ? Service : Services[L]>>;
     /**
      * Get the Feathers service instance for a path. This will
      * be the service originally registered with Feathers functionality
@@ -121,32 +171,58 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
      *
      * @param path The name of the service.
      */
-    service<L extends keyof ServiceTypes & string>(path: L): FeathersService<this, keyof any extends keyof ServiceTypes ? Service<any> : ServiceTypes[L]>;
+    service<L extends keyof Services & string>(path: L): FeathersService<this, keyof any extends keyof Services ? Service : Services[L]>;
+    /**
+     * Set up the application and call all services `.setup` method if available.
+     *
+     * @param server A server instance (optional)
+     */
     setup(server?: any): Promise<this>;
+    /**
+     * Tear down the application and call all services `.teardown` method if available.
+     *
+     * @param server A server instance (optional)
+     */
+    teardown(server?: any): Promise<this>;
     /**
      * Register application level hooks.
      *
      * @param map The application hook settings.
      */
-    hooks(map: HookOptions<this, any>): this;
+    hooks(map: ApplicationHookOptions<this>): this;
 }
-export interface Application<ServiceTypes = any, AppSettings = any> extends FeathersApplication<ServiceTypes, AppSettings>, EventEmitter {
+export interface Application<Services = any, Settings = any> extends FeathersApplication<Services, Settings>, EventEmitter {
 }
 export declare type Id = number | string;
 export declare type NullableId = Id | null;
 export interface Query {
     [key: string]: any;
 }
-export interface Params {
-    query?: Query;
+export interface Params<Q = Query> {
+    query?: Q;
     provider?: string;
     route?: {
-        [key: string]: string;
+        [key: string]: any;
     };
     headers?: {
         [key: string]: any;
     };
-    [key: string]: any;
+}
+export interface Http {
+    /**
+     * A writeable, optional property with status code override.
+     */
+    status?: number;
+    /**
+     * A writeable, optional property with headers.
+     */
+    headers?: {
+        [key: string]: string | string[];
+    };
+    /**
+     * A writeable, optional property with `Location` header's value.
+     */
+    location?: string;
 }
 export interface HookContext<A = Application, S = any> extends BaseHookContext<ServiceGenericType<S>> {
     /**
@@ -198,7 +274,7 @@ export interface HookContext<A = Application, S = any> extends BaseHookContext<S
      * A writeable property that contains the service method parameters (including
      * params.query).
      */
-    params: Params;
+    params: ServiceGenericParams<S>;
     /**
      * A writeable property containing the result of the successful service method call.
      * It is only available in after hooks.
@@ -218,28 +294,47 @@ export interface HookContext<A = Application, S = any> extends BaseHookContext<S
     /**
      * A writeable, optional property that allows to override the standard HTTP status
      * code that should be returned.
+     *
+     * @deprecated Use `http.status` instead.
      */
     statusCode?: number;
+    /**
+     * A writeable, optional property with options specific to HTTP transports.
+     */
+    http?: Http;
     /**
      * The event emitted by this method. Can be set to `null` to skip event emitting.
      */
     event: string | null;
 }
-export declare type LegacyHookFunction<A = Application, S = Service<any, any>> = (this: S, context: HookContext<A, S>) => (Promise<HookContext<Application, S> | void> | HookContext<Application, S> | void);
-export declare type Hook<A = Application, S = Service<any, any>> = LegacyHookFunction<A, S>;
-declare type LegacyHookMethodMap<A, S> = {
-    [L in keyof S]?: SelfOrArray<LegacyHookFunction<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<LegacyHookFunction<A, S>>;
+    all?: SelfOrArray<HookFunction<A, S>>;
 };
-declare type LegacyHookTypeMap<A, S> = SelfOrArray<LegacyHookFunction<A, S>> | LegacyHookMethodMap<A, S>;
-export declare type LegacyHookMap<A, S> = {
-    before?: LegacyHookTypeMap<A, S>;
-    after?: LegacyHookTypeMap<A, S>;
-    error?: LegacyHookTypeMap<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<any, any>> = (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> = AroundHookMap<A, S> | AroundHookFunction<A, S>[] | HookMap<A, S>;
+export interface ApplicationHookContext<A = Application> extends BaseHookContext {
+    app: A;
+    server: any;
+}
+export declare type ApplicationHookFunction<A> = (context: ApplicationHookContext<A>, next: NextFunction) => Promise<void>;
+export declare type ApplicationHookMap<A> = {
+    setup?: ApplicationHookFunction<A>[];
+    teardown?: ApplicationHookFunction<A>[];
 };
-export declare type HookOptions<A, S> = HookMap<A, S> | HookFunction<A, S>[] | LegacyHookMap<A, S>;
+export declare type ApplicationHookOptions<A> = HookOptions<A, any> | ApplicationHookMap<A>;