removed controller singleton exports

src/app/workerApp.ts

@@ -58,7 +58,8 @@ export class CloudflareWorkerApp {
   }
 
   private setupRoutes () {
-    this.restApiWorker.register('/', 'GET', RootController.list)
+    const rootController = new RootController()
+    this.restApiWorker.register('/', 'GET', rootController.list)
     this.restApiWorker.useRoutingTable('/cards', CardRoutingTable)
   }
 }

src/controller/card.ts

@@ -6,7 +6,7 @@ import {
   CardRepository
 } from '../index'
 
-class CardController extends Controller {
+export class CardController extends Controller {
   /**
    * Path: /cards (GET)
    * It will return the index and not the full item list
@@ -133,6 +133,3 @@ class CardController extends Controller {
     return res.send(card, status)
   }
 }
-
-// Singleton export
-export = new CardController()

src/controller/root.ts

@@ -5,7 +5,7 @@ import {
   RestApiResponse
 } from '../index'
 
-class RootController extends Controller {
+export class RootController extends Controller {
   /**
    * Path: / (GET)
    *
@@ -21,6 +21,3 @@ class RootController extends Controller {
     return res.send(reply)
   }
 }
-
-// Singleton export
-export = new RootController()

src/index.ts

@@ -38,8 +38,8 @@ import { Platform } from './util/platform'
 
 // Controllers
 import { Controller } from './controller/controller'
-import RootController from './controller/root'
-import CardController from './controller/card'
+import { RootController } from './controller/root'
+import { CardController } from './controller/card'
 
 // Routing
 import { CardRoutingTable } from './router/card'

src/router/card.ts

@@ -4,12 +4,14 @@ import {
 } from '../index'
 
 /**
+ * @fixme: this requires the cardController to be created before the app is initialized
  * Export a simple table of routes to be handled by the controller
  */
+const cardController = new CardController()
 export const CardRoutingTable: RawRouteItem[] = [
-  { path: '/', method: 'GET', callback: CardController.list },
-  { path: '/:id', method: 'GET', callback: CardController.getOne },
-  { path: '/', method: 'POST', callback: CardController.create },
-  { path: '/:id', method: 'PUT', callback: CardController.update },
-  { path: '/:id', method: 'DELETE', callback: CardController.delete }
+  { path: '/', method: 'GET', callback: cardController.list },
+  { path: '/:id', method: 'GET', callback: cardController.getOne },
+  { path: '/', method: 'POST', callback: cardController.create },
+  { path: '/:id', method: 'PUT', callback: cardController.update },
+  { path: '/:id', method: 'DELETE', callback: cardController.delete }
 ]

test/functional/rest.api.test.ts

@@ -64,6 +64,6 @@ describe('Rest API', () => {
       route: '/non_existent_route',
       method: 'GET'
     }])
-    console.log(reply)
+    // console.log(reply)
   })
 })