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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/express",
   "description": "Feathers Express framework bindings and REST provider",
-  "version": "5.0.0-pre.1",
+  "version": "5.0.0-pre.15",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "keywords": [
@@ -27,7 +27,7 @@
     "url": "https://github.com/feathersjs/feathers/issues"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">= 12"
   },
   "files": [
     "CHANGELOG.md",
@@ -49,27 +49,28 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/commons": "^5.0.0-pre.1",
-    "@feathersjs/errors": "^5.0.0-pre.1",
-    "@types/express": "^4.17.9",
-    "debug": "^4.3.1",
+    "@feathersjs/commons": "^5.0.0-pre.15",
+    "@feathersjs/errors": "^5.0.0-pre.15",
+    "@feathersjs/feathers": "^5.0.0-pre.15",
+    "@feathersjs/transport-commons": "^5.0.0-pre.15",
+    "@types/express": "^4.17.13",
+    "@types/express-serve-static-core": "^4.17.24",
     "express": "^4.17.1",
-    "lodash": "^4.17.20",
-    "uberproto": "^2.0.6"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.1",
-    "@feathersjs/authentication-local": "^5.0.0-pre.1",
-    "@feathersjs/feathers": "^5.0.0-pre.1",
-    "@feathersjs/tests": "^5.0.0-pre.1",
-    "@types/mocha": "^8.0.4",
-    "@types/node": "^14.14.10",
-    "axios": "^0.21.0",
-    "lodash": "^4.17.20",
-    "mocha": "^8.2.1",
+    "@feathersjs/authentication": "^5.0.0-pre.15",
+    "@feathersjs/authentication-local": "^5.0.0-pre.15",
+    "@feathersjs/tests": "^5.0.0-pre.15",
+    "@types/lodash": "^4.14.176",
+    "@types/mocha": "^9.0.0",
+    "@types/node": "^16.11.6",
+    "axios": "^0.24.0",
+    "lodash": "^4.17.21",
+    "mocha": "^9.1.3",
     "shx": "^0.3.3",
-    "ts-node": "^9.1.0",
-    "typescript": "^4.1.2"
+    "ts-node": "^10.4.0",
+    "typescript": "^4.4.4"
   },
-  "gitHead": "3756506935c520fc50d4be416ff649c2158afdac"
+  "gitHead": "8008bf4f8529a2a40b6a2f976c1f43ae13675693"
 }

package/src/authentication.ts

@@ -1,8 +1,8 @@
-import Debug from 'debug';
+import { createDebug } from '@feathersjs/commons';
 import { merge, flatten } from 'lodash';
-import { NextFunction, RequestHandler } from 'express';
+import { NextFunction, RequestHandler, Request, Response } from 'express';
 
-const debug = Debug('@feathersjs/express/authentication');
+const debug = createDebug('@feathersjs/express/authentication');
 
 type StrategyOptions = {
   service?: string;

package/src/declarations.ts

@@ -0,0 +1,60 @@
+import http from 'http';
+import express, { Express } from 'express';
+import {
+  Application as FeathersApplication, Params as FeathersParams,
+  HookContext, ServiceMethods, ServiceInterface
+} from '@feathersjs/feathers';
+
+interface ExpressUseHandler<T, Services> {
+  <L extends keyof Services & string> (
+    path: L,
+    ...middlewareOrService: (
+      Express|express.RequestHandler|
+      (keyof any extends keyof Services ? ServiceInterface : Services[L])
+    )[]
+  ): T;
+  (path: string|RegExp, ...expressHandlers: express.RequestHandler[]): T;
+  (...expressHandlers: express.RequestHandler[]): T;
+  (handler: Express|express.ErrorRequestHandler): T;
+}
+
+export interface ExpressOverrides<Services> {
+  listen(port: number, hostname: string, backlog: number, callback?: () => void): Promise<http.Server>;
+  listen(port: number, hostname: string, callback?: () => void): Promise<http.Server>;
+  listen(port: number|string|any, callback?: () => void): Promise<http.Server>;
+  listen(callback?: () => void): Promise<http.Server>;
+  use: ExpressUseHandler<this, Services>;
+}
+
+export type Application<Services = any, Settings = any> =
+  Omit<Express, 'listen'|'use'> &
+  FeathersApplication<Services, Settings> &
+  ExpressOverrides<Services>;
+
+declare module '@feathersjs/feathers/lib/declarations' {
+  interface ServiceOptions {
+    middleware?: {
+      before: express.RequestHandler[],
+      after: express.RequestHandler[]
+    }
+  }
+}
+
+declare module 'express-serve-static-core' {
+  interface Request {
+      feathers?: Partial<FeathersParams>;
+  }
+
+  interface Response {
+      data?: any;
+      hook?: HookContext;
+  }
+
+  interface IRouterMatcher<T> {
+      // eslint-disable-next-line
+      <P extends Params = ParamsDictionary, ResBody = any, ReqBody = any>(
+          path: PathParams,
+          ...handlers: (RequestHandler<P, ResBody, ReqBody> | Partial<ServiceMethods> | Application)[]
+      ): T;
+  }
+}

package/src/index.ts

@@ -1,48 +1,27 @@
-// @ts-ignore
-import Proto from 'uberproto';
-import express, { Express, static as _static, json, raw, text, urlencoded, query } from 'express';
-import Debug from 'debug';
+import express, {
+  Express, static as _static, json, raw, text, urlencoded, query
+} from 'express';
 import {
-  Application as FeathersApplication, Params as FeathersParams,
-  HookContext, ServiceMethods, SetupMethod
+  Application as FeathersApplication, defaultServiceMethods
 } from '@feathersjs/feathers';
+import { createDebug } from '@feathersjs/commons';
 
+import { Application } from './declarations';
 import { errorHandler, notFound } from './handlers';
-import { rest } from './rest';
 import { parseAuthentication, authenticate } from './authentication';
 
 export {
-  _static as static, json, raw, text, urlencoded, query,
-  errorHandler, notFound, rest, express as original,
+  _static as serveStatic, _static as static, json, raw, text,
+  urlencoded, query, errorHandler, notFound, express as original,
   authenticate, parseAuthentication
 };
 
-const debug = Debug('@feathersjs/express');
+export * from './rest';
+export * from './declarations';
 
-declare module 'express-serve-static-core' {
-  interface Request {
-      feathers?: Partial<FeathersParams>;
-  }
-
-  interface Response {
-      data?: any;
-      hook?: HookContext;
-  }
-
-  type FeathersService = Partial<ServiceMethods<any> & SetupMethod>;
-
-  interface IRouterMatcher<T> {
-      // eslint-disable-next-line
-      <P extends Params = ParamsDictionary, ResBody = any, ReqBody = any>(
-          path: PathParams,
-          ...handlers: (RequestHandler<P, ResBody, ReqBody> | FeathersService | Application)[]
-      ): T;
-  }
-}
+const debug = createDebug('@feathersjs/express');
 
-export type Application<T = any> = Express & FeathersApplication<T>;
-
-export default function feathersExpress<T = any> (feathersApp?: FeathersApplication, expressApp: Express = express()): Application<T> {
+export default function feathersExpress<S = any, C = any> (feathersApp?: FeathersApplication<S, C>, expressApp: Express = express()): Application<S, C> {
   if (!feathersApp) {
     return expressApp as any;
   }
@@ -51,20 +30,20 @@ export default function feathersExpress<T = any> (feathersApp?: FeathersApplicat
     throw new Error('@feathersjs/express requires a valid Feathers application instance');
   }
 
-  if (!feathersApp.version || feathersApp.version < '3.0.0') {
-    throw new Error(`@feathersjs/express requires an instance of a Feathers application version 3.x or later (got ${feathersApp.version || 'unknown'})`);
-  }
-
-  // An Uberproto mixin that provides the extended functionality
+  const { use, listen } = expressApp as any;
+  // A mixin that provides the extended functionality
   const mixin: any = {
-    use (location: string) {
+    use (location: string, ...rest: any[]) {
       let service: any;
-      const middleware = Array.from(arguments).slice(1)
-        .reduce(function (middleware, arg) {
+      let options = {};
+
+      const middleware = rest.reduce(function (middleware, arg) {
           if (typeof arg === 'function' || Array.isArray(arg)) {
             middleware[service ? 'after' : 'before'].push(arg);
           } else if (!service) {
             service = arg;
+          } else if (arg.methods || arg.events) {
+            options = arg;
           } else {
             throw new Error('Invalid options passed to app.use');
           }
@@ -79,32 +58,40 @@ export default function feathersExpress<T = any> (feathersApp?: FeathersApplicat
       );
 
       // Check for service (any object with at least one service method)
-      if (hasMethod(['handle', 'set']) || !hasMethod(this.methods.concat('setup'))) {
+      if (hasMethod(['handle', 'set']) || !hasMethod(defaultServiceMethods)) {
         debug('Passing app.use call to Express app');
-        return this._super.apply(this, arguments);
+        return use.call(this, location, ...rest);
       }
 
       debug('Registering service with middleware', middleware);
       // Since this is a service, call Feathers `.use`
-      feathersApp.use.call(this, location, service, { middleware });
+      (feathersApp as FeathersApplication).use.call(this, location, service, {
+        ...options,
+        middleware
+      });
 
       return this;
     },
 
-    listen () {
-      const server = this._super.apply(this, arguments);
+    async listen (...args: any[]) {
+      const server = listen.call(this, ...args);
 
-      this.setup(server);
+      await this.setup(server);
       debug('Feathers application listening');
 
       return server;
     }
   };
 
+  const feathersDescriptors = {
+    ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(feathersApp)),
+    ...Object.getOwnPropertyDescriptors(feathersApp)
+  };
+
   // Copy all non-existing properties (including non-enumerables)
   // that don't already exist on the Express app
-  Object.getOwnPropertyNames(feathersApp).forEach(prop => {
-    const feathersProp = Object.getOwnPropertyDescriptor(feathersApp, prop);
+  Object.keys(feathersDescriptors).forEach(prop => {
+    const feathersProp = feathersDescriptors[prop];
     const expressProp = Object.getOwnPropertyDescriptor(expressApp, prop);
 
     if (expressProp === undefined && feathersProp !== undefined) {
@@ -112,7 +99,7 @@ export default function feathersExpress<T = any> (feathersApp?: FeathersApplicat
     }
   });
 
-  return Proto.mixin(mixin, expressApp);
+  return Object.assign(expressApp, mixin);
 }
 
 if (typeof module !== 'undefined') {

package/src/rest.ts

@@ -0,0 +1,119 @@
+import { MethodNotAllowed } from '@feathersjs/errors';
+import { createDebug } from '@feathersjs/commons';
+import { http } from '@feathersjs/transport-commons';
+import { HookContext, createContext, defaultServiceMethods, getServiceOptions } from '@feathersjs/feathers';
+import { Request, Response, NextFunction, RequestHandler, Router } from 'express';
+
+import { parseAuthentication } from './authentication';
+
+const debug = createDebug('@feathersjs/express/rest');
+
+export type ServiceCallback = (req: Request, res: Response, options: http.ServiceParams) => Promise<HookContext>;
+
+export const feathersParams = (req: Request, _res: Response, next: NextFunction) => {
+  req.feathers = {
+    ...req.feathers,
+    provider: 'rest',
+    headers: req.headers
+  };
+  next();
+}
+
+export const formatter = (_req: Request, res: Response, next: NextFunction) => {
+  if (res.data === undefined) {
+    return next();
+  }
+
+  res.format({
+    'application/json' () {
+      res.json(res.data);
+    }
+  });
+}
+
+
+export const serviceMiddleware = (callback: ServiceCallback) =>
+  async (req: Request, res: Response, next: NextFunction) => {
+    debug(`Running service middleware for '${req.url}'`);
+
+    try {
+      const { query, body: data } = req;
+      const { __feathersId: id = null, ...route } = req.params;
+      const params = { query, route, ...req.feathers };
+      const context = await callback(req, res, { id, data, params });
+      const result = http.getData(context);
+
+      res.data = result;
+      res.status(http.getStatusCode(context, result));
+
+      next();
+    } catch (error: any) {
+      next(error);
+    }
+  }
+
+export const serviceMethodHandler = (
+  service: any, methodName: string, getArgs: (opts: http.ServiceParams) => any[], headerOverride?: string
+) => serviceMiddleware(async (req, res, options) => {
+  const methodOverride = typeof headerOverride === 'string' && (req.headers[headerOverride] as string);
+  const method = methodOverride ? methodOverride : methodName
+  const { methods } = getServiceOptions(service);
+
+  if (!methods.includes(method) || defaultServiceMethods.includes(methodOverride)) {
+    res.status(http.statusCodes.methodNotAllowed);
+
+    throw new MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
+  }
+
+  const args = getArgs(options);
+  const context = createContext(service, method, { http: {} });
+
+  res.hook = context;
+
+  return service[method](...args, context);
+});
+
+export function rest (handler: RequestHandler = formatter) {
+  return function (this: any, app: any) {
+    if (typeof app.route !== 'function') {
+      throw new Error('@feathersjs/express/rest needs an Express compatible app.');
+    }
+
+    app.use(feathersParams);
+    app.use(parseAuthentication());
+
+    // Register the REST provider
+    app.mixins.push(function (service: any, path: string, options: any) {
+      const { middleware: { before = [] } } = options;
+      let { middleware: { after = [] } } = options;
+
+      if (typeof handler === 'function') {
+        after = after.concat(handler);
+      }
+
+      const baseUri = `/${path}`;
+      const find = serviceMethodHandler(service, 'find', http.argumentsFor.find);
+      const get = serviceMethodHandler(service, 'get', http.argumentsFor.get);
+      const create = serviceMethodHandler(service, 'create', http.argumentsFor.create, http.METHOD_HEADER);
+      const update = serviceMethodHandler(service, 'update', http.argumentsFor.update);
+      const patch = serviceMethodHandler(service, 'patch', http.argumentsFor.patch);
+      const remove = serviceMethodHandler(service, 'remove', http.argumentsFor.remove);
+
+      debug(`Adding REST provider for service \`${path}\` at base route \`${baseUri}\``);
+
+      const idRoute = '/:__feathersId';
+      const serviceRouter = Router({ mergeParams: true })
+        .get('/', find)
+        .post('/', create)
+        .get(idRoute, get)
+        .put('/', update)
+        .put(idRoute, update)
+        .patch('/', patch)
+        .patch(idRoute, patch)
+        .delete('/', remove)
+        .delete(idRoute, remove);
+
+      app.use(baseUri, ...before, serviceRouter, ...after);
+    });
+  };
+}

package/lib/rest/getHandler.d.ts

@@ -1,17 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-export declare const statusCodes: {
-    created: number;
-    noContent: number;
-    methodNotAllowed: number;
-};
-export declare const methodMap: {
-    find: string;
-    get: string;
-    create: string;
-    update: string;
-    patch: string;
-    remove: string;
-};
-export declare function getAllowedMethods(service: any, routes: any): any;
-export declare function makeArgsGetter(argsOrder: any): (req: Request, params: any) => any;
-export declare function getHandler(method: string): (service: any, routes: any) => (req: Request, res: Response, next: NextFunction) => void;

package/lib/rest/getHandler.js

@@ -1,105 +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.getHandler = exports.makeArgsGetter = exports.getAllowedMethods = exports.methodMap = exports.statusCodes = void 0;
-const debug_1 = __importDefault(require("debug"));
-const errors_1 = require("@feathersjs/errors");
-const commons_1 = require("@feathersjs/commons");
-const { omit } = commons_1._;
-const debug = debug_1.default('@feathersjs/express/rest');
-exports.statusCodes = {
-    created: 201,
-    noContent: 204,
-    methodNotAllowed: 405
-};
-exports.methodMap = {
-    find: 'GET',
-    get: 'GET',
-    create: 'POST',
-    update: 'PUT',
-    patch: 'PATCH',
-    remove: 'DELETE'
-};
-function getAllowedMethods(service, routes) {
-    if (routes) {
-        return routes
-            .filter(({ method }) => typeof service[method] === 'function')
-            .map((methodRoute) => methodRoute.verb.toUpperCase())
-            .filter((value, index, list) => list.indexOf(value) === index);
-    }
-    return Object.keys(exports.methodMap)
-        .filter((method) => typeof service[method] === 'function')
-        .map((method) => exports.methodMap[method])
-        // Filter out duplicates
-        .filter((value, index, list) => list.indexOf(value) === index);
-}
-exports.getAllowedMethods = getAllowedMethods;
-function makeArgsGetter(argsOrder) {
-    return (req, params) => argsOrder.map((argName) => {
-        switch (argName) {
-            case 'id':
-                return req.params.__feathersId || null;
-            case 'data':
-                return req.body;
-            case 'params':
-                return params;
-        }
-    });
-}
-exports.makeArgsGetter = makeArgsGetter;
-// A function that returns the middleware for a given method and service
-// `getArgs` is a function that should return additional leading service arguments
-function getHandler(method) {
-    return (service, routes) => {
-        const getArgs = makeArgsGetter(service.methods[method]);
-        const allowedMethods = getAllowedMethods(service, routes);
-        return (req, res, next) => {
-            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(exports.statusCodes.methodNotAllowed);
-                return next(new errors_1.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) => {
-                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(exports.statusCodes.noContent);
-                }
-                else if (method === 'create') {
-                    res.status(exports.statusCodes.created);
-                }
-                return next();
-            })
-                .catch((hook) => {
-                const { error } = hook;
-                debug(`Error in handler: \`${error.message}\``);
-                res.hook = hook;
-                return next(hook.error);
-            });
-        };
-    };
-}
-exports.getHandler = getHandler;
-//# sourceMappingURL=getHandler.js.map

package/lib/rest/getHandler.js.map

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

package/lib/rest/index.d.ts

@@ -1,20 +0,0 @@
-import { Request, Response, NextFunction, RequestHandler } from 'express';
-export declare function httpMethod(verb: any, uris?: any): (method: any) => any;
-export declare function getDefaultUri(path: string, methods: any, method: any): string;
-export declare function parseRoute(path: any, methods: any, method: any, route: any): {
-    method: any;
-    verb: any;
-    uri: string;
-};
-export declare function getServiceRoutes(service: any, path: any, defaultRoutes: any): any;
-export declare function getDefaultRoutes(uri: string): {
-    method: string;
-    verb: string;
-    uri: string;
-}[];
-export declare function formatter(_req: Request, res: Response, next: NextFunction): void;
-export declare function rest(handler?: RequestHandler): (this: any) => void;
-export declare namespace rest {
-    var formatter: typeof import(".").formatter;
-    var httpMethod: typeof import(".").httpMethod;
-}