@shrub/express 0.5.31 → 0.5.35

package/dist/app.d.ts

@@ -0,0 +1,4 @@
+import { Application } from "express";
+export declare const IExpressApplication: import("@shrub/core").IService<IExpressApplication>;
+export interface IExpressApplication extends Application {
+}

package/dist/app.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IExpressApplication = void 0;
+const core_1 = require("@shrub/core");
+exports.IExpressApplication = core_1.createService("express-application");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2FwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxzQ0FBNEM7QUFHL0IsUUFBQSxtQkFBbUIsR0FBRyxvQkFBYSxDQUFzQixxQkFBcUIsQ0FBQyxDQUFDIn0=

package/dist/controller-invoker.d.ts

@@ -0,0 +1,39 @@
+import { RequestHandler } from "express";
+import { PathParams } from "express-serve-static-core";
+import { IExpressApplication } from "./app";
+import { Constructor } from "./controller";
+export declare type ControllerInvokerConstructor<T> = {
+    new (options: IControllerInvokerOptions): T;
+};
+/** Defines options for a controller invoker. */
+export interface IControllerInvokerOptions {
+    readonly app: IExpressApplication;
+    readonly handler?: RequestHandler;
+}
+/** A service for creating controller invokers. */
+export interface IControllerInvokerService {
+    createControllerInvoker<T>(ctor: ControllerInvokerConstructor<T>, handler?: RequestHandler): T;
+}
+/** Defines options for invoking a controller action. */
+export interface IControllerRequestOptions<TController> {
+    readonly controller: Constructor<TController>;
+    readonly method: "GET" | "PATCH" | "POST" | "PUT" | "DELETE";
+    readonly path: PathParams;
+    readonly body?: any;
+}
+/** Defines the response from invoking a controller action. */
+export interface IControllerResponse {
+    readonly status: number;
+    readonly data: any;
+}
+export declare const IControllerInvokerService: import("@shrub/core").IService<IControllerInvokerService>;
+/** A class that is responsible for exposing and invoking controller actions. */
+export declare abstract class ControllerInvoker {
+    private readonly options;
+    private readonly handler;
+    constructor(options: IControllerInvokerOptions);
+    /** Invokes an express request handler directly which represents a single controller action and returns a result. */
+    protected invokeAction<TController>(options: IControllerRequestOptions<TController>): Promise<IControllerResponse>;
+    private createExpressRequest;
+    private createExpressResponse;
+}

package/dist/controller-invoker.js

@@ -0,0 +1,113 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ControllerInvokerService = exports.ControllerInvoker = exports.IControllerInvokerService = void 0;
+const core_1 = require("@shrub/core");
+const app_1 = require("./app");
+const controller_1 = require("./controller");
+exports.IControllerInvokerService = core_1.createService("controller-invoker-service");
+/** A class that is responsible for exposing and invoking controller actions. */
+class ControllerInvoker {
+    constructor(options) {
+        this.options = options;
+        this.handler = !options.handler ? (_, __, next) => next() : options.handler;
+    }
+    /** Invokes an express request handler directly which represents a single controller action and returns a result. */
+    invokeAction(options) {
+        const router = controller_1.controller(options.controller);
+        return new Promise((resolve, reject) => {
+            // create the express Request object to pass down the request chain
+            const req = this.createExpressRequest(options);
+            // create the express Response object that will resovle the Promise when the response has ended (i.e. when res.end is inovked)
+            const res = this.createExpressResponse(resolve);
+            // if an error is returned at any point reject the promise
+            const nextOrReject = (err, next) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    next();
+                }
+            };
+            this.options.app(req, res, (err) => nextOrReject(err, () => {
+                // the handler is the custom handler provided to the controller invoker, this allows configuring the express middleware before invoking the controller
+                // the router handles invoking the controller and if next is invoked assume an error or a 404
+                this.handler(req, res, (err) => nextOrReject(err, () => router(req, res, (err) => reject(err || new Error(`Path ${options.path} not found.`)))));
+            }));
+        });
+    }
+    createExpressRequest(options) {
+        return {
+            method: options.method,
+            body: options.body,
+            url: options.path
+        };
+    }
+    createExpressResponse(callback) {
+        let headers = {};
+        let status = 200;
+        return {
+            get statusCode() {
+                return status;
+            },
+            set statusCode(s) {
+                this.status(status);
+            },
+            end: function (data, _, cb) {
+                callback({ status, data });
+                if (cb) {
+                    cb();
+                }
+            },
+            getHeader: name => headers[name],
+            json: function (data) {
+                return this.send(data);
+            },
+            send: function (data) {
+                this.end(data);
+                return this;
+            },
+            sendStatus: function (s) {
+                status = s;
+                return this.send();
+            },
+            setHeader: function (name, value) {
+                headers[name] = value;
+            },
+            status: function (s) {
+                status = s;
+                return this;
+            },
+            write: function (data, _, cb) {
+                this.end(data);
+                if (cb) {
+                    cb(undefined);
+                }
+            },
+        };
+    }
+}
+exports.ControllerInvoker = ControllerInvoker;
+/** @internal */
+let ControllerInvokerService = class ControllerInvokerService {
+    constructor(app) {
+        this.app = app;
+    }
+    createControllerInvoker(ctor, handler) {
+        return new ctor({ app: this.app, handler });
+    }
+};
+ControllerInvokerService = __decorate([
+    core_1.Transient,
+    __param(0, app_1.IExpressApplication)
+], ControllerInvokerService);
+exports.ControllerInvokerService = ControllerInvokerService;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbGxlci1pbnZva2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnRyb2xsZXItaW52b2tlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FBdUQ7QUFHdkQsK0JBQTRDO0FBQzVDLDZDQUF1RDtBQTZCMUMsUUFBQSx5QkFBeUIsR0FBRyxvQkFBYSxDQUE0Qiw0QkFBNEIsQ0FBQyxDQUFDO0FBRWhILGdGQUFnRjtBQUNoRixNQUFzQixpQkFBaUI7SUFHbkMsWUFBNkIsT0FBa0M7UUFBbEMsWUFBTyxHQUFQLE9BQU8sQ0FBMkI7UUFDM0QsSUFBSSxDQUFDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDO0lBQ2hGLENBQUM7SUFFRCxvSEFBb0g7SUFDMUcsWUFBWSxDQUFjLE9BQStDO1FBQy9FLE1BQU0sTUFBTSxHQUFHLHVCQUFVLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQzlDLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDbkMsbUVBQW1FO1lBQ25FLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUMvQyw4SEFBOEg7WUFDOUgsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLHFCQUFxQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ2hELDBEQUEwRDtZQUMxRCxNQUFNLFlBQVksR0FBRyxDQUFDLEdBQVEsRUFBRSxJQUFnQixFQUFFLEVBQUU7Z0JBQ2hELElBQUksR0FBRyxFQUFFO29CQUNMLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztpQkFDZjtxQkFDSTtvQkFDRCxJQUFJLEVB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

package/dist/controller.d.ts

@@ -20,7 +20,7 @@ export declare function Post(path?: PathParams, ...handlers: RequestHandler[]):
 /** A function decorator identifying a request handler on a controller for a specific path and HTTP PUT method.*/
 export declare function Put(path?: PathParams, ...handlers: RequestHandler[]): (target: any, propertyKey: string) => void;
 /** Middleware that exposes the routes for a Controller. */
-export declare function useController<T>(ctor: Constructor<T>): RequestHandler;
+export declare function controller<T>(ctor: Constructor<T>): RequestHandler;
 /**
  * Creates a route decorator for a controller function; the provided callback is responsible for
  * registering a route with the provided router and the given handler is the controller handler

package/dist/controller.js

@@ -1,24 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRouteDecorator = exports.useController = exports.Put = exports.Post = exports.Patch = exports.Get = exports.Delete = exports.Route = void 0;
-const express_1 = require("express");
+exports.createRouteDecorator = exports.controller = exports.Put = exports.Post = exports.Patch = exports.Get = exports.Delete = exports.Route = void 0;
 const core_1 = require("@shrub/core");
+const express_1 = require("express");
 const controllerKey = "__controller";
 const routerKey = "__router";
 const routesKey = "__routes";
-const routeHandler = (proto, propertyKey) => (req, res, next) => {
-    const controller = req[controllerKey];
-    if (!controller) {
-        return next(new Error(`Controller '${proto.constructor.name}' not found for request '${req.path}'.`));
-    }
-    const handler = controller[propertyKey];
-    if (!handler) {
-        return next(new Error(`Request handler method '${propertyKey}' not found on controller '${proto.constructor.name}'.`));
-    }
-    // a request handler may return a promise or not; if the request handler is async capture unhandled errors and pass them to next
-    // this can easly be done by wrapping the result in a Promise.resolve() and handling catch 
-    Promise.resolve(handler.call(controller, req, res, next)).catch(err => next(err));
-};
 /** A class decorator for a Controller identifying the request route the controller handles. */
 const Route = function () {
     const path = arguments.length && typeof arguments[0] !== "function" ? arguments[0] : undefined;
@@ -66,14 +53,14 @@ function Put(path, ...handlers) {
 }
 exports.Put = Put;
 /** Middleware that exposes the routes for a Controller. */
-function useController(ctor) {
+function controller(ctor) {
     const router = ctor.prototype[routerKey];
     if (!router) {
         throw new Error(`Invalid controller '${ctor.name}', class does not have a Route decorator.`);
     }
     return router;
 }
-exports.useController = useController;
+exports.controller = controller;
 /**
  * Creates a route decorator for a controller function; the provided callback is responsible for
  * registering a route with the provided router and the given handler is the controller handler
@@ -82,10 +69,25 @@ exports.useController = useController;
 function createRouteDecorator(register) {
     return (target, propertyKey) => {
         target[routesKey] = target[routesKey] || express_1.Router();
-        register(target[routesKey], routeHandler(target, propertyKey));
+        register(target[routesKey], getControllerActionRouteHandler(target, propertyKey));
     };
 }
 exports.createRouteDecorator = createRouteDecorator;
+function getControllerActionRouteHandler(proto, propertyKey) {
+    return (req, res, next) => {
+        const controller = req[controllerKey];
+        if (!controller) {
+            return next(new Error(`Controller '${proto.constructor.name}' not found for request '${req.path}'.`));
+        }
+        const handler = controller[propertyKey];
+        if (!handler) {
+            return next(new Error(`Request handler method '${propertyKey}' not found on controller '${proto.constructor.name}'.`));
+        }
+        // a request handler may return a promise or not; if the request handler is async capture unhandled errors and pass them to next
+        // this can easly be done by wrapping the result in a Promise.resolve() and handling catch 
+        Promise.resolve(handler.call(controller, req, res, next)).catch(err => next(err));
+    };
+}
 function registerRoute(path, handlers, cb) {
     return (router, handler) => cb(router).call(router, path, ...[...handlers, handler]);
 }
@@ -96,4 +98,4 @@ function createController(ctor) {
         next();
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFDQUFpRDtBQUVqRCxzQ0FBb0Q7QUFhcEQsTUFBTSxhQUFhLEdBQUcsY0FBYyxDQUFDO0FBQ3JDLE1BQU0sU0FBUyxHQUFHLFVBQVUsQ0FBQztBQUM3QixNQUFNLFNBQVMsR0FBRyxVQUFVLENBQUM7QUFFN0IsTUFBTSxZQUFZLEdBQXdELENBQUMsS0FBSyxFQUFFLFdBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFO0lBQ2pILE1BQU0sVUFBVSxHQUFTLEdBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUM3QyxJQUFJLENBQUMsVUFBVSxFQUFFO1FBQ2IsT0FBTyxJQUFJLENBQUMsSUFBSSxLQUFLLENBQUMsZUFBZSxLQUFLLENBQUMsV0FBVyxDQUFDLElBQUksNEJBQTRCLEdBQUcsQ0FBQyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUM7S0FDekc7SUFFRCxNQUFNLE9BQU8sR0FBbUIsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3hELElBQUksQ0FBQyxPQUFPLEVBQUU7UUFDVixPQUFPLElBQUksQ0FBQyxJQUFJLEtBQUssQ0FBQywyQkFBMkIsV0FBVyw4QkFBOEIsS0FBSyxDQUFDLFdBQVcsQ0FBQyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUM7S0FDMUg7SUFFRCxnSUFBZ0k7SUFDaEksMkZBQTJGO0lBQzNGLE9BQU8sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0FBQ3RGLENBQUMsQ0FBQztBQUVGLCtGQUErRjtB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUFvRDtBQUNwRCxxQ0FBaUQ7QUFjakQsTUFBTSxhQUFhLEdBQUcsY0FBYyxDQUFDO0FBQ3JDLE1BQU0sU0FBUyxHQUFHLFVBQVUsQ0FBQztBQUM3QixNQUFNLFNBQVMsR0FBRyxVQUFVLENBQUM7QUFFN0IsK0ZBQStGO0FBQ3hGLE1BQU0sS0FBSyxHQUFvQjtJQUNsQyxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsTUFBTSxJQUFJLE9BQU8sU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDL0YsTUFBTSxRQUFRLEdBQUcsSUFBSSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBRTNGLE9BQU8sVUFBVSxJQUFjO1FBQzNCLHVFQUF1RTtRQUN2RSxNQUFNLEdBQUcsR0FBVyxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzlDLElBQUksQ0FBQyxHQUFHLEVBQUU7WUFDTixNQUFNLElBQUksS0FBSyxDQUFDLHVDQUF1QyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQztTQUN6RTtRQUVELE1BQU0sTUFBTSxHQUFHLGdCQUFNLEVBQUUsQ0FBQztRQUV4QixJQUFJLElBQUksRUFBRTtZQUNOLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEdBQUcsUUFBUSxFQUFFLGdCQUFnQixDQUFtQixJQUFJLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQztTQUNoRjthQUNJO1lBQ0QsTUFBTSxDQUFDLEdB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

package/dist/esm/app.js

@@ -0,0 +1,3 @@
+import { createService } from "@shrub/core";
+export const IExpressApplication = createService("express-application");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRzVDLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLGFBQWEsQ0FBc0IscUJBQXFCLENBQUMsQ0FBQyJ9

package/dist/esm/controller-invoker.js

@@ -0,0 +1,109 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+import { createService, Transient } from "@shrub/core";
+import { IExpressApplication } from "./app";
+import { controller } from "./controller";
+export const IControllerInvokerService = createService("controller-invoker-service");
+/** A class that is responsible for exposing and invoking controller actions. */
+export class ControllerInvoker {
+    constructor(options) {
+        this.options = options;
+        this.handler = !options.handler ? (_, __, next) => next() : options.handler;
+    }
+    /** Invokes an express request handler directly which represents a single controller action and returns a result. */
+    invokeAction(options) {
+        const router = controller(options.controller);
+        return new Promise((resolve, reject) => {
+            // create the express Request object to pass down the request chain
+            const req = this.createExpressRequest(options);
+            // create the express Response object that will resovle the Promise when the response has ended (i.e. when res.end is inovked)
+            const res = this.createExpressResponse(resolve);
+            // if an error is returned at any point reject the promise
+            const nextOrReject = (err, next) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    next();
+                }
+            };
+            this.options.app(req, res, (err) => nextOrReject(err, () => {
+                // the handler is the custom handler provided to the controller invoker, this allows configuring the express middleware before invoking the controller
+                // the router handles invoking the controller and if next is invoked assume an error or a 404
+                this.handler(req, res, (err) => nextOrReject(err, () => router(req, res, (err) => reject(err || new Error(`Path ${options.path} not found.`)))));
+            }));
+        });
+    }
+    createExpressRequest(options) {
+        return {
+            method: options.method,
+            body: options.body,
+            url: options.path
+        };
+    }
+    createExpressResponse(callback) {
+        let headers = {};
+        let status = 200;
+        return {
+            get statusCode() {
+                return status;
+            },
+            set statusCode(s) {
+                this.status(status);
+            },
+            end: function (data, _, cb) {
+                callback({ status, data });
+                if (cb) {
+                    cb();
+                }
+            },
+            getHeader: name => headers[name],
+            json: function (data) {
+                return this.send(data);
+            },
+            send: function (data) {
+                this.end(data);
+                return this;
+            },
+            sendStatus: function (s) {
+                status = s;
+                return this.send();
+            },
+            setHeader: function (name, value) {
+                headers[name] = value;
+            },
+            status: function (s) {
+                status = s;
+                return this;
+            },
+            write: function (data, _, cb) {
+                this.end(data);
+                if (cb) {
+                    cb(undefined);
+                }
+            },
+        };
+    }
+}
+/** @internal */
+let ControllerInvokerService = class ControllerInvokerService {
+    constructor(app) {
+        this.app = app;
+    }
+    createControllerInvoker(ctor, handler) {
+        return new ctor({ app: this.app, handler });
+    }
+};
+ControllerInvokerService = __decorate([
+    Transient,
+    __param(0, IExpressApplication)
+], ControllerInvokerService);
+export { ControllerInvokerService };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbGxlci1pbnZva2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyb2xsZXItaW52b2tlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUd2RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxPQUFPLENBQUM7QUFDNUMsT0FBTyxFQUFFLFVBQVUsRUFBZSxNQUFNLGNBQWMsQ0FBQztBQTZCdkQsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQUcsYUFBYSxDQUE0Qiw0QkFBNEIsQ0FBQyxDQUFDO0FBRWhILGdGQUFnRjtBQUNoRixNQUFNLE9BQWdCLGlCQUFpQjtJQUduQyxZQUE2QixPQUFrQztRQUFsQyxZQUFPLEdBQVAsT0FBTyxDQUEyQjtRQUMzRCxJQUFJLENBQUMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDaEYsQ0FBQztJQUVELG9IQUFvSDtJQUMxRyxZQUFZLENBQWMsT0FBK0M7UUFDL0UsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUM5QyxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1lBQ25DLG1FQUFtRTtZQUNuRSxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsb0JBQW9CLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDL0MsOEhBQThIO1lBQzlILE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUNoRCwwREFBMEQ7WUFDMUQsTUFBTSxZQUFZLEdBQUcs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

package/dist/esm/controller.js

@@ -1,21 +1,8 @@
-import { Router } from "express";
 import { IInstantiationService } from "@shrub/core";
+import { Router } from "express";
 const controllerKey = "__controller";
 const routerKey = "__router";
 const routesKey = "__routes";
-const routeHandler = (proto, propertyKey) => (req, res, next) => {
-    const controller = req[controllerKey];
-    if (!controller) {
-        return next(new Error(`Controller '${proto.constructor.name}' not found for request '${req.path}'.`));
-    }
-    const handler = controller[propertyKey];
-    if (!handler) {
-        return next(new Error(`Request handler method '${propertyKey}' not found on controller '${proto.constructor.name}'.`));
-    }
-    // a request handler may return a promise or not; if the request handler is async capture unhandled errors and pass them to next
-    // this can easly be done by wrapping the result in a Promise.resolve() and handling catch 
-    Promise.resolve(handler.call(controller, req, res, next)).catch(err => next(err));
-};
 /** A class decorator for a Controller identifying the request route the controller handles. */
 export const Route = function () {
     const path = arguments.length && typeof arguments[0] !== "function" ? arguments[0] : undefined;
@@ -57,7 +44,7 @@ export function Put(path, ...handlers) {
     return createRouteDecorator(registerRoute(path || "/", handlers, router => router.put));
 }
 /** Middleware that exposes the routes for a Controller. */
-export function useController(ctor) {
+export function controller(ctor) {
     const router = ctor.prototype[routerKey];
     if (!router) {
         throw new Error(`Invalid controller '${ctor.name}', class does not have a Route decorator.`);
@@ -72,7 +59,22 @@ export function useController(ctor) {
 export function createRouteDecorator(register) {
     return (target, propertyKey) => {
         target[routesKey] = target[routesKey] || Router();
-        register(target[routesKey], routeHandler(target, propertyKey));
+        register(target[routesKey], getControllerActionRouteHandler(target, propertyKey));
+    };
+}
+function getControllerActionRouteHandler(proto, propertyKey) {
+    return (req, res, next) => {
+        const controller = req[controllerKey];
+        if (!controller) {
+            return next(new Error(`Controller '${proto.constructor.name}' not found for request '${req.path}'.`));
+        }
+        const handler = controller[propertyKey];
+        if (!handler) {
+            return next(new Error(`Request handler method '${propertyKey}' not found on controller '${proto.constructor.name}'.`));
+        }
+        // a request handler may return a promise or not; if the request handler is async capture unhandled errors and pass them to next
+        // this can easly be done by wrapping the result in a Promise.resolve() and handling catch 
+        Promise.resolve(handler.call(controller, req, res, next)).catch(err => next(err));
     };
 }
 function registerRoute(path, handlers, cb) {
@@ -85,4 +87,4 @@ function createController(ctor) {
         next();
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBa0IsTUFBTSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBRWpELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQWFwRCxNQUFNLGFBQWEsR0FBRyxjQUFjLENBQUM7QUFDckMsTUFBTSxTQUFTLEdBQUcsVUFBVSxDQUFDO0FBQzdCLE1BQU0sU0FBUyxHQUFHLFVBQVUsQ0FBQztBQUU3QixNQUFNLFlBQVksR0FBd0QsQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEVBQUU7SUFDakgsTUFBTSxVQUFVLEdBQVMsR0FBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzdDLElBQUksQ0FBQyxVQUFVLEVBQUU7UUFDYixPQUFPLElBQUksQ0FBQyxJQUFJLEtBQUssQ0FBQyxlQUFlLEtBQUssQ0FBQyxXQUFXLENBQUMsSUFBSSw0QkFBNEIsR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQztLQUN6RztJQUVELE1BQU0sT0FBTyxHQUFtQixVQUFVLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDeEQsSUFBSSxDQUFDLE9BQU8sRUFBRTtRQUNWLE9BQU8sSUFBSSxDQUFDLElBQUksS0FBSyxDQUFDLDJCQUEyQixXQUFXLDhCQUE4QixLQUFLLENBQUMsV0FBVyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQztLQUMxSDtJQUVELGdJQUFnSTtJQUNoSSwyRkFBMkY7SUFDM0YsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNwRCxPQUFPLEVBQWtCLE1BQU0sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQWNqRCxNQUFNLGFBQWEsR0FBRyxjQUFjLENBQUM7QUFDckMsTUFBTSxTQUFTLEdBQUcsVUFBVSxDQUFDO0FBQzdCLE1BQU0sU0FBUyxHQUFHLFVBQVUsQ0FBQztBQUU3QiwrRkFBK0Y7QUFDL0YsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFvQjtJQUNsQyxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsTUFBTSxJQUFJLE9BQU8sU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDL0YsTUFBTSxRQUFRLEdBQUcsSUFBSSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBRTNGLE9BQU8sVUFBVSxJQUFjO1FBQzNCLHVFQUF1RTtRQUN2RSxNQUFNLEdBQUcsR0FBVyxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzlDLElBQUksQ0FBQyxHQUFHLEVBQUU7WUFDTixNQUFNLElBQUksS0FBSyxDQUFDLHVDQUF1QyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQztTQUN6RTtRQUVELE1BQU0sTUFBTSxHQUFHLE1BQU0sRUFBRSxDQUFDO1FBRXhCLElBQUksSUFBSSxFQUFFO1lBQ04sTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsR0FBRyxRQUFRLEVBQUUsZ0JB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

package/dist/esm/factory.js

@@ -1,5 +1,6 @@
 import { ModuleLoader } from "@shrub/core";
-import { ExpressModule, IExpressApplication } from "./module";
+import { IExpressApplication } from "./app";
+import { ExpressModule } from "./module";
 /** A factory class for registering modules within an Express application context. */
 export class ExpressFactory {
     constructor() {
@@ -45,4 +46,4 @@ export class ExpressFactory {
         return this;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBZ0YsWUFBWSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3pILE9BQU8sRUFBRSxhQUFhLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFFOUQscUZBQXFGO0FBQ3JGLE1BQU0sT0FBTyxjQUFjO0lBQTNCO1FBQ3FCLFlBQU8sR0FBa0MsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUN6RCxhQUFRLEdBQWdDLEVBQUUsQ0FBQztRQUNwRCxzQkFBaUIsR0FBaUQsR0FBRyxFQUFFLEdBQUUsQ0FBQyxDQUFDO0lBaUR2RixDQUFDO0lBOUNHLHNDQUFzQztJQUN0QyxNQUFNLENBQUMsTUFBTTtRQUNULE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUN6QyxDQUFDO0lBRUQsTUFBTSxDQUFDLGlCQUFpQixDQUFDLFFBQXNEO1FBQzNFLE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUM1RCxDQUFDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxPQUFzQztRQUNwRCxPQUFPLElBQUksY0FBYyxFQUFFLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFFRCxNQUFNLENBQUMsV0FBVyxDQUFDLFFBQW1DO1FBQ2xELE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVELDZIQUE2SDtJQUM3SCxNQUFNO1FBQ0YsTUFBTSxNQUFNLEdBQUcsSUFBSSxZQUFZLEVBQUU7YUFDNUIsaUJBQWlCLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDO2FBQ3pDLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFFOUIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDdEQsT0FBTyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFDO0lBQ3BGLENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxRQUFzRDtRQUNwRSxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsaUJBQWlCLENBQUM7UUFDcEMsSUFBSSxDQUFDLGlCQUFpQixHQUFHLFlBQVksQ0FBQyxFQUFFO1lBQ3BDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUN2QixJQUFJLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDdkIsQ0FBQyxDQUFDO1FBRUYsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUVELFVBQVUsQ0FBQyxPQUFzQztRQUM3QyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDO1FBQzlCLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFFRCxXQUFXLENBQUMsUUFBbUM7UUFDM0MsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDN0IsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztDQUNKIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBZ0YsWUFBWSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3pILE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLE9BQU8sQ0FBQztBQUM1QyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRXpDLHFGQUFxRjtBQUNyRixNQUFNLE9BQU8sY0FBYztJQUEzQjtRQUNxQixZQUFPLEdBQWtDLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDekQsYUFBUSxHQUFnQyxFQUFFLENBQUM7UUFDcEQsc0JBQWlCLEdBQWlELEdBQUcsRUFBRSxHQUFFLENBQUMsQ0FBQztJQWlEdkYsQ0FBQztJQTlDRyxzQ0FBc0M7SUFDdEMsTUFBTSxDQUFDLE1BQU07UUFDVCxPQUFPLElBQUksY0FBYyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDekMsQ0FBQztJQUVELE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxRQUFzRDtRQUMzRSxPQUFPLElBQUksY0FBYyxFQUFFLENBQUMsaUJBQWlCLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsT0FBc0M7UUFDcEQsT0FBTyxJQUFJLGNBQWMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRUQsTUFBTSxDQUFDLFdBQVcsQ0FBQyxRQUFtQztRQUNsRCxPQUFPLElBQUksY0FBYyxFQUFFLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3RELENBQUM7SUFFRCw2SEFBNkg7SUFDN0gsTUFBTTtRQUNGLE1BQU0sTUFBTSxHQUFHLElBQUksWUFBWSxFQUFFO2FBQzVCLGlCQUFpQixDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQzthQUN6QyxVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRTlCLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ3RELE9BQU8sTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQztJQUNwRixDQUFDO0lBRUQsaUJBQWlCLENBQUMsUUFBc0Q7UUFDcEUsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDO1FBQ3BDLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxZQUFZLENBQUMsRUFBRTtZQUNwQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUM7WUFDdkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3ZCLENBQUMsQ0FBQztRQUVGLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFFRCxVQUFVLENBQUMsT0FBc0M7UUFDN0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxPQUFPLENBQUMsQ0FBQztRQUM5QixPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0lBRUQsV0FBVyxDQUFDLFFBQW1DO1FBQzNDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzdCLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7Q0FDSiJ9

package/dist/esm/index.js

@@ -1,5 +1,7 @@
+export * from "./app";
 export * from "./controller";
+export * from "./controller-invoker";
 export * from "./factory";
 export * from "./module";
 export * from "./request-context";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxtQkFBbUIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxPQUFPLENBQUM7QUFDdEIsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLFVBQVUsQ0FBQztBQUN6QixjQUFjLG1CQUFtQixDQUFDIn0=

package/dist/esm/module.js

@@ -1,9 +1,10 @@
 import express from "express";
-import { createConfig, createService } from "@shrub/core";
+import { createConfig } from "@shrub/core";
 import { HttpModule, IHttpModuleConfiguration, IHttpServer } from "@shrub/http";
-import { IRequestContextBuilder, IRequestContextBuilderRegistration, IRequestContextService, RequestContextBuilder, RequestContextBuilderRegistration, RequestContextService } from "./request-context";
+import { ControllerInvokerService, IControllerInvokerService } from "./controller-invoker";
+import { IRequestContextService, requestContext, RequestContextService } from "./request-context";
+import { IExpressApplication } from "./app";
 export const IExpressConfiguration = createConfig();
-export const IExpressApplication = createService("express-application");
 export class ExpressModule {
     constructor() {
         this.name = "express";
@@ -13,38 +14,13 @@ export class ExpressModule {
         init.config(IExpressConfiguration).register(({ services }) => services.get(IExpressApplication));
     }
     configureServices(registration) {
-        registration.register(IRequestContextBuilderRegistration, RequestContextBuilderRegistration);
+        registration.register(IControllerInvokerService, ControllerInvokerService);
         registration.register(IRequestContextService, RequestContextService, { sealed: true });
-        registration.register(IRequestContextBuilder, RequestContextBuilder, { sealed: true });
         registration.registerSingleton(IExpressApplication, {
             create: services => {
                 const app = express();
+                app.use(requestContext(services));
                 this.overrideListen(services, app);
-                app.use((req, res, next) => {
-                    // use a scoped service collection for the request
-                    const requestServices = services.createScope();
-                    const requestContextService = requestServices.get(IRequestContextService);
-                    const requestContextBuilder = requestServices.get(IRequestContextBuilder);
-                    res.on("finish", () => requestServices.dispose());
-                    // note: these properties need to be configurable to support express sub apps
-                    // when loading a set of modules as an independent sub app the root app will
-                    // have defined a context on the request but for sub apps we need to overwrite
-                    // it using the context configured for this specific domain
-                    Object.defineProperty(req, "context", {
-                        configurable: true,
-                        get() { return requestContextService.context; }
-                    });
-                    Object.defineProperty(req, "contextBuilder", {
-                        configurable: true,
-                        get() { return requestContextBuilder; }
-                    });
-                    next();
-                });
-                // the express app gets returned as the express configuration object so add the extended
-                // configuration functions to the express app here
-                app.useRequestBuilder = (name, callback) => {
-                    services.get(IRequestContextBuilderRegistration).register(name, callback);
-                };
                 return app;
             }
         });
@@ -63,4 +39,4 @@ export class ExpressModule {
         };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE9BQU8sTUFBTSxTQUFTLENBQUM7QUFDOUIsT0FBTyxFQUFFLFlBQVksRUFBRSxhQUFhLEVBQThGLE1BQU0sYUFBYSxDQUFDO0FBQ3RKLE9BQU8sRUFBRSxVQUFVLEVBQUUsd0JBQXdCLEVBQUUsV0FBVyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2hGLE9BQU8sRUFDSCxzQkFBc0IsRUFBa0Msa0NBQWtDLEVBQUUsc0JBQXNCLEVBQ2xILHFCQUFxQixFQUFFLGlDQUFpQyxFQUFFLHFCQUFxQixFQUNsRixNQUFNLG1CQUFtQixDQUFDO0FBRTNCLE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHLFlBQVksRUFBeUIsQ0FBQztBQVUzRSxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxhQUFhLENBQXNCLHFCQUFxQixDQUFDLENBQUM7QUFJN0YsTUFBTSxPQUFPLGFBQWE7SUFBMUI7UUFDYSxTQUFJLEdBQUcsU0FBUyxDQUFDO1FBQ2pCLGlCQUFZLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQWtFekMsQ0FBQztJQWhFRyxVQUFVLENBQUMsSUFBd0I7UUFDL0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUF3QixRQUFRLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQztJQUM1SCxDQUFDO0lBRUQsaUJBQWlCLENBQUMsWUFBa0M7UUFDaEQsWUFBWSxDQUFDLFFBQVEsQ0FBQyxrQ0FBa0MsRUFBRSxpQ0FBaUMsQ0FBQyxDQUFDO1FBQzdGLFlBQVksQ0FBQyxRQUFRLENBQUMsc0JBQXNCLEVBQUUscUJBQXFCLEVBQUUsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUN2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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE9BQU8sTUFBTSxTQUFTLENBQUM7QUFDOUIsT0FBTyxFQUFFLFlBQVksRUFBOEYsTUFBTSxhQUFhLENBQUM7QUFDdkksT0FBTyxFQUFFLFVBQVUsRUFBRSx3QkFBd0IsRUFBRSxXQUFXLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDaEYsT0FBTyxFQUFFLHdCQUF3QixFQUFFLHlCQUF5QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDM0YsT0FBTyxFQUFFLHNCQUFzQixFQUFFLGNBQWMsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2xHLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLE9BQU8sQ0FBQztBQUU1QyxNQUFNLENBQUMsTUFBTSxxQkFBcUIsR0FBRyxZQUFZLEVBQXlCLENBQUM7QUFJM0UsTUFBTSxPQUFPLGFBQWE7SUFBMUI7UUFDYSxTQUFJLEdBQUcsU0FBUyxDQUFDO1FBQ2pCLGlCQUFZLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQWlDekMsQ0FBQztJQS9CRyxVQUFVLENBQUMsSUFBd0I7UUFDL0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUF3QixRQUFRLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQztJQUM1SCxDQUFDO0lBRUQsaUJBQWlCLENBQUMsWUFBa0M7UUFDaEQsWUFBWSxDQUFDLFFBQVEsQ0FBQyx5QkFBeUIsRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO1FBQzNFLFlBQVksQ0FBQyxRQUFRLENBQUMsc0JBQXNCLEVBQUUscUJBQXFCLEVBQUUsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUN2RixZQUFZLENBQUMsaUJBQWlCLENBQUMsbUJBQW1CLEVBQUU7WUFDaEQsTUFBTSxFQUFFLFFBQVEsQ0FBQyxFQUFFO2dCQUNmLE1BQU0sR0FBRyxHQUFHLE9BQU8sRUFBRSxDQUFDO2dCQUN0QixHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUNsQyxJQUFJLENBQUMsY0FBYyxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztnQkFDbkMsT0FBTyxHQUFHLENBQUM7WUFDZixDQUFDO1NBQ0osQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUVELFNBQVMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQXVCO1FBQy9DLE1BQU0sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQztJQUMvRixDQUFDO0lBRU8sY0FBYyxDQUFDLFFBQTRCLEVBQUUsR0FBb0I7UUFDckUsMEVBQTBFO1FBQzFFLG1GQUFtRjtRQUNuRiw0RUFBNEU7UUFDNUUsc0NBQXNDO1FBQ3RDLEdBQUcsQ0FBQyxNQUFNLEdBQUcsU0FBUyxNQUFNO1lBQ3hCLE1BQU0sTUFBTSxHQUFRLFFBQVEsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDOUMsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDbEQsQ0FBQyxDQUFBO0lBQ0wsQ0FBQztDQUNKIn0=

package/dist/esm/request-context.js

@@ -7,42 +7,32 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { createService, IServiceCollection, Scoped, Singleton } from "@shrub/core";
-/** @internal */
-export const IRequestContextBuilder = createService("request-context-builder");
-/** @internal */
-export const IRequestContextBuilderRegistration = createService("request-context-registration");
+import { createService, IServiceCollection, Scoped } from "@shrub/core";
 export const IRequestContextService = createService("request-context-service");
-/** @internal */
-let RequestContextBuilderRegistration = class RequestContextBuilderRegistration {
-    constructor() {
-        this.map = {};
-    }
-    getCallbacks() {
-        return this.map;
-    }
-    register(name, callback) {
-        this.map[name] = callback;
-    }
+/** @internal Express middleware that creates and installs the request context; the provided service collection should be the root collection in which a scoped collection will be created from. */
+export const requestContext = services => (req, res, next) => {
+    // use a scoped service collection for the request
+    const requestServices = services.createScope();
+    const requestContextService = requestServices.get(IRequestContextService);
+    res.on("finish", () => requestServices.dispose());
+    // note: this needs to be configurable to support express sub apps
+    // when loading a set of modules as an independent sub app the root app will
+    // have defined a context on the request but for sub apps we need to overwrite
+    // it using the context configured for this specific domain
+    Object.defineProperty(req, "context", {
+        configurable: true,
+        get() { return requestContextService.context; }
+    });
+    Object.defineProperty(req, "services", {
+        configurable: true,
+        get() { return requestServices; }
+    });
+    next();
 };
-RequestContextBuilderRegistration = __decorate([
-    Singleton
-], RequestContextBuilderRegistration);
-export { RequestContextBuilderRegistration };
-// the request context service is responsible for holding a reference to the current request context
-// and making it available publicly through the service
-// the request builder is responsible for building/modifying the request context and is used by
-// express middleware that handle extending the request context
 /** @internal */
 let RequestContextService = class RequestContextService {
     constructor(services) {
-        this.current = { bag: {}, services };
-    }
-    get context() {
-        return this.current;
-    }
-    setCurrentContext(current) {
-        this.current = current;
+        this.context = { bag: {}, services };
     }
 };
 RequestContextService = __decorate([
@@ -50,24 +40,4 @@ RequestContextService = __decorate([
     __param(0, IServiceCollection)
 ], RequestContextService);
 export { RequestContextService };
-/** @internal */
-let RequestContextBuilder = class RequestContextBuilder {
-    constructor(builders, service) {
-        const map = builders.getCallbacks();
-        // TODO: can this be more efficient? -- is there a better way than to loop through and copy each function?
-        // extend the current instance to include the registered builder callbacks
-        for (const name in map) {
-            this[name] = (...args) => {
-                service.setCurrentContext(map[name](service.context, ...args));
-                return this;
-            };
-        }
-    }
-};
-RequestContextBuilder = __decorate([
-    Scoped,
-    __param(0, IRequestContextBuilderRegistration),
-    __param(1, IRequestContextService)
-], RequestContextBuilder);
-export { RequestContextBuilder };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdC1jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JlcXVlc3QtY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLGtCQUFrQixFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFvRm5GLGdCQUFnQjtBQUNoQixNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxhQUFhLENBQXlCLHlCQUF5QixDQUFDLENBQUM7QUFDdkcsZ0JBQWdCO0FBQ2hCLE1BQU0sQ0FBQyxNQUFNLGtDQUFrQyxHQUFHLGFBQWEsQ0FBcUMsOEJBQThCLENBQUMsQ0FBQztBQUNwSSxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxhQUFhLENBQXlCLHlCQUF5QixDQUFDLENBQUM7QUFFdkcsZ0JBQWdCO0FBRWhCLElBQWEsaUNBQWlDLEdBQTlDLE1BQWEsaUNBQWlDO0lBQTlDO1FBQ3FCLFFBQUcsR0FBdUMsRUFBRSxDQUFDO0lBU2xFLENBQUM7SUFQRyxZQUFZO1FBQ1IsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDO0lBQ3BCLENBQUM7SUFFRCxRQUFRLENBQUMsSUFBWSxFQUFFLFFBQXdDO1FBQzNELElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsUUFBUSxDQUFDO0lBQzlCLENBQUM7Q0FDSixDQUFBO0FBVlksaUNBQWlDO0lBRDdDLFNBQVM7R0FDRyxpQ0FBaUMsQ0FVN0M7U0FWWSxpQ0FBaUM7QUFZOUMsb0dBQW9HO0FBQ3BHLHVEQUF1RDtBQUV2RCwrRkFBK0Y7QUFDL0YsK0RBQStEO0FBRS9ELGdCQUFnQjtBQUVoQixJQUFhLHFCQUFxQixHQUFsQyxNQUFhLHFCQUFxQjtJQUc5QixZQUFnQyxRQUE0QjtRQUN4RCxJQUFJLENBQUMsT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxRQUFRLEVBQUUsQ0FBQztJQUN6QyxDQUFDO0lBRUQsSUFBSSxPQUFPO1FBQ1AsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3hCLENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxPQUF3QjtRQUN0QyxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztJQUMzQixDQUFDO0NBQ0osQ0FBQTtBQWRZLHFCQUFxQjtJQURqQyxNQUFNO0lBSVUsV0FBQSxrQkFBa0IsQ0FBQTtHQUh0QixxQkFBcUIsQ0FjakM7U0FkWSxxQkFBcUI7QUFnQmxDLGdCQUFnQjtBQUVoQixJQUFhLHFCQUFxQixHQUFsQyxNQUFhLHFCQUFxQjtJQUM5QixZQUN3QyxRQUE0QyxFQUN4RCxPQUE4QjtRQUNsRCxNQUFNLEdBQUcsR0FBRyxRQUFRLENBQUMsWUFBWSxFQUFFLENBQUM7UUFFcEMsMEdBQTBHO1FBQzFHLDBFQUEwRTtRQUMxRSxLQUFLLE1BQU0sSUFBSSxJQUFJLEdBQUcsRUFBRTtZQUNkLElBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBVyxFQUFFLEVBQUU7Z0JBQ25DLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQy9ELE9BQU8sSUFBSSxDQUFDO1lBQ2hCLENBQUMsQ0FBQztTQUNMO0lBQ1QsQ0FBQztDQUNKLENBQUE7QUFmWSxxQkFBcUI7SUFEakMsTUFBTTtJQUdFLFdBQUEsa0NBQWtDLENBQUE7SUFDbEMsV0FBQSxzQkFBc0IsQ0FBQTtHQUhsQixxQkFBcUIsQ0FlakM7U0FmWSxxQkFBcUIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdC1jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JlcXVlc3QtY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLGtCQUFrQixFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQztBQXVDeEUsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUcsYUFBYSxDQUF5Qix5QkFBeUIsQ0FBQyxDQUFDO0FBRXZHLG1NQUFtTTtBQUNuTSxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQXFELFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFO0lBQzNHLGtEQUFrRDtJQUNsRCxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDL0MsTUFBTSxxQkFBcUIsR0FBRyxlQUFlLENBQUMsR0FBRyxDQUFDLHNCQUFzQixDQUFDLENBQUM7SUFFMUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsZUFBZSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFFbEQsa0VBQWtFO0lBQ2xFLDRFQUE0RTtJQUM1RSw4RUFBOEU7SUFDOUUsMkRBQTJEO0lBQzNELE1BQU0sQ0FBQyxjQUFjLENBQUMsR0FBRyxFQUFFLFNBQVMsRUFBRTtRQUNsQyxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUssT0FBTyxxQkFBcUIsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0tBQ2xELENBQUMsQ0FBQztJQUVILE1BQU0sQ0FBQyxjQUFjLENBQUMsR0FBRyxFQUFFLFVBQVUsRUFBRTtRQUNuQyxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUssT0FBTyxlQUFlLENBQUMsQ0FBQyxDQUFDO0tBQ3BDLENBQUMsQ0FBQztJQUVILElBQUksRUFBRSxDQUFDO0FBQ1gsQ0FBQyxDQUFDO0FBRUYsZ0JBQWdCO0FBRWhCLElBQWEscUJBQXFCLEdBQWxDLE1BQWEscUJBQXFCO0lBRzlCLFlBQWdDLFFBQTRCO1FBQ3hELElBQUksQ0FBQyxPQUFPLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxDQUFDO0lBQ3pDLENBQUM7Q0FDSixDQUFBO0FBTlkscUJBQXFCO0lBRGpDLE1BQU07SUFJVSxXQUFBLGtCQUFrQixDQUFBO0dBSHRCLHFCQUFxQixDQU1qQztTQU5ZLHFCQUFxQiJ9

package/dist/factory.d.ts

@@ -1,5 +1,5 @@
 import { IModuleSettingsCollection, IServiceRegistration, ModuleInstanceOrConstructor } from "@shrub/core";
-import { IExpressApplication } from "./module";
+import { IExpressApplication } from "./app";
 /** A factory class for registering modules within an Express application context. */
 export declare class ExpressFactory {
     private readonly modules;

package/dist/factory.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressFactory = void 0;
 const core_1 = require("@shrub/core");
+const app_1 = require("./app");
 const module_1 = require("./module");
 /** A factory class for registering modules within an Express application context. */
 class ExpressFactory {
@@ -29,7 +30,7 @@ class ExpressFactory {
             .configureServices(this.configureCallback)
             .useModules(this.modules);
         this.settings.forEach(cur => loader.useSettings(cur));
-        return loader.load().then(modules => modules.services.get(module_1.IExpressApplication));
+        return loader.load().then(modules => modules.services.get(app_1.IExpressApplication));
     }
     configureServices(callback) {
         const base = this.configureCallback;
@@ -49,4 +50,4 @@ class ExpressFactory {
     }
 }
 exports.ExpressFactory = ExpressFactory;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUF5SDtBQUN6SCxxQ0FBOEQ7QUFFOUQscUZBQXFGO0FBQ3JGLE1BQWEsY0FBYztJQUEzQjtRQUNxQixZQUFPLEdBQWtDLENBQUMsc0JBQWEsQ0FBQyxDQUFDO1FBQ3pELGFBQVEsR0FBZ0MsRUFBRSxDQUFDO1FBQ3BELHNCQUFpQixHQUFpRCxHQUFHLEVBQUUsR0FBRSxDQUFDLENBQUM7SUFpRHZGLENBQUM7SUE5Q0csc0NBQXNDO0lBQ3RDLE1BQU0sQ0FBQyxNQUFNO1FBQ1QsT0FBTyxJQUFJLGNBQWMsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQ3pDLENBQUM7SUFFRCxNQUFNLENBQUMsaUJBQWlCLENBQUMsUUFBc0Q7UUFDM0UsT0FBTyxJQUFJLGNBQWMsRUFBRSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE9BQXNDO1FBQ3BELE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUVELE1BQU0sQ0FBQyxXQUFXLENBQUMsUUFBbUM7UUFDbEQsT0FBTyxJQUFJLGNBQWMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBRUQsNkhBQTZIO0lBQzdILE1BQU07UUFDRixNQUFNLE1BQU0sR0FBRyxJQUFJLG1CQUFZLEVBQUU7YUFDNUIsaUJBQWlCLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDO2FBQ3pDLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFFOUIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDdEQsT0FBTyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsNEJBQW1CLENBQUMsQ0FBQyxDQUFDO0lBQ3BGLENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxRQUFzRDtRQUNwRSxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsaUJBQWlCLENBQUM7UUFDcEMsSUFBSSxDQUFDLGlCQUFpQixHQUFHLFlBQVksQ0FBQyxFQUFFO1lBQ3BDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUN2QixJQUFJLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDdkIsQ0FBQyxDQUFDO1FBRUYsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUVELFVBQVUsQ0FBQyxPQUFzQztRQUM3QyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDO1FBQzlCLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFFRCxXQUFXLENBQUMsUUFBbUM7UUFDM0MsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDN0IsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztDQUNKO0FBcERELHdDQW9EQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUF5SDtBQUN6SCwrQkFBNEM7QUFDNUMscUNBQXlDO0FBRXpDLHFGQUFxRjtBQUNyRixNQUFhLGNBQWM7SUFBM0I7UUFDcUIsWUFBTyxHQUFrQyxDQUFDLHNCQUFhLENBQUMsQ0FBQztRQUN6RCxhQUFRLEdBQWdDLEVBQUUsQ0FBQztRQUNwRCxzQkFBaUIsR0FBaUQsR0FBRyxFQUFFLEdBQUUsQ0FBQyxDQUFDO0lBaUR2RixDQUFDO0lBOUNHLHNDQUFzQztJQUN0QyxNQUFNLENBQUMsTUFBTTtRQUNULE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUN6QyxDQUFDO0lBRUQsTUFBTSxDQUFDLGlCQUFpQixDQUFDLFFBQXNEO1FBQzNFLE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUM1RCxDQUFDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxPQUFzQztRQUNwRCxPQUFPLElBQUksY0FBYyxFQUFFLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFFRCxNQUFNLENBQUMsV0FBVyxDQUFDLFFBQW1DO1FBQ2xELE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVELDZIQUE2SDtJQUM3SCxNQUFNO1FBQ0YsTUFBTSxNQUFNLEdBQUcsSUFBSSxtQkFBWSxFQUFFO2FBQzVCLGlCQUFpQixDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQzthQUN6QyxVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRTlCLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ3RELE9BQU8sTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLHlCQUFtQixDQUFDLENBQUMsQ0FBQztJQUNwRixDQUFDO0lBRUQsaUJBQWlCLENBQUMsUUFBc0Q7UUFDcEUsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDO1FBQ3BDLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxZQUFZLENBQUMsRUFBRTtZQUNwQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUM7WUFDdkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3ZCLENBQUMsQ0FBQztRQUVGLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFFRCxVQUFVLENBQUMsT0FBc0M7UUFDN0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxPQUFPLENBQUMsQ0FBQztRQUM5QixPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0lBRUQsV0FBVyxDQUFDLFFBQW1DO1FBQzNDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzdCLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7Q0FDSjtBQXBERCx3Q0FvREMifQ==

package/dist/index.d.ts

@@ -1,4 +1,6 @@
+export * from "./app";
 export * from "./controller";
+export * from "./controller-invoker";
 export * from "./factory";
 export * from "./module";
 export * from "./request-context";

package/dist/index.js

@@ -10,8 +10,10 @@ 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);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./app"), exports);
 __exportStar(require("./controller"), exports);
+__exportStar(require("./controller-invoker"), exports);
 __exportStar(require("./factory"), exports);
 __exportStar(require("./module"), exports);
 __exportStar(require("./request-context"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsK0NBQTZCO0FBQzdCLDRDQUEwQjtBQUMxQiwyQ0FBeUI7QUFDekIsb0RBQWtDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsd0NBQXNCO0FBQ3RCLCtDQUE2QjtBQUM3Qix1REFBcUM7QUFDckMsNENBQTBCO0FBQzFCLDJDQUF5QjtBQUN6QixvREFBa0MifQ==

package/dist/module.d.ts

@@ -1,18 +1,8 @@
 import express from "express";
 import { IModule, IModuleConfigurator, IModuleInitializer, IServiceRegistration } from "@shrub/core";
 import { HttpModule } from "@shrub/http";
-import { IRequestContextBuilderCallback } from "./request-context";
 export declare const IExpressConfiguration: import("@shrub/core").IModuleConfigurationType<IExpressConfiguration>;
 export interface IExpressConfiguration extends express.Application {
-    /**
-     * Registers a callback to use with the IRequestBuilder; the name of the builder is used
-     * as the name of the function that gets created on the IRequestBuilder and the callback
-     * is the function that will get invoked internally when called by an external user.
-     */
-    useRequestBuilder(name: string, callback: IRequestContextBuilderCallback): void;
-}
-export declare const IExpressApplication: import("@shrub/core").IService<IExpressApplication>;
-export interface IExpressApplication extends express.Application {
 }
 export declare class ExpressModule implements IModule {
     readonly name = "express";

package/dist/module.js

@@ -3,60 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpressModule = exports.IExpressApplication = exports.IExpressConfiguration = void 0;
+exports.ExpressModule = exports.IExpressConfiguration = void 0;
 const express_1 = __importDefault(require("express"));
 const core_1 = require("@shrub/core");
 const http_1 = require("@shrub/http");
+const controller_invoker_1 = require("./controller-invoker");
 const request_context_1 = require("./request-context");
+const app_1 = require("./app");
 exports.IExpressConfiguration = core_1.createConfig();
-exports.IExpressApplication = core_1.createService("express-application");
 class ExpressModule {
     constructor() {
         this.name = "express";
         this.dependencies = [http_1.HttpModule];
     }
     initialize(init) {
-        init.config(exports.IExpressConfiguration).register(({ services }) => services.get(exports.IExpressApplication));
+        init.config(exports.IExpressConfiguration).register(({ services }) => services.get(app_1.IExpressApplication));
     }
     configureServices(registration) {
-        registration.register(request_context_1.IRequestContextBuilderRegistration, request_context_1.RequestContextBuilderRegistration);
+        registration.register(controller_invoker_1.IControllerInvokerService, controller_invoker_1.ControllerInvokerService);
         registration.register(request_context_1.IRequestContextService, request_context_1.RequestContextService, { sealed: true });
-        registration.register(request_context_1.IRequestContextBuilder, request_context_1.RequestContextBuilder, { sealed: true });
-        registration.registerSingleton(exports.IExpressApplication, {
+        registration.registerSingleton(app_1.IExpressApplication, {
             create: services => {
                 const app = express_1.default();
+                app.use(request_context_1.requestContext(services));
                 this.overrideListen(services, app);
-                app.use((req, res, next) => {
-                    // use a scoped service collection for the request
-                    const requestServices = services.createScope();
-                    const requestContextService = requestServices.get(request_context_1.IRequestContextService);
-                    const requestContextBuilder = requestServices.get(request_context_1.IRequestContextBuilder);
-                    res.on("finish", () => requestServices.dispose());
-                    // note: these properties need to be configurable to support express sub apps
-                    // when loading a set of modules as an independent sub app the root app will
-                    // have defined a context on the request but for sub apps we need to overwrite
-                    // it using the context configured for this specific domain
-                    Object.defineProperty(req, "context", {
-                        configurable: true,
-                        get() { return requestContextService.context; }
-                    });
-                    Object.defineProperty(req, "contextBuilder", {
-                        configurable: true,
-                        get() { return requestContextBuilder; }
-                    });
-                    next();
-                });
-                // the express app gets returned as the express configuration object so add the extended
-                // configuration functions to the express app here
-                app.useRequestBuilder = (name, callback) => {
-                    services.get(request_context_1.IRequestContextBuilderRegistration).register(name, callback);
-                };
                 return app;
             }
         });
     }
     configure({ config, services }) {
-        config.get(http_1.IHttpModuleConfiguration).useRequestListener(services.get(exports.IExpressApplication));
+        config.get(http_1.IHttpModuleConfiguration).useRequestListener(services.get(app_1.IExpressApplication));
     }
     overrideListen(services, app) {
         // The express.listen function creates a new http.Server so this overrides
@@ -70,4 +46,4 @@ class ExpressModule {
     }
 }
 exports.ExpressModule = ExpressModule;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxzREFBOEI7QUFDOUIsc0NBQXNKO0FBQ3RKLHNDQUFnRjtBQUNoRix1REFHMkI7QUFFZCxRQUFBLHFCQUFxQixHQUFHLG1CQUFZLEVBQXlCLENBQUM7QUFVOUQsUUFBQSxtQkFBbUIsR0FBRyxvQkFBYSxDQUFzQixxQkFBcUIsQ0FBQyxDQUFDO0FBSTdGLE1BQWEsYUFBYTtJQUExQjtRQUNhLFNBQUksR0FBRyxTQUFTLENBQUM7UUFDakIsaUJBQVksR0FBRyxDQUFDLGlCQUFVLENBQUMsQ0FBQztJQWtFekMsQ0FBQztJQWhFRyxVQUFVLENBQUMsSUFBd0I7UUFDL0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyw2QkFBcUIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUF3QixRQUFRLENBQUMsR0FBRyxDQUFDLDJCQUFtQixDQUFDLENBQUMsQ0FBQztJQUM1SCxDQUFDO0lBRUQsaUJBQWlCLENBQUMsWUFBa0M7UUFDaEQsWUFBWSxDQUFDLFFBQVEsQ0FBQyxvREFBa0MsRUFBRSxtREFBaUMsQ0FBQyxDQUFDO1FBQzdGLFlBQVksQ0FBQyxRQUFRLENBQUMsd0NBQXNCLEVBQUUsdUNBQXFCLEVBQUUsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUN2RixZQUFZLENBQUMsUUFBUSxDQUFDLHdDQUFzQixFQUFFLHVDQUFxQixFQUFFLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFdkYsWUFBWSxDQUFDLGlCQUFpQixDQUFDLDJCQUFtQixFQUFFO1lBQ2hELE1BQU0sRUFBRSxRQUFRLENBQUMsRUFBRTtnQkFDZixNQUFNLEdBQUcsR0FBRyxpQkFBTyxFQUFFLENBQUM7Z0JBQ3RCLElBQUksQ0FBQyxjQUFjLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDO2dCQUVuQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRTtvQkFDdkIsa0RBQWtEO29CQUNsRCxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsV0FBVyxFQUFFLENBQUM7b0JBQy9DLE1BQU0scUJBQXFCLEdBQUcsZUFBZSxDQUFDLEdBQUcsQ0FBQyx3Q0FBc0IsQ0FBQyxDQUFDO29CQUMxRSxNQUFNLHFCQUFxQixHQUFHLGVBQWUsQ0FBQyxHQUFHLENBQUMsd0NBQXNCLENBQUMsQ0FBQztvQkFFMUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsZUFBZSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7b0JBRWxELDZFQUE2RTtvQkFDN0UsNEVBQTRFO29CQUM1RSw4RUFBOEU7b0JBQzlFLDJEQUEyRDtvQkFDM0QsTUFBTSxDQUFDLGNBQWMsQ0FBQyxHQUFHLEVBQUUsU0FBUyxFQUFFO3dCQUNsQyxZQUFZLEVBQUUsSUFBSTt3QkFDbEIsR0FBRyxLQUFLLE9BQU8scUJBQXFCLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztxQkFDbEQsQ0FBQyxDQUFDO29CQUVILE1BQU0sQ0FBQyxjQUFjLENBQUMsR0FBRyxFQUFFLGdCQUFnQixFQUFFO3dCQUN6QyxZQUFZLEVBQUUsSUFBSTt3QkFDbEIsR0FBRyxLQUFLLE9BQU8scUJBQXFCLENBQUMsQ0FBQyxDQUFDO3FCQUMxQyxDQUFDLENBQUM7b0JBRUgsSUFBSSxFQUFFLENBQUM7Z0JBQ1gsQ0FBQyxDQUFDLENBQUM7Z0JBRUgsd0ZBQXdGO2dCQUN4RixrREFBa0Q7Z0JBQ3BCLEdBQUssQ0FBQyxpQkFBaUIsR0FBRyxDQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsRUFBRTtvQkFDdkUsUUFBUSxDQUFDLEdBQUcsQ0FBQyxvREFBa0MsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7Z0JBQzlFLENBQUMsQ0FBQztnQkFFRixPQUFPLEdBQUcsQ0FBQztZQUNmLENBQUM7U0FDSixDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsU0FBUyxDQUFDLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBdUI7UUFDL0MsTUFBTSxDQUFDLEdBQUcsQ0FBQywrQkFBd0IsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsMkJBQW1CLENBQUMsQ0FBQyxDQUFDO0lBQy9GLENBQUM7SUFFTyxjQUFjLENBQUMsUUFBNEIsRUFBRSxHQUFvQjtRQUNyRSwwRUFBMEU7UUFDMUUsbUZBQW1GO1FBQ25GLDRFQUE0RTtRQUM1RSxzQ0FBc0M7UUFDdEMsR0FBRyxDQUFDLE1BQU0sR0FBRyxTQUFTLE1BQU07WUFDeEIsTUFBTSxNQUFNLEdBQVEsUUFBUSxDQUFDLEdBQUcsQ0FBQyxrQkFBVyxDQUFDLENBQUM7WUFDOUMsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDbEQsQ0FBQyxDQUFBO0lBQ0wsQ0FBQztDQUNKO0FBcEVELHNDQW9FQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxzREFBOEI7QUFDOUIsc0NBQXVJO0FBQ3ZJLHNDQUFnRjtBQUNoRiw2REFBMkY7QUFDM0YsdURBQWtHO0FBQ2xHLCtCQUE0QztBQUUvQixRQUFBLHFCQUFxQixHQUFHLG1CQUFZLEVBQXlCLENBQUM7QUFJM0UsTUFBYSxhQUFhO0lBQTFCO1FBQ2EsU0FBSSxHQUFHLFNBQVMsQ0FBQztRQUNqQixpQkFBWSxHQUFHLENBQUMsaUJBQVUsQ0FBQyxDQUFDO0lBaUN6QyxDQUFDO0lBL0JHLFVBQVUsQ0FBQyxJQUF3QjtRQUMvQixJQUFJLENBQUMsTUFBTSxDQUFDLDZCQUFxQixDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQXdCLFFBQVEsQ0FBQyxHQUFHLENBQUMseUJBQW1CLENBQUMsQ0FBQyxDQUFDO0lBQzVILENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxZQUFrQztRQUNoRCxZQUFZLENBQUMsUUFBUSxDQUFDLDhDQUF5QixFQUFFLDZDQUF3QixDQUFDLENBQUM7UUFDM0UsWUFBWSxDQUFDLFFBQVEsQ0FBQyx3Q0FBc0IsRUFBRSx1Q0FBcUIsRUFBRSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZGLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQyx5QkFBbUIsRUFBRTtZQUNoRCxNQUFNLEVBQUUsUUFBUSxDQUFDLEVBQUU7Z0JBQ2YsTUFBTSxHQUFHLEdBQUcsaUJBQU8sRUFBRSxDQUFDO2dCQUN0QixHQUFHLENBQUMsR0FBRyxDQUFDLGdDQUFjLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDbEMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxRQUFRLEVBQUUsR0FBRyxDQUFDLENBQUM7Z0JBQ25DLE9BQU8sR0FBRyxDQUFDO1lBQ2YsQ0FBQztTQUNKLENBQUMsQ0FBQztJQUNQLENBQUM7SUFFRCxTQUFTLENBQUMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUF1QjtRQUMvQyxNQUFNLENBQUMsR0FBRyxDQUFDLCtCQUF3QixDQUFDLENBQUMsa0JBQWtCLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyx5QkFBbUIsQ0FBQyxDQUFDLENBQUM7SUFDL0YsQ0FBQztJQUVPLGNBQWMsQ0FBQyxRQUE0QixFQUFFLEdBQW9CO1FBQ3JFLDBFQUEwRTtRQUMxRSxtRkFBbUY7UUFDbkYsNEVBQTRFO1FBQzVFLHNDQUFzQztRQUN0QyxHQUFHLENBQUMsTUFBTSxHQUFHLFNBQVMsTUFBTTtZQUN4QixNQUFNLE1BQU0sR0FBUSxRQUFRLENBQUMsR0FBRyxDQUFDLGtCQUFXLENBQUMsQ0FBQztZQUM5QyxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNsRCxDQUFDLENBQUE7SUFDTCxDQUFDO0NBQ0o7QUFuQ0Qsc0NBbUNDIn0=

package/dist/request-context.d.ts

@@ -4,21 +4,22 @@ declare global {
         interface Request {
             /** Gets the current request context. */
             readonly context: IRequestContext;
-            /** Gets the builder for the current request context. This is intended for use by upstream middleware to extend the request context and should not be used directly. */
-            readonly contextBuilder: IRequestContextBuilder;
+            /** Gets the scoped service collection for the request. */
+            readonly services: IServiceCollection;
         }
     }
 }
 /**
  * Defines a context representing the current request.
- * All express modules that want to extend a request
- * context should register a request context builder instead
- * of trying to extend the express Request object. This helps
- * avoid conflict with other libraries that extend express.
+ * It's recommended that express modules extend the request
+ * context instead of the express Request object. This helps
+ * avoid conflict with other libraries that extend express and
+ * also allows services outside of express middleware the ability
+ * to access the request context via the request context service.
  *
  * declare module "@shrub/express/dist/request-context" {
  *     interface IRequestContext {
- *         readonly customProperty?: any;
+ *         customProperty?: any;
  *     }
  * }
  */
@@ -30,38 +31,6 @@ export interface IRequestContext {
     /** A reference to the service collection available to the request. */
     readonly services: IServiceCollection;
 }
-/**
- * Defines a builder used to create/build request contexts.
- * This is mainly useful when there is a need to build a
- * request context outside of the express request pipeline.
- * The express request pipeline uses the builder to construct
- * the request context.
- *
- * Modules that extend the request context should also consider
- * extending the request context builder. Note, it may not always
- * be possible for a request context to exist outside the express
- * request pipeline.
- *
- * declare module "@shrub/express/dist/request-context" {
- *     interface IRequestContextBuilder {
- *         addCustomProperty(...args): IRequestBuilder;
- *     }
- * }
- *
- * Modules then should register the builder callback/function with the
- * express module. See IRequestContextBuilderCallback for more details.
- */
-export interface IRequestContextBuilder {
-}
-/**
- * Defines a request context builder callback that is registered with the express module.
- * The first parameter is expected to be a request context and the rest of the parameters
- * are expected to match the parameters for the function declared in the IRequestContextBuilder
- * interface..
- */
-export interface IRequestContextBuilderCallback {
-    (context: IRequestContext, ...args: any[]): IRequestContext;
-}
 export interface IRequestContextService {
     readonly context: IRequestContext;
 }

package/dist/request-context.js

@@ -9,43 +9,34 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestContextBuilder = exports.RequestContextService = exports.RequestContextBuilderRegistration = exports.IRequestContextService = exports.IRequestContextBuilderRegistration = exports.IRequestContextBuilder = void 0;
+exports.RequestContextService = exports.requestContext = exports.IRequestContextService = void 0;
 const core_1 = require("@shrub/core");
-/** @internal */
-exports.IRequestContextBuilder = core_1.createService("request-context-builder");
-/** @internal */
-exports.IRequestContextBuilderRegistration = core_1.createService("request-context-registration");
 exports.IRequestContextService = core_1.createService("request-context-service");
-/** @internal */
-let RequestContextBuilderRegistration = class RequestContextBuilderRegistration {
-    constructor() {
-        this.map = {};
-    }
-    getCallbacks() {
-        return this.map;
-    }
-    register(name, callback) {
-        this.map[name] = callback;
-    }
+/** @internal Express middleware that creates and installs the request context; the provided service collection should be the root collection in which a scoped collection will be created from. */
+const requestContext = services => (req, res, next) => {
+    // use a scoped service collection for the request
+    const requestServices = services.createScope();
+    const requestContextService = requestServices.get(exports.IRequestContextService);
+    res.on("finish", () => requestServices.dispose());
+    // note: this needs to be configurable to support express sub apps
+    // when loading a set of modules as an independent sub app the root app will
+    // have defined a context on the request but for sub apps we need to overwrite
+    // it using the context configured for this specific domain
+    Object.defineProperty(req, "context", {
+        configurable: true,
+        get() { return requestContextService.context; }
+    });
+    Object.defineProperty(req, "services", {
+        configurable: true,
+        get() { return requestServices; }
+    });
+    next();
 };
-RequestContextBuilderRegistration = __decorate([
-    core_1.Singleton
-], RequestContextBuilderRegistration);
-exports.RequestContextBuilderRegistration = RequestContextBuilderRegistration;
-// the request context service is responsible for holding a reference to the current request context
-// and making it available publicly through the service
-// the request builder is responsible for building/modifying the request context and is used by
-// express middleware that handle extending the request context
+exports.requestContext = requestContext;
 /** @internal */
 let RequestContextService = class RequestContextService {
     constructor(services) {
-        this.current = { bag: {}, services };
-    }
-    get context() {
-        return this.current;
-    }
-    setCurrentContext(current) {
-        this.current = current;
+        this.context = { bag: {}, services };
     }
 };
 RequestContextService = __decorate([
@@ -53,24 +44,4 @@ RequestContextService = __decorate([
     __param(0, core_1.IServiceCollection)
 ], RequestContextService);
 exports.RequestContextService = RequestContextService;
-/** @internal */
-let RequestContextBuilder = class RequestContextBuilder {
-    constructor(builders, service) {
-        const map = builders.getCallbacks();
-        // TODO: can this be more efficient? -- is there a better way than to loop through and copy each function?
-        // extend the current instance to include the registered builder callbacks
-        for (const name in map) {
-            this[name] = (...args) => {
-                service.setCurrentContext(map[name](service.context, ...args));
-                return this;
-            };
-        }
-    }
-};
-RequestContextBuilder = __decorate([
-    core_1.Scoped,
-    __param(0, exports.IRequestContextBuilderRegistration),
-    __param(1, exports.IRequestContextService)
-], RequestContextBuilder);
-exports.RequestContextBuilder = RequestContextBuilder;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdC1jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3JlcXVlc3QtY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FBbUY7QUFvRm5GLGdCQUFnQjtBQUNILFFBQUEsc0JBQXNCLEdBQUcsb0JBQWEsQ0FBeUIseUJBQXlCLENBQUMsQ0FBQztBQUN2RyxnQkFBZ0I7QUFDSCxRQUFBLGtDQUFrQyxHQUFHLG9CQUFhLENBQXFDLDhCQUE4QixDQUFDLENBQUM7QUFDdkgsUUFBQSxzQkFBc0IsR0FBRyxvQkFBYSxDQUF5Qix5QkFBeUIsQ0FBQyxDQUFDO0FBRXZHLGdCQUFnQjtBQUVoQixJQUFhLGlDQUFpQyxHQUE5QyxNQUFhLGlDQUFpQztJQUE5QztRQUNxQixRQUFHLEdBQXVDLEVBQUUsQ0FBQztJQVNsRSxDQUFDO0lBUEcsWUFBWTtRQUNSLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQztJQUNwQixDQUFDO0lBRUQsUUFBUSxDQUFDLElBQVksRUFBRSxRQUF3QztRQUMzRCxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLFFBQVEsQ0FBQztJQUM5QixDQUFDO0NBQ0osQ0FBQTtBQVZZLGlDQUFpQztJQUQ3QyxnQkFBUztHQUNHLGlDQUFpQyxDQVU3QztBQVZZLDhFQUFpQztBQVk5QyxvR0FBb0c7QUFDcEcsdURBQXVEO0FBRXZELCtGQUErRjtBQUMvRiwrREFBK0Q7QUFFL0QsZ0JBQWdCO0FBRWhCLElBQWEscUJBQXFCLEdBQWxDLE1BQWEscUJBQXFCO0lBRzlCLFlBQWdDLFFBQTRCO1FBQ3hELElBQUksQ0FBQyxPQUFPLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxDQUFDO0lBQ3pDLENBQUM7SUFFRCxJQUFJLE9BQU87UUFDUCxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQztJQUVELGlCQUFpQixDQUFDLE9BQXdCO1FBQ3RDLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQzNCLENBQUM7Q0FDSixDQUFBO0FBZFkscUJBQXFCO0lBRGpDLGFBQU07SUFJVSxXQUFBLHlCQUFrQixDQUFBO0dBSHRCLHFCQUFxQixDQWNqQztBQWRZLHNEQUFxQjtBQWdCbEMsZ0JBQWdCO0FBRWhCLElBQWEscUJBQXFCLEdBQWxDLE1BQWEscUJBQXFCO0lBQzlCLFlBQ3dDLFFBQTRDLEVBQ3hELE9BQThCO1FBQ2xELE1BQU0sR0FBRyxHQUFHLFFBQVEsQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUVwQywwR0FBMEc7UUFDMUcsMEVBQTBFO1FBQzFFLEtBQUssTUFBTSxJQUFJLElBQUksR0FBRyxFQUFFO1lBQ2QsSUFBSyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxJQUFXLEVBQUUsRUFBRTtnQkFDbkMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQztnQkFDL0QsT0FBTyxJQUFJLENBQUM7WUFDaEIsQ0FBQyxDQUFDO1NBQ0w7SUFDVCxDQUFDO0NBQ0osQ0FBQTtBQWZZLHFCQUFxQjtJQURqQyxhQUFNO0lBR0UsV0FBQSwwQ0FBa0MsQ0FBQTtJQUNsQyxXQUFBLDhCQUFzQixDQUFBO0dBSGxCLHFCQUFxQixDQWVqQztBQWZZLHNEQUFxQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdC1jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3JlcXVlc3QtY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FBd0U7QUF1QzNELFFBQUEsc0JBQXNCLEdBQUcsb0JBQWEsQ0FBeUIseUJBQXlCLENBQUMsQ0FBQztBQUV2RyxtTUFBbU07QUFDNUwsTUFBTSxjQUFjLEdBQXFELFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFO0lBQzNHLGtEQUFrRDtJQUNsRCxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDL0MsTUFBTSxxQkFBcUIsR0FBRyxlQUFlLENBQUMsR0FBRyxDQUFDLDhCQUFzQixDQUFDLENBQUM7SUFFMUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsZUFBZSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFFbEQsa0VBQWtFO0lBQ2xFLDRFQUE0RTtJQUM1RSw4RUFBOEU7SUFDOUUsMkRBQTJEO0lBQzNELE1BQU0sQ0FBQyxjQUFjLENBQUMsR0FBRyxFQUFFLFNBQVMsRUFBRTtRQUNsQyxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUssT0FBTyxxQkFBcUIsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0tBQ2xELENBQUMsQ0FBQztJQUVILE1BQU0sQ0FBQyxjQUFjLENBQUMsR0FBRyxFQUFFLFVBQVUsRUFBRTtRQUNuQyxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUssT0FBTyxlQUFlLENBQUMsQ0FBQyxDQUFDO0tBQ3BDLENBQUMsQ0FBQztJQUVILElBQUksRUFBRSxDQUFDO0FBQ1gsQ0FBQyxDQUFDO0FBdEJXLFFBQUEsY0FBYyxrQkFzQnpCO0FBRUYsZ0JBQWdCO0FBRWhCLElBQWEscUJBQXFCLEdBQWxDLE1BQWEscUJBQXFCO0lBRzlCLFlBQWdDLFFBQTRCO1FBQ3hELElBQUksQ0FBQyxPQUFPLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxDQUFDO0lBQ3pDLENBQUM7Q0FDSixDQUFBO0FBTlkscUJBQXFCO0lBRGpDLGFBQU07SUFJVSxXQUFBLHlCQUFrQixDQUFBO0dBSHRCLHFCQUFxQixDQU1qQztBQU5ZLHNEQUFxQiJ9

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@shrub/express",
     "description": "A module that adds support for Express based apps.",
-    "version": "0.5.31",
+    "version": "0.5.35",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -25,12 +25,12 @@
         "test": "jest"
     },
     "dependencies": {
-        "@shrub/core": "0.5.31",
-        "@shrub/http": "0.5.31",
+        "@shrub/core": "0.5.35",
+        "@shrub/http": "0.5.35",
         "express": "^4.17.1"
     },
     "devDependencies": {
         "@types/express": "4.17.9"
     },
-    "gitHead": "abeed709101e03dccc83d7f43eab20e1270d72d8"
+    "gitHead": "c10d4d9a1aa5f28454b4921e1bb5887abd9447b1"
 }