feat(rest): allow factory for controller routes

loopbackio · Mar 9, 2018 · 6916fcf · 6916fcf
1 parent de08aa5
commit 6916fcf
Show file tree

Hide file tree

Showing 7 changed files with 350 additions and 46 deletions.
diff --git a/packages/rest/src/http-handler.ts b/packages/rest/src/http-handler.ts
@@ -15,6 +15,7 @@ import {
   ResolvedRoute,
   RouteEntry,
   ControllerClass,
+  ControllerFactory,
 } from './router/routing-table';
 import {ParsedRequest} from './internal-types';
 
@@ -33,8 +34,12 @@ export class HttpHandler {
     this.handleRequest = (req, res) => this._handleRequest(req, res);
   }
 
-  registerController(name: ControllerClass, spec: ControllerSpec) {
-    this._routes.registerController(name, spec);
+  registerController(
+    controllerCtor: ControllerClass,
+    spec: ControllerSpec,
+    factory?: ControllerFactory,
+  ) {
+    this._routes.registerController(controllerCtor, spec);
   }
 
   registerRoute(route: RouteEntry) {

diff --git a/packages/rest/src/index.ts b/packages/rest/src/index.ts
@@ -14,6 +14,10 @@ export {
   ResolvedRoute,
   createResolvedRoute,
   parseRequestUrl,
+  ControllerClass,
+  ControllerInstance,
+  ControllerFactory,
+  createControllerFactory,
 } from './router/routing-table';
 
 export * from './providers';

diff --git a/packages/rest/src/rest-server.ts b/packages/rest/src/rest-server.ts
@@ -6,7 +6,13 @@
 import {AssertionError} from 'assert';
 import {safeDump} from 'js-yaml';
 import {Binding, Context, Constructor, inject} from '@loopback/context';
-import {Route, ControllerRoute, RouteEntry} from './router/routing-table';
+import {
+  Route,
+  ControllerRoute,
+  RouteEntry,
+  createControllerFactory,
+  ControllerFactory,
+} from './router/routing-table';
 import {ParsedRequest} from './internal-types';
 import {OpenApiSpec, OperationObject} from '@loopback/openapi-v3-types';
 import {ServerRequest, ServerResponse, createServer} from 'http';
@@ -228,7 +234,8 @@ export class RestServer extends Context implements Server {
       if (apiSpec.components && apiSpec.components.schemas) {
         this._httpHandler.registerApiDefinitions(apiSpec.components.schemas);
       }
-      this._httpHandler.registerController(ctor, apiSpec);
+      const controllerFactory = createControllerFactory(b.key);
+      this._httpHandler.registerController(ctor, apiSpec, controllerFactory);
     }
 
     for (const b of this.find('routes.*')) {
@@ -277,7 +284,15 @@ export class RestServer extends Context implements Server {
         );
       }
 
-      const route = new ControllerRoute(verb, path, spec, ctor);
+      const controllerFactory = createControllerFactory(b.key);
+      const route = new ControllerRoute(
+        verb,
+        path,
+        spec,
+        ctor,
+        undefined,
+        controllerFactory,
+      );
       this._httpHandler.registerRoute(route);
       return;
     }
@@ -366,6 +381,7 @@ export class RestServer extends Context implements Server {
     spec: OperationObject,
     controller: ControllerClass,
     methodName: string,
+    factory?: ControllerFactory,
   ): Binding;
 
   /**
@@ -389,6 +405,7 @@ export class RestServer extends Context implements Server {
     spec?: OperationObject,
     controller?: ControllerClass,
     methodName?: string,
+    controllerFactory?: ControllerFactory,
   ): Binding {
     if (typeof routeOrVerb === 'object') {
       const r = routeOrVerb;
@@ -424,7 +441,14 @@ export class RestServer extends Context implements Server {
     }
 
     return this.route(
-      new ControllerRoute(routeOrVerb, path, spec, controller, methodName),
+      new ControllerRoute(
+        routeOrVerb,
+        path,
+        spec,
+        controller,
+        methodName,
+        controllerFactory,
+      ),
     );
   }