@feathersjs/express 5.0.0-pre.10 → 5.0.0-pre.16

package/CHANGELOG.md

@@ -3,6 +3,67 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-pre.16](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.15...v5.0.0-pre.16) (2022-01-12)
+
+
+### Features
+
+* **express, koa:** make transports similar ([#2486](https://github.com/feathersjs/feathers/issues/2486)) ([26aa937](https://github.com/feathersjs/feathers/commit/26aa937c114fb8596dfefc599b1f53cead69c159))
+
+
+
+
+
+# [5.0.0-pre.15](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.14...v5.0.0-pre.15) (2021-11-27)
+
+
+### Bug Fixes
+
+* missing express types for Request, Response ([#2498](https://github.com/feathersjs/feathers/issues/2498)) ([ee67131](https://github.com/feathersjs/feathers/commit/ee67131bbaa24c54d3d781bdf8820015759ac488))
+* **typescript:** Overall typing improvements ([#2478](https://github.com/feathersjs/feathers/issues/2478)) ([b8eb804](https://github.com/feathersjs/feathers/commit/b8eb804158556d9651a8607e3c3fda15e0bfd110))
+
+
+### Features
+
+* **core:** add `context.http` and move `statusCode` there ([#2496](https://github.com/feathersjs/feathers/issues/2496)) ([b701bf7](https://github.com/feathersjs/feathers/commit/b701bf77fb83048aa1dffa492b3d77dd53f7b72b))
+* **core:** Improve legacy hooks integration ([08c8b40](https://github.com/feathersjs/feathers/commit/08c8b40999bf3889c61a4d4fad97a2c4f78bafc9))
+
+
+
+
+
+# [5.0.0-pre.14](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.13...v5.0.0-pre.14) (2021-10-13)
+
+**Note:** Version bump only for package @feathersjs/express
+
+
+
+
+
+# [5.0.0-pre.13](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.12...v5.0.0-pre.13) (2021-10-13)
+
+**Note:** Version bump only for package @feathersjs/express
+
+
+
+
+
+# [5.0.0-pre.12](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.11...v5.0.0-pre.12) (2021-10-12)
+
+**Note:** Version bump only for package @feathersjs/express
+
+
+
+
+
+# [5.0.0-pre.11](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.10...v5.0.0-pre.11) (2021-10-06)
+
+**Note:** Version bump only for package @feathersjs/express
+
+
+
+
+
 # [5.0.0-pre.10](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.9...v5.0.0-pre.10) (2021-09-19)
 
 **Note:** Version bump only for package @feathersjs/express

package/lib/authentication.d.ts

@@ -1,8 +1,7 @@
-import { NextFunction, RequestHandler } from 'express';
-declare type StrategyOptions = {
+import { RequestHandler } from 'express';
+export declare type AuthenticationSettings = {
     service?: string;
-    strategies: string[];
+    strategies?: string[];
 };
-export declare function parseAuthentication(settings?: any): RequestHandler;
-export declare function authenticate(_settings: string | StrategyOptions, ..._strategies: string[]): (_req: Request, _res: Response, next: NextFunction) => void;
-export {};
+export declare function parseAuthentication(settings?: AuthenticationSettings): RequestHandler;
+export declare function authenticate(settings: string | AuthenticationSettings, ...strategies: string[]): RequestHandler;

package/lib/authentication.js

@@ -2,55 +2,44 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authenticate = exports.parseAuthentication = void 0;
 const commons_1 = require("@feathersjs/commons");
-const lodash_1 = require("lodash");
+const authentication_1 = require("@feathersjs/authentication");
 const debug = (0, commons_1.createDebug)('@feathersjs/express/authentication');
-const normalizeStrategy = (_settings, ..._strategies) => typeof _settings === 'string'
-    ? { strategies: (0, lodash_1.flatten)([_settings, ..._strategies]) }
-    : _settings;
+const toHandler = (func) => {
+    return (req, res, next) => func(req, res, next).catch(error => next(error));
+};
 function parseAuthentication(settings = {}) {
-    return function (req, res, next) {
+    return toHandler(async (req, res, next) => {
+        var _a;
         const app = req.app;
-        const service = app.defaultAuthentication ? app.defaultAuthentication(settings.service) : null;
-        if (service === null) {
+        const service = (_a = app.defaultAuthentication) === null || _a === void 0 ? void 0 : _a.call(app, settings.service);
+        if (!service) {
             return next();
         }
         const config = service.configuration;
-        const authStrategies = config.parseStrategies || config.authStrategies || [];
+        const authStrategies = settings.strategies || config.parseStrategies || config.authStrategies || [];
         if (authStrategies.length === 0) {
             debug('No `authStrategies` or `parseStrategies` found in authentication configuration');
             return next();
         }
-        service.parse(req, res, ...authStrategies)
-            .then((authentication) => {
-            if (authentication) {
-                debug('Parsed authentication from HTTP header', authentication);
-                (0, lodash_1.merge)(req, {
-                    authentication,
-                    feathers: { authentication }
-                });
-            }
-            next();
-        }).catch(next);
-    };
+        const authentication = await service.parse(req, res, ...authStrategies);
+        if (authentication) {
+            debug('Parsed authentication from HTTP header', authentication);
+            req.feathers = { ...req.feathers, authentication };
+        }
+        return next();
+    });
 }
 exports.parseAuthentication = parseAuthentication;
-function authenticate(_settings, ..._strategies) {
-    const settings = normalizeStrategy(_settings, ..._strategies);
-    if (!Array.isArray(settings.strategies) || settings.strategies.length === 0) {
-        throw new Error('\'authenticate\' middleware requires at least one strategy name');
-    }
-    return (_req, _res, next) => {
-        const req = _req;
-        const { app, authentication } = req;
-        const service = app.defaultAuthentication(settings.service);
-        debug('Authenticating with Express middleware and strategies', settings.strategies);
-        service.authenticate(authentication, req.feathers, ...settings.strategies)
-            .then((authResult) => {
-            debug('Merging request with', authResult);
-            (0, lodash_1.merge)(req, authResult);
-            next();
-        }).catch(next);
-    };
+function authenticate(settings, ...strategies) {
+    const hook = (0, authentication_1.authenticate)(settings, ...strategies);
+    return toHandler(async (req, _res, next) => {
+        const app = req.app;
+        const params = req.feathers;
+        const context = { app, params };
+        await hook(context);
+        req.feathers = context.params;
+        return next();
+    });
 }
 exports.authenticate = authenticate;
 //# sourceMappingURL=authentication.js.map

package/lib/authentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../src/authentication.ts"],"names":[],"mappings":";;;AAAA,iDAAkD;AAClD,mCAAwC;AAGxC,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,oCAAoC,CAAC,CAAC;AAOhE,MAAM,iBAAiB,GAAG,CAAC,SAAiC,EAAE,GAAG,WAAqB,EAAE,EAAE,CACxF,OAAO,SAAS,KAAK,QAAQ;IAC3B,CAAC,CAAC,EAAE,UAAU,EAAE,IAAA,gBAAO,EAAC,CAAE,SAAS,EAAE,GAAG,WAAW,CAAE,CAAC,EAAE;IACxD,CAAC,CAAC,SAAS,CAAC;AAEhB,SAAgB,mBAAmB,CAAE,WAAgB,EAAE;IACrD,OAAO,UAAU,GAAG,EAAE,GAAG,EAAE,IAAI;QAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,GAAU,CAAC;QAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE/F,IAAI,OAAO,KAAK,IAAI,EAAE;YACpB,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;QACrC,MAAM,cAAc,GAAG,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;QAE7E,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,KAAK,CAAC,gFAAgF,CAAC,CAAC;YACxF,OAAO,IAAI,EAAE,CAAC;SACf;QAED,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;aACvC,IAAI,CAAC,CAAC,cAAmB,EAAE,EAAE;YAC5B,IAAI,cAAc,EAAE;gBAClB,KAAK,CAAC,wCAAwC,EAAE,cAAc,CAAC,CAAC;gBAChE,IAAA,cAAK,EAAC,GAAG,EAAE;oBACT,cAAc;oBACd,QAAQ,EAAE,EAAE,cAAc,EAAE;iBAC7B,CAAC,CAAC;aACJ;YAED,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AA9BD,kDA8BC;AAED,SAAgB,YAAY,CAAE,SAAiC,EAAE,GAAG,WAAqB;IACvF,MAAM,QAAQ,GAAG,iBAAiB,CAAC,SAAS,EAAE,GAAG,WAAW,CAAC,CAAC;IAE9D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3E,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;KACpF;IAED,OAAO,CAAC,IAAa,EAAE,IAAc,EAAE,IAAkB,EAAE,EAAE;QAC3D,MAAM,GAAG,GAAG,IAAW,CAAC;QACxB,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;QACpC,MAAM,OAAO,GAAG,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5D,KAAK,CAAC,uDAAuD,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;QAEpF,OAAO,CAAC,YAAY,CAAC,cAAc,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC;aACvE,IAAI,CAAC,CAAC,UAAe,EAAE,EAAE;YACxB,KAAK,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;YAC1C,IAAA,cAAK,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAEvB,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AAtBD,oCAsBC"}
+{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../src/authentication.ts"],"names":[],"mappings":";;;AAEA,iDAAkD;AAClD,+DAA8E;AAI9E,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,oCAAoC,CAAC,CAAC;AAEhE,MAAM,SAAS,GAAG,CAAC,IAAsE,EAAkB,EAAE;IAC3G,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC9E,CAAC,CAAC;AAOF,SAAgB,mBAAmB,CAAE,WAAmC,EAAE;IACxE,OAAO,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QACxC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAyB,CAAC;QAC1C,MAAM,OAAO,GAAG,MAAA,GAAG,CAAC,qBAAqB,+CAAzB,GAAG,EAAyB,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE9D,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;QACrC,MAAM,cAAc,GAAG,QAAQ,CAAC,UAAU,IAAI,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;QAEpG,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,KAAK,CAAC,gFAAgF,CAAC,CAAC;YACxF,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,CAAA;QAEvE,IAAI,cAAc,EAAE;YAClB,KAAK,CAAC,wCAAwC,EAAE,cAAc,CAAC,CAAC;YAChE,GAAG,CAAC,QAAQ,GAAG,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;SACpD;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AA1BD,kDA0BC;AAED,SAAgB,YAAY,CAAE,QAAyC,EAAE,GAAG,UAAoB;IAC9F,MAAM,IAAI,GAAG,IAAA,6BAAgB,EAAC,QAAQ,EAAE,GAAG,UAAU,CAAC,CAAC;IAEvD,OAAO,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QACzC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAyB,CAAC;QAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC5B,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAwB,CAAC;QAEtD,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpB,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAdD,oCAcC"}

package/lib/declarations.d.ts

@@ -1,39 +1,41 @@
 /// <reference types="node" />
 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, ServiceTypes> {
-    <L extends keyof ServiceTypes & string>(path: L, ...middlewareOrService: (Express | express.RequestHandler | (keyof any extends keyof ServiceTypes ? ServiceInterface<any> : ServiceTypes[L]))[]): T;
+import { Application as FeathersApplication, Params as FeathersParams, HookContext, ServiceMethods, ServiceInterface, RouteLookup } 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<ServiceTypes> {
+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, ServiceTypes>;
+    use: ExpressUseHandler<this, Services>;
 }
-export declare type Application<ServiceTypes = any, AppSettings = any> = Omit<Express, 'listen' | 'use'> & FeathersApplication<ServiceTypes, AppSettings> & ExpressOverrides<ServiceTypes>;
+export declare 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[];
+        express?: {
+            before?: express.RequestHandler[];
+            after?: express.RequestHandler[];
+            composed?: express.RequestHandler;
         };
     }
 }
 declare module 'express-serve-static-core' {
     interface Request {
         feathers?: Partial<FeathersParams>;
+        lookup?: RouteLookup;
     }
     interface Response {
         data?: any;
         hook?: HookContext;
     }
     interface IRouterMatcher<T> {
-        <P extends Params = ParamsDictionary, ResBody = any, ReqBody = any>(path: PathParams, ...handlers: (RequestHandler<P, ResBody, ReqBody> | Partial<ServiceMethods<any, any>> | Application)[]): T;
+        <P extends Params = ParamsDictionary, ResBody = any, ReqBody = any>(path: PathParams, ...handlers: (RequestHandler<P, ResBody, ReqBody> | Partial<ServiceMethods> | Application)[]): T;
     }
 }
 export {};

package/lib/index.d.ts

@@ -1,9 +1,9 @@
-import express, { Express, static as _static, json, raw, text, urlencoded, query } from 'express';
+import { Express } from 'express';
 import { Application as FeathersApplication } from '@feathersjs/feathers';
 import { Application } from './declarations';
-import { errorHandler, notFound } from './handlers';
-import { parseAuthentication, authenticate } from './authentication';
-export { _static as static, json, raw, text, urlencoded, query, errorHandler, notFound, express as original, authenticate, parseAuthentication };
-export * from './rest';
+export { default as original, static, static as serveStatic, json, raw, text, urlencoded, query } from 'express';
+export * from './authentication';
 export * from './declarations';
+export * from './handlers';
+export * from './rest';
 export default function feathersExpress<S = any, C = any>(feathersApp?: FeathersApplication<S, C>, expressApp?: Express): Application<S, C>;

package/lib/index.js

@@ -6,41 +6,31 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseAuthentication = exports.authenticate = exports.original = exports.notFound = exports.errorHandler = exports.query = exports.urlencoded = exports.text = exports.raw = exports.json = exports.static = void 0;
-const express_1 = __importStar(require("express"));
-exports.original = express_1.default;
-Object.defineProperty(exports, "static", { enumerable: true, get: function () { return express_1.static; } });
-Object.defineProperty(exports, "json", { enumerable: true, get: function () { return express_1.json; } });
-Object.defineProperty(exports, "raw", { enumerable: true, get: function () { return express_1.raw; } });
-Object.defineProperty(exports, "text", { enumerable: true, get: function () { return express_1.text; } });
-Object.defineProperty(exports, "urlencoded", { enumerable: true, get: function () { return express_1.urlencoded; } });
-Object.defineProperty(exports, "query", { enumerable: true, get: function () { return express_1.query; } });
+exports.query = exports.urlencoded = exports.text = exports.raw = exports.json = exports.serveStatic = exports.static = exports.original = void 0;
+const express_1 = __importDefault(require("express"));
 const feathers_1 = require("@feathersjs/feathers");
+const transport_commons_1 = require("@feathersjs/transport-commons");
 const commons_1 = require("@feathersjs/commons");
-const handlers_1 = require("./handlers");
-Object.defineProperty(exports, "errorHandler", { enumerable: true, get: function () { return handlers_1.errorHandler; } });
-Object.defineProperty(exports, "notFound", { enumerable: true, get: function () { return handlers_1.notFound; } });
-const authentication_1 = require("./authentication");
-Object.defineProperty(exports, "parseAuthentication", { enumerable: true, get: function () { return authentication_1.parseAuthentication; } });
-Object.defineProperty(exports, "authenticate", { enumerable: true, get: function () { return authentication_1.authenticate; } });
-__exportStar(require("./rest"), exports);
+var express_2 = require("express");
+Object.defineProperty(exports, "original", { enumerable: true, get: function () { return __importDefault(express_2).default; } });
+Object.defineProperty(exports, "static", { enumerable: true, get: function () { return express_2.static; } });
+Object.defineProperty(exports, "serveStatic", { enumerable: true, get: function () { return express_2.static; } });
+Object.defineProperty(exports, "json", { enumerable: true, get: function () { return express_2.json; } });
+Object.defineProperty(exports, "raw", { enumerable: true, get: function () { return express_2.raw; } });
+Object.defineProperty(exports, "text", { enumerable: true, get: function () { return express_2.text; } });
+Object.defineProperty(exports, "urlencoded", { enumerable: true, get: function () { return express_2.urlencoded; } });
+Object.defineProperty(exports, "query", { enumerable: true, get: function () { return express_2.query; } });
+__exportStar(require("./authentication"), exports);
 __exportStar(require("./declarations"), exports);
+__exportStar(require("./handlers"), exports);
+__exportStar(require("./rest"), exports);
 const debug = (0, commons_1.createDebug)('@feathersjs/express');
 function feathersExpress(feathersApp, expressApp = (0, express_1.default)()) {
     if (!feathersApp) {
@@ -49,9 +39,10 @@ function feathersExpress(feathersApp, expressApp = (0, express_1.default)()) {
     if (typeof feathersApp.setup !== 'function') {
         throw new Error('@feathersjs/express requires a valid Feathers application instance');
     }
-    const { use, listen } = expressApp;
-    // A mixin that provides the extended functionality
-    const mixin = {
+    const app = expressApp;
+    const { use: expressUse, listen: expressListen } = expressApp;
+    const feathersUse = feathersApp.use;
+    Object.assign(app, {
         use(location, ...rest) {
             let service;
             let options = {};
@@ -77,37 +68,46 @@ function feathersExpress(feathersApp, expressApp = (0, express_1.default)()) {
             // Check for service (any object with at least one service method)
             if (hasMethod(['handle', 'set']) || !hasMethod(feathers_1.defaultServiceMethods)) {
                 debug('Passing app.use call to Express app');
-                return use.call(this, location, ...rest);
+                return expressUse.call(this, location, ...rest);
             }
             debug('Registering service with middleware', middleware);
             // Since this is a service, call Feathers `.use`
-            feathersApp.use.call(this, location, service, {
+            feathersUse.call(this, location, service, {
                 ...options,
-                middleware
+                express: middleware
             });
             return this;
         },
         async listen(...args) {
-            const server = listen.call(this, ...args);
+            const server = expressListen.call(this, ...args);
             await this.setup(server);
             debug('Feathers application listening');
             return server;
         }
+    });
+    const appDescriptors = {
+        ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(app)),
+        ...Object.getOwnPropertyDescriptors(app)
     };
-    const feathersDescriptors = {
+    const newDescriptors = {
         ...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.keys(feathersDescriptors).forEach(prop => {
-        const feathersProp = feathersDescriptors[prop];
-        const expressProp = Object.getOwnPropertyDescriptor(expressApp, prop);
-        if (expressProp === undefined && feathersProp !== undefined) {
-            Object.defineProperty(expressApp, prop, feathersProp);
+    Object.keys(newDescriptors).forEach(prop => {
+        const appProp = appDescriptors[prop];
+        const newProp = newDescriptors[prop];
+        if (appProp === undefined && newProp !== undefined) {
+            Object.defineProperty(expressApp, prop, newProp);
         }
     });
-    return Object.assign(expressApp, mixin);
+    app.configure((0, transport_commons_1.routing)());
+    app.use((req, _res, next) => {
+        req.feathers = { ...req.feathers, provider: 'rest' };
+        return next();
+    });
+    return app;
 }
 exports.default = feathersExpress;
 if (typeof module !== 'undefined') {

package/lib/index.js.map

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

package/lib/rest.d.ts

@@ -1,9 +1,9 @@
-import { HookContext } from '@feathersjs/hooks';
-import { http } from '@feathersjs/transport-commons';
-import { Request, Response, NextFunction, RequestHandler } from 'express';
-export declare type ServiceCallback = (req: Request, res: Response, options: http.ServiceParams) => Promise<HookContext | any>;
-export declare const feathersParams: (req: Request, _res: Response, next: NextFunction) => void;
-export declare const formatter: (_req: Request, res: Response, next: NextFunction) => void;
-export declare const serviceMiddleware: (callback: ServiceCallback) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
-export declare const serviceMethodHandler: (service: any, methodName: string, getArgs: (opts: http.ServiceParams) => any[], headerOverride?: string) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
-export declare function rest(handler?: RequestHandler): (this: any, app: any) => void;
+import { RequestHandler } from 'express';
+import { AuthenticationSettings } from './authentication';
+import { Application } from './declarations';
+export declare const formatter: RequestHandler;
+export declare type RestOptions = {
+    formatter?: RequestHandler;
+    authentication?: AuthenticationSettings;
+};
+export declare const rest: (options?: RestOptions | RequestHandler) => (app: Application) => void;

package/lib/rest.js

@@ -1,22 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rest = exports.serviceMethodHandler = exports.serviceMiddleware = exports.formatter = exports.feathersParams = void 0;
+exports.rest = exports.formatter = void 0;
+const express_1 = require("express");
 const errors_1 = require("@feathersjs/errors");
 const commons_1 = require("@feathersjs/commons");
 const transport_commons_1 = require("@feathersjs/transport-commons");
 const feathers_1 = require("@feathersjs/feathers");
-const express_1 = require("express");
 const authentication_1 = require("./authentication");
 const debug = (0, commons_1.createDebug)('@feathersjs/express/rest');
-const feathersParams = (req, _res, next) => {
-    req.feathers = {
-        ...req.feathers,
-        provider: 'rest',
-        headers: req.headers
-    };
-    next();
+const toHandler = (func) => {
+    return (req, res, next) => func(req, res, next).catch(error => next(error));
+};
+const serviceMiddleware = () => {
+    return toHandler(async (req, res, next) => {
+        const { query, headers, path, body: data, method: httpMethod } = req;
+        const methodOverride = req.headers[transport_commons_1.http.METHOD_HEADER];
+        const { service, params: { __id: id = null, ...route } = {} } = req.lookup;
+        const method = transport_commons_1.http.getServiceMethod(httpMethod, id, methodOverride);
+        const { methods } = (0, feathers_1.getServiceOptions)(service);
+        debug(`Found service for path ${path}, attempting to run '${method}' service method`);
+        if (!methods.includes(method) || feathers_1.defaultServiceMethods.includes(methodOverride)) {
+            const error = new errors_1.MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
+            res.statusCode = error.code;
+            throw error;
+        }
+        const createArguments = transport_commons_1.http.argumentsFor[method] || transport_commons_1.http.argumentsFor.default;
+        const params = { query, headers, route, ...req.feathers };
+        const args = createArguments({ id, data, params });
+        const contextBase = (0, feathers_1.createContext)(service, method, { http: {} });
+        res.hook = contextBase;
+        const context = await service[method](...args, contextBase);
+        res.hook = context;
+        const result = transport_commons_1.http.getData(context);
+        const statusCode = transport_commons_1.http.getStatusCode(context, result);
+        res.data = result;
+        res.statusCode = statusCode;
+        return next();
+    });
+};
+const servicesMiddleware = () => {
+    return toHandler(async (req, res, next) => {
+        const app = req.app;
+        const lookup = app.lookup(req.path);
+        if (!lookup) {
+            return next();
+        }
+        req.lookup = lookup;
+        const options = (0, feathers_1.getServiceOptions)(lookup.service);
+        const middleware = options.express.composed;
+        return middleware(req, res, next);
+    });
 };
-exports.feathersParams = feathersParams;
 const formatter = (_req, res, next) => {
     if (res.data === undefined) {
         return next();
@@ -28,73 +62,24 @@ const formatter = (_req, res, next) => {
     });
 };
 exports.formatter = formatter;
-const serviceMiddleware = (callback) => async (req, res, next) => {
-    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 = transport_commons_1.http.getData(context);
-        res.data = result;
-        res.status(transport_commons_1.http.getStatusCode(context, result));
-        next();
-    }
-    catch (error) {
-        next(error);
-    }
-};
-exports.serviceMiddleware = serviceMiddleware;
-const serviceMethodHandler = (service, methodName, getArgs, headerOverride) => (0, exports.serviceMiddleware)(async (req, res, options) => {
-    const methodOverride = typeof headerOverride === 'string' && req.headers[headerOverride];
-    const method = methodOverride ? methodOverride : methodName;
-    const { methods } = (0, feathers_1.getServiceOptions)(service);
-    if (!methods.includes(method) || feathers_1.defaultServiceMethods.includes(methodOverride)) {
-        res.status(transport_commons_1.http.statusCodes.methodNotAllowed);
-        throw new errors_1.MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
-    }
-    const args = getArgs(options);
-    const context = (0, feathers_1.createContext)(service, method);
-    res.hook = context;
-    return service[method](...args, context);
-});
-exports.serviceMethodHandler = serviceMethodHandler;
-function rest(handler = exports.formatter) {
-    return function (app) {
+const rest = (options) => {
+    options = typeof options === 'function' ? { formatter: options } : options || {};
+    const formatterMiddleware = options.formatter || exports.formatter;
+    const authenticationOptions = options.authentication;
+    return (app) => {
         if (typeof app.route !== 'function') {
             throw new Error('@feathersjs/express/rest needs an Express compatible app.');
         }
-        app.use(exports.feathersParams);
-        app.use((0, authentication_1.parseAuthentication)());
-        // Register the REST provider
-        app.mixins.push(function (service, path, options) {
-            const { middleware: { before = [] } } = options;
-            let { middleware: { after = [] } } = options;
-            if (typeof handler === 'function') {
-                after = after.concat(handler);
-            }
-            const baseUri = `/${path}`;
-            const find = (0, exports.serviceMethodHandler)(service, 'find', transport_commons_1.http.argumentsFor.find);
-            const get = (0, exports.serviceMethodHandler)(service, 'get', transport_commons_1.http.argumentsFor.get);
-            const create = (0, exports.serviceMethodHandler)(service, 'create', transport_commons_1.http.argumentsFor.create, transport_commons_1.http.METHOD_HEADER);
-            const update = (0, exports.serviceMethodHandler)(service, 'update', transport_commons_1.http.argumentsFor.update);
-            const patch = (0, exports.serviceMethodHandler)(service, 'patch', transport_commons_1.http.argumentsFor.patch);
-            const remove = (0, exports.serviceMethodHandler)(service, 'remove', transport_commons_1.http.argumentsFor.remove);
-            debug(`Adding REST provider for service \`${path}\` at base route \`${baseUri}\``);
-            const idRoute = '/:__feathersId';
-            const serviceRouter = (0, express_1.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);
+        app.use((0, authentication_1.parseAuthentication)(authenticationOptions));
+        app.use(servicesMiddleware());
+        app.mixins.push((_service, _path, options) => {
+            const { express: { before = [], after = [] } = {} } = options;
+            const middlewares = [].concat(before, serviceMiddleware(), after, formatterMiddleware);
+            const middleware = (0, express_1.Router)().use(middlewares);
+            options.express || (options.express = {});
+            options.express.composed = middleware;
         });
     };
-}
+};
 exports.rest = rest;
 //# sourceMappingURL=rest.js.map

package/lib/rest.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/express",
   "description": "Feathers Express framework bindings and REST provider",
-  "version": "5.0.0-pre.10",
+  "version": "5.0.0-pre.16",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "keywords": [
@@ -49,26 +49,27 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/commons": "^5.0.0-pre.10",
-    "@feathersjs/errors": "^5.0.0-pre.10",
-    "@feathersjs/transport-commons": "^5.0.0-pre.10",
+    "@feathersjs/authentication": "^5.0.0-pre.16",
+    "@feathersjs/commons": "^5.0.0-pre.16",
+    "@feathersjs/errors": "^5.0.0-pre.16",
+    "@feathersjs/feathers": "^5.0.0-pre.16",
+    "@feathersjs/transport-commons": "^5.0.0-pre.16",
     "@types/express": "^4.17.13",
-    "express": "^4.17.1",
-    "lodash": "^4.17.21"
+    "@types/express-serve-static-core": "^4.17.27",
+    "express": "^4.17.2"
   },
   "devDependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.10",
-    "@feathersjs/authentication-local": "^5.0.0-pre.10",
-    "@feathersjs/feathers": "^5.0.0-pre.10",
-    "@feathersjs/tests": "^5.0.0-pre.10",
+    "@feathersjs/authentication-local": "^5.0.0-pre.16",
+    "@feathersjs/tests": "^5.0.0-pre.16",
+    "@types/lodash": "^4.14.178",
     "@types/mocha": "^9.0.0",
-    "@types/node": "^16.9.4",
-    "axios": "^0.21.4",
+    "@types/node": "^17.0.5",
+    "axios": "^0.24.0",
     "lodash": "^4.17.21",
-    "mocha": "^9.1.1",
+    "mocha": "^9.1.3",
     "shx": "^0.3.3",
-    "ts-node": "^10.2.1",
-    "typescript": "^4.4.3"
+    "ts-node": "^10.4.0",
+    "typescript": "^4.5.4"
   },
-  "gitHead": "a9f7865cce8db2305b7c0d2ef4a165c2724034ef"
+  "gitHead": "f0cd227a82d159b528193bd33747c97684a48773"
 }

package/src/authentication.ts

@@ -1,71 +1,61 @@
+import { RequestHandler, Request, Response } from 'express';
+import { HookContext } from '@feathersjs/feathers';
 import { createDebug } from '@feathersjs/commons';
-import { merge, flatten } from 'lodash';
-import { NextFunction, RequestHandler } from 'express';
+import { authenticate as AuthenticateHook } from '@feathersjs/authentication';
+
+import { Application } from './declarations';
 
 const debug = createDebug('@feathersjs/express/authentication');
 
-type StrategyOptions = {
-  service?: string;
-  strategies: string[]
+const toHandler = (func: (req: Request, res: Response, next: () => void) => Promise<void>): RequestHandler => {
+  return (req, res, next) => func(req, res, next).catch(error => next(error));
 };
 
-const normalizeStrategy = (_settings: string|StrategyOptions, ..._strategies: string[]) =>
-  typeof _settings === 'string'
-    ? { strategies: flatten([ _settings, ..._strategies ]) }
-    : _settings;
+export type AuthenticationSettings = {
+  service?: string;
+  strategies?: string[];
+};
 
-export function parseAuthentication (settings: any = {}): RequestHandler {
-  return function (req, res, next) {
-    const app = req.app as any;
-    const service = app.defaultAuthentication ? app.defaultAuthentication(settings.service) : null;
+export function parseAuthentication (settings: AuthenticationSettings = {}): RequestHandler {
+  return toHandler(async (req, res, next) => {
+    const app = req.app as any as Application;
+    const service = app.defaultAuthentication?.(settings.service);
 
-    if (service === null) {
+    if (!service) {
       return next();
     }
 
     const config = service.configuration;
-    const authStrategies = config.parseStrategies || config.authStrategies || [];
+    const authStrategies = settings.strategies || config.parseStrategies || config.authStrategies || [];
 
     if (authStrategies.length === 0) {
       debug('No `authStrategies` or `parseStrategies` found in authentication configuration');
       return next();
     }
 
-    service.parse(req, res, ...authStrategies)
-      .then((authentication: any) => {
-        if (authentication) {
-          debug('Parsed authentication from HTTP header', authentication);
-          merge(req, {
-            authentication,
-            feathers: { authentication }
-          });
-        }
-
-        next();
-      }).catch(next);
-  };
-}
+    const authentication = await service.parse(req, res, ...authStrategies)
+
+    if (authentication) {
+      debug('Parsed authentication from HTTP header', authentication);
+      req.feathers = { ...req.feathers, authentication };
+    }
 
-export function authenticate (_settings: string|StrategyOptions, ..._strategies: string[]) {
-  const settings = normalizeStrategy(_settings, ..._strategies);
+    return next();
+  });
+}
 
-  if (!Array.isArray(settings.strategies) || settings.strategies.length === 0) {
-    throw new Error('\'authenticate\' middleware requires at least one strategy name');
-  }
+export function authenticate (settings: string | AuthenticationSettings, ...strategies: string[]): RequestHandler {
+  const hook = AuthenticateHook(settings, ...strategies);
 
-  return (_req: Request, _res: Response, next: NextFunction) => {
-    const req = _req as any;
-    const { app, authentication } = req;
-    const service = app.defaultAuthentication(settings.service);
+  return toHandler(async (req, _res, next) => {
+    const app = req.app as any as Application;
+    const params = req.feathers;
+    const context = { app, params } as any as HookContext;
 
-    debug('Authenticating with Express middleware and strategies', settings.strategies);
+    await hook(context);
 
-    service.authenticate(authentication, req.feathers, ...settings.strategies)
-      .then((authResult: any) => {
-        debug('Merging request with', authResult);
-        merge(req, authResult);
+    req.feathers = context.params;
 
-        next();
-      }).catch(next);
-  };
+    return next();
+  });
 }

package/src/declarations.ts

@@ -2,15 +2,15 @@ import http from 'http';
 import express, { Express } from 'express';
 import {
   Application as FeathersApplication, Params as FeathersParams,
-  HookContext, ServiceMethods, ServiceInterface
+  HookContext, ServiceMethods, ServiceInterface, RouteLookup
 } from '@feathersjs/feathers';
 
-interface ExpressUseHandler<T, ServiceTypes> {
-  <L extends keyof ServiceTypes & string> (
+interface ExpressUseHandler<T, Services> {
+  <L extends keyof Services & string> (
     path: L,
     ...middlewareOrService: (
       Express|express.RequestHandler|
-      (keyof any extends keyof ServiceTypes ? ServiceInterface<any> : ServiceTypes[L])
+      (keyof any extends keyof Services ? ServiceInterface : Services[L])
     )[]
   ): T;
   (path: string|RegExp, ...expressHandlers: express.RequestHandler[]): T;
@@ -18,43 +18,45 @@ interface ExpressUseHandler<T, ServiceTypes> {
   (handler: Express|express.ErrorRequestHandler): T;
 }
 
-export interface ExpressOverrides<ServiceTypes> {
+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, ServiceTypes>;
+  use: ExpressUseHandler<this, Services>;
 }
 
-export type Application<ServiceTypes = any, AppSettings = any> =
+export type Application<Services = any, Settings = any> =
   Omit<Express, 'listen'|'use'> &
-  FeathersApplication<ServiceTypes, AppSettings> &
-  ExpressOverrides<ServiceTypes>;
+  FeathersApplication<Services, Settings> &
+  ExpressOverrides<Services>;
 
 declare module '@feathersjs/feathers/lib/declarations' {
-  export interface ServiceOptions {
-    middleware?: {
-      before: express.RequestHandler[],
-      after: express.RequestHandler[]
-    }
+  interface ServiceOptions {
+    express?: {
+      before?: express.RequestHandler[];
+      after?: express.RequestHandler[];
+      composed?: express.RequestHandler;
+    };
   }
 }
 
 declare module 'express-serve-static-core' {
   interface Request {
-      feathers?: Partial<FeathersParams>;
+    feathers?: Partial<FeathersParams>;
+    lookup?: RouteLookup;
   }
 
   interface Response {
-      data?: any;
-      hook?: HookContext;
+    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<any, any>> | Application)[]
-      ): 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/handlers.ts

@@ -18,10 +18,10 @@ export function notFound ({ verbose = false } = {}): RequestHandler {
 }
 
 export type ErrorHandlerOptions = {
-  public?: string,
-  logger?: boolean|{ error?: (msg: any) => void, info?: (msg: any) => void },
-  html?: any,
-  json?: any
+  public?: string;
+  logger?: boolean|{ error?: (msg: any) => void, info?: (msg: any) => void };
+  html?: any;
+  json?: any;
 };
 
 export function errorHandler (_options: ErrorHandlerOptions = {}): ErrorRequestHandler {

package/src/index.ts

@@ -1,23 +1,16 @@
-import express, {
-  Express, static as _static, json, raw, text, urlencoded, query
-} from 'express';
-import {
-  Application as FeathersApplication, defaultServiceMethods
-} from '@feathersjs/feathers';
+import express, { Express } from 'express';
+import { Application as FeathersApplication, defaultServiceMethods } from '@feathersjs/feathers';
+import { routing } from '@feathersjs/transport-commons';
 import { createDebug } from '@feathersjs/commons';
 
 import { Application } from './declarations';
-import { errorHandler, notFound } from './handlers';
-import { parseAuthentication, authenticate } from './authentication';
 
-export {
-  _static as static, json, raw, text, urlencoded, query,
-  errorHandler, notFound, express as original,
-  authenticate, parseAuthentication
-};
+export { default as original, static, static as serveStatic, json, raw, text, urlencoded, query } from 'express';
 
-export * from './rest';
+export * from './authentication';
 export * from './declarations';
+export * from './handlers';
+export * from './rest';
 
 const debug = createDebug('@feathersjs/express');
 
@@ -30,10 +23,12 @@ export default function feathersExpress<S = any, C = any> (feathersApp?: Feather
     throw new Error('@feathersjs/express requires a valid Feathers application instance');
   }
 
-  const { use, listen } = expressApp as any;
-  // A mixin that provides the extended functionality
-  const mixin: any = {
-    use (location: string, ...rest: any[]) {
+  const app = expressApp as any as Application<S, C>;
+  const { use: expressUse, listen: expressListen } = expressApp as any;
+  const feathersUse = feathersApp.use;
+
+  Object.assign(app, {
+    use (location: string & keyof S, ...rest: any[]) {
       let service: any;
       let options = {};
 
@@ -60,46 +55,56 @@ export default function feathersExpress<S = any, C = any> (feathersApp?: Feather
       // Check for service (any object with at least one service method)
       if (hasMethod(['handle', 'set']) || !hasMethod(defaultServiceMethods)) {
         debug('Passing app.use call to Express app');
-        return use.call(this, location, ...rest);
+        return expressUse.call(this, location, ...rest);
       }
 
       debug('Registering service with middleware', middleware);
       // Since this is a service, call Feathers `.use`
-      (feathersApp as FeathersApplication).use.call(this, location, service, {
+      feathersUse.call(this, location, service, {
         ...options,
-        middleware
+        express: middleware
       });
 
       return this;
     },
 
     async listen (...args: any[]) {
-      const server = listen.call(this, ...args);
+      const server = expressListen.call(this, ...args);
 
       await this.setup(server);
       debug('Feathers application listening');
 
       return server;
     }
-  };
+  } as Application<S, C>);
 
-  const feathersDescriptors = {
+  const appDescriptors = {
+    ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(app)),
+    ...Object.getOwnPropertyDescriptors(app)
+  };
+  const newDescriptors = {
     ...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.keys(feathersDescriptors).forEach(prop => {
-    const feathersProp = feathersDescriptors[prop];
-    const expressProp = Object.getOwnPropertyDescriptor(expressApp, prop);
+  Object.keys(newDescriptors).forEach(prop => {
+    const appProp = appDescriptors[prop];
+    const newProp = newDescriptors[prop];
 
-    if (expressProp === undefined && feathersProp !== undefined) {
-      Object.defineProperty(expressApp, prop, feathersProp);
+    if (appProp === undefined && newProp !== undefined) {
+      Object.defineProperty(expressApp, prop, newProp);
     }
   });
 
-  return Object.assign(expressApp, mixin);
+  app.configure(routing() as any);
+  app.use((req, _res, next) => {
+    req.feathers = { ...req.feathers, provider: 'rest' };
+    return next();
+  });
+
+  return app;
 }
 
 if (typeof module !== 'undefined') {

package/src/rest.ts

@@ -1,120 +1,111 @@
+import { Request, Response, RequestHandler, Router } from 'express';
 import { MethodNotAllowed } from '@feathersjs/errors';
-import { HookContext } from '@feathersjs/hooks';
 import { createDebug } from '@feathersjs/commons';
 import { http } from '@feathersjs/transport-commons';
 import { createContext, defaultServiceMethods, getServiceOptions } from '@feathersjs/feathers';
-import { Request, Response, NextFunction, RequestHandler, Router } from 'express';
 
-import { parseAuthentication } from './authentication';
+import { AuthenticationSettings, parseAuthentication } from './authentication';
+import { Application } from './declarations';
 
 const debug = createDebug('@feathersjs/express/rest');
 
-export type ServiceCallback = (req: Request, res: Response, options: http.ServiceParams) => Promise<HookContext|any>;
+const toHandler = (func: (req: Request, res: Response, next: () => void) => Promise<void>): RequestHandler => {
+  return (req, res, next) => func(req, res, next).catch(error => next(error));
+};
 
-export const feathersParams = (req: Request, _res: Response, next: NextFunction) => {
-  req.feathers = {
-    ...req.feathers,
-    provider: 'rest',
-    headers: req.headers
-  };
-  next();
-}
+const serviceMiddleware = (): RequestHandler => {
+  return toHandler(async (req, res, next) => {
+    const { query, headers, path, body: data, method: httpMethod } = req;
+    const methodOverride = req.headers[http.METHOD_HEADER] as string | undefined;
 
-export const formatter = (_req: Request, res: Response, next: NextFunction) => {
-  if (res.data === undefined) {
-    return next();
-  }
+    const { service, params: { __id: id = null, ...route } = {} } = req.lookup!;
+    const method = http.getServiceMethod(httpMethod, id, methodOverride);
+    const { methods } = getServiceOptions(service);
 
-  res.format({
-    'application/json' () {
-      res.json(res.data);
+    debug(`Found service for path ${path}, attempting to run '${method}' service method`);
+
+    if (!methods.includes(method) || defaultServiceMethods.includes(methodOverride)) {
+      const error = new MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
+      res.statusCode = error.code;
+      throw error;
     }
-  });
-}
 
+    const createArguments = http.argumentsFor[method as 'get'] || http.argumentsFor.default;
+    const params = { query, headers, route, ...req.feathers };
+    const args = createArguments({ id, data, params });
+    const contextBase = createContext(service, method, { http: {} });
+    res.hook = contextBase;
+
+    const context = await (service as any)[method](...args, contextBase);
+    res.hook = context;
 
-export const serviceMiddleware = (callback: ServiceCallback) =>
-  async (req: Request, res: Response, next: NextFunction) => {
-    debug(`Running service middleware for '${req.url}'`);
+    const result = http.getData(context);
+    const statusCode = http.getStatusCode(context, result);
 
-    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.statusCode = statusCode;
+
+    return next();
+  });
+};
 
-      res.data = result;
-      res.status(http.getStatusCode(context, result));
+const servicesMiddleware = (): RequestHandler => {
+  return toHandler(async (req, res, next) => {
+    const app = req.app as any as Application;
+    const lookup = app.lookup(req.path);
 
-      next();
-    } catch (error: any) {
-      next(error);
+    if (!lookup) {
+      return next();
     }
-  }
 
-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);
+    req.lookup = lookup;
+
+    const options = getServiceOptions(lookup.service);
+    const middleware = options.express!.composed!;
 
-  if (!methods.includes(method) || defaultServiceMethods.includes(methodOverride)) {
-    res.status(http.statusCodes.methodNotAllowed);
+    return middleware(req, res, next);
+  });
+};
 
-    throw new MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
+export const formatter: RequestHandler = (_req, res, next) => {
+  if (res.data === undefined) {
+    return next();
   }
 
-  const args = getArgs(options);
-  const context = createContext(service, method);
+  res.format({
+    'application/json' () {
+      res.json(res.data);
+    }
+  });
+};
+
+export type RestOptions = {
+  formatter?: RequestHandler;
+  authentication?: AuthenticationSettings;
+};
 
-  res.hook = context as any;
+export const rest = (options?: RestOptions | RequestHandler) => {
+  options = typeof options === 'function' ? { formatter: options } : options || {};
 
-  return service[method](...args, context);
-});
+  const formatterMiddleware = options.formatter || formatter;
+  const authenticationOptions = options.authentication;
 
-export function rest (handler: RequestHandler = formatter) {
-  return function (this: any, app: any) {
+  return (app: Application) => {
     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);
+    app.use(parseAuthentication(authenticationOptions));
+    app.use(servicesMiddleware());
+
+    app.mixins.push((_service, _path, options) => {
+      const { express: { before = [], after = [] } = {} } = options;
+
+      const middlewares = [].concat(before, serviceMiddleware(), after, formatterMiddleware);
+      const middleware = Router().use(middlewares);
+
+      options.express ||= {};
+      options.express.composed = middleware;
     });
   };
 }