feat(express): updated di version (#134)

serhiisol · Jan 30, 2023 · 7985649 · 7985649
1 parent 781a488
commit 7985649
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 44 deletions.
diff --git a/express/package-lock.json b/express/package-lock.json
diff --git a/express/package.json b/express/package.json
@@ -1,24 +1,24 @@
 {
   "name": "@decorators/express",
-  "version": "2.8.1",
+  "version": "2.9.0",
   "description": "node decorators - decorators for express library",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "peerDependencies": {
-    "express": ">=4.16.3",
-    "@decorators/di": ">=1.0.3"
+    "express": "^4.16.3",
+    "@decorators/di": "^2.0.0"
   },
   "devDependencies": {
-    "@decorators/di": ">=1.0.3",
+    "@decorators/di": "../di",
     "@types/express": "4.17.8",
     "@typescript-eslint/eslint-plugin": "^5.6.0",
     "@typescript-eslint/parser": "^5.6.0",
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-jsdoc": "^37.1.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "eslint": "^8.4.0",
-    "express": ">=4.16.3",
-    "typescript": ">=4.9.4"
+    "express": "^4.16.3",
+    "typescript": "^4.9.4"
   },
   "keywords": [
     "nodejs",

diff --git a/express/src/express.ts b/express/src/express.ts
@@ -27,12 +27,12 @@ export function attachControllerInstances(app: Express | Router, controllers: In
 /**
  * Register controller via registering new Router
  */
-function registerController(
+async function registerController(
   app: Application | Router,
   Controller: Type | InstanceType<Type>,
-  extractController: (c: Type | InstanceType<Type>) => InstanceType<Type>,
+  extractController: (c: Type | InstanceType<Type>) => Promise<InstanceType<Type>> | InstanceType<Type>,
 ) {
-  const controller = extractController(Controller);
+  const controller = await extractController(Controller);
   const meta = getMeta(controller);
   const router = Router(meta.routerOptions);
 
@@ -142,7 +142,7 @@ function extractParameters(req: Request, res: Response, next: NextFunction, para
 /**
  * Get controller instance from container or instantiate one
  */
-function getController(Controller: Type): ExpressClass {
+function getController(Controller: Type): Promise<ExpressClass> | ExpressClass {
   try {
     return Container.get(Controller);
   } catch {

diff --git a/express/src/middleware.ts b/express/src/middleware.ts
@@ -20,7 +20,7 @@ export type ErrorMiddleware = ErrorMiddlewareFunction | Type<ErrorMiddlewareClas
  */
 export function middlewareHandler(middleware: Middleware): RequestHandler {
   return (req: Request, res: Response, next: NextFunction) => {
-    invokeMiddleware(middleware, [req, res, next]);
+    invokeMiddleware(middleware, [req, res, next]).catch(next);
   };
 }
 
@@ -34,14 +34,14 @@ export const ERROR_MIDDLEWARE = new InjectionToken('ERROR_MIDDLEWARE');
  */
 export function errorMiddlewareHandler(): ErrorRequestHandler {
   return (error: Error, req: Request, res: Response, next: NextFunction) => {
-    invokeMiddleware(ERROR_MIDDLEWARE, [error, req, res, next]);
+    invokeMiddleware(ERROR_MIDDLEWARE, [error, req, res, next]).catch(next);
   };
 }
 
 /**
  * Instantiate middleware and invoke it with arguments
  */
-function invokeMiddleware(
+async function invokeMiddleware(
   middleware: InjectionToken | Middleware | ErrorMiddleware,
   args: Parameters<MiddlewareFunction> | Parameters<ErrorMiddlewareFunction>,
 ) {
@@ -57,7 +57,7 @@ function invokeMiddleware(
         instance = middleware as MiddlewareFunction;
       }
     } else {
-      instance = Container.get(middleware);
+      instance = await Container.get(middleware);
     }
 
     const handler = (instance as MiddlewareClass | ErrorMiddlewareClass)?.use ?? instance;