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

package/lib/declarations.d.ts

@@ -1,54 +1,66 @@
 /// <reference types="node" />
-import { EventEmitter } from 'events';
-import { NextFunction, HookContext as BaseHookContext } from '@feathersjs/hooks';
+import { EventEmitter, NextFunction, HookContext as BaseHookContext } from './dependencies';
 declare type SelfOrArray<S> = S | S[];
 declare type OptionalPick<T, K extends PropertyKey> = Pick<T, Extract<keyof T, K>>;
-export { NextFunction };
+export type { NextFunction };
+export interface Paginated<T> {
+    total: number;
+    limit: number;
+    skip: number;
+    data: T[];
+}
 export interface ServiceOptions {
     events?: string[];
     methods?: string[];
     serviceEvents?: 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 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 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 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, 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, S> extends EventEmitter {
+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]>;
 };
-export declare type ServiceMixin<A> = (service: FeathersService<A>, path: string, options?: ServiceOptions) => void;
+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
      */
@@ -56,19 +68,19 @@ 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
      */
@@ -76,20 +88,20 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
     /**
      * Contains all registered application level hooks.
      */
-    appHooks: HookMap<Application<ServiceTypes, AppSettings>, any>;
+    appHooks: HookMap<Application<Services, Settings>, 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.
      *
@@ -103,7 +115,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
@@ -114,7 +126,7 @@ 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;
     /**
      * Get the Feathers service instance for a path. This will
      * be the service originally registered with Feathers functionality
@@ -122,32 +134,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>> {
     /**
@@ -199,7 +237,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.
@@ -219,27 +257,44 @@ 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);
-declare type LegacyHookMethodMap<A, S> = {
-    [L in keyof S]?: SelfOrArray<LegacyHookFunction<A, S>>;
+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>>;
 } & {
-    all?: SelfOrArray<LegacyHookFunction<A, S>>;
+    all?: SelfOrArray<RegularHookFunction<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 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>;
 };
-export declare type HookFunction<A = Application, S = Service<any, any>> = (context: HookContext<A, S>, next: NextFunction) => Promise<void>;
+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>[];
 };
-export declare type HookOptions<A, S> = HookMap<A, S> | HookFunction<A, S>[] | LegacyHookMap<A, S>;
+export declare type HookOptions<A, S> = HookMap<A, S> | HookFunction<A, S>[] | RegularHookMap<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 ApplicationHookOptions<A> = HookOptions<A, any> | ApplicationHookMap<A>;

package/lib/dependencies.d.ts

@@ -0,0 +1,4 @@
+import { EventEmitter } from 'events';
+export * from '@feathersjs/commons';
+export * from '@feathersjs/hooks';
+export { EventEmitter };

package/lib/dependencies.js

@@ -0,0 +1,22 @@
+"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 });
+exports.EventEmitter = void 0;
+const events_1 = require("events");
+Object.defineProperty(exports, "EventEmitter", { enumerable: true, get: function () { return events_1.EventEmitter; } });
+__exportStar(require("@feathersjs/commons"), exports);
+__exportStar(require("@feathersjs/hooks"), exports);
+//# sourceMappingURL=dependencies.js.map

package/lib/dependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../src/dependencies.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mCAAsC;AAI7B,6FAJA,qBAAY,OAIA;AAHrB,sDAAoC;AACpC,oDAAkC"}

package/lib/events.d.ts

@@ -1,4 +1,4 @@
-import { NextFunction } from '@feathersjs/hooks';
+import { NextFunction } from './dependencies';
 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>>>;
+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,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eventMixin = exports.eventHook = void 0;
-const events_1 = require("events");
+const dependencies_1 = require("./dependencies");
 const service_1 = require("./service");
 function eventHook(context, next) {
-    const { events } = service_1.getServiceOptions(context.self);
+    const { events } = (0, service_1.getServiceOptions)(context.self);
     const defaultEvent = service_1.defaultEventMap[context.method] || null;
     context.event = defaultEvent;
     return next().then(() => {
@@ -21,7 +21,7 @@ function eventMixin(service) {
     const isEmitter = typeof service.on === 'function' &&
         typeof service.emit === 'function';
     if (!isEmitter) {
-        Object.assign(service, events_1.EventEmitter.prototype);
+        Object.assign(service, dependencies_1.EventEmitter.prototype);
     }
     return service;
 }

package/lib/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":";;;AACA,mCAAsC;AAGtC,uCAA+D;AAE/D,SAAgB,SAAS,CAAE,OAAoB,EAAE,IAAkB;IACjE,MAAM,EAAE,MAAM,EAAE,GAAG,2BAAiB,CAAE,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,qBAAY,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,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"}

package/lib/hooks/index.d.ts

@@ -1,14 +1,13 @@
-import { HookContextData, HookManager, Middleware } from '@feathersjs/hooks';
+import { HookContextData, HookManager, Middleware } from '../dependencies';
 import { Service, ServiceOptions, HookContext, FeathersService, Application } from '../declarations';
-import { fromAfterHook, fromBeforeHook, fromErrorHooks } from './legacy';
-export { fromAfterHook, fromBeforeHook, fromErrorHooks };
-export declare function createContext(service: Service<any>, method: string, data?: HookContextData): HookContext<Application<any, any>, any>;
+export { fromBeforeHook, fromBeforeHooks, fromAfterHook, fromAfterHooks, fromErrorHook, fromErrorHooks } from './regular';
+export declare function createContext(service: Service, method: string, data?: HookContextData): HookContext<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>;
+    initializeContext(self: any, args: any[], context: HookContext): import("@feathersjs/hooks/types/base").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>>>;
+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/index.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hookMixin = exports.FeathersHookManager = exports.createContext = exports.fromErrorHooks = exports.fromBeforeHook = exports.fromAfterHook = void 0;
-const hooks_1 = require("@feathersjs/hooks");
+exports.hookMixin = exports.FeathersHookManager = exports.createContext = exports.fromErrorHooks = exports.fromErrorHook = exports.fromAfterHooks = exports.fromAfterHook = exports.fromBeforeHooks = exports.fromBeforeHook = void 0;
+const dependencies_1 = require("../dependencies");
 const service_1 = require("../service");
-const legacy_1 = require("./legacy");
-Object.defineProperty(exports, "fromAfterHook", { enumerable: true, get: function () { return legacy_1.fromAfterHook; } });
-Object.defineProperty(exports, "fromBeforeHook", { enumerable: true, get: function () { return legacy_1.fromBeforeHook; } });
-Object.defineProperty(exports, "fromErrorHooks", { enumerable: true, get: function () { return legacy_1.fromErrorHooks; } });
+const regular_1 = require("./regular");
+var regular_2 = require("./regular");
+Object.defineProperty(exports, "fromBeforeHook", { enumerable: true, get: function () { return regular_2.fromBeforeHook; } });
+Object.defineProperty(exports, "fromBeforeHooks", { enumerable: true, get: function () { return regular_2.fromBeforeHooks; } });
+Object.defineProperty(exports, "fromAfterHook", { enumerable: true, get: function () { return regular_2.fromAfterHook; } });
+Object.defineProperty(exports, "fromAfterHooks", { enumerable: true, get: function () { return regular_2.fromAfterHooks; } });
+Object.defineProperty(exports, "fromErrorHook", { enumerable: true, get: function () { return regular_2.fromErrorHook; } });
+Object.defineProperty(exports, "fromErrorHooks", { enumerable: true, get: function () { return regular_2.fromErrorHooks; } });
 function createContext(service, method, data = {}) {
     const createContext = service[method].createContext;
     if (typeof createContext !== 'function') {
@@ -15,7 +19,7 @@ function createContext(service, method, data = {}) {
     return createContext(data);
 }
 exports.createContext = createContext;
-class FeathersHookManager extends hooks_1.HookManager {
+class FeathersHookManager extends dependencies_1.HookManager {
     constructor(app, method) {
         super();
         this.app = app;
@@ -24,11 +28,11 @@ class FeathersHookManager extends hooks_1.HookManager {
     }
     collectMiddleware(self, args) {
         const app = this.app;
-        const appHooks = app.appHooks[hooks_1.HOOKS].concat(app.appHooks[this.method] || []);
-        const legacyAppHooks = legacy_1.collectLegacyHooks(this.app, this.method);
+        const appHooks = app.appHooks[dependencies_1.HOOKS].concat(app.appHooks[this.method] || []);
+        const regularAppHooks = (0, regular_1.collectRegularHooks)(this.app, this.method);
         const middleware = super.collectMiddleware(self, args);
-        const legacyHooks = legacy_1.collectLegacyHooks(self, this.method);
-        return [...appHooks, ...legacyAppHooks, ...middleware, ...legacyHooks];
+        const regularHooks = (0, regular_1.collectRegularHooks)(self, this.method);
+        return [...appHooks, ...regularAppHooks, ...middleware, ...regularHooks];
     }
     initializeContext(self, args, context) {
         const ctx = super.initializeContext(self, args, context);
@@ -46,7 +50,8 @@ function hookMixin(service, path, options) {
         return service;
     }
     const app = this;
-    const serviceMethodHooks = service_1.getHookMethods(service, options).reduce((res, method) => {
+    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(app, method)
             .params(...params)
@@ -56,21 +61,28 @@ function hookMixin(service, path, options) {
             method,
             service,
             event: null,
-            type: 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 = {})).status = value;
+            }
         });
         return res;
     }, {});
-    const handleLegacyHooks = legacy_1.enableLegacyHooks(service);
-    hooks_1.hooks(service, serviceMethodHooks);
+    const handleRegularHooks = (0, regular_1.enableRegularHooks)(service, hookMethods);
+    (0, dependencies_1.hooks)(service, serviceMethodHooks);
     service.hooks = function (hookOptions) {
         if (hookOptions.before || hookOptions.after || hookOptions.error) {
-            return handleLegacyHooks.call(this, hookOptions);
+            return handleRegularHooks.call(this, hookOptions);
         }
         if (Array.isArray(hookOptions)) {
-            return hooks_1.hooks(this, hookOptions);
+            return (0, dependencies_1.hooks)(this, hookOptions);
         }
         Object.keys(hookOptions).forEach(method => {
-            const manager = hooks_1.getManager(this[method]);
+            const manager = (0, dependencies_1.getManager)(this[method]);
             if (!(manager instanceof FeathersHookManager)) {
                 throw new Error(`Method ${method} is not a Feathers hooks enabled service method`);
             }

package/lib/hooks/index.js.map

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

package/lib/hooks/regular.d.ts

@@ -0,0 +1,12 @@
+import { HookFunction, RegularHookFunction, RegularHookMap } from '../declarations';
+export declare function fromBeforeHook<A, S>(hook: RegularHookFunction<A, S>): HookFunction<A, S>;
+export declare function fromAfterHook<A, S>(hook: RegularHookFunction<A, S>): HookFunction<A, S>;
+export declare function fromErrorHook<A, S>(hook: RegularHookFunction<A, S>): HookFunction<A, S>;
+export declare function fromBeforeHooks<A, S>(hooks: RegularHookFunction<A, S>[]): HookFunction<unknown, unknown>;
+export declare function fromAfterHooks<A, S>(hooks: RegularHookFunction<A, S>[]): HookFunction<unknown, unknown>;
+export declare function fromErrorHooks<A, S>(hooks: RegularHookFunction<A, S>[]): HookFunction<unknown, unknown>;
+export declare function collectRegularHooks(target: any, method: string): any;
+export declare function convertHookData(input: any): {
+    [method: string]: RegularHookFunction<import("../declarations").Application<any, any>, import("../declarations").Service<any, Partial<any>, import("../declarations").Params<import("../declarations").Query>>>[];
+};
+export declare function enableRegularHooks(object: any, methods?: string[]): (this: any, input: RegularHookMap<any, any>) => any;