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

package/lib/rest/index.js

@@ -1,129 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rest = exports.formatter = exports.getDefaultRoutes = exports.getServiceRoutes = exports.parseRoute = exports.getDefaultUri = exports.httpMethod = void 0;
-const debug_1 = __importDefault(require("debug"));
-const commons_1 = require("@feathersjs/commons");
-const authentication_1 = require("../authentication");
-const getHandler_1 = require("./getHandler");
-const debug = debug_1.default('@feathersjs/express/rest');
-const HTTP_METHOD = Symbol('@feathersjs/express/rest/HTTP_METHOD');
-function httpMethod(verb, uris) {
-    return (method) => {
-        Object.defineProperty(method, HTTP_METHOD, {
-            enumerable: false,
-            configurable: true,
-            writable: false,
-            value: (Array.isArray(uris) ? uris : [uris])
-                .reduce((result, uri) => ([...result, { verb, uri }]), method[HTTP_METHOD] || [])
-        });
-        return method;
-    };
-}
-exports.httpMethod = httpMethod;
-function getDefaultUri(path, methods, method) {
-    return methods[method].indexOf('id') === -1
-        ? `/${path}/${method}`
-        : `/${path}/:__feathersId/${method}`;
-}
-exports.getDefaultUri = getDefaultUri;
-function parseRoute(path, methods, method, route) {
-    return {
-        method,
-        verb: route.verb,
-        uri: route.uri ? `/${path}/${commons_1.stripSlashes(route.uri)}` : getDefaultUri(path, methods, method)
-    };
-}
-exports.parseRoute = parseRoute;
-function getServiceRoutes(service, path, defaultRoutes) {
-    const { methods } = service;
-    return Object.keys(methods)
-        .filter(method => (service[method] && service[method][HTTP_METHOD]))
-        .reduce((result, method) => {
-        const routes = service[method][HTTP_METHOD];
-        if (Array.isArray(routes)) {
-            return [
-                ...result,
-                ...routes.map(route => parseRoute(path, methods, method, route))
-            ];
-        }
-        return [
-            ...result,
-            parseRoute(path, methods, method, routes)
-        ];
-    }, defaultRoutes);
-}
-exports.getServiceRoutes = getServiceRoutes;
-function getDefaultRoutes(uri) {
-    const idUri = `${uri}/:__feathersId`;
-    return [
-        { method: 'find', verb: 'GET', uri },
-        { method: 'get', verb: 'GET', uri: idUri },
-        { method: 'create', verb: 'POST', uri },
-        { method: 'patch', verb: 'PATCH', uri: idUri },
-        { method: 'patch', verb: 'PATCH', uri },
-        { method: 'update', verb: 'PUT', uri: idUri },
-        { method: 'update', verb: 'PUT', uri },
-        { method: 'remove', verb: 'DELETE', uri: idUri },
-        { method: 'remove', verb: 'DELETE', uri } // remove(null, data, params)
-    ];
-}
-exports.getDefaultRoutes = getDefaultRoutes;
-function formatter(_req, res, next) {
-    if (res.data === undefined) {
-        return next();
-    }
-    res.format({
-        'application/json'() {
-            res.json(res.data);
-        }
-    });
-}
-exports.formatter = formatter;
-function rest(handler = formatter) {
-    return function () {
-        const app = this;
-        if (typeof app.route !== 'function') {
-            throw new Error('@feathersjs/express/rest needs an Express compatible app. Feathers apps have to wrapped with feathers-express first.');
-        }
-        if (!app.version || app.version < '3.0.0') {
-            throw new Error(`@feathersjs/express/rest requires an instance of a Feathers application version 3.x or later (got ${app.version})`);
-        }
-        app.rest = {
-            find: getHandler_1.getHandler('find'),
-            get: getHandler_1.getHandler('get'),
-            create: getHandler_1.getHandler('create'),
-            update: getHandler_1.getHandler('update'),
-            patch: getHandler_1.getHandler('patch'),
-            remove: getHandler_1.getHandler('remove')
-        };
-        app.use((req, _res, next) => {
-            req.feathers = Object.assign({
-                provider: 'rest',
-                headers: req.headers
-            }, req.feathers);
-            next();
-        });
-        app.use(authentication_1.parseAuthentication());
-        // Register the REST provider
-        app.providers.push(function (service, path, options) {
-            const baseUri = `/${path}`;
-            const { middleware: { before } } = options;
-            let { middleware: { after } } = options;
-            if (typeof handler === 'function') {
-                after = after.concat(handler);
-            }
-            debug(`Adding REST provider for service \`${path}\` at base route \`${baseUri}\``);
-            const routes = getServiceRoutes(service, path, getDefaultRoutes(baseUri));
-            for (const { method, verb, uri } of routes) {
-                app.route(uri)[verb.toLowerCase()](...before, getHandler_1.getHandler(method)(service, routes), ...after);
-            }
-        });
-    };
-}
-exports.rest = rest;
-rest.formatter = formatter;
-rest.httpMethod = httpMethod;
-//# sourceMappingURL=index.js.map

package/lib/rest/index.js.map

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

package/src/rest/getHandler.ts

@@ -1,115 +0,0 @@
-import  Debug from 'debug';
-import { Request, Response, NextFunction } from 'express';
-import { MethodNotAllowed } from '@feathersjs/errors';
-import { _  } from '@feathersjs/commons';
-import { HookContext } from '@feathersjs/feathers';
-
-const { omit } = _;
-const debug = Debug('@feathersjs/express/rest');
-
-export const statusCodes = {
-  created: 201,
-  noContent: 204,
-  methodNotAllowed: 405
-};
-export const methodMap = {
-  find: 'GET',
-  get: 'GET',
-  create: 'POST',
-  update: 'PUT',
-  patch: 'PATCH',
-  remove: 'DELETE'
-};
-
-export function getAllowedMethods (service: any, routes: any) {
-  if (routes) {
-    return routes
-      .filter(({ method }: any) => typeof service[method] === 'function')
-      .map((methodRoute: any) => methodRoute.verb.toUpperCase())
-      .filter((value: any, index: number, list: any) => list.indexOf(value) === index);
-  }
-
-  return Object.keys(methodMap)
-    .filter((method: any) => typeof service[method] === 'function')
-    .map((method: any) => (methodMap as any)[method])
-    // Filter out duplicates
-    .filter((value: any, index: number, list: any) => list.indexOf(value) === index);
-}
-
-export function makeArgsGetter (argsOrder: any) {
-  return (req: Request, params: any) => argsOrder.map((argName: string) => {
-    switch (argName) {
-      case 'id':
-        return req.params.__feathersId || null;
-      case 'data':
-        return req.body;
-      case 'params':
-        return params;
-    }
-  });
-}
-
-// A function that returns the middleware for a given method and service
-// `getArgs` is a function that should return additional leading service arguments
-export function getHandler (method: string) {
-  return (service: any, routes: any) => {
-    const getArgs = makeArgsGetter(service.methods[method]);
-    const allowedMethods = getAllowedMethods(service, routes);
-
-    return (req: Request, res: Response, next: NextFunction) => {
-      const { query } = req;
-      const route = omit(req.params, '__feathersId');
-
-      res.setHeader('Allow', allowedMethods.join(','));
-
-      // Check if the method exists on the service at all. Send 405 (Method not allowed) if not
-      if (typeof service[method] !== 'function') {
-        debug(`Method '${method}' not allowed on '${req.url}'`);
-        res.status(statusCodes.methodNotAllowed);
-
-        return next(new MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`));
-      }
-
-      // Grab the service parameters. Use req.feathers
-      // and set the query to req.query merged with req.params
-      const params = Object.assign({
-        query, route
-      }, req.feathers);
-
-      Object.defineProperty(params, '__returnHook', {
-        value: true
-      });
-
-      const args = getArgs(req, params);
-
-      debug(`REST handler calling \`${method}\` from \`${req.url}\``);
-
-      service[method](...args, true)
-        .then((hook: HookContext) => {
-          const data = hook.dispatch !== undefined ? hook.dispatch : hook.result;
-
-          res.data = data;
-          res.hook = hook;
-
-          if (hook.statusCode) {
-            res.status(hook.statusCode);
-          } else if (!data) {
-            debug(`No content returned for '${req.url}'`);
-            res.status(statusCodes.noContent);
-          } else if (method === 'create') {
-            res.status(statusCodes.created);
-          }
-
-          return next();
-        })
-        .catch((hook: HookContext) => {
-          const { error } = hook;
-
-          debug(`Error in handler: \`${error.message}\``);
-          res.hook = hook;
-
-          return next(hook.error);
-        });
-    };
-  };
-}

package/src/rest/index.ts

@@ -1,148 +0,0 @@
-import Debug from 'debug';
-import { stripSlashes } from '@feathersjs/commons';
-import { Request, Response, NextFunction, RequestHandler } from 'express';
-import { parseAuthentication } from '../authentication';
-import { getHandler } from './getHandler';
-
-const debug = Debug('@feathersjs/express/rest');
-const HTTP_METHOD = Symbol('@feathersjs/express/rest/HTTP_METHOD');
-
-export function httpMethod (verb: any, uris?: any) {
-  return (method: any) => {
-    Object.defineProperty(method, HTTP_METHOD, {
-      enumerable: false,
-      configurable: true,
-      writable: false,
-      value: (Array.isArray(uris) ? uris : [uris])
-        .reduce(
-          (result, uri) => ([...result, { verb, uri }]),
-          method[HTTP_METHOD] || []
-        )
-    });
-
-    return method;
-  };
-}
-
-export function getDefaultUri (path: string, methods: any, method: any) {
-  return methods[method].indexOf('id') === -1
-    ? `/${path}/${method}`
-    : `/${path}/:__feathersId/${method}`;
-}
-
-export function parseRoute (path: any, methods: any, method: any, route: any) {
-  return {
-    method,
-    verb: route.verb,
-    uri: route.uri ? `/${path}/${stripSlashes(route.uri)}` : getDefaultUri(path, methods, method)
-  };
-}
-
-export function getServiceRoutes (service: any, path: any, defaultRoutes: any) {
-  const { methods } = service;
-
-  return Object.keys(methods)
-    .filter(method => (service[method] && service[method][HTTP_METHOD]))
-    .reduce((result, method) => {
-      const routes = service[method][HTTP_METHOD];
-
-      if (Array.isArray(routes)) {
-        return [
-          ...result,
-          ...routes.map(route => parseRoute(path, methods, method, route))
-        ];
-      }
-
-      return [
-        ...result,
-        parseRoute(path, methods, method, routes)
-      ];
-    }, defaultRoutes);
-}
-
-export function getDefaultRoutes (uri: string) {
-  const idUri = `${uri}/:__feathersId`;
-
-  return [
-    { method: 'find', verb: 'GET', uri }, // find(params)
-    { method: 'get', verb: 'GET', uri: idUri }, // get(id, params)
-    { method: 'create', verb: 'POST', uri }, // create(data, params)
-    { method: 'patch', verb: 'PATCH', uri: idUri }, // patch(id, data, params)
-    { method: 'patch', verb: 'PATCH', uri }, // patch(null, data, params)
-    { method: 'update', verb: 'PUT', uri: idUri }, // update(id, data, params)
-    { method: 'update', verb: 'PUT', uri }, // update(null, data, params)
-    { method: 'remove', verb: 'DELETE', uri: idUri }, // remove(id, data, params)
-    { method: 'remove', verb: 'DELETE', uri } // remove(null, data, params)
-  ];
-}
-
-export function formatter (_req: Request, res: Response, next: NextFunction) {
-  if (res.data === undefined) {
-    return next();
-  }
-
-  res.format({
-    'application/json' () {
-      res.json(res.data);
-    }
-  });
-}
-
-export function rest (handler: RequestHandler = formatter) {
-  return function (this: any) {
-    const app = this;
-
-    if (typeof app.route !== 'function') {
-      throw new Error('@feathersjs/express/rest needs an Express compatible app. Feathers apps have to wrapped with feathers-express first.');
-    }
-
-    if (!app.version || app.version < '3.0.0') {
-      throw new Error(`@feathersjs/express/rest requires an instance of a Feathers application version 3.x or later (got ${app.version})`);
-    }
-
-    app.rest = {
-      find: getHandler('find'),
-      get: getHandler('get'),
-      create: getHandler('create'),
-      update: getHandler('update'),
-      patch: getHandler('patch'),
-      remove: getHandler('remove')
-    };
-
-    app.use((req: Request, _res: Response, next: NextFunction) => {
-      req.feathers = Object.assign({
-        provider: 'rest',
-        headers: req.headers
-      }, req.feathers);
-      next();
-    });
-
-    app.use(parseAuthentication());
-
-    // Register the REST provider
-    app.providers.push(function (service: any, path: string, options: any) {
-      const baseUri = `/${path}`;
-      const { middleware: { before } } = options;
-      let { middleware: { after } } = options;
-
-      if (typeof handler === 'function') {
-        after = after.concat(handler);
-      }
-
-      debug(`Adding REST provider for service \`${path}\` at base route \`${baseUri}\``);
-
-      const routes = getServiceRoutes(service, path, getDefaultRoutes(baseUri));
-
-      for (const { method, verb, uri } of routes) {
-        app.route(uri)[verb.toLowerCase()](
-          ...before,
-          getHandler(method)(service, routes),
-          ...after
-        );
-      }
-    });
-  };
-}
-
-rest.formatter = formatter;
-rest.httpMethod = httpMethod;