@feathersjs/koa 5.0.0-pre.15 → 5.0.0-pre.16

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 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)
 
 

package/lib/authentication.d.ts

@@ -0,0 +1,7 @@
+import { Middleware } from './declarations';
+export declare type AuthenticationSettings = {
+    service?: string;
+    strategies?: string[];
+};
+export declare function parseAuthentication(settings?: AuthenticationSettings): Middleware;
+export declare function authenticate(settings: string | AuthenticationSettings, ...strategies: string[]): Middleware;

package/lib/authentication.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.authenticate = exports.parseAuthentication = void 0;
+const commons_1 = require("@feathersjs/commons");
+const authentication_1 = require("@feathersjs/authentication");
+const debug = (0, commons_1.createDebug)('@feathersjs/koa/authentication');
+function parseAuthentication(settings = {}) {
+    return async (ctx, next) => {
+        var _a;
+        const app = ctx.app;
+        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 = settings.strategies || config.parseStrategies || config.authStrategies || [];
+        if (authStrategies.length === 0) {
+            debug('No `authStrategies` or `parseStrategies` found in authentication configuration');
+            return next();
+        }
+        const authentication = await service.parse(ctx.req, ctx.res, ...authStrategies);
+        if (authentication) {
+            debug('Parsed authentication from HTTP header', authentication);
+            ctx.feathers = { ...ctx.feathers, authentication };
+        }
+        return next();
+    };
+}
+exports.parseAuthentication = parseAuthentication;
+function authenticate(settings, ...strategies) {
+    const hook = (0, authentication_1.authenticate)(settings, ...strategies);
+    return async (ctx, next) => {
+        const app = ctx.app;
+        const params = ctx.feathers;
+        const context = { app, params };
+        await hook(context);
+        ctx.feathers = context.params;
+        return next();
+    };
+}
+exports.authenticate = authenticate;
+//# sourceMappingURL=authentication.js.map

package/lib/authentication.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../src/authentication.ts"],"names":[],"mappings":";;;AACA,iDAAkD;AAClD,+DAA8E;AAI9E,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,gCAAgC,CAAC,CAAC;AAO5D,SAAgB,mBAAmB,CAAE,WAAmC,EAAE;IACxE,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QACzB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QACpB,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,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC,CAAC;QAEhF,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;AACJ,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,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACzB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAkB,CAAC;QACnC,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC5B,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAiB,CAAC;QAE/C,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpB,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAdD,oCAcC"}

package/lib/declarations.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import Koa from 'koa';
+import Koa, { Next } from 'koa';
 import { Server } from 'http';
-import { Application as FeathersApplication, HookContext, Params } from '@feathersjs/feathers';
+import { Application as FeathersApplication, HookContext, Params, RouteLookup } from '@feathersjs/feathers';
 import '@feathersjs/authentication';
 export declare type ApplicationAddons = {
     listen(port?: number, ...args: any[]): Promise<Server>;
@@ -10,9 +10,20 @@ export declare type Application<T = any, C = any> = Omit<Koa, 'listen'> & Feathe
 export declare type FeathersKoaContext<A = Application> = Koa.Context & {
     app: A;
 };
+export declare type Middleware<A = Application> = (context: FeathersKoaContext<A>, next: Next) => any;
+declare module '@feathersjs/feathers/lib/declarations' {
+    interface ServiceOptions {
+        koa?: {
+            before?: Middleware[];
+            after?: Middleware[];
+            composed?: Middleware;
+        };
+    }
+}
 declare module 'koa' {
     interface ExtendableContext {
         feathers?: Partial<Params>;
+        lookup?: RouteLookup;
         hook?: HookContext;
     }
 }

package/lib/{error-handler.js → handlers.js}

@@ -17,4 +17,4 @@ const errorHandler = () => async (ctx, next) => {
     }
 };
 exports.errorHandler = errorHandler;
-//# sourceMappingURL=error-handler.js.map
+//# sourceMappingURL=handlers.js.map

package/lib/handlers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../src/handlers.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAGvC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,KAAK,EAAE,GAAuB,EAAE,IAAwB,EAAE,EAAE;IAC5F,IAAI;QACF,MAAM,IAAI,EAAE,CAAC;QAEb,IAAG,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;YACzB,MAAM,IAAI,iBAAQ,CAAC,WAAW,CAAC,CAAC;SACjC;KAEF;IAAC,OAAO,KAAU,EAAE;QACnB,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,IAAI,GAAG,CAAC;QACxC,GAAG,CAAC,IAAI,GAAG,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC/D,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC;KACH;AACH,CAAC,CAAC;AAdW,QAAA,YAAY,gBAcvB"}

package/lib/index.d.ts

@@ -1,10 +1,10 @@
 import Koa from 'koa';
-import bodyParser from 'koa-bodyparser';
 import { Application as FeathersApplication } from '@feathersjs/feathers';
 import { Application } from './declarations';
-import { errorHandler } from './error-handler';
+export { default as Koa } from 'koa';
+export { default as bodyParser } from 'koa-bodyparser';
+export * from './authentication';
 export * from './declarations';
-export * from './authenticate';
-export { rest } from './rest';
-export { Koa, bodyParser, errorHandler };
-export declare function koa(_app?: FeathersApplication): Application;
+export * from './handlers';
+export * from './rest';
+export declare function koa<S = any, C = any>(feathersApp?: FeathersApplication<S, C>, koaApp?: Koa): Application<S, C>;

package/lib/index.js

@@ -13,36 +13,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.koa = exports.errorHandler = exports.bodyParser = exports.Koa = exports.rest = void 0;
+exports.koa = exports.bodyParser = exports.Koa = void 0;
 const koa_1 = __importDefault(require("koa"));
-exports.Koa = koa_1.default;
-const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
-exports.bodyParser = koa_bodyparser_1.default;
 const koa_qs_1 = __importDefault(require("koa-qs"));
 const transport_commons_1 = require("@feathersjs/transport-commons");
 const commons_1 = require("@feathersjs/commons");
-const error_handler_1 = require("./error-handler");
-Object.defineProperty(exports, "errorHandler", { enumerable: true, get: function () { return error_handler_1.errorHandler; } });
-const debug = (0, commons_1.createDebug)('@feathersjs/koa');
+var koa_2 = require("koa");
+Object.defineProperty(exports, "Koa", { enumerable: true, get: function () { return __importDefault(koa_2).default; } });
+var koa_bodyparser_1 = require("koa-bodyparser");
+Object.defineProperty(exports, "bodyParser", { enumerable: true, get: function () { return __importDefault(koa_bodyparser_1).default; } });
+__exportStar(require("./authentication"), exports);
 __exportStar(require("./declarations"), exports);
-__exportStar(require("./authenticate"), exports);
-var rest_1 = require("./rest");
-Object.defineProperty(exports, "rest", { enumerable: true, get: function () { return rest_1.rest; } });
-function koa(_app) {
-    const koaApp = new koa_1.default();
-    if (!_app) {
+__exportStar(require("./handlers"), exports);
+__exportStar(require("./rest"), exports);
+const debug = (0, commons_1.createDebug)('@feathersjs/koa');
+function koa(feathersApp, koaApp = new koa_1.default()) {
+    if (!feathersApp) {
         return koaApp;
     }
-    if (typeof _app.setup !== 'function') {
+    if (typeof feathersApp.setup !== 'function') {
         throw new Error('@feathersjs/koa requires a valid Feathers application instance');
     }
-    const app = _app;
+    const app = feathersApp;
     const { listen: koaListen, use: koaUse } = koaApp;
-    const oldUse = app.use;
+    const feathersUse = feathersApp.use;
     Object.assign(app, {
         use(location, ...args) {
             if (typeof location === 'string') {
-                return oldUse.call(this, location, ...args);
+                return feathersUse.call(this, location, ...args);
             }
             return koaUse.call(this, location);
         },
@@ -53,27 +51,27 @@ function koa(_app) {
             return server;
         }
     });
-    const feathersDescriptors = {
+    const appDescriptors = {
         ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(app)),
         ...Object.getOwnPropertyDescriptors(app)
     };
-    const koaDescriptors = {
+    const newDescriptors = {
         ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(koaApp)),
         ...Object.getOwnPropertyDescriptors(koaApp)
     };
     // Copy all non-existing properties (including non-enumerables)
     // that don't already exist on the Express app
-    Object.keys(koaDescriptors).forEach(prop => {
-        const feathersProp = feathersDescriptors[prop];
-        const koaProp = koaDescriptors[prop];
-        if (koaProp !== undefined && feathersProp === undefined) {
-            Object.defineProperty(app, prop, koaProp);
+    Object.keys(newDescriptors).forEach(prop => {
+        const appProp = appDescriptors[prop];
+        const newProp = newDescriptors[prop];
+        if (appProp === undefined && newProp !== undefined) {
+            Object.defineProperty(app, prop, newProp);
         }
     });
     (0, koa_qs_1.default)(app);
     app.configure((0, transport_commons_1.routing)());
     app.use((ctx, next) => {
-        ctx.feathers = { provider: 'rest' };
+        ctx.feathers = { ...ctx.feathers, provider: 'rest' };
         return next();
     });
     return app;

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,3 +1,8 @@
-import { Next } from 'koa';
-import { FeathersKoaContext } from './declarations';
-export declare function rest(): (ctx: FeathersKoaContext, next: Next) => Promise<any>;
+import { Application, Middleware } from './declarations';
+import { AuthenticationSettings } from './authentication';
+export declare const formatter: Middleware;
+export declare type RestOptions = {
+    formatter?: Middleware;
+    authentication?: AuthenticationSettings;
+};
+export declare const rest: (options?: RestOptions | Middleware) => (app: Application) => void;

package/lib/rest.js

@@ -1,44 +1,73 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rest = void 0;
+exports.rest = exports.formatter = void 0;
+const koa_compose_1 = __importDefault(require("koa-compose"));
 const transport_commons_1 = require("@feathersjs/transport-commons");
 const commons_1 = require("@feathersjs/commons");
 const feathers_1 = require("@feathersjs/feathers");
 const errors_1 = require("@feathersjs/errors");
-const debug = (0, commons_1.createDebug)('@feathersjs/koa:rest');
-function rest() {
+const authentication_1 = require("./authentication");
+const debug = (0, commons_1.createDebug)('@feathersjs/koa/rest');
+const serviceMiddleware = () => {
     return async (ctx, next) => {
-        const { app, request } = ctx;
-        const { query: koaQuery, headers, path, body: data, method: httpMethod } = request;
-        const query = { ...koaQuery };
-        const methodOverride = request.headers[transport_commons_1.http.METHOD_HEADER] ?
-            request.headers[transport_commons_1.http.METHOD_HEADER] : null;
-        const lookup = app.lookup(path);
-        if (lookup !== null) {
-            const { service, params: { __id: id = null, ...route } = {} } = 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)) {
-                ctx.response.status = transport_commons_1.http.statusCodes.methodNotAllowed;
-                throw new errors_1.MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
-            }
-            const createArguments = transport_commons_1.http.argumentsFor[method] || transport_commons_1.http.argumentsFor.default;
-            const params = {
-                ...ctx.feathers,
-                query,
-                headers,
-                route
-            };
-            const args = createArguments({ id, data, params });
-            const hookContext = (0, feathers_1.createContext)(service, method, { http: {} });
-            ctx.hook = hookContext;
-            const result = await service[method](...args, hookContext);
-            ctx.response.status = transport_commons_1.http.getStatusCode(result, {});
-            ctx.body = transport_commons_1.http.getData(result);
+        const { query, headers, path, body: data, method: httpMethod } = ctx.request;
+        const methodOverride = ctx.request.headers[transport_commons_1.http.METHOD_HEADER];
+        const { service, params: { __id: id = null, ...route } = {} } = ctx.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.`);
+            ctx.response.status = error.code;
+            throw error;
         }
+        const createArguments = transport_commons_1.http.argumentsFor[method] || transport_commons_1.http.argumentsFor.default;
+        const params = { query, headers, route, ...ctx.feathers };
+        const args = createArguments({ id, data, params });
+        const contextBase = (0, feathers_1.createContext)(service, method, { http: {} });
+        ctx.hook = contextBase;
+        const context = await service[method](...args, contextBase);
+        ctx.hook = context;
+        const result = transport_commons_1.http.getData(context);
+        const statusCode = transport_commons_1.http.getStatusCode(context, result);
+        ctx.body = result;
+        ctx.status = statusCode;
         return next();
     };
-}
+};
+const servicesMiddleware = () => {
+    return async (ctx, next) => {
+        const app = ctx.app;
+        const lookup = app.lookup(ctx.request.path);
+        if (!lookup) {
+            return next();
+        }
+        ctx.lookup = lookup;
+        const options = (0, feathers_1.getServiceOptions)(lookup.service);
+        const middleware = options.koa.composed;
+        return middleware(ctx, next);
+    };
+};
+const formatter = (_ctx, _next) => { };
+exports.formatter = formatter;
+const rest = (options) => {
+    options = typeof options === 'function' ? { formatter: options } : options || {};
+    const formatterMiddleware = options.formatter || exports.formatter;
+    const authenticationOptions = options.authentication;
+    return (app) => {
+        app.use((0, authentication_1.parseAuthentication)(authenticationOptions));
+        app.use(servicesMiddleware());
+        app.mixins.push((_service, _path, options) => {
+            const { koa: { before = [], after = [] } = {} } = options;
+            const middlewares = [].concat(before, serviceMiddleware(), after, formatterMiddleware);
+            const middleware = (0, koa_compose_1.default)(middlewares);
+            options.koa || (options.koa = {});
+            options.koa.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":";;;AACA,qEAAqD;AACrD,iDAAkD;AAClD,mDAA+F;AAC/F,+CAAsD;AAGtD,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,sBAAsB,CAAC,CAAC;AAElD,SAAgB,IAAI;IAClB,OAAO,KAAK,EAAE,GAAuB,EAAE,IAAU,EAAE,EAAE;QACnD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QAC7B,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACnF,MAAM,KAAK,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC9B,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,wBAAI,CAAC,aAAa,CAAC,CAAC,CAAC;YAC1D,OAAO,CAAC,OAAO,CAAC,wBAAI,CAAC,aAAa,CAAW,CAAC,CAAC,CAAC,IAAI,CAAC;QACvD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,MAAM,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;YACvE,MAAM,MAAM,GAAG,wBAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;YACrE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,4BAAiB,EAAC,OAAO,CAAC,CAAC;YAE/C,KAAK,CAAC,0BAA0B,IAAI,wBAAwB,MAAM,kBAAkB,CAAC,CAAC;YAEtF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,gCAAqB,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;gBAC/E,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,wBAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC;gBAExD,MAAM,IAAI,yBAAgB,CAAC,YAAY,MAAM,uCAAuC,CAAC,CAAC;aACvF;YAED,MAAM,eAAe,GAAI,wBAAI,CAAC,YAAoB,CAAC,MAAM,CAAC,IAAI,wBAAI,CAAC,YAAY,CAAC,OAAO,CAAC;YACxF,MAAM,MAAM,GAAG;gBACb,GAAG,GAAG,CAAC,QAAQ;gBACf,KAAK;gBACL,OAAO;gBACP,KAAK;aACN,CAAC;YACF,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YACnD,MAAM,WAAW,GAAG,IAAA,wBAAa,EAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YAEjE,GAAG,CAAC,IAAI,GAAG,WAAkB,CAAC;YAE9B,MAAM,MAAM,GAAG,MAAO,OAAe,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,EAAE,WAAW,CAAC,CAAC;YAEpE,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,wBAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACrD,GAAG,CAAC,IAAI,GAAG,wBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AA1CD,oBA0CC"}
+{"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/koa",
   "description": "Feathers KoaJS framework bindings and REST provider",
-  "version": "5.0.0-pre.15",
+  "version": "5.0.0-pre.16",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "keywords": [
@@ -47,28 +47,31 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.15",
-    "@feathersjs/commons": "^5.0.0-pre.15",
-    "@feathersjs/errors": "^5.0.0-pre.15",
-    "@feathersjs/transport-commons": "^5.0.0-pre.15",
+    "@feathersjs/authentication": "^5.0.0-pre.16",
+    "@feathersjs/commons": "^5.0.0-pre.16",
+    "@feathersjs/errors": "^5.0.0-pre.16",
+    "@feathersjs/transport-commons": "^5.0.0-pre.16",
     "@types/koa": "^2.13.4",
-    "@types/koa-bodyparser": "^4.3.4",
+    "@types/koa-bodyparser": "^4.3.5",
     "@types/koa-qs": "^2.0.0",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
+    "koa-compose": "^4.1.0",
     "koa-qs": "^3.0.0"
   },
   "devDependencies": {
-    "@feathersjs/authentication-local": "^5.0.0-pre.15",
-    "@feathersjs/feathers": "^5.0.0-pre.15",
-    "@feathersjs/memory": "^5.0.0-pre.15",
-    "@feathersjs/tests": "^5.0.0-pre.15",
+    "@feathersjs/authentication-local": "^5.0.0-pre.16",
+    "@feathersjs/feathers": "^5.0.0-pre.16",
+    "@feathersjs/memory": "^5.0.0-pre.16",
+    "@feathersjs/tests": "^5.0.0-pre.16",
+    "@types/koa-compose": "^3.2.5",
     "@types/mocha": "^9.0.0",
-    "@types/node": "^16.11.6",
+    "@types/node": "^17.0.5",
+    "axios": "^0.24.0",
     "mocha": "^9.1.3",
     "shx": "^0.3.3",
     "ts-node": "^10.4.0",
-    "typescript": "^4.4.4"
+    "typescript": "^4.5.4"
   },
-  "gitHead": "8008bf4f8529a2a40b6a2f976c1f43ae13675693"
+  "gitHead": "f0cd227a82d159b528193bd33747c97684a48773"
 }

package/src/authentication.ts

@@ -0,0 +1,56 @@
+import { Application, HookContext } from '@feathersjs/feathers';
+import { createDebug } from '@feathersjs/commons';
+import { authenticate as AuthenticateHook } from '@feathersjs/authentication';
+
+import { Middleware } from './declarations';
+
+const debug = createDebug('@feathersjs/koa/authentication');
+
+export type AuthenticationSettings = {
+  service?: string;
+  strategies?: string[];
+};
+
+export function parseAuthentication (settings: AuthenticationSettings = {}): Middleware {
+  return async (ctx, next) => {
+    const app = ctx.app;
+    const service = app.defaultAuthentication?.(settings.service);
+
+    if (!service) {
+      return next();
+    }
+
+    const config = service.configuration;
+    const authStrategies = settings.strategies || config.parseStrategies || config.authStrategies || [];
+
+    if (authStrategies.length === 0) {
+      debug('No `authStrategies` or `parseStrategies` found in authentication configuration');
+      return next();
+    }
+
+    const authentication = await service.parse(ctx.req, ctx.res, ...authStrategies);
+
+    if (authentication) {
+      debug('Parsed authentication from HTTP header', authentication);
+      ctx.feathers = { ...ctx.feathers, authentication };
+    }
+
+    return next();
+  };
+}
+
+export function authenticate (settings: string | AuthenticationSettings, ...strategies: string[]): Middleware {
+  const hook = AuthenticateHook(settings, ...strategies);
+
+  return async (ctx, next) => {
+    const app = ctx.app as Application;
+    const params = ctx.feathers;
+    const context = { app, params } as HookContext;
+
+    await hook(context);
+
+    ctx.feathers = context.params;
+
+    return next();
+  };
+}

package/src/declarations.ts

@@ -1,6 +1,6 @@
-import Koa from 'koa';
+import Koa, { Next } from 'koa';
 import { Server } from 'http';
-import { Application as FeathersApplication, HookContext, Params } from '@feathersjs/feathers';
+import { Application as FeathersApplication, HookContext, Params, RouteLookup } from '@feathersjs/feathers';
 import '@feathersjs/authentication';
 
 export type ApplicationAddons = {
@@ -14,9 +14,22 @@ export type FeathersKoaContext<A = Application> = Koa.Context & {
   app: A;
 };
 
+export type Middleware<A = Application> = (context: FeathersKoaContext<A>, next: Next) => any;
+
+declare module '@feathersjs/feathers/lib/declarations' {
+  interface ServiceOptions {
+    koa?: {
+      before?: Middleware[];
+      after?: Middleware[];
+      composed?: Middleware;
+    };
+  }
+}
+
 declare module 'koa' {
   interface ExtendableContext {
     feathers?: Partial<Params>;
+    lookup?: RouteLookup;
     hook?: HookContext;
   }
 }

package/src/{error-handler.ts → handlers.ts}

@@ -8,7 +8,7 @@ export const errorHandler = () => async (ctx: FeathersKoaContext, next: () => Pr
     if(ctx.body === undefined) {
       throw new NotFound('Not Found');
     }
-    
+
   } catch (error: any) {
     ctx.response.status = error.code || 500;
     ctx.body = typeof error.toJSON === 'function' ? error.toJSON() : {

package/src/index.ts

@@ -1,39 +1,38 @@
 import Koa from 'koa';
-import bodyParser from 'koa-bodyparser';
 import koaQs from 'koa-qs';
 import { Application as FeathersApplication } from '@feathersjs/feathers';
 import { routing } from '@feathersjs/transport-commons';
 import { createDebug } from '@feathersjs/commons';
 
 import { Application } from './declarations';
-import { errorHandler } from './error-handler';
 
-const debug = createDebug('@feathersjs/koa');
+export { default as Koa } from 'koa';
+export { default as bodyParser } from 'koa-bodyparser';
 
+export * from './authentication';
 export * from './declarations';
-export * from './authenticate';
-export { rest } from './rest';
-export { Koa, bodyParser, errorHandler };
+export * from './handlers';
+export * from './rest';
 
-export function koa (_app?: FeathersApplication): Application {
-  const koaApp = new Koa();
+const debug = createDebug('@feathersjs/koa');
 
-  if (!_app) {
-    return koaApp as unknown as Application;
+export function koa<S = any, C = any> (feathersApp?: FeathersApplication<S, C>, koaApp: Koa = new Koa()): Application<S, C> {
+  if (!feathersApp) {
+    return koaApp as any;
   }
 
-  if (typeof _app.setup !== 'function') {
+  if (typeof feathersApp.setup !== 'function') {
     throw new Error('@feathersjs/koa requires a valid Feathers application instance');
   }
 
-  const app = _app as Application;
+  const app = feathersApp as any as Application<S, C>;
   const { listen: koaListen, use: koaUse } = koaApp;
-  const oldUse = app.use;
+  const feathersUse = feathersApp.use as any;
 
   Object.assign(app, {
     use (location: string|Koa.Middleware, ...args: any[]) {
       if (typeof location === 'string') {
-        return (oldUse as any).call(this, location, ...args);
+        return feathersUse.call(this, location, ...args);
       }
 
       return koaUse.call(this, location);
@@ -49,31 +48,31 @@ export function koa (_app?: FeathersApplication): Application {
     }
   } as Application);
 
-  const feathersDescriptors = {
+  const appDescriptors = {
     ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(app)),
     ...Object.getOwnPropertyDescriptors(app)
   };
-  const koaDescriptors = {
+  const newDescriptors = {
     ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(koaApp)),
     ...Object.getOwnPropertyDescriptors(koaApp)
   };
 
   // Copy all non-existing properties (including non-enumerables)
   // that don't already exist on the Express app
-  Object.keys(koaDescriptors).forEach(prop => {
-    const feathersProp = feathersDescriptors[prop];
-    const koaProp = koaDescriptors[prop];
+  Object.keys(newDescriptors).forEach(prop => {
+    const appProp = appDescriptors[prop];
+    const newProp = newDescriptors[prop];
 
-    if (koaProp !== undefined && feathersProp === undefined) {
-      Object.defineProperty(app, prop, koaProp);
+    if (appProp === undefined && newProp !== undefined) {
+      Object.defineProperty(app, prop, newProp);
     }
   });
 
   koaQs(app as any);
-  app.configure(routing());
-  app.use((ctx, next) => {
-    ctx.feathers = { provider: 'rest' };
 
+  app.configure(routing() as any);
+  app.use((ctx, next) => {
+    ctx.feathers = { ...ctx.feathers, provider: 'rest' };
     return next();
   });
 

package/src/rest.ts

@@ -1,52 +1,93 @@
-import { Next } from 'koa';
+import compose from 'koa-compose';
 import { http } from '@feathersjs/transport-commons';
 import { createDebug } from '@feathersjs/commons';
 import { getServiceOptions, defaultServiceMethods, createContext } from '@feathersjs/feathers';
 import { MethodNotAllowed } from '@feathersjs/errors';
-import { FeathersKoaContext } from './declarations';
-
-const debug = createDebug('@feathersjs/koa:rest');
-
-export function rest () {
-  return async (ctx: FeathersKoaContext, next: Next) => {
-    const { app, request } = ctx;
-    const { query: koaQuery, headers, path, body: data, method: httpMethod } = request;
-    const query = { ...koaQuery };
-    const methodOverride = request.headers[http.METHOD_HEADER] ?
-      request.headers[http.METHOD_HEADER] as string : null;
-    const lookup = app.lookup(path);
-
-    if (lookup !== null) {
-      const { service, params: { __id: id = null, ...route } = {} } = lookup;
-      const method = http.getServiceMethod(httpMethod, id, methodOverride);
-      const { methods } = getServiceOptions(service);
-      
-      debug(`Found service for path ${path}, attempting to run '${method}' service method`);
-
-      if (!methods.includes(method) || defaultServiceMethods.includes(methodOverride)) {
-        ctx.response.status = http.statusCodes.methodNotAllowed;
-
-        throw new MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
-      }
-
-      const createArguments = (http.argumentsFor as any)[method] || http.argumentsFor.default;
-      const params = {
-        ...ctx.feathers,
-        query,
-        headers,
-        route
-      };
-      const args = createArguments({ id, data, params });
-      const hookContext = createContext(service, method, { http: {} });
-
-      ctx.hook = hookContext as any;
-
-      const result = await (service as any)[method](...args, hookContext);
-
-      ctx.response.status = http.getStatusCode(result, {});
-      ctx.body = http.getData(result);
+
+import { Application, Middleware } from './declarations';
+import { AuthenticationSettings, parseAuthentication } from './authentication';
+
+const debug = createDebug('@feathersjs/koa/rest');
+
+const serviceMiddleware = (): Middleware => {
+  return async (ctx, next) => {
+    const { query, headers, path, body: data, method: httpMethod } = ctx.request;
+    const methodOverride = ctx.request.headers[http.METHOD_HEADER] as string | undefined;
+
+    const { service, params: { __id: id = null, ...route } = {} } = ctx.lookup!;
+    const method = http.getServiceMethod(httpMethod, id, methodOverride);
+    const { methods } = getServiceOptions(service);
+
+    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.`);
+      ctx.response.status = error.code;
+      throw error;
     }
 
+    const createArguments = http.argumentsFor[method as 'get'] || http.argumentsFor.default;
+    const params = { query, headers, route, ...ctx.feathers };
+    const args = createArguments({ id, data, params });
+    const contextBase = createContext(service, method, { http: {} });
+    ctx.hook = contextBase;
+
+    const context = await (service as any)[method](...args, contextBase);
+    ctx.hook = context;
+
+    const result = http.getData(context);
+    const statusCode = http.getStatusCode(context, result);
+
+    ctx.body = result;
+    ctx.status = statusCode;
+
     return next();
   };
-}
+};
+
+const servicesMiddleware = (): Middleware => {
+  return async (ctx, next) => {
+    const app = ctx.app;
+    const lookup = app.lookup(ctx.request.path);
+
+    if (!lookup) {
+      return next();
+    }
+
+    ctx.lookup = lookup;
+
+    const options = getServiceOptions(lookup.service);
+    const middleware = options.koa!.composed!;
+
+    return middleware(ctx, next);
+  };
+};
+
+export const formatter: Middleware = (_ctx, _next) => {};
+
+export type RestOptions = {
+  formatter?: Middleware;
+  authentication?: AuthenticationSettings;
+};
+
+export const rest = (options?: RestOptions | Middleware) => {
+  options = typeof options === 'function' ? { formatter: options } : options || {};
+
+  const formatterMiddleware = options.formatter || formatter;
+  const authenticationOptions = options.authentication;
+
+  return (app: Application) => {
+    app.use(parseAuthentication(authenticationOptions));
+    app.use(servicesMiddleware());
+
+    app.mixins.push((_service, _path, options) => {
+      const { koa: { before = [], after = [] } = {} } = options;
+
+      const middlewares = [].concat(before, serviceMiddleware(), after, formatterMiddleware);
+      const middleware = compose(middlewares);
+
+      options.koa ||= {};
+      options.koa.composed = middleware;
+    });
+  };
+};

package/lib/authenticate.d.ts

@@ -1,8 +0,0 @@
-import { Next } from 'koa';
-import { FeathersKoaContext } from './declarations';
-interface MiddlewareSettings {
-    service?: string;
-    strategies?: string[];
-}
-export declare function authentication(settings?: MiddlewareSettings): (ctx: FeathersKoaContext, next: Next) => Promise<any>;
-export {};

package/lib/authenticate.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.authentication = void 0;
-const commons_1 = require("@feathersjs/commons");
-const debug = (0, commons_1.createDebug)('@feathersjs/koa:authentication');
-function authentication(settings = {}) {
-    return async (ctx, next) => {
-        const { app } = ctx;
-        const service = app.defaultAuthentication ? app.defaultAuthentication(settings.service) : null;
-        if (service === null) {
-            return next();
-        }
-        const config = service.configuration;
-        const authStrategies = settings.strategies || config.parseStrategies || config.authStrategies || [];
-        if (authStrategies.length === 0) {
-            debug('No `authStrategies` or `parseStrategies` found in authentication configuration');
-            return next();
-        }
-        const { req, res } = ctx;
-        const authentication = await service.parse(req, res, ...authStrategies);
-        if (authentication) {
-            debug('Parsed authentication from HTTP header', authentication);
-            ctx.feathers.authentication = authentication;
-        }
-        return next();
-    };
-}
-exports.authentication = authentication;
-//# sourceMappingURL=authenticate.js.map

package/lib/authenticate.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../src/authenticate.ts"],"names":[],"mappings":";;;AACA,iDAAkD;AAIlD,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,gCAAgC,CAAC,CAAC;AAO5D,SAAgB,cAAc,CAAE,WAA+B,EAAE;IAC/D,OAAO,KAAK,EAAE,GAAuB,EAAE,IAAU,EAAE,EAAE;QACnD,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;QACpB,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,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,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAU,CAAC;QAChC,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,CAAC;QAExE,IAAI,cAAc,EAAE;YAClB,KAAK,CAAC,wCAAwC,EAAE,cAAc,CAAC,CAAC;YAChE,GAAG,CAAC,QAAQ,CAAC,cAAc,GAAG,cAAc,CAAC;SAC9C;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AA3BD,wCA2BC"}

package/lib/error-handler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../src/error-handler.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAGvC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,KAAK,EAAE,GAAuB,EAAE,IAAwB,EAAE,EAAE;IAC5F,IAAI;QACF,MAAM,IAAI,EAAE,CAAC;QAEb,IAAG,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;YACzB,MAAM,IAAI,iBAAQ,CAAC,WAAW,CAAC,CAAC;SACjC;KAEF;IAAC,OAAO,KAAU,EAAE;QACnB,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,IAAI,GAAG,CAAC;QACxC,GAAG,CAAC,IAAI,GAAG,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC/D,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC;KACH;AACH,CAAC,CAAC;AAdW,QAAA,YAAY,gBAcvB"}

package/src/authenticate.ts

@@ -1,40 +0,0 @@
-import { Next } from 'koa';
-import { createDebug } from '@feathersjs/commons';
-
-import { FeathersKoaContext } from './declarations';
-
-const debug = createDebug('@feathersjs/koa:authentication');
-
-interface MiddlewareSettings {
-  service?: string;
-  strategies?: string[];
-}
-
-export function authentication (settings: MiddlewareSettings = {}) {
-  return async (ctx: FeathersKoaContext, next: Next) => {
-    const { app } = ctx;
-    const service = app.defaultAuthentication ? app.defaultAuthentication(settings.service) : null;
-
-    if (service === null) {
-      return next();
-    }
-
-    const config = service.configuration;
-    const authStrategies = settings.strategies || config.parseStrategies || config.authStrategies || [];
-
-    if (authStrategies.length === 0) {
-      debug('No `authStrategies` or `parseStrategies` found in authentication configuration');
-      return next();
-    }
-
-    const { req, res } = ctx as any;
-    const authentication = await service.parse(req, res, ...authStrategies);
-
-    if (authentication) {
-      debug('Parsed authentication from HTTP header', authentication);
-      ctx.feathers.authentication = authentication;
-    }
-
-    return next();
-  };
-}