@expressots/adapter-express 1.1.1 → 1.2.0

package/lib/CHANGELOG.md

@@ -1,5 +1,15 @@
 
 
+## [1.2.0](https://github.com/expressots/adapter-express/compare/1.1.1...1.2.0) (2024-3-5)
+
+
+### Features
+
+* add expressots middleware support ([809f148](https://github.com/expressots/adapter-express/commit/809f148a2b9a6bb0aa41f231595b3a4c394574ee))
+* bump @commitlint/cli from 17.8.1 to 18.0.0 ([15fbb1a](https://github.com/expressots/adapter-express/commit/15fbb1a84c758df25b60f2a893fd44829db3c0dc))
+* fix middleware binding to constructor ([3a6f7dc](https://github.com/expressots/adapter-express/commit/3a6f7dca40889133b09630582c775156392c4fd7))
+* fix path call on expresso middleware ([934ae17](https://github.com/expressots/adapter-express/commit/934ae17110489315536e28b71cde24f5f18d88dc))
+
 ## [1.1.1](https://github.com/expressots/adapter-express/compare/1.1.0...1.1.1) (2023-10-10)
 
 

package/lib/cjs/adapter-express/application-express.js

@@ -24,6 +24,16 @@ const process_1 = __importDefault(require("process"));
 const core_1 = require("@expressots/core");
 const inversify_express_server_1 = require("./express-utils/inversify-express-server");
 const application_base_1 = require("./application-base");
+/**
+ * Abstract class for creating custom Expresso middleware.
+ * Custom middleware classes should extend this class and implement the use method.
+ *
+ */
+class ExpressoMiddleware {
+    get name() {
+        return this.constructor.name;
+    }
+}
 /**
  * Enum representing possible server environments.
  */
@@ -51,6 +61,41 @@ let ApplicationExpress = class ApplicationExpress extends application_base_1.App
         this.serverShutdown();
         process_1.default.exit(0);
     }
+    /**
+     * Configures the Express application with the provided middleware entries.
+     * @param app - The Express application instance.
+     * @param middlewareEntries - An array of Express middleware entries to be applied.
+     */
+    configureMiddleware(app, middlewareEntries) {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const entry of middlewareEntries) {
+                if (typeof entry === "function") {
+                    app.use(entry);
+                    // eslint-disable-next-line no-prototype-builtins
+                }
+                else if (entry === null || entry === void 0 ? void 0 : entry.hasOwnProperty("path")) {
+                    const { path, middlewares } = entry;
+                    for (const mid of middlewares) {
+                        if (path) {
+                            if (typeof mid === "function") {
+                                app.use(path, mid);
+                            }
+                            else {
+                                const middleware = mid;
+                                middleware.use = middleware.use.bind(middleware);
+                                app.use(path, middleware.use);
+                            }
+                        }
+                    }
+                }
+                else {
+                    const middleware = entry;
+                    middleware.use = middleware.use.bind(middleware);
+                    app.use(middleware.use);
+                }
+            }
+        });
+    }
     /**
      * Create and configure the Express application.
      * @param container - The InversifyJS container.
@@ -59,32 +104,16 @@ let ApplicationExpress = class ApplicationExpress extends application_base_1.App
      */
     init(container, middlewares = []) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield Promise.resolve(this.configureServices());
+            yield this.configureServices();
             const middleware = container.get(core_1.Middleware);
             const sortedMiddlewarePipeline = middleware.getMiddlewarePipeline();
             const pipeline = sortedMiddlewarePipeline.map((entry) => entry.middleware);
             this.middlewares.push(...middlewares, ...pipeline);
-            const allMiddlewareEntries = [...this.middlewares];
             const expressServer = new inversify_express_server_1.InversifyExpressServer(container, null, {
                 rootPath: this.globalPrefix,
             });
             expressServer.setConfig((app) => {
-                allMiddlewareEntries.forEach((entry) => {
-                    if (typeof entry === "function") {
-                        app.use(entry);
-                    }
-                    else {
-                        const { path, middlewares } = entry;
-                        middlewares.forEach((middleware) => {
-                            if (path) {
-                                app.use(path, middleware);
-                            }
-                            else {
-                                app.use(middleware);
-                            }
-                        });
-                    }
-                });
+                this.configureMiddleware(app, this.middlewares);
             });
             expressServer.setErrorConfig((app) => {
                 if (middleware.getErrorHandler()) {

package/lib/cjs/types/adapter-express/application-express.d.ts

@@ -3,6 +3,16 @@ import { Container } from "inversify";
 import { IApplicationMessageToConsole, RenderTemplateOptions } from "@expressots/core";
 import { IApplicationExpress } from "./application-express.interface";
 import { ApplicationBase } from "./application-base";
+/**
+ * ExpressHandler Type
+ *
+ * The ExpressHandler type is a union type that represents various types of Express middleware functions.
+ * It can be one of the following types:
+ * - express.ErrorRequestHandler: Handles errors in the middleware pipeline.
+ * - express.RequestParamHandler: Handles parameters in the middleware pipeline.
+ * - express.RequestHandler: General request handler.
+ * - undefined: Represents the absence of a handler.
+ */
 type ExpressHandler = express.ErrorRequestHandler | express.RequestParamHandler | express.RequestHandler | undefined;
 /**
  * Enum representing possible server environments.
@@ -29,6 +39,12 @@ declare class ApplicationExpress extends ApplicationBase implements IApplication
      * Handles process exit by calling serverShutdown and then exiting the process.
      */
     private handleExit;
+    /**
+     * Configures the Express application with the provided middleware entries.
+     * @param app - The Express application instance.
+     * @param middlewareEntries - An array of Express middleware entries to be applied.
+     */
+    private configureMiddleware;
     /**
      * Create and configure the Express application.
      * @param container - The InversifyJS container.

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expressots/adapter-express",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Expressots - modern, fast, lightweight nodejs web framework (@adapter-express)",
   "author": "",
   "main": "./lib/cjs/index.js",
@@ -69,7 +69,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.7.1",
+    "@commitlint/cli": "^18.0.0",
     "@commitlint/config-conventional": "^17.7.0",
     "@expressots/core": "^2.2.0",
     "@release-it/conventional-changelog": "^7.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expressots/adapter-express",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Expressots - modern, fast, lightweight nodejs web framework (@adapter-express)",
   "author": "",
   "main": "./lib/cjs/index.js",
@@ -69,7 +69,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.7.1",
+    "@commitlint/cli": "^18.0.0",
     "@commitlint/config-conventional": "^17.7.0",
     "@expressots/core": "^2.2.0",
     "@release-it/conventional-changelog": "^7.0.1",