axe-api 1.7.1 → 1.7.3

package/build/src/Builders/SwaggerBuilder.js

@@ -522,6 +522,9 @@ const deepMerge = (base, source) => {
     }
     return merged;
 };
+const normalizeSwaggerPath = (path) => {
+    return path.replaceAll(/:([^/]+)/g, "{$1}");
+};
 const generateDocumentation = () => __awaiter(void 0, void 0, void 0, function* () {
     const docs = Services_1.DocumentationService.getInstance();
     const api = Services_1.APIService.getInstance();
@@ -582,10 +585,11 @@ const generateDocumentation = () => __awaiter(void 0, void 0, void 0, function*
     const modelPatterns = {};
     const paths = {};
     for (const endpoint of docs.get()) {
-        if (paths[endpoint.url] === undefined) {
-            paths[endpoint.url] = {};
+        const normalizedPath = normalizeSwaggerPath(endpoint.url);
+        if (paths[normalizedPath] === undefined) {
+            paths[normalizedPath] = {};
         }
-        modelPatterns[endpoint.url] = endpoint.model;
+        modelPatterns[normalizedPath] = endpoint.model;
         const path = {
             tags: [endpoint.model],
             summary: toEndpointSummary(endpoint),
@@ -598,20 +602,21 @@ const generateDocumentation = () => __awaiter(void 0, void 0, void 0, function*
         if (requestBody) {
             path.requestBody = requestBody;
         }
-        paths[endpoint.url][endpoint.method.toLowerCase()] = path;
+        paths[normalizedPath][endpoint.method.toLowerCase()] = path;
     }
     const modelPatternsKeys = Object.keys(modelPatterns);
     // Added custom endpoint
     for (const custom of docs.getCustoms()) {
-        if (paths[custom.url] === undefined) {
-            paths[custom.url] = {};
+        const normalizedPath = normalizeSwaggerPath(custom.url);
+        if (paths[normalizedPath] === undefined) {
+            paths[normalizedPath] = {};
         }
-        const samePattern = modelPatternsKeys.find((key) => custom.url.startsWith(key));
+        const samePattern = modelPatternsKeys.find((key) => normalizedPath.startsWith(key));
         const tags = [];
         if (samePattern) {
             tags.push(modelPatterns[samePattern]);
         }
-        paths[custom.url][custom.method.toLowerCase()] = {
+        paths[normalizedPath][custom.method.toLowerCase()] = {
             tags,
             description: "Custom endpoint",
         };

package/build/src/Handlers/RequestHandler.js

@@ -74,7 +74,7 @@ exports.default = (request, response, next) => __awaiter(void 0, void 0, void 0,
             // Rollback transaction
             if (match.hasTransaction && trx) {
                 Services_1.LogService.info("\t🛢 DBTransaction:rollback()");
-                trx.rollback();
+                yield trx.rollback();
             }
             if (error.type === "ApiError") {
                 const apiError = error;
@@ -94,7 +94,7 @@ exports.default = (request, response, next) => __awaiter(void 0, void 0, void 0,
         if (context.res.statusCode() >= 400 && context.res.statusCode() < 599) {
             if (match.hasTransaction && trx) {
                 Services_1.LogService.info("\t🛢 DBTransaction:rollback()");
-                trx.rollback();
+                yield trx.rollback();
             }
             Services_1.LogService.debug(`\tResponse ${context.res.statusCode()}`);
             break;
@@ -102,7 +102,7 @@ exports.default = (request, response, next) => __awaiter(void 0, void 0, void 0,
         // We should commit the transaction if there is any
         if (match.hasTransaction && trx) {
             Services_1.LogService.info("\t🛢 DBTransaction:commit()");
-            trx.commit();
+            yield trx.commit();
         }
         Services_1.LogService.debug(`\t🟢 Response ${context.res.statusCode()}`);
         // We should brake the for-loop

package/build/src/Middlewares/RateLimit/RedisAdaptor.js

@@ -24,6 +24,9 @@ class RedisAdaptor {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.client.connect();
+                this.client.on("error", (err) => {
+                    Services_1.LogService.error(`Redis Client Error: ${err.message}`);
+                });
                 Services_1.LogService.info("Redis connection done!");
                 this.isConnected = true;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axe-api",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "AXE API is a simple tool to create Rest APIs quickly.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -46,92 +46,78 @@
   "scripts": {
     "build": "rm -rf build && tsc && rm -rf build/dev-kit",
     "build:watch": "tsc -w",
-    "dev-kit": "tsx watch dev-kit.ts",
-    "dev-kit:install": "node ./scripts/dev-kit-install.js",
-    "dev-kit:remove": "node ./scripts/dev-kit-remove.js",
-    "test": "jest --runInBand",
+    "test": "vitest run",
     "test:all": "npm run lint && npm run prettier:check && npm run test && npm run test:sqlite",
-    "test:dev": "jest --watch",
+    "test:dev": "vitest",
     "lint": "eslint --max-warnings=0 .",
     "lint:watch": "esw --watch --color",
-    "test:postgres11": "sh ./scripts/test-postgres11.sh",
-    "test:postgres12": "sh ./scripts/test-postgres12.sh",
-    "test:postgres13": "sh ./scripts/test-postgres13.sh",
-    "test:postgres14": "sh ./scripts/test-postgres14.sh",
-    "test:postgres15": "sh ./scripts/test-postgres15.sh",
-    "test:cockroach": "sh ./scripts/test-cockroach.sh",
-    "test:mysql57": "sh ./scripts/test-mysql57.sh",
-    "test:mysql8": "sh ./scripts/test-mysql8.sh",
-    "test:mariadb": "sh ./scripts/test-mariadb.sh",
-    "test:sqlite": "sh ./scripts/test-sqlite.sh",
     "prettier:check": "prettier --check .",
     "prettier:write": "prettier --write .",
     "prepare": "husky",
     "benchmark": "k6 run benchmark/run.js"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "dependencies": {
-    "body-parser": "^2.2.0",
+    "body-parser": "^2.2.2",
     "change-case": "^4.1.2",
     "colors": "^1.4.0",
-    "commander": "^14.0.0",
+    "commander": "^14.0.3",
     "connect": "^3.7.0",
-    "dotenv": "^16.5.0",
+    "dotenv": "^16.6.1",
     "formidable": "^3.5.4",
     "knex": "^3.1.0",
-    "knex-paginate": "^3.1.4",
+    "knex-paginate": "^3.2.0",
     "knex-schema-inspector": "^3.1.0",
     "nanoid": "^3.3.11",
-    "pino": "^9.7.0",
-    "pino-pretty": "^13.0.0",
+    "pino": "^9.14.0",
+    "pino-pretty": "^13.1.3",
     "pluralize": "^8.0.0",
-    "rimraf": "^6.0.1",
+    "rimraf": "^6.1.3",
     "shelljs": "^0.10.0",
     "validatorjs": "^3.22.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.27.4",
-    "@babel/preset-env": "^7.27.2",
-    "@babel/preset-typescript": "^7.27.1",
-    "@elastic/elasticsearch": "^8.18.2",
+    "@babel/core": "^7.29.0",
+    "@babel/preset-env": "^7.29.0",
+    "@babel/preset-typescript": "^7.28.5",
+    "@elastic/elasticsearch": "^8.19.1",
     "@types/accept-language-parser": "^1.5.8",
-    "@types/aws-lambda": "^8.10.149",
+    "@types/aws-lambda": "^8.10.161",
     "@types/cors": "^2.8.19",
-    "@types/formidable": "^3.4.5",
+    "@types/formidable": "^3.4.7",
     "@types/multer": "^1.4.13",
     "@types/pluralize": "^0.0.33",
     "@types/validatorjs": "^3.15.5",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
-    "babel-jest": "^30.0.0",
-    "cors": "^2.8.5",
+    "cors": "^2.8.6",
     "eslint": "^8.57.1",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.6.0",
     "eslint-plugin-unicorn": "^56.0.1",
     "eslint-watch": "^8.0.0",
-    "glob": "^11.0.3",
+    "glob": "^11.1.0",
     "husky": "^9.1.7",
-    "jest": "^30.0.0",
-    "lint-staged": "^16.1.0",
-    "multer": "^2.0.1",
+    "lint-staged": "^16.3.1",
+    "multer": "^2.1.0",
     "mysql": "^2.18.1",
-    "mysql2": "^3.14.1",
+    "mysql2": "^3.18.2",
     "node-cache": "^5.1.2",
-    "pg": "^8.16.0",
-    "prettier": "^3.5.3",
+    "pg": "^8.19.0",
+    "prettier": "^3.8.1",
     "redis": "^4.7.1",
     "robust-validator": "^2.2.1",
-    "serve-static": "^2.2.0",
+    "serve-static": "^2.2.1",
     "set-value": ">=4.1.0",
     "sqlite3": "^5.1.7",
     "ts-node": "^10.9.2",
-    "tsx": "^4.20.3",
-    "typescript": "^5.8.3"
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3",
+    "vitest": "^3.2.4"
   },
   "lint-staged": {
     "**/*": "prettier --write --ignore-unknown"

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Özgür Adem Işıklı <i.ozguradem@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/readme.md

@@ -1,54 +0,0 @@
-<h1 align="center">
-  <br>
-  <a href="https://axe-api.com/">
-    <img src="https://axe-api.com/viking.png" alt="Markdownify" width="200">
-  </a>
-  <br>
-  Axe API
-  <br>
-  <a href="https://badge.fury.io/js/axe-api">
-    <img src="https://badge.fury.io/js/axe-api.svg" alt="npm version" height="18">
-  </a>
-  <a href="https://github.com/axe-api/axe-api/actions/workflows/npm-release-publish.yml" target="_blank">
-    <img src="https://github.com/axe-api/axe-api/actions/workflows/npm-release-publish.yml/badge.svg?branch=master">
-  </a>
-  <a href="https://sonarcloud.io/dashboard?id=axe-api_axe-api" target="_blank">
-    <img src="https://sonarcloud.io/api/project_badges/measure?project=axe-api_axe-api&metric=alert_status">
-  </a>
-  <a href="https://github.com/axe-api/axe-api/issues" target="_blank">
-    <img src="https://img.shields.io/github/issues/axe-api/axe-api.svg">
-  </a>
-  <a href="https://opensource.org/licenses/MIT" target="_blank">
-    <img src="https://img.shields.io/badge/license-MIT-blue.svg">
-  </a>
-</h1>
-
-**Axe API** is a **TypeScript-based** **Node.js** framework designed to eliminate the need for repetitive tasks associated with common elements while allowing developers to focus on custom logic.
-
-It offers a comprehensive structure for your API, including numerous features and best practices that will save you time.
-
-## 🎥 Video Introduction
-
-<div style="display: flex; justify-content: center;">
-
-<a href="https://www.youtube.com/watch?v=3p4jggsNrJA" target="_blank">
-  <img src="https://raw.githubusercontent.com/axe-api/axe-api/master/youtube.png" />
-</a>
-
-</div>
-
-## 📚 Documentation
-
-Axe API has great documentation. Please [check it out in here](https://axe-api.com/).
-
-## 👥 Contributors
-
-<a href="https://github.com/axe-api/axe-api/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=axe-api/axe-api" />
-</a>
-
-Made with [contrib.rocks](https://contrib.rocks).
-
-## 📜 License
-
-[MIT License](LICENSE)