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

package/src/declarations.ts

@@ -1,134 +1,112 @@
-import {
-  EventEmitter, NextFunction, HookContext as BaseHookContext
-} from './dependencies';
+import { EventEmitter } from 'events'
+import { NextFunction, HookContext as BaseHookContext } from '@feathersjs/hooks'
 
-type SelfOrArray<S> = S | S[];
+type SelfOrArray<S> = S | S[]
 type OptionalPick<T, K extends PropertyKey> = Pick<T, Extract<keyof T, K>>
 
-export type { NextFunction };
+export type { NextFunction }
 
 export interface Paginated<T> {
-  total: number;
-  limit: number;
-  skip: number;
-  data: T[];
+  total: number
+  limit: number
+  skip: number
+  data: T[]
 }
 
 export interface ServiceOptions {
-  events?: string[];
-  methods?: string[];
-  serviceEvents?: string[];
-  routeParams?: { [key: string]: any };
+  events?: string[]
+  methods?: string[]
+  serviceEvents?: string[]
+  routeParams?: { [key: string]: any }
 }
 
 export interface ServiceMethods<T = any, D = Partial<T>, P = Params> {
-  find (params?: P): Promise<T | T[]>;
+  find(params?: P): Promise<T | T[]>
 
-  get (id: Id, params?: P): Promise<T>;
+  get(id: Id, params?: P): Promise<T>
 
-  create (data: D, params?: P): Promise<T>;
+  create(data: D, params?: P): Promise<T>
 
-  update (id: NullableId, data: D, params?: P): Promise<T | T[]>;
+  update(id: NullableId, data: D, params?: P): Promise<T | T[]>
 
-  patch (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[]>;
+  remove(id: NullableId, params?: P): Promise<T | T[]>
 
-  setup? (app: Application, path: string): Promise<void>;
+  setup?(app: Application, path: string): Promise<void>
 
-  teardown? (app: Application, path: string): Promise<void>;
+  teardown?(app: Application, path: string): Promise<void>
 }
 
 export interface ServiceOverloads<T = any, D = Partial<T>, P = Params> {
-  create? (data: D[], params?: P): Promise<T[]>;
+  create?(data: D[], params?: P): Promise<T[]>
 
-  update? (id: Id, data: D, params?: P): Promise<T>;
+  update?(id: Id, data: D, params?: P): Promise<T>
 
-  update? (id: null, 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: Id, data: D, params?: P): Promise<T>
 
-  patch? (id: null, data: D, params?: P): Promise<T[]>;
+  patch?(id: null, data: D, params?: P): Promise<T[]>
 
-  remove? (id: Id, params?: P): Promise<T>;
+  remove?(id: Id, params?: P): Promise<T>
 
-  remove? (id: null, params?: P): Promise<T[]>;
+  remove?(id: null, params?: P): Promise<T[]>
 }
 
-export type Service<T = any, D = Partial<T>, P = Params> =
-  ServiceMethods<T, D, P> &
-  ServiceOverloads<T, D, P>;
+export type Service<T = any, D = Partial<T>, P = Params> = ServiceMethods<T, D, P> & ServiceOverloads<T, D, P>
 
-export type ServiceInterface<T = any, D = Partial<T>, P = Params> =
-  Partial<ServiceMethods<T, D, P>>;
+export 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;
+  id?: string
+  hooks(options: HookOptions<A, S>): this
 }
 
 export interface ServiceHookOverloads<S, P = Params> {
-  find (
-    params: P,
-    context: HookContext
-  ): Promise<HookContext>;
+  find(params: P, context: HookContext): Promise<HookContext>
 
-  get (
-    id: Id,
-    params: P,
-    context: HookContext
-  ): Promise<HookContext>;
+  get(id: Id, params: P, context: HookContext): Promise<HookContext>
 
-  create (
+  create(
     data: ServiceGenericData<S> | ServiceGenericData<S>[],
     params: P,
     context: HookContext
-  ): Promise<HookContext>;
+  ): Promise<HookContext>
 
-  update (
-    id: NullableId,
-    data: 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>;
+  patch(id: NullableId, data: ServiceGenericData<S>, params: P, context: HookContext): Promise<HookContext>
 
-  remove (
-    id: NullableId,
-    params: P,
-    context: HookContext
-  ): Promise<HookContext>;
+  remove(id: NullableId, params: P, context: HookContext): Promise<HookContext>
 }
 
-export type FeathersService<A = FeathersApplication, S = Service> =
-  S & ServiceAddons<A, S> & OptionalPick<ServiceHookOverloads<S>, keyof S>;
+export type FeathersService<A = FeathersApplication, S = Service> = S &
+  ServiceAddons<A, S> &
+  OptionalPick<ServiceHookOverloads<S>, keyof S>
 
-export type CustomMethods<T extends {[key: string]: [any, any]}> = {
-  [K in keyof T]: (data: T[K][0], params?: Params) => Promise<T[K][1]>;
+export type CustomMethods<T extends { [key: string]: [any, any] }> = {
+  [K in keyof T]: (data: T[K][0], params?: Params) => Promise<T[K][1]>
 }
 
-export type ServiceMixin<A> = (service: FeathersService<A>, path: string, options: ServiceOptions) => void;
+export type CustomMethod<T = any, R = T, P extends Params = Params> = (data: T, params?: P) => Promise<R>
 
-export type ServiceGenericType<S> = S extends ServiceInterface<infer T> ? T : any;
-export type ServiceGenericData<S> = S extends ServiceInterface<infer _T, infer D> ? D : any;
-export type ServiceGenericParams<S> = S extends ServiceInterface<infer _T, infer _D, infer P> ? P : any;
+export type ServiceMixin<A> = (service: FeathersService<A>, path: string, options: ServiceOptions) => void
+
+export type ServiceGenericType<S> = S extends ServiceInterface<infer T> ? T : any
+export type ServiceGenericData<S> = S extends ServiceInterface<infer _T, infer D> ? D : any
+export 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
    */
-  version: string;
+  version: string
 
   /**
    * A list of callbacks that run when a new service is registered
    */
-  mixins: ServiceMixin<Application<Services, Settings>>[];
+  mixins: ServiceMixin<Application<Services, Settings>>[]
 
   /**
    * The index of all services keyed by their path.
@@ -136,30 +114,25 @@ export interface FeathersApplication<Services = any, Settings = any> {
    * __Important:__ Services should always be retrieved via `app.service('name')`
    * not via `app.services`.
    */
-  services: Services;
+  services: Services
 
   /**
    * The application settings that can be used via
    * `app.get` and `app.set`
    */
-  settings: Settings;
+  settings: Settings
 
   /**
    * 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>;
+  _isSetup: boolean
 
   /**
    * Retrieve an application setting by name
    *
    * @param name The setting name
    */
-  get<L extends keyof Settings & string> (name: L): Settings[L];
+  get<L extends keyof Settings & string>(name: L): Settings[L]
 
   /**
    * Set an application setting
@@ -167,14 +140,14 @@ export interface FeathersApplication<Services = any, Settings = any> {
    * @param name The setting name
    * @param value The setting value
    */
-  set<L extends keyof Settings & string> (name: L, value: Settings[L]): this;
+  set<L extends keyof Settings & string>(name: L, value: Settings[L]): this
 
   /**
    * Runs a callback configure function with the current application instance.
    *
    * @param callback The callback `(app: Application) => {}` to run
    */
-  configure (callback: (this: this, app: this) => void): this;
+  configure(callback: (this: this, app: this) => void): this
 
   /**
    * Returns a fallback service instance that will be registered
@@ -183,7 +156,7 @@ export interface FeathersApplication<Services = any, Settings = any> {
    *
    * @param location The path of the service
    */
-  defaultService (location: string): ServiceInterface;
+  defaultService(location: string): ServiceInterface
 
   /**
    * Register a new service or a sub-app. When passed another
@@ -195,11 +168,11 @@ export interface FeathersApplication<Services = any, Settings = any> {
    * Feathers application to use a sub-app under the `path` prefix.
    * @param options The options for this service
    */
-  use<L extends keyof Services & string> (
+  use<L extends keyof Services & string>(
     path: L,
     service: keyof any extends keyof Services ? ServiceInterface | Application : Services[L],
     options?: ServiceOptions
-  ): this;
+  ): this
 
   /**
    * Get the Feathers service instance for a path. This will
@@ -208,65 +181,65 @@ export interface FeathersApplication<Services = any, Settings = any> {
    *
    * @param path The name of the service.
    */
-  service<L extends keyof Services & string> (
+  service<L extends keyof Services & string>(
     path: L
-  ): FeathersService<this, keyof any extends keyof Services ? Service : Services[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>;
+  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>;
+  teardown(server?: any): Promise<this>
 
   /**
    * Register application level hooks.
    *
    * @param map The application hook settings.
    */
-  hooks (map: ApplicationHookOptions<this>): this;
+  hooks(map: ApplicationHookOptions<this>): this
 }
 
 // This needs to be an interface instead of a type
 // so that the declaration can be extended by other modules
-export interface Application<Services = any, Settings = any> extends FeathersApplication<Services, Settings>, EventEmitter {
-
-}
+export interface Application<Services = any, Settings = any>
+  extends FeathersApplication<Services, Settings>,
+    EventEmitter {}
 
-export type Id = number | string;
-export type NullableId = Id | null;
+export type Id = number | string
+export type NullableId = Id | null
 
 export interface Query {
-  [key: string]: any;
+  [key: string]: any
 }
 
 export interface Params<Q = Query> {
-  query?: Q;
-  provider?: string;
-  route?: { [key: string]: any };
-  headers?: { [key: string]: any };
+  query?: Q
+  provider?: string
+  route?: { [key: string]: any }
+  headers?: { [key: string]: any }
 }
 
 export interface Http {
   /**
    * A writeable, optional property with status code override.
    */
-  status?: number;
+  status?: number
   /**
    * A writeable, optional property with headers.
    */
-  headers?: { [key: string]: string | string[] };
+  headers?: { [key: string]: string | string[] }
   /**
    * A writeable, optional property with `Location` header's value.
    */
-  location?: string;
+  location?: string
 }
 
 export interface HookContext<A = Application, S = any> extends BaseHookContext<ServiceGenericType<S>> {
@@ -274,52 +247,52 @@ export interface HookContext<A = Application, S = any> extends BaseHookContext<S
    * A read only property that contains the Feathers application object. This can be used to
    * retrieve other services (via context.app.service('name')) or configuration values.
    */
-  readonly app: A;
+  readonly app: A
   /**
    * A read only property with the name of the service method (one of find, get,
    * create, update, patch, remove).
    */
-  readonly method: string;
+  readonly method: string
   /**
    * A read only property and contains the service name (or path) without leading or
    * trailing slashes.
    */
-  readonly path: string;
+  readonly path: string
   /**
    * A read only property and contains the service this hook currently runs on.
    */
-  readonly service: S;
+  readonly service: S
   /**
    * A read only property with the hook type (one of before, after or error).
    * Will be `null` for asynchronous hooks.
    */
-  readonly type: null | 'before' | 'after' | 'error';
+  readonly type: null | 'before' | 'after' | 'error'
   /**
    * The list of method arguments. Should not be modified, modify the
    * `params`, `data` and `id` properties instead.
    */
-  readonly arguments: any[];
+  readonly arguments: any[]
   /**
    * A writeable property containing the data of a create, update and patch service
    * method call.
    */
-  data?: ServiceGenericData<S>;
+  data?: ServiceGenericData<S>
   /**
    * A writeable property with the error object that was thrown in a failed method call.
    * It is only available in error hooks.
    */
-  error?: any;
+  error?: any
   /**
    * A writeable property and the id for a get, remove, update and patch service
    * method call. For remove, update and patch context.id can also be null when
    * modifying multiple entries. In all other cases it will be undefined.
    */
-  id?: Id;
+  id?: Id
   /**
    * A writeable property that contains the service method parameters (including
    * params.query).
    */
-  params: ServiceGenericParams<S>;
+  params: ServiceGenericParams<S>
   /**
    * A writeable property containing the result of the successful service method call.
    * It is only available in after hooks.
@@ -329,70 +302,75 @@ export interface HookContext<A = Application, S = any> extends BaseHookContext<S
    * - A before hook to skip the actual service method (database) call
    * - An error hook to swallow the error and return a result instead
    */
-  result?: ServiceGenericType<S>;
+  result?: ServiceGenericType<S>
   /**
    * A writeable, optional property and contains a 'safe' version of the data that
    * should be sent to any client. If context.dispatch has not been set context.result
    * will be sent to the client instead.
    */
-  dispatch?: ServiceGenericType<S>;
+  dispatch?: ServiceGenericType<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;
+  statusCode?: number
   /**
    * A writeable, optional property with options specific to HTTP transports.
    */
-  http?: Http;
+  http?: Http
   /**
    * The event emitted by this method. Can be set to `null` to skip event emitting.
    */
-  event: string|null;
+  event: string | null
 }
 
 // Regular hook typings
-export type RegularHookFunction<A = Application, S = Service> =
-  (this: S, context: HookContext<A, S>) => (Promise<HookContext<Application, S> | void> | HookContext<Application, S> | void);
-
-export type Hook<A = Application, S = Service> = RegularHookFunction<A, S>;
+export type HookFunction<A = Application, S = Service> = (
+  this: S,
+  context: HookContext<A, S>
+) => Promise<HookContext<Application, S> | void> | HookContext<Application, S> | void
 
-type RegularHookMethodMap<A, S> =
-  { [L in keyof S]?: SelfOrArray<RegularHookFunction<A, S>>; } &
-  { all?: SelfOrArray<RegularHookFunction<A, S>> };
+export type Hook<A = Application, S = Service> = HookFunction<A, S>
 
-type RegularHookTypeMap<A, S> =
-  SelfOrArray<RegularHookFunction<A, S>> | RegularHookMethodMap<A, S>;
+type HookMethodMap<A, S> = {
+  [L in keyof S]?: SelfOrArray<HookFunction<A, S>>
+} & { all?: SelfOrArray<HookFunction<A, S>> }
 
-export type RegularHookMap<A, S> = {
-  before?: RegularHookTypeMap<A, S>,
-  after?: RegularHookTypeMap<A, S>,
-  error?: RegularHookTypeMap<A, S>
-}
+type HookTypeMap<A, S> = SelfOrArray<HookFunction<A, S>> | HookMethodMap<A, S>
 
 // New @feathersjs/hook typings
-export type HookFunction<A = Application, S = Service> =
-  (context: HookContext<A, S>, next: NextFunction) => Promise<void>;
+export type AroundHookFunction<A = Application, S = Service> = (
+  context: HookContext<A, S>,
+  next: NextFunction
+) => Promise<void>
+
+export type AroundHookMap<A, S> = {
+  [L in keyof S]?: AroundHookFunction<A, S>[]
+} & { all?: AroundHookFunction<A, S>[] }
 
 export 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 type HookOptions<A, S> =
-  HookMap<A, S> | HookFunction<A, S>[] | RegularHookMap<A, S>;
+export type HookOptions<A, S> = AroundHookMap<A, S> | AroundHookFunction<A, S>[] | HookMap<A, S>
 
 export interface ApplicationHookContext<A = Application> extends BaseHookContext {
-  app: A;
-  server: any;
+  app: A
+  server: any
 }
 
-export type ApplicationHookFunction<A> =
-  (context: ApplicationHookContext<A>, next: NextFunction) => Promise<void>;
+export type ApplicationHookFunction<A> = (
+  context: ApplicationHookContext<A>,
+  next: NextFunction
+) => Promise<void>
 
 export type ApplicationHookMap<A> = {
-  setup?: ApplicationHookFunction<A>[],
+  setup?: ApplicationHookFunction<A>[]
   teardown?: ApplicationHookFunction<A>[]
 }
 

package/src/events.ts

@@ -1,31 +1,31 @@
-import { NextFunction, EventEmitter } from './dependencies';
-import { HookContext, FeathersService } from './declarations';
-import { getServiceOptions, defaultEventMap } from './service';
+import { EventEmitter } from 'events'
+import { NextFunction } from '@feathersjs/hooks'
+import { HookContext, FeathersService } from './declarations'
+import { getServiceOptions, defaultEventMap } from './service'
 
-export function eventHook (context: HookContext, next: NextFunction) {
-  const { events } = getServiceOptions((context as any).self);
-  const defaultEvent = (defaultEventMap as any)[context.method] || null;
+export function eventHook(context: HookContext, next: NextFunction) {
+  const { events } = getServiceOptions((context as any).self)
+  const defaultEvent = (defaultEventMap as any)[context.method] || null
 
-  context.event = defaultEvent;
+  context.event = defaultEvent
 
   return next().then(() => {
     // Send the event only if the service does not do so already (indicated in the `events` option)
     // 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 ];
+      const results = Array.isArray(context.result) ? context.result : [context.result]
 
-      results.forEach(element => (context as any).self.emit(context.event, element, context));
+      results.forEach((element) => (context as any).self.emit(context.event, element, context))
     }
-  });
+  })
 }
 
-export function eventMixin<A> (service: FeathersService<A>) {
-  const isEmitter = typeof service.on === 'function' &&
-    typeof service.emit === 'function';
+export function eventMixin<A>(service: FeathersService<A>) {
+  const isEmitter = typeof service.on === 'function' && typeof service.emit === 'function'
 
   if (!isEmitter) {
-    Object.assign(service, EventEmitter.prototype);
+    Object.assign(service, EventEmitter.prototype)
   }
 
-  return service;
+  return service
 }