@feathersjs/express 5.0.0-pre.3 → 5.0.0-pre.31

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Feathers
+Copyright (c) 2022 Feathers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,8 +1,8 @@
 # @feathersjs/express
 
 [![CI](https://github.com/feathersjs/feathers/workflows/CI/badge.svg)](https://github.com/feathersjs/feathers/actions?query=workflow%3ACI)
-[![Dependency Status](https://img.shields.io/david/feathersjs/feathers.svg?style=flat-square&path=packages/express)](https://david-dm.org/feathersjs/feathers?path=packages/express)
 [![Download Status](https://img.shields.io/npm/dm/@feathersjs/express.svg?style=flat-square)](https://www.npmjs.com/package/@feathersjs/express)
+[![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/qa8kez8QBx)
 
 > Feathers Express framework bindings and REST provider
 
@@ -18,6 +18,6 @@ Refer to the [Feathers Express API documentation](https://docs.feathersjs.com/ap
 
 ## License
 
-Copyright (c) 2021 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
+Copyright (c) 2022 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
 
 Licensed under the [MIT license](LICENSE).

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 debug = commons_1.createDebug('@feathersjs/express/authentication');
-const normalizeStrategy = (_settings, ..._strategies) => typeof _settings === 'string'
-    ? { strategies: lodash_1.flatten([_settings, ..._strategies]) }
-    : _settings;
+const authentication_1 = require("@feathersjs/authentication");
+const debug = (0, commons_1.createDebug)('@feathersjs/express/authentication');
+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);
-                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);
-            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,qBAAW,CAAC,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,gBAAO,CAAC,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,cAAK,CAAC,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,cAAK,CAAC,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,iDAAiD;AACjD,+DAA6E;AAI7E,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,oCAAoC,CAAC,CAAA;AAE/D,MAAM,SAAS,GAAG,CAChB,IAAsE,EACtD,EAAE;IAClB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;AAC/E,CAAC,CAAA;AAOD,SAAgB,mBAAmB,CAAC,WAAmC,EAAE;IACvE,OAAO,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QACxC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAyB,CAAA;QACzC,MAAM,OAAO,GAAG,MAAA,GAAG,CAAC,qBAAqB,oDAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;QAE7D,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,IAAI,EAAE,CAAA;SACd;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAA;QACpC,MAAM,cAAc,GAAG,QAAQ,CAAC,UAAU,IAAI,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,cAAc,IAAI,EAAE,CAAA;QAEnG,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,KAAK,CAAC,gFAAgF,CAAC,CAAA;YACvF,OAAO,IAAI,EAAE,CAAA;SACd;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,CAAA;YAC/D,GAAG,CAAC,QAAQ,GAAG,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAA;SACnD;QAED,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAC,CAAA;AACJ,CAAC;AA1BD,kDA0BC;AAED,SAAgB,YAAY,CAC1B,QAAyC,EACzC,GAAG,UAAoB;IAEvB,MAAM,IAAI,GAAG,IAAA,6BAAgB,EAAC,QAAQ,EAAE,GAAG,UAAU,CAAC,CAAA;IAEtD,OAAO,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QACzC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAyB,CAAA;QACzC,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAA;QAC3B,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAwB,CAAA;QAErD,MAAM,IAAI,CAAC,OAAO,CAAC,CAAA;QAEnB,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAA;QAE7B,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAC,CAAA;AACJ,CAAC;AAjBD,oCAiBC"}

package/lib/declarations.d.ts

@@ -1,39 +1,44 @@
 /// <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 | 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>;
+    server?: http.Server;
 }
-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' | 'get' | 'set'> & 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>;
+        feathers?: Partial<FeathersParams> & {
+            [key: string]: any;
+        };
+        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/handlers.js

@@ -45,9 +45,11 @@ function errorHandler(_options = {}) {
         }
         if (error.type !== 'FeathersError') {
             const oldError = error;
-            error = oldError.errors ? new errors_1.GeneralError(oldError.message, {
-                errors: oldError.errors
-            }) : new errors_1.GeneralError(oldError.message);
+            error = oldError.errors
+                ? new errors_1.GeneralError(oldError.message, {
+                    errors: oldError.errors
+                })
+                : new errors_1.GeneralError(oldError.message);
             if (oldError.stack) {
                 error.stack = oldError.stack;
             }

package/lib/handlers.js.map

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

package/lib/index.d.ts

@@ -1,9 +1,10 @@
-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 * from './declarations';
+import cors from 'cors';
+import { rest, RestOptions, formatter } from './rest';
+import { errorHandler, notFound, ErrorHandlerOptions } from './handlers';
+import { Application, ExpressOverrides } from './declarations';
+import { AuthenticationSettings, authenticate, parseAuthentication } from './authentication';
+import { default as original, static as serveStatic, json, raw, text, urlencoded, query } from 'express';
+export { original, serveStatic, serveStatic as static, json, raw, text, urlencoded, query, rest, RestOptions, formatter, errorHandler, notFound, Application, ErrorHandlerOptions, ExpressOverrides, AuthenticationSettings, parseAuthentication, authenticate, cors };
 export default function feathersExpress<S = any, C = any>(feathersApp?: FeathersApplication<S, C>, expressApp?: Express): Application<S, C>;

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -18,49 +22,47 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+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.cors = exports.authenticate = exports.parseAuthentication = exports.notFound = exports.errorHandler = exports.formatter = exports.rest = exports.query = exports.urlencoded = exports.text = exports.raw = exports.json = exports.static = exports.serveStatic = 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 cors_1 = __importDefault(require("cors"));
+exports.cors = cors_1.default;
+const rest_1 = require("./rest");
+Object.defineProperty(exports, "rest", { enumerable: true, get: function () { return rest_1.rest; } });
+Object.defineProperty(exports, "formatter", { enumerable: true, get: function () { return rest_1.formatter; } });
 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);
-__exportStar(require("./declarations"), exports);
-const debug = commons_1.createDebug('@feathersjs/express');
-function feathersExpress(feathersApp, expressApp = express_1.default()) {
+Object.defineProperty(exports, "parseAuthentication", { enumerable: true, get: function () { return authentication_1.parseAuthentication; } });
+const express_2 = __importStar(require("express"));
+Object.defineProperty(exports, "original", { enumerable: true, get: function () { return express_2.default; } });
+Object.defineProperty(exports, "serveStatic", { enumerable: true, get: function () { return express_2.static; } });
+Object.defineProperty(exports, "static", { 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; } });
+const debug = (0, commons_1.createDebug)('@feathersjs/express');
+function feathersExpress(feathersApp, expressApp = (0, express_1.default)()) {
     if (!feathersApp) {
         return expressApp;
     }
     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 { use: feathersUse, teardown: feathersTeardown } = feathersApp;
+    Object.assign(app, {
         use(location, ...rest) {
             let service;
             let options = {};
@@ -71,7 +73,7 @@ function feathersExpress(feathersApp, expressApp = express_1.default()) {
                 else if (!service) {
                     service = arg;
                 }
-                else if (arg.methods || arg.events) {
+                else if (arg.methods || arg.events || arg.express || arg.koa) {
                     options = arg;
                 }
                 else {
@@ -82,37 +84,59 @@ function feathersExpress(feathersApp, expressApp = express_1.default()) {
                 before: [],
                 after: []
             });
-            const hasMethod = (methods) => methods.some(name => (service && typeof service[name] === 'function'));
+            const hasMethod = (methods) => methods.some((name) => service && typeof service[name] === 'function');
             // 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, Object.assign(Object.assign({}, options), { middleware }));
+            feathersUse.call(this, location, service, {
+                express: middleware,
+                ...options
+            });
             return this;
         },
-        listen(...args) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const server = listen.call(this, ...args);
-                yield this.setup(server);
-                debug('Feathers application listening');
-                return server;
-            });
+        async listen(...args) {
+            const server = expressListen.call(this, ...args);
+            this.server = server;
+            await this.setup(server);
+            debug('Feathers application listening');
+            return server;
         }
+    });
+    const appDescriptors = {
+        ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(app)),
+        ...Object.getOwnPropertyDescriptors(app)
+    };
+    const newDescriptors = {
+        ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(feathersApp)),
+        ...Object.getOwnPropertyDescriptors(feathersApp)
     };
-    const feathersDescriptors = Object.assign(Object.assign({}, 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);
+    // Assign teardown and setup which will also make sure that hooks are initialized
+    app.setup = feathersApp.setup;
+    app.teardown = async function teardown(server) {
+        return feathersTeardown.call(this, server).then(() => new Promise((resolve, reject) => {
+            if (this.server) {
+                this.server.close((e) => (e ? reject(e) : resolve(this)));
+            }
+            else {
+                resolve(this);
+            }
+        }));
+    };
+    app.configure((0, transport_commons_1.routing)());
+    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,21 +1,9 @@
-import { HookContext } from '@feathersjs/hooks';
-import { NullableId, Params } from '@feathersjs/feathers';
-import { Request, Response, NextFunction, RequestHandler } from 'express';
-export declare const METHOD_HEADER = "x-service-method";
-export interface ServiceParams {
-    id: NullableId;
-    data: any;
-    params: Params;
-}
-export declare type ServiceCallback = (req: Request, res: Response, options: ServiceParams) => Promise<HookContext | any>;
-export declare const statusCodes: {
-    created: number;
-    noContent: number;
-    methodNotAllowed: number;
-    success: number;
+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 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: ServiceParams) => any[], headerOverride?: string) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
-export declare function rest(handler?: RequestHandler): (this: any, app: any) => void;
+export declare const rest: (options?: RestOptions | RequestHandler) => (app: Application) => void;