@feathersjs/feathers 5.0.0-pre.1 → 5.0.0-pre.15

package/lib/hooks/commons.js

@@ -1,298 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrap = exports.errorWrapper = exports.finallyWrapper = exports.afterWrapper = exports.beforeWrapper = exports.toFinallyHook = exports.toErrorHook = exports.toAfterHook = exports.toBeforeHook = exports.lastHook = exports.firstHook = exports.enableHooks = exports.processHooks = exports.getHooks = exports.isHookObject = exports.convertHookData = exports.makeArguments = exports.defaultMakeArguments = exports.createHookObject = exports.ACTIVATE_HOOKS = void 0;
-const hooks_1 = require("@feathersjs/hooks");
-const commons_1 = require("@feathersjs/commons");
-const { each, pick, omit } = commons_1._;
-const noop = () => { };
-exports.ACTIVATE_HOOKS = commons_1.createSymbol('__feathersActivateHooks');
-function createHookObject(method, data = {}) {
-    const hook = {};
-    Object.defineProperty(hook, 'toJSON', {
-        value() {
-            return pick(this, 'type', 'method', 'path', 'params', 'id', 'data', 'result', 'error');
-        }
-    });
-    return Object.assign(hook, data, {
-        method,
-        // A dynamic getter that returns the path of the service
-        get path() {
-            const { app, service } = data;
-            if (!service || !app || !app.services) {
-                return null;
-            }
-            return Object.keys(app.services)
-                .find(path => app.services[path] === service);
-        }
-    });
-}
-exports.createHookObject = createHookObject;
-// Fallback used by `makeArguments` which usually won't be used
-function defaultMakeArguments(hook) {
-    const result = [];
-    if (typeof hook.id !== 'undefined') {
-        result.push(hook.id);
-    }
-    if (hook.data) {
-        result.push(hook.data);
-    }
-    result.push(hook.params || {});
-    return result;
-}
-exports.defaultMakeArguments = defaultMakeArguments;
-// Turns a hook object back into a list of arguments
-// to call a service method with
-function makeArguments(hook) {
-    switch (hook.method) {
-        case 'find':
-            return [hook.params];
-        case 'get':
-        case 'remove':
-            return [hook.id, hook.params];
-        case 'update':
-        case 'patch':
-            return [hook.id, hook.data, hook.params];
-        case 'create':
-            return [hook.data, hook.params];
-    }
-    return defaultMakeArguments(hook);
-}
-exports.makeArguments = makeArguments;
-// 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;
-// Duck-checks a given object to be a hook object
-// A valid hook object has `type` and `method`
-function isHookObject(hookObject) {
-    return (hookObject instanceof hooks_1.HookContext || (typeof hookObject === 'object' &&
-        typeof hookObject.method === 'string' &&
-        typeof hookObject.type === 'string'));
-}
-exports.isHookObject = isHookObject;
-// Returns all service and application hooks combined
-// for a given method and type `appLast` sets if the hooks
-// from `app` should be added last (or first by default)
-function getHooks(app, service, type, method, appLast = false) {
-    const appHooks = app.__hooks[type][method] || [];
-    const serviceHooks = service.__hooks[type][method] || [];
-    if (appLast) {
-        // Run hooks in the order of service -> app -> finally
-        return serviceHooks.concat(appHooks);
-    }
-    return appHooks.concat(serviceHooks);
-}
-exports.getHooks = getHooks;
-function processHooks(hooks, initialHookObject) {
-    let hookObject = initialHookObject;
-    const updateCurrentHook = (current) => {
-        // Either use the returned hook object or the current
-        // hook object from the chain if the hook returned undefined
-        if (current) {
-            if (!isHookObject(current)) {
-                throw new Error(`${hookObject.type} hook for '${hookObject.method}' method returned invalid hook object`);
-            }
-            hookObject = current;
-        }
-        return hookObject;
-    };
-    // Go through all hooks and chain them into our promise
-    const promise = hooks.reduce((current, fn) => {
-        // @ts-ignore
-        const hook = fn.bind(this);
-        // Use the returned hook object or the old one
-        return current.then((currentHook) => hook(currentHook)).then(updateCurrentHook);
-    }, Promise.resolve(hookObject));
-    return promise.then(() => hookObject).catch(error => {
-        // Add the hook information to any errors
-        error.hook = hookObject;
-        throw error;
-    });
-}
-exports.processHooks = processHooks;
-// Add `.hooks` functionality to an object
-function enableHooks(obj, methods, types) {
-    if (typeof obj.hooks === 'function') {
-        return obj;
-    }
-    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 Object.assign(obj, {
-        hooks(allHooks) {
-            each(allHooks, (current, type) => {
-                // @ts-ignore
-                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 => {
-                    // @ts-ignore
-                    const myHooks = this.__hooks[type][method] || (this.__hooks[type][method] = []);
-                    if (hooks.all) {
-                        myHooks.push.apply(myHooks, hooks.all);
-                    }
-                    if (hooks[method]) {
-                        myHooks.push.apply(myHooks, hooks[method]);
-                    }
-                });
-            });
-            return this;
-        }
-    });
-}
-exports.enableHooks = enableHooks;
-function handleError(hook, context, onError) {
-    try {
-        return Promise.resolve(hook.call(context.self, context))
-            .catch((error) => {
-            if (typeof onError === 'function') {
-                onError(error, context);
-            }
-            throw error;
-        })
-            .then((result) => {
-            Object.assign(context, omit(result, 'arguments', 'path'));
-            if (typeof context.error !== 'undefined') {
-                throw context.error;
-            }
-            return result;
-        });
-    }
-    catch (errorError) {
-        if (typeof onError === 'function') {
-            onError(errorError, context);
-        }
-        throw errorError;
-    }
-}
-function firstHook(context, next) {
-    context.type = 'before';
-    return next();
-}
-exports.firstHook = firstHook;
-function lastHook(context, next) {
-    context.type = 'after';
-    return next();
-}
-exports.lastHook = lastHook;
-function toBeforeHook(hook) {
-    return (context, next) => {
-        return Promise.resolve(hook.call(context.self, context))
-            .then((result) => Object.assign(context, omit(result, 'arguments', 'path')))
-            .then(() => next());
-    };
-}
-exports.toBeforeHook = toBeforeHook;
-function toAfterHook(hook) {
-    return (context, next) => {
-        return next()
-            .then(() => hook.call(context.self, context))
-            .then((result) => Object.assign(context, omit(result, 'arguments', 'path')));
-    };
-}
-exports.toAfterHook = toAfterHook;
-function toErrorHook(hook, onError, control) {
-    return (context, next) => {
-        return next()
-            .catch((error) => {
-            if (typeof control === 'function') {
-                control(context);
-            }
-            context.error = error;
-            context.result = undefined;
-            return handleError(hook, context, onError);
-        });
-    };
-}
-exports.toErrorHook = toErrorHook;
-function toFinallyHook(hook, onError, control) {
-    return (context, next) => {
-        return next()
-            .finally(() => {
-            if (typeof control === 'function') {
-                control(context);
-            }
-            return handleError(hook, context, onError);
-        });
-    };
-}
-exports.toFinallyHook = toFinallyHook;
-function beforeWrapper(hooks) {
-    return [firstHook, ...[].concat(hooks).map(toBeforeHook)];
-}
-exports.beforeWrapper = beforeWrapper;
-function afterWrapper(hooks) {
-    return [...[].concat(hooks).reverse().map(toAfterHook), lastHook];
-}
-exports.afterWrapper = afterWrapper;
-function finallyWrapper(hooks) {
-    let errorInFinally;
-    const onError = (error, context) => {
-        errorInFinally = error;
-        context.error = error;
-        context.result = undefined;
-    };
-    const control = () => {
-        if (errorInFinally) {
-            throw errorInFinally;
-        }
-    };
-    return [].concat(hooks).reverse().map(hook => toFinallyHook(hook, onError, control));
-}
-exports.finallyWrapper = finallyWrapper;
-function errorWrapper(hooks) {
-    let errorInError;
-    const onError = (error, context) => {
-        errorInError = error;
-        context.error = error;
-        context.result = undefined;
-    };
-    const control = (context) => {
-        if (!context.original) {
-            context.original = Object.assign({}, context);
-        }
-        if (errorInError) {
-            throw errorInError;
-        }
-        context.type = 'error';
-    };
-    return [noop].concat(hooks).reverse().map(hook => toErrorHook(hook, onError, control));
-}
-exports.errorWrapper = errorWrapper;
-function wrap({ async = [], before = [], after = [] } = {}) {
-    return [
-        ...[].concat(async),
-        ...beforeWrapper(before),
-        ...afterWrapper(after)
-    ];
-}
-exports.wrap = wrap;
-//# sourceMappingURL=commons.js.map

package/lib/hooks/commons.js.map

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

package/src/hooks/base.ts

@@ -1,32 +0,0 @@
-import { _ } from '@feathersjs/commons';
-import { HookContext } from '../declarations';
-
-export const assignArguments = (context: HookContext, next: any) => {
-  const { service, method } = context;
-  const parameters = service.methods[method];
-
-  context.arguments.forEach((value, index) => {
-    (context as any)[parameters[index]] = value;
-  });
-
-  if (!context.params) {
-    context.params = {};
-  }
-
-  return next();
-};
-
-export const validate = (context: HookContext, next: any) => {
-  const { service, method, path } = context;
-  const parameters = service.methods[method];
-
-  if (parameters.includes('id') && context.id === undefined) {
-    throw new Error(`An id must be provided to the '${path}.${method}' method`);
-  }
-
-  if (parameters.includes('data') && !_.isObjectOrArray(context.data)) {
-    throw new Error(`A data object must be provided to the '${path}.${method}' method`);
-  }
-
-  return next();
-};

package/src/hooks/commons.ts

@@ -1,336 +0,0 @@
-import { HookContext } from '@feathersjs/hooks';
-import { createSymbol, _ } from '@feathersjs/commons';
-
-const { each, pick, omit } = _;
-const noop = () => {};
-
-export const ACTIVATE_HOOKS = createSymbol('__feathersActivateHooks');
-
-export function createHookObject (method: string, data: any = {}) {
-  const hook = {};
-
-  Object.defineProperty(hook, 'toJSON', {
-    value () {
-      return pick(this, 'type', 'method', 'path',
-        'params', 'id', 'data', 'result', 'error');
-    }
-  });
-
-  return Object.assign(hook, data, {
-    method,
-    // A dynamic getter that returns the path of the service
-    get path () {
-      const { app, service } = data;
-
-      if (!service || !app || !app.services) {
-        return null;
-      }
-
-      return Object.keys(app.services)
-        .find(path => app.services[path] === service);
-    }
-  });
-}
-
-// Fallback used by `makeArguments` which usually won't be used
-export function defaultMakeArguments (hook: any) {
-  const result = [];
-
-  if (typeof hook.id !== 'undefined') {
-    result.push(hook.id);
-  }
-
-  if (hook.data) {
-    result.push(hook.data);
-  }
-
-  result.push(hook.params || {});
-
-  return result;
-}
-
-// Turns a hook object back into a list of arguments
-// to call a service method with
-export function makeArguments (hook: any) {
-  switch (hook.method) {
-    case 'find':
-      return [ hook.params ];
-    case 'get':
-    case 'remove':
-      return [ hook.id, hook.params ];
-    case 'update':
-    case 'patch':
-      return [ hook.id, hook.data, hook.params ];
-    case 'create':
-      return [ hook.data, hook.params ];
-  }
-
-  return defaultMakeArguments(hook);
-}
-
-// Converts different hook registration formats into the
-// same internal format
-export function convertHookData (obj: any) {
-  let hook: any = {};
-
-  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;
-}
-
-// Duck-checks a given object to be a hook object
-// A valid hook object has `type` and `method`
-export function isHookObject (hookObject: any) {
-  return (
-    hookObject instanceof HookContext || (
-      typeof hookObject === 'object' &&
-      typeof hookObject.method === 'string' &&
-      typeof hookObject.type === 'string'
-    )
-  );
-}
-
-// Returns all service and application hooks combined
-// for a given method and type `appLast` sets if the hooks
-// from `app` should be added last (or first by default)
-export function getHooks (app: any, service: any, type: string, method: string, appLast = false) {
-  const appHooks = app.__hooks[type][method] || [];
-  const serviceHooks = service.__hooks[type][method] || [];
-
-  if (appLast) {
-    // Run hooks in the order of service -> app -> finally
-    return serviceHooks.concat(appHooks);
-  }
-
-  return appHooks.concat(serviceHooks);
-}
-
-export function processHooks (hooks: any[], initialHookObject: any) {
-  let hookObject = initialHookObject;
-
-  const updateCurrentHook = (current: any) => {
-    // Either use the returned hook object or the current
-    // hook object from the chain if the hook returned undefined
-    if (current) {
-      if (!isHookObject(current)) {
-        throw new Error(`${hookObject.type} hook for '${hookObject.method}' method returned invalid hook object`);
-      }
-
-      hookObject = current;
-    }
-
-    return hookObject;
-  };
-  // Go through all hooks and chain them into our promise
-  const promise = hooks.reduce((current: Promise<any>, fn) => {
-    // @ts-ignore
-    const hook = fn.bind(this);
-
-    // Use the returned hook object or the old one
-    return current.then((currentHook: any) => hook(currentHook)).then(updateCurrentHook);
-  }, Promise.resolve(hookObject));
-
-  return promise.then(() => hookObject).catch(error => {
-    // Add the hook information to any errors
-    error.hook = hookObject;
-    throw error;
-  });
-}
-
-// Add `.hooks` functionality to an object
-export function enableHooks (obj: any, methods: string[], types: string[]) {
-  if (typeof obj.hooks === 'function') {
-    return obj;
-  }
-
-  const hookData: any = {};
-
-  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 Object.assign(obj, {
-    hooks (allHooks: any) {
-      each(allHooks, (current: any, type) => {
-        // @ts-ignore
-        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 => {
-          // @ts-ignore
-          const myHooks = this.__hooks[type][method] || (this.__hooks[type][method] = []);
-
-          if (hooks.all) {
-            myHooks.push.apply(myHooks, hooks.all);
-          }
-
-          if (hooks[method]) {
-            myHooks.push.apply(myHooks, hooks[method]);
-          }
-        });
-      });
-
-      return this;
-    }
-  });
-}
-
-function handleError (hook: any, context: any, onError: any) {
-  try {
-    return Promise.resolve(hook.call(context.self, context))
-      .catch((error: any) => {
-        if (typeof onError === 'function') {
-          onError(error, context);
-        }
-        throw error;
-      })
-      .then((result: any) => {
-        Object.assign(context, omit(result, 'arguments', 'path'));
-
-        if (typeof context.error !== 'undefined') {
-          throw context.error;
-        }
-
-        return result;
-      });
-  } catch(errorError: any) {
-    if (typeof onError === 'function') {
-      onError(errorError, context);
-    }
-    throw errorError;
-  }
-}
-
-export function firstHook (context: any, next: any) {
-  context.type = 'before';
-  return next();
-}
-
-export function lastHook (context: any, next: any) {
-  context.type = 'after';
-  return next();
-}
-
-export function toBeforeHook (hook: any) {
-  return (context: any, next: any) => {
-    return Promise.resolve(hook.call(context.self, context))
-      .then((result: any) => Object.assign(context, omit(result, 'arguments', 'path')))
-      .then(() => next());
-  };
-}
-
-export function toAfterHook (hook: any) {
-  return (context: any, next: any) => {
-    return next()
-      .then(() => hook.call(context.self, context))
-      .then((result: any) => Object.assign(context, omit(result, 'arguments', 'path')));
-  }
-}
-
-export function toErrorHook (hook: any, onError: any, control: any) {
-  return (context: any, next: any) => {
-    return next()
-      .catch((error: any) => {
-        if (typeof control === 'function') {
-          control(context);
-        }
-
-        context.error = error;
-        context.result = undefined;
-
-        return handleError(hook, context, onError);
-      });
-  };
-}
-
-export function toFinallyHook (hook: any, onError: any, control: any) {
-  return (context: any, next: any) => {
-    return next()
-      .finally(() => {
-        if (typeof control === 'function') {
-          control(context);
-        }
-
-        return handleError(hook, context, onError);
-      })
-  };
-}
-
-export function beforeWrapper (hooks: any) {
-  return [firstHook, ...[].concat(hooks).map(toBeforeHook)];
-}
-
-export function afterWrapper (hooks: any) {
-  return [...[].concat(hooks).reverse().map(toAfterHook), lastHook];
-}
-
-export function finallyWrapper (hooks: any) {
-  let errorInFinally: any;
-
-  const onError = (error: any, context: any) => {
-    errorInFinally = error;
-    context.error = error;
-    context.result = undefined;
-  };
-  const control = () => {
-    if (errorInFinally) {
-      throw errorInFinally;
-    }
-  };
-
-  return [].concat(hooks).reverse().map(hook => toFinallyHook(hook, onError, control));
-}
-
-export function errorWrapper (hooks: any) {
-  let errorInError: any;
-
-  const onError = (error: any, context: any) => {
-    errorInError = error;
-    context.error = error;
-    context.result = undefined;
-  };
-  const control = (context: any) => {
-    if (!context.original) {
-      context.original = { ...context };
-    }
-    if (errorInError) {
-      throw errorInError;
-    }
-    context.type = 'error';
-  };
-
-  return [noop].concat(hooks).reverse().map(hook => toErrorHook(hook, onError, control));
-}
-
-export function wrap ({ async = [], before = [], after = [] }: any = {}) {
-  return [
-    ...[].concat(async),
-    ...beforeWrapper(before),
-    ...afterWrapper(after)
-  ];
-}