@feathersjs/express 5.0.0-pre.2 → 5.0.0-pre.22

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;

package/lib/rest.js

@@ -1,48 +1,56 @@
 "use strict";
-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 __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rest = exports.serviceMethodHandler = exports.serviceMiddleware = exports.formatter = exports.feathersParams = exports.statusCodes = exports.METHOD_HEADER = void 0;
-const debug_1 = __importDefault(require("debug"));
+exports.rest = exports.formatter = void 0;
+const express_1 = require("express");
 const errors_1 = require("@feathersjs/errors");
-const hooks_1 = require("@feathersjs/hooks");
+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 = debug_1.default('@feathersjs/express/rest');
-exports.METHOD_HEADER = 'x-service-method';
-exports.statusCodes = {
-    created: 201,
-    noContent: 204,
-    methodNotAllowed: 405,
-    success: 200
+const debug = (0, commons_1.createDebug)('@feathersjs/express/rest');
+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 response = transport_commons_1.http.getResponse(context);
+        res.statusCode = response.status;
+        res.set(response.headers);
+        res.data = response.body;
+        return next();
+    });
 };
-const feathersParams = (req, _res, next) => {
-    req.feathers = Object.assign(Object.assign({}, req.feathers), { provider: 'rest', headers: req.headers });
-    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();
@@ -54,94 +62,24 @@ const formatter = (_req, res, next) => {
     });
 };
 exports.formatter = formatter;
-const getData = (context) => {
-    if (!(context instanceof hooks_1.HookContext)) {
-        return context;
-    }
-    return context.dispatch !== undefined
-        ? context.dispatch
-        : context.result;
-};
-const getStatusCode = (context, res) => {
-    if (context instanceof hooks_1.HookContext) {
-        if (context.statusCode) {
-            return context.statusCode;
-        }
-        if (context.method === 'create') {
-            return exports.statusCodes.created;
-        }
-    }
-    if (!res.data) {
-        return exports.statusCodes.noContent;
-    }
-    return exports.statusCodes.success;
-};
-const serviceMiddleware = (callback) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    debug(`Running service middleware for '${req.url}'`);
-    try {
-        const { query, body: data } = req;
-        const _a = req.params, { __feathersId: id = null } = _a, route = __rest(_a, ["__feathersId"]);
-        const params = Object.assign({ query, route }, req.feathers);
-        const context = yield callback(req, res, { id, data, params });
-        res.data = getData(context);
-        res.status(getStatusCode(context, res));
-        next();
-    }
-    catch (error) {
-        next(error);
-    }
-});
-exports.serviceMiddleware = serviceMiddleware;
-const serviceMethodHandler = (service, methodName, getArgs, headerOverride) => exports.serviceMiddleware((req, res, options) => __awaiter(void 0, void 0, void 0, function* () {
-    const methodOverride = typeof headerOverride === 'string' && req.headers[headerOverride];
-    const method = methodOverride ? methodOverride : methodName;
-    const { methods } = feathers_1.getServiceOptions(service);
-    if (!methods.includes(method) || feathers_1.defaultServiceMethods.includes(methodOverride)) {
-        res.status(exports.statusCodes.methodNotAllowed);
-        throw new errors_1.MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
-    }
-    const args = getArgs(options);
-    const context = 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(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 = exports.serviceMethodHandler(service, 'find', ({ params }) => [params]);
-            const get = exports.serviceMethodHandler(service, 'get', ({ id, params }) => [id, params]);
-            const create = exports.serviceMethodHandler(service, 'create', ({ data, params }) => [data, params], exports.METHOD_HEADER);
-            const update = exports.serviceMethodHandler(service, 'update', ({ id, data, params }) => [id, data, params]);
-            const patch = exports.serviceMethodHandler(service, 'patch', ({ id, data, params }) => [id, data, params]);
-            const remove = exports.serviceMethodHandler(service, 'remove', ({ id, params }) => [id, params]);
-            debug(`Adding REST provider for service \`${path}\` at base route \`${baseUri}\``);
-            const idRoute = '/:__feathersId';
-            const serviceRouter = 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,9 +1,10 @@
 {
   "name": "@feathersjs/express",
   "description": "Feathers Express framework bindings and REST provider",
-  "version": "5.0.0-pre.2",
+  "version": "5.0.0-pre.22",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
+  "types": "lib/",
   "keywords": [
     "feathers",
     "feathers-plugin"
@@ -15,7 +16,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/feathersjs/feathers.git"
+    "url": "git://github.com/feathersjs/feathers.git",
+    "directory": "packages/express"
   },
   "author": {
     "name": "Feathers contributors",
@@ -49,26 +51,27 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/commons": "^5.0.0-pre.2",
-    "@feathersjs/errors": "^5.0.0-pre.2",
-    "@types/express": "^4.17.11",
-    "debug": "^4.3.1",
-    "express": "^4.17.1",
-    "lodash": "^4.17.21"
+    "@feathersjs/authentication": "^5.0.0-pre.22",
+    "@feathersjs/commons": "^5.0.0-pre.22",
+    "@feathersjs/errors": "^5.0.0-pre.22",
+    "@feathersjs/feathers": "^5.0.0-pre.22",
+    "@feathersjs/transport-commons": "^5.0.0-pre.22",
+    "@types/express": "^4.17.13",
+    "@types/express-serve-static-core": "^4.17.28",
+    "express": "^4.18.1"
   },
   "devDependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.2",
-    "@feathersjs/authentication-local": "^5.0.0-pre.2",
-    "@feathersjs/feathers": "^5.0.0-pre.2",
-    "@feathersjs/tests": "^5.0.0-pre.2",
-    "@types/mocha": "^8.2.2",
-    "@types/node": "^14.14.37",
-    "axios": "^0.21.1",
+    "@feathersjs/authentication-local": "^5.0.0-pre.22",
+    "@feathersjs/tests": "^5.0.0-pre.22",
+    "@types/lodash": "^4.14.182",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^17.0.31",
+    "axios": "^0.27.2",
     "lodash": "^4.17.21",
-    "mocha": "^8.3.2",
-    "shx": "^0.3.3",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.2.3"
+    "mocha": "^10.0.0",
+    "shx": "^0.3.4",
+    "ts-node": "^10.7.0",
+    "typescript": "^4.6.4"
   },
-  "gitHead": "6e1f888dc5b612d2d77653177622e3f66245a0fb"
+  "gitHead": "e452e02063e6d8943a9cae2315ab585bc4f82fb6"
 }

package/src/authentication.ts

@@ -1,71 +1,61 @@
-import Debug from 'debug';
-import { merge, flatten } from 'lodash';
-import { NextFunction, RequestHandler } from 'express';
+import { RequestHandler, Request, Response } from 'express';
+import { HookContext } from '@feathersjs/feathers';
+import { createDebug } from '@feathersjs/commons';
+import { authenticate as AuthenticateHook } from '@feathersjs/authentication';
 
-const debug = Debug('@feathersjs/express/authentication');
+import { Application } from './declarations';
 
-type StrategyOptions = {
-  service?: string;
-  strategies: string[]
+const debug = createDebug('@feathersjs/express/authentication');
+
+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,59 +2,62 @@ 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])
+      Express|express.RequestHandler|express.RequestHandler[]|
+      (keyof any extends keyof Services ? ServiceInterface : Services[L])
     )[]
   ): T;
-  (path: RegExp, ...expressHandlers: express.RequestHandler[]): 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 type Application<ServiceTypes = any, AppSettings = any> =
-  Omit<Express, 'listen'|'use'> &
-  FeathersApplication<ServiceTypes, AppSettings> &
-  ExpressOverrides<ServiceTypes>;
+export type Application<Services = any, Settings = any> =
+  Omit<Express, 'listen'|'use'|'get'|'set'> &
+  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> & { [key: string]: any };
+    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 {