@feathersjs/feathers 5.0.0-pre.6 → 5.0.0

package/src/hooks.ts

@@ -0,0 +1,234 @@
+import {
+  getManager,
+  HookContextData,
+  HookManager,
+  HookMap as BaseHookMap,
+  hooks,
+  Middleware,
+  collect
+} from '@feathersjs/hooks'
+import {
+  Service,
+  ServiceOptions,
+  HookContext,
+  FeathersService,
+  HookMap,
+  AroundHookFunction,
+  HookFunction,
+  HookType
+} from './declarations'
+import { defaultServiceArguments, getHookMethods } from './service'
+
+type ConvertedMap = { [type in HookType]: ReturnType<typeof convertHookData> }
+
+type HookStore = {
+  around: { [method: string]: AroundHookFunction[] }
+  before: { [method: string]: HookFunction[] }
+  after: { [method: string]: HookFunction[] }
+  error: { [method: string]: HookFunction[] }
+  collected: { [method: string]: AroundHookFunction[] }
+  collectedAll: { before?: AroundHookFunction[]; after?: AroundHookFunction[] }
+}
+
+type HookEnabled = { __hooks: HookStore }
+
+const types: HookType[] = ['before', 'after', 'error', 'around']
+
+const isType = (value: any): value is HookType => types.includes(value)
+
+// Converts different hook registration formats into the
+// same internal format
+export function convertHookData(input: any) {
+  const result: { [method: string]: HookFunction[] | AroundHookFunction[] } = {}
+
+  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
+}
+
+export function collectHooks(target: HookEnabled, method: string) {
+  const { collected, collectedAll, around } = target.__hooks
+
+  return [
+    ...(around.all || []),
+    ...(around[method] || []),
+    ...(collectedAll.before || []),
+    ...(collected[method] || []),
+    ...(collectedAll.after || [])
+  ] as AroundHookFunction[]
+}
+
+// Add `.hooks` functionality to an object
+export function enableHooks(object: any) {
+  const store: HookStore = {
+    around: {},
+    before: {},
+    after: {},
+    error: {},
+    collected: {},
+    collectedAll: {}
+  }
+
+  Object.defineProperty(object, '__hooks', {
+    configurable: true,
+    value: store,
+    writable: true
+  })
+
+  return function registerHooks(this: HookEnabled, input: HookMap<any, any>) {
+    const store = this.__hooks
+    const map = Object.keys(input).reduce((map, type) => {
+      if (!isType(type)) {
+        throw new Error(`'${type}' is not a valid hook type`)
+      }
+
+      map[type] = convertHookData(input[type])
+
+      return map
+    }, {} as ConvertedMap)
+    const types = Object.keys(map) as HookType[]
+
+    types.forEach((type) =>
+      Object.keys(map[type]).forEach((method) => {
+        const mapHooks = map[type][method]
+        const storeHooks: any[] = (store[type][method] ||= [])
+
+        storeHooks.push(...mapHooks)
+
+        if (method === 'all') {
+          if (store.before[method] || store.error[method]) {
+            const beforeAll = collect({
+              before: store.before[method] || [],
+              error: store.error[method] || []
+            })
+            store.collectedAll.before = [beforeAll]
+          }
+
+          if (store.after[method]) {
+            const afterAll = collect({
+              after: store.after[method] || []
+            })
+            store.collectedAll.after = [afterAll]
+          }
+        } else {
+          if (store.before[method] || store.after[method] || store.error[method]) {
+            const collected = collect({
+              before: store.before[method] || [],
+              after: store.after[method] || [],
+              error: store.error[method] || []
+            })
+
+            store.collected[method] = [collected]
+          }
+        }
+      })
+    )
+
+    return this
+  }
+}
+
+export function createContext(service: Service, method: string, data: HookContextData = {}) {
+  const createContext = (service as any)[method].createContext
+
+  if (typeof createContext !== 'function') {
+    throw new Error(`Can not create context for method ${method}`)
+  }
+
+  return createContext(data) as HookContext
+}
+
+export class FeathersHookManager<A> extends HookManager {
+  constructor(public app: A, public method: string) {
+    super()
+    this._middleware = []
+  }
+
+  collectMiddleware(self: any, args: any[]): Middleware[] {
+    const appHooks = collectHooks(this.app as any as HookEnabled, this.method)
+    const middleware = super.collectMiddleware(self, args)
+    const methodHooks = collectHooks(self, this.method)
+
+    return [...appHooks, ...middleware, ...methodHooks]
+  }
+
+  initializeContext(self: any, args: any[], context: HookContext) {
+    const ctx = super.initializeContext(self, args, context)
+
+    ctx.params = ctx.params || {}
+
+    return ctx
+  }
+
+  middleware(mw: Middleware[]) {
+    this._middleware.push(...mw)
+    return this
+  }
+}
+
+export function hookMixin<A>(this: A, service: FeathersService<A>, path: string, options: ServiceOptions) {
+  if (typeof service.hooks === 'function') {
+    return service
+  }
+
+  const hookMethods = getHookMethods(service, options)
+
+  const serviceMethodHooks = hookMethods.reduce((res, method) => {
+    const params = (defaultServiceArguments as any)[method] || ['data', 'params']
+
+    res[method] = new FeathersHookManager<A>(this, method).params(...params).props({
+      app: this,
+      path,
+      method,
+      service,
+      event: null,
+      type: 'around',
+      get statusCode() {
+        return this.http?.status
+      },
+      set statusCode(value: number) {
+        this.http = this.http || {}
+        this.http.status = value
+      }
+    })
+
+    return res
+  }, {} as BaseHookMap)
+
+  const registerHooks = enableHooks(service)
+
+  hooks(service, serviceMethodHooks)
+
+  service.hooks = function (this: any, hookOptions: any) {
+    if (hookOptions.before || hookOptions.after || hookOptions.error || hookOptions.around) {
+      return registerHooks.call(this, hookOptions)
+    }
+
+    if (Array.isArray(hookOptions)) {
+      return hooks(this, hookOptions)
+    }
+
+    Object.keys(hookOptions).forEach((method) => {
+      const manager = 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
+}

package/src/index.ts

@@ -1,19 +1,20 @@
-import { setDebug } from './dependencies';
-import version from './version';
-import { Feathers } from './application';
-import { Application } from './declarations';
+import { setDebug } from '@feathersjs/commons'
 
-export function feathers<T = any, S = any> () {
-  return new Feathers<T, S>() as Application<T, S>;
+import version from './version'
+import { Feathers } from './application'
+import { Application } from './declarations'
+
+export function feathers<T = any, S = any>() {
+  return new Feathers<T, S>() as Application<T, S>
 }
 
-feathers.setDebug = setDebug;
+feathers.setDebug = setDebug
 
-export { version, Feathers };
-export * from './hooks/index';
-export * from './declarations';
-export * from './service';
+export { version, Feathers }
+export * from './hooks'
+export * from './declarations'
+export * from './service'
 
 if (typeof module !== 'undefined') {
-  module.exports = Object.assign(feathers, module.exports);
+  module.exports = Object.assign(feathers, module.exports)
 }

package/src/service.ts

@@ -1,18 +1,18 @@
-import { createSymbol, EventEmitter } from './dependencies';
-import { ServiceOptions } from './declarations';
+import { EventEmitter } from 'events'
+import { createSymbol } from '@feathersjs/commons'
+import { ServiceOptions } from './declarations'
 
-export const SERVICE = createSymbol('@feathersjs/service');
+export const SERVICE = createSymbol('@feathersjs/service')
 
 export const defaultServiceArguments = {
-  find: [ 'params' ],
-  get: [ 'id', 'params' ],
-  create: [ 'data', 'params' ],
-  update: [ 'id', 'data', 'params' ],
-  patch: [ 'id', 'data', 'params' ],
-  remove: [ 'id', 'params' ]
+  find: ['params'],
+  get: ['id', 'params'],
+  create: ['data', 'params'],
+  update: ['id', 'data', 'params'],
+  patch: ['id', 'data', 'params'],
+  remove: ['id', 'params']
 }
-
-export const defaultServiceMethods = Object.keys(defaultServiceArguments);
+export const defaultServiceMethods = ['find', 'get', 'create', 'update', 'patch', 'remove']
 
 export const defaultEventMap = {
   create: 'created',
@@ -21,70 +21,58 @@ export const defaultEventMap = {
   remove: 'removed'
 }
 
+export const defaultServiceEvents = Object.values(defaultEventMap)
+
 export const protectedMethods = Object.keys(Object.prototype)
   .concat(Object.keys(EventEmitter.prototype))
-  .concat([
-    'before',
-    'after',
-    'error',
-    'hooks',
-    'setup',
-    'publish'
-  ]);
+  .concat(['all', 'around', 'before', 'after', 'error', 'hooks', 'setup', 'teardown', 'publish'])
 
-export function getHookMethods (service: any, options: ServiceOptions) {
-  const { methods } = options;
+export function getHookMethods(service: any, options: ServiceOptions) {
+  const { methods } = options
 
-  return defaultServiceMethods.filter(m =>
-    typeof service[m] === 'function' && !methods.includes(m)
-  ).concat(methods);
+  return (defaultServiceMethods as any as string[])
+    .filter((m) => typeof service[m] === 'function' && !methods.includes(m))
+    .concat(methods)
 }
 
-export function getServiceOptions (
-  service: any, options: ServiceOptions = {}
-): ServiceOptions {
-  const existingOptions = service[SERVICE];
-
-  if (existingOptions) {
-    return existingOptions;
-  }
+export function getServiceOptions(service: any): ServiceOptions {
+  return service[SERVICE]
+}
 
+export const normalizeServiceOptions = (service: any, options: ServiceOptions = {}): ServiceOptions => {
   const {
-    methods = defaultServiceMethods.filter(method =>
-      typeof service[method] === 'function'
-    ),
+    methods = defaultServiceMethods.filter((method) => typeof service[method] === 'function'),
     events = service.events || []
-  } = options;
-  const {
-    serviceEvents = Object.values(defaultEventMap).concat(events)
-  } = options;
+  } = options
+  const serviceEvents = options.serviceEvents || defaultServiceEvents.concat(events)
 
   return {
     ...options,
     events,
     methods,
     serviceEvents
-  };
+  }
 }
 
-export function wrapService (
-  location: string, service: any, options: ServiceOptions
-) {
+export function wrapService(location: string, service: any, options: ServiceOptions) {
   // Do nothing if this is already an initialized
   if (service[SERVICE]) {
-    return service;
+    return service
   }
 
-  const protoService = Object.create(service);
-  const serviceOptions = getServiceOptions(service, options);
+  const protoService = Object.create(service)
+  const serviceOptions = normalizeServiceOptions(service, options)
 
-  if (Object.keys(serviceOptions.methods).length === 0 && typeof service.setup !== 'function') {
-    throw new Error(`Invalid service object passed for path \`${location}\``);
+  if (
+    Object.keys(serviceOptions.methods).length === 0 &&
+    ![...defaultServiceMethods, 'setup', 'teardown'].some((method) => typeof service[method] === 'function')
+  ) {
+    throw new Error(`Invalid service object passed for path \`${location}\``)
   }
 
   Object.defineProperty(protoService, SERVICE, {
     value: serviceOptions
-  });
+  })
 
-  return protoService;
+  return protoService
 }

package/src/version.ts

@@ -1 +1 @@
-export default '5.0.0-pre.6';
+export default '5.0.0'

package/lib/dependencies.d.ts

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

package/lib/dependencies.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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

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

package/lib/hooks/index.d.ts

@@ -1,14 +0,0 @@
-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 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/lib/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>>>;

package/lib/hooks/index.js

@@ -1,84 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hookMixin = exports.FeathersHookManager = exports.createContext = exports.fromErrorHooks = exports.fromBeforeHook = exports.fromAfterHook = 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; } });
-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 dependencies_1.HookManager {
-    constructor(app, method) {
-        super();
-        this.app = app;
-        this.method = method;
-        this._middleware = [];
-    }
-    collectMiddleware(self, args) {
-        const app = this.app;
-        const appHooks = app.appHooks[dependencies_1.HOOKS].concat(app.appHooks[this.method] || []);
-        const legacyAppHooks = legacy_1.collectLegacyHooks(this.app, this.method);
-        const middleware = super.collectMiddleware(self, args);
-        const legacyHooks = legacy_1.collectLegacyHooks(self, this.method);
-        return [...appHooks, ...legacyAppHooks, ...middleware, ...legacyHooks];
-    }
-    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 app = this;
-    const serviceMethodHooks = service_1.getHookMethods(service, options).reduce((res, method) => {
-        const params = service_1.defaultServiceArguments[method] || ['data', 'params'];
-        res[method] = new FeathersHookManager(app, method)
-            .params(...params)
-            .props({
-            app,
-            path,
-            method,
-            service,
-            event: null,
-            type: null
-        });
-        return res;
-    }, {});
-    const handleLegacyHooks = legacy_1.enableLegacyHooks(service);
-    dependencies_1.hooks(service, serviceMethodHooks);
-    service.hooks = function (hookOptions) {
-        if (hookOptions.before || hookOptions.after || hookOptions.error) {
-            return handleLegacyHooks.call(this, hookOptions);
-        }
-        if (Array.isArray(hookOptions)) {
-            return dependencies_1.hooks(this, hookOptions);
-        }
-        Object.keys(hookOptions).forEach(method => {
-            const manager = dependencies_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=index.js.map

package/lib/hooks/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,kDAEyB;AAIzB,wCAAqE;AACrE,qCAMkB;AAET,8FALP,sBAAa,OAKO;AAAE,+FAJtB,uBAAc,OAIsB;AAAE,+FAHtC,uBAAc,OAGsC;AAEtD,SAAgB,aAAa,CAAE,OAAqB,EAAE,MAAc,EAAE,OAAwB,EAAE;IAC9F,MAAM,aAAa,GAAI,OAAe,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;IAE7D,IAAI,OAAO,aAAa,KAAK,UAAU,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,qCAAqC,MAAM,EAAE,CAAC,CAAC;KAChE;IAED,OAAO,aAAa,CAAC,IAAI,CAAgB,CAAC;AAC5C,CAAC;AARD,sCAQC;AAED,MAAa,mBAAuB,SAAQ,0BAAW;IACrD,YAAoB,GAAM,EAAS,MAAc;QAC/C,KAAK,EAAE,CAAC;QADU,QAAG,GAAH,GAAG,CAAG;QAAS,WAAM,GAAN,MAAM,CAAQ;QAE/C,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,iBAAiB,CAAE,IAAS,EAAE,IAAW;QACvC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAyB,CAAC;QAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,oBAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7E,MAAM,cAAc,GAAG,2BAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACjE,MAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,2BAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1D,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,cAAc,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC,CAAC;IACzE,CAAC;IAED,iBAAiB,CAAE,IAAS,EAAE,IAAW,EAAE,OAAoB;QAC7D,MAAM,GAAG,GAAG,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzD,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;QAE9B,OAAO,GAAG,CAAC;IACb,CAAC;IAED,UAAU,CAAE,EAAgB;QAC1B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA5BD,kDA4BC;AAED,SAAgB,SAAS,CACd,OAA2B,EAAE,IAAY,EAAE,OAAuB;IAE3E,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,EAAE;QACvC,OAAO,OAAO,CAAC;KAChB;IAED,MAAM,GAAG,GAAG,IAAI,CAAC;IACjB,MAAM,kBAAkB,GAAG,wBAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QACjF,MAAM,MAAM,GAAI,iCAA+B,CAAC,MAAM,CAAC,IAAI,CAAE,MAAM,EAAE,QAAQ,CAAE,CAAC;QAEhF,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,mBAAmB,CAAI,GAAG,EAAE,MAAM,CAAC;aAClD,MAAM,CAAC,GAAG,MAAM,CAAC;aACjB,KAAK,CAAC;YACL,GAAG;YACH,IAAI;YACJ,MAAM;YACN,OAAO;YACP,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QAEL,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAa,CAAC,CAAC;IAClB,MAAM,iBAAiB,GAAG,0BAAiB,CAAC,OAAO,CAAC,CAAC;IAErD,oBAAK,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAEnC,OAAO,CAAC,KAAK,GAAG,UAAqB,WAAgB;QACnD,IAAI,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,EAAE;YAChE,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;SAClD;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC9B,OAAO,oBAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;SACjC;QAED,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACxC,MAAM,OAAO,GAAG,yBAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAEzC,IAAI,CAAC,CAAC,OAAO,YAAY,mBAAmB,CAAC,EAAE;gBAC7C,MAAM,IAAI,KAAK,CAAC,UAAU,MAAM,iDAAiD,CAAC,CAAC;aACpF;YAED,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAnDD,8BAmDC"}

package/lib/hooks/legacy.d.ts

@@ -1,7 +0,0 @@
-import { LegacyHookFunction } from '../declarations';
-export declare function fromBeforeHook(hook: LegacyHookFunction): (context: any, next: any) => Promise<any>;
-export declare function fromAfterHook(hook: LegacyHookFunction): (context: any, next: any) => any;
-export declare function fromErrorHooks(hooks: LegacyHookFunction[]): (context: any, next: any) => any;
-export declare function collectLegacyHooks(target: any, method: string): any[];
-export declare function convertHookData(obj: any): any;
-export declare function enableLegacyHooks(obj: any, methods?: string[], types?: string[]): (this: any, allHooks: any) => any;

package/lib/hooks/legacy.js

@@ -1,114 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.enableLegacyHooks = exports.convertHookData = exports.collectLegacyHooks = exports.fromErrorHooks = exports.fromAfterHook = exports.fromBeforeHook = void 0;
-const dependencies_1 = require("../dependencies");
-const { each } = dependencies_1._;
-function fromBeforeHook(hook) {
-    return (context, next) => {
-        context.type = 'before';
-        return Promise.resolve(hook.call(context.self, context)).then(() => {
-            context.type = null;
-            return next();
-        });
-    };
-}
-exports.fromBeforeHook = fromBeforeHook;
-function fromAfterHook(hook) {
-    return (context, next) => {
-        return next().then(() => {
-            context.type = 'after';
-            return hook.call(context.self, context);
-        }).then(() => {
-            context.type = null;
-        });
-    };
-}
-exports.fromAfterHook = fromAfterHook;
-function fromErrorHooks(hooks) {
-    return (context, next) => {
-        return next().catch((error) => {
-            let promise = Promise.resolve();
-            context.original = Object.assign({}, context);
-            context.error = error;
-            context.type = 'error';
-            delete context.result;
-            for (const hook of hooks) {
-                promise = promise.then(() => hook.call(context.self, context));
-            }
-            return promise.then(() => {
-                context.type = null;
-                if (context.result === undefined) {
-                    throw context.error;
-                }
-            });
-        });
-    };
-}
-exports.fromErrorHooks = fromErrorHooks;
-function collectLegacyHooks(target, method) {
-    const { before: { [method]: before = [] }, after: { [method]: after = [] }, error: { [method]: error = [] } } = target.__hooks;
-    const beforeHooks = before;
-    const afterHooks = [...after].reverse();
-    const errorHook = fromErrorHooks(error);
-    return [errorHook, ...beforeHooks, ...afterHooks];
-}
-exports.collectLegacyHooks = collectLegacyHooks;
-// Converts different hook registration formats into the
-// same internal format
-function convertHookData(obj) {
-    let hook = {};
-    if (Array.isArray(obj)) {
-        hook = { all: obj };
-    }
-    else if (typeof obj !== 'object') {
-        hook = { all: [obj] };
-    }
-    else {
-        each(obj, function (value, key) {
-            hook[key] = !Array.isArray(value) ? [value] : value;
-        });
-    }
-    return hook;
-}
-exports.convertHookData = convertHookData;
-// Add `.hooks` functionality to an object
-function enableLegacyHooks(obj, methods = ['find', 'get', 'create', 'update', 'patch', 'remove'], types = ['before', 'after', 'error']) {
-    const hookData = {};
-    types.forEach(type => {
-        // Initialize properties where hook functions are stored
-        hookData[type] = {};
-    });
-    // Add non-enumerable `__hooks` property to the object
-    Object.defineProperty(obj, '__hooks', {
-        configurable: true,
-        value: hookData,
-        writable: true
-    });
-    return function legacyHooks(allHooks) {
-        each(allHooks, (current, type) => {
-            if (!this.__hooks[type]) {
-                throw new Error(`'${type}' is not a valid hook type`);
-            }
-            const hooks = convertHookData(current);
-            each(hooks, (_value, method) => {
-                if (method !== 'all' && methods.indexOf(method) === -1) {
-                    throw new Error(`'${method}' is not a valid hook method`);
-                }
-            });
-            methods.forEach(method => {
-                let currentHooks = [...(hooks.all || []), ...(hooks[method] || [])];
-                this.__hooks[type][method] = this.__hooks[type][method] || [];
-                if (type === 'before') {
-                    currentHooks = currentHooks.map(fromBeforeHook);
-                }
-                if (type === 'after') {
-                    currentHooks = currentHooks.map(fromAfterHook);
-                }
-                this.__hooks[type][method].push(...currentHooks);
-            });
-        });
-        return this;
-    };
-}
-exports.enableLegacyHooks = enableLegacyHooks;
-//# sourceMappingURL=legacy.js.map

package/lib/hooks/legacy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../src/hooks/legacy.ts"],"names":[],"mappings":";;;AAAA,kDAAoC;AAGpC,MAAM,EAAE,IAAI,EAAE,GAAG,gBAAC,CAAC;AAEnB,SAAgB,cAAc,CAAE,IAAwB;IACtD,OAAO,CAAC,OAAY,EAAE,IAAS,EAAE,EAAE;QACjC,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC;QAExB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACjE,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;YACpB,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AATD,wCASC;AAED,SAAgB,aAAa,CAAE,IAAwB;IACrD,OAAO,CAAC,OAAY,EAAE,IAAS,EAAE,EAAE;QACjC,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACtB,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC;YACvB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACzC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACX,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC,CAAA;AACH,CAAC;AATD,sCASC;AAED,SAAgB,cAAc,CAAE,KAA2B;IACzD,OAAO,CAAC,OAAY,EAAE,IAAS,EAAE,EAAE;QACjC,OAAO,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;YACjC,IAAI,OAAO,GAAiB,OAAO,CAAC,OAAO,EAAE,CAAC;YAE9C,OAAO,CAAC,QAAQ,qBAAQ,OAAO,CAAE,CAAC;YAClC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;YACtB,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC;YAEvB,OAAO,OAAO,CAAC,MAAM,CAAC;YAEtB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;aAC/D;YAED,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;gBACvB,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;gBAEpB,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;oBAChC,MAAM,OAAO,CAAC,KAAK,CAAC;iBACrB;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAA;AACH,CAAC;AAxBD,wCAwBC;AAED,SAAgB,kBAAkB,CAAE,MAAW,EAAE,MAAc;IAC7D,MAAM,EACJ,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,EACjC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,EAC/B,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,EAChC,GAAG,MAAM,CAAC,OAAO,CAAC;IACnB,MAAM,WAAW,GAAG,MAAM,CAAC;IAC3B,MAAM,UAAU,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IACxC,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAExC,OAAO,CAAC,SAAS,EAAE,GAAG,WAAW,EAAE,GAAG,UAAU,CAAC,CAAC;AACpD,CAAC;AAXD,gDAWC;AAED,wDAAwD;AACxD,uBAAuB;AACvB,SAAgB,eAAe,CAAE,GAAQ;IACvC,IAAI,IAAI,GAAQ,EAAE,CAAC;IAEnB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACtB,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;KACrB;SAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAClC,IAAI,GAAG,EAAE,GAAG,EAAE,CAAE,GAAG,CAAE,EAAE,CAAC;KACzB;SAAM;QACL,IAAI,CAAC,GAAG,EAAE,UAAU,KAAK,EAAE,GAAG;YAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAE,KAAK,CAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QACxD,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAdD,0CAcC;AAED,0CAA0C;AAC1C,SAAgB,iBAAiB,CAC/B,GAAQ,EACR,UAAoB,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC1E,QAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC;IAE9C,MAAM,QAAQ,GAAQ,EAAE,CAAC;IAEzB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,wDAAwD;QACxD,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,sDAAsD;IACtD,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,EAAE;QACpC,YAAY,EAAE,IAAI;QAClB,KAAK,EAAE,QAAQ;QACf,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IAEH,OAAO,SAAS,WAAW,CAAa,QAAa;QACnD,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAY,EAAE,IAAI,EAAE,EAAE;YACpC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,4BAA4B,CAAC,CAAC;aACvD;YAED,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;YAEvC,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;gBAC7B,IAAI,MAAM,KAAK,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;oBACtD,MAAM,IAAI,KAAK,CAAC,IAAI,MAAM,8BAA8B,CAAC,CAAC;iBAC3D;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBACvB,IAAI,YAAY,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAEpE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBAE9D,IAAI,IAAI,KAAK,QAAQ,EAAE;oBACrB,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;iBACjD;gBAED,IAAI,IAAI,KAAK,OAAO,EAAE;oBACpB,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;iBAChD;gBAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC;AApDD,8CAoDC"}

package/src/dependencies.ts

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