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

package/lib/hooks/regular.js

@@ -1,169 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.enableRegularHooks = exports.convertHookData = exports.collectRegularHooks = exports.fromErrorHooks = exports.fromAfterHooks = exports.fromBeforeHooks = exports.fromErrorHook = exports.fromAfterHook = exports.fromBeforeHook = void 0;
-const service_1 = require("../service");
-const runHook = (hook, context, type) => {
-    if (type)
-        context.type = type;
-    return Promise.resolve(hook.call(context.self, context))
-        .then((res) => {
-        if (type)
-            context.type = null;
-        if (res && res !== context) {
-            Object.assign(context, res);
-        }
-    });
-};
-function fromBeforeHook(hook) {
-    return (context, next) => {
-        return runHook(hook, context, 'before').then(next);
-    };
-}
-exports.fromBeforeHook = fromBeforeHook;
-function fromAfterHook(hook) {
-    return (context, next) => {
-        return next().then(() => runHook(hook, context, 'after'));
-    };
-}
-exports.fromAfterHook = fromAfterHook;
-function fromErrorHook(hook) {
-    return (context, next) => {
-        return next().catch((error) => {
-            if (context.error !== error || context.result !== undefined) {
-                context.original = { ...context };
-                context.error = error;
-                delete context.result;
-            }
-            return runHook(hook, context, 'error').then(() => {
-                if (context.result === undefined && context.error !== undefined) {
-                    throw context.error;
-                }
-            });
-        });
-    };
-}
-exports.fromErrorHook = fromErrorHook;
-const RunHooks = (hooks) => (context) => {
-    return hooks.reduce((promise, hook) => {
-        return promise.then(() => runHook(hook, context));
-    }, Promise.resolve(undefined));
-};
-function fromBeforeHooks(hooks) {
-    return fromBeforeHook(RunHooks(hooks));
-}
-exports.fromBeforeHooks = fromBeforeHooks;
-function fromAfterHooks(hooks) {
-    return fromAfterHook(RunHooks(hooks));
-}
-exports.fromAfterHooks = fromAfterHooks;
-function fromErrorHooks(hooks) {
-    return fromErrorHook(RunHooks(hooks));
-}
-exports.fromErrorHooks = fromErrorHooks;
-function collectRegularHooks(target, method) {
-    return target.__hooks.hooks[method] || [];
-}
-exports.collectRegularHooks = collectRegularHooks;
-// Converts different hook registration formats into the
-// same internal format
-function convertHookData(input) {
-    const result = {};
-    if (Array.isArray(input)) {
-        result.all = input;
-    }
-    else if (typeof input !== 'object') {
-        result.all = [input];
-    }
-    else {
-        for (const key of Object.keys(input)) {
-            const value = input[key];
-            result[key] = Array.isArray(value) ? value : [value];
-        }
-    }
-    return result;
-}
-exports.convertHookData = convertHookData;
-const types = ['before', 'after', 'error'];
-const isType = (value) => types.includes(value);
-const wrappers = {
-    before: fromBeforeHooks,
-    after: fromAfterHooks,
-    error: fromErrorHooks
-};
-const createStore = (methods) => {
-    const store = {
-        before: {},
-        after: {},
-        error: {},
-        hooks: {}
-    };
-    for (const method of methods) {
-        store.hooks[method] = [];
-    }
-    return store;
-};
-const setStore = (object, store) => {
-    Object.defineProperty(object, '__hooks', {
-        configurable: true,
-        value: store,
-        writable: true
-    });
-};
-const getStore = (object) => object.__hooks;
-const createMap = (input, methods) => {
-    const map = {};
-    Object.keys(input).forEach((type) => {
-        if (!isType(type)) {
-            throw new Error(`'${type}' is not a valid hook type`);
-        }
-        const data = convertHookData(input[type]);
-        Object.keys(data).forEach((method) => {
-            if (method !== 'all' && !methods.includes(method)) {
-                throw new Error(`'${method}' is not a valid hook method`);
-            }
-        });
-        map[type] = data;
-    });
-    return map;
-};
-const createAdapter = (type) => {
-    const hooks = [];
-    const hook = wrappers[type](hooks);
-    const adapter = Object.assign(hook, { hooks });
-    return adapter;
-};
-const updateStore = (store, map) => {
-    Object.keys(store.hooks).forEach((method) => {
-        let adapted = false;
-        Object.keys(map).forEach((key) => {
-            var _a;
-            const type = key;
-            const allHooks = map[type].all || [];
-            const methodHooks = map[type][method] || [];
-            if (allHooks.length || methodHooks.length) {
-                const adapter = (_a = store[type])[method] || (_a[method] = (adapted = true, createAdapter(type)));
-                adapter.hooks.push(...allHooks, ...methodHooks);
-            }
-        });
-        if (adapted) {
-            store.hooks[method] = [
-                store.error[method],
-                store.before[method],
-                store.after[method]
-            ].filter(hook => hook);
-        }
-    });
-};
-// Add `.hooks` functionality to an object
-function enableRegularHooks(object, methods = service_1.defaultServiceMethods) {
-    const store = createStore(methods);
-    setStore(object, store);
-    return function regularHooks(input) {
-        const store = getStore(this);
-        const map = createMap(input, methods);
-        updateStore(store, map);
-        return this;
-    };
-}
-exports.enableRegularHooks = enableRegularHooks;
-//# sourceMappingURL=regular.js.map

package/lib/hooks/regular.js.map

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

package/src/dependencies.ts

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

package/src/hooks/index.ts

@@ -1,122 +0,0 @@
-import {
-  getManager, HookContextData, HookManager, HookMap, HOOKS, hooks, Middleware
-} from '../dependencies';
-import {
-  Service, ServiceOptions, HookContext, FeathersService, Application
-} from '../declarations';
-import { defaultServiceArguments, getHookMethods } from '../service';
-import {
-  collectRegularHooks,
-  enableRegularHooks
-} from './regular';
-
-export {
-  fromBeforeHook,
-  fromBeforeHooks,
-  fromAfterHook,
-  fromAfterHooks,
-  fromErrorHook,
-  fromErrorHooks
-} from './regular';
-
-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 app = this.app as any as Application;
-    const appHooks = app.appHooks[HOOKS].concat(app.appHooks[this.method] || []);
-    const regularAppHooks = collectRegularHooks(this.app, this.method);
-    const middleware = super.collectMiddleware(self, args);
-    const regularHooks = collectRegularHooks(self, this.method);
-
-    return [...appHooks, ...regularAppHooks, ...middleware, ...regularHooks];
-  }
-
-  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 app = this;
-  const hookMethods = getHookMethods(service, options);
-
-  const serviceMethodHooks = hookMethods.reduce((res, method) => {
-    const params = (defaultServiceArguments as any)[method] || [ 'data', 'params' ];
-
-    res[method] = new FeathersHookManager<A>(app, method)
-      .params(...params)
-      .props({
-        app,
-        path,
-        method,
-        service,
-        event: null,
-        type: null,
-        get statusCode () {
-          return this.http?.status;
-        },
-        set statusCode (value: number) {
-          (this.http ||= {}).status = value;
-        }
-      });
-
-    return res;
-  }, {} as HookMap);
-
-  const handleRegularHooks = enableRegularHooks(service, hookMethods);
-
-  hooks(service, serviceMethodHooks);
-
-  service.hooks = function (this: any, hookOptions: any) {
-    if (hookOptions.before || hookOptions.after || hookOptions.error) {
-      return handleRegularHooks.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/hooks/regular.ts

@@ -1,207 +0,0 @@
-import { HookFunction, RegularHookFunction, RegularHookMap } from '../declarations';
-import { defaultServiceMethods } from '../service';
-
-const runHook = <A, S> (hook: RegularHookFunction<A, S>, context: any, type?: string) => {
-  if (type) context.type = type;
-  return Promise.resolve(hook.call(context.self, context))
-    .then((res: any) => {
-      if (type) context.type = null;
-      if (res && res !== context) {
-        Object.assign(context, res);
-      }
-    });
-};
-
-export function fromBeforeHook<A, S> (hook: RegularHookFunction<A, S>): HookFunction<A, S> {
-  return (context, next) => {
-    return runHook(hook, context, 'before').then(next);
-  };
-}
-
-export function fromAfterHook<A, S> (hook: RegularHookFunction<A, S>): HookFunction<A, S> {
-  return (context, next) => {
-    return next().then(() => runHook(hook, context, 'after'));
-  }
-}
-
-export function fromErrorHook<A, S> (hook: RegularHookFunction<A, S>): HookFunction<A, S> {
-  return (context, next) => {
-    return next().catch((error: any) => {
-      if (context.error !== error || context.result !== undefined) {
-        (context as any).original = { ...context };
-        context.error = error;
-        delete context.result;
-      }
-
-      return runHook(hook, context, 'error').then(() => {
-        if (context.result === undefined && context.error !== undefined) {
-          throw context.error;
-        }
-      });
-    });
-  }
-}
-
-const RunHooks = <A, S> (hooks: RegularHookFunction<A, S>[]) => (context: any) => {
-  return hooks.reduce((promise, hook) => {
-    return promise.then(() => runHook(hook, context))
-  }, Promise.resolve(undefined));
-};
-
-export function fromBeforeHooks<A, S> (hooks: RegularHookFunction<A, S>[]) {
-  return fromBeforeHook(RunHooks(hooks));
-}
-
-export function fromAfterHooks<A, S> (hooks: RegularHookFunction<A, S>[]) {
-  return fromAfterHook(RunHooks(hooks));
-}
-
-export function fromErrorHooks<A, S> (hooks: RegularHookFunction<A, S>[]) {
-  return fromErrorHook(RunHooks(hooks));
-}
-
-export function collectRegularHooks (target: any, method: string) {
-  return target.__hooks.hooks[method] || [];
-}
-
-// Converts different hook registration formats into the
-// same internal format
-export function convertHookData (input: any) {
-  const result: { [ method: string ]: RegularHookFunction[] } = {};
-
-  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;
-}
-
-type RegularType = 'before' | 'after' | 'error';
-
-type RegularMap = { [ type in RegularType ]: ReturnType< typeof convertHookData > };
-
-type RegularAdapter = HookFunction & { hooks: RegularHookFunction[] };
-
-type RegularStore = {
-  before: { [ method: string ]: RegularAdapter },
-  after: { [ method: string ]: RegularAdapter },
-  error: { [ method: string ]: RegularAdapter },
-  hooks: { [ method: string ]: HookFunction[] }
-};
-
-const types: RegularType[] = ['before', 'after', 'error'];
-
-const isType = (value: any): value is RegularType => types.includes(value);
-
-const wrappers = {
-  before: fromBeforeHooks,
-  after: fromAfterHooks,
-  error: fromErrorHooks
-};
-
-const createStore = (methods: string[]) => {
-  const store: RegularStore = {
-    before: {},
-    after: {},
-    error: {},
-    hooks: {}
-  };
-
-  for (const method of methods) {
-    store.hooks[method] = [];
-  }
-
-  return store;
-};
-
-const setStore = (object: any, store: RegularStore) => {
-  Object.defineProperty(object, '__hooks', {
-    configurable: true,
-    value: store,
-    writable: true
-  });
-};
-
-const getStore = (object: any): RegularStore => object.__hooks;
-
-const createMap = (input: RegularHookMap<any, any>, methods: string[]) => {
-  const map = {} as RegularMap;
-
-  Object.keys(input).forEach((type) => {
-    if (!isType(type)) {
-      throw new Error(`'${type}' is not a valid hook type`);
-    }
-
-    const data = convertHookData(input[type]);
-
-    Object.keys(data).forEach((method) => {
-      if (method !== 'all' && !methods.includes(method)) {
-        throw new Error(`'${method}' is not a valid hook method`);
-      }
-    });
-
-    map[type] = data;
-  });
-
-  return map;
-};
-
-const createAdapter = (type: RegularType) => {
-  const hooks: RegularHookFunction[] = [];
-  const hook = wrappers[type](hooks);
-  const adapter = Object.assign(hook, { hooks });
-
-  return adapter;
-};
-
-const updateStore = (store: RegularStore, map: RegularMap) => {
-  Object.keys(store.hooks).forEach((method) => {
-    let adapted = false;
-
-    Object.keys(map).forEach((key) => {
-      const type = key as RegularType;
-      const allHooks = map[type].all || [];
-      const methodHooks = map[type][method] || [];
-
-      if (allHooks.length || methodHooks.length) {
-        const adapter = store[type][method] ||= (adapted = true, createAdapter(type));
-
-        adapter.hooks.push(...allHooks, ...methodHooks);
-      }
-    });
-
-    if (adapted) {
-      store.hooks[method] = [
-        store.error[method],
-        store.before[method],
-        store.after[method]
-      ].filter(hook => hook);
-    }
-  });
-};
-
-// Add `.hooks` functionality to an object
-export function enableRegularHooks (
-  object: any,
-  methods: string[] = defaultServiceMethods
-) {
-  const store = createStore(methods);
-
-  setStore(object, store);
-
-  return function regularHooks (this: any, input: RegularHookMap<any, any>) {
-    const store = getStore(this);
-    const map = createMap(input, methods);
-
-    updateStore(store, map);
-
-    return this;
-  }
-}