@adaptivestone/framework 3.0.13 → 3.0.16

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+### 3.0.16
+
+[UPDATE] update deps
+[FIX] fix bug with route level middleware
+
+### 3.0.15
+
+[UPDATE] update deps
+[UPDATE] minimum node version 16
+
+### 3.0.14
+
+[NEW] now possible to show all errors during validation (default one) by parameter controllerValidationAbortEarly
+[UPDATE] update deps
+
 ### 3.0.13
 
 [UPDATE] bug fix with "mergeParams"

package/commands/migration/Create.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
 const path = require('path');
 const fs = require('fs').promises;
 

package/commands/migration/Migrate.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
 const AbstractCommand = require('../../modules/AbstractCommand');
 
 class Migrate extends AbstractCommand {

package/config/validate.js

@@ -0,0 +1,3 @@
+module.exports = {
+  controllerValidationAbortEarly: true, // abort validation on first error and return first error
+};

package/models/User.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-param-reassign */
 const bcrypt = require('bcrypt');
 
 const AbstractModel = require('../modules/AbstractModel');
@@ -99,8 +100,7 @@ class User extends AbstractModel {
       avatar: this.avatar,
       name: this.name,
       email: this.email,
-      // eslint-disable-next-line no-underscore-dangle
-      _id: this._id,
+      id: this.id,
       isVerified: this.isVerified,
       permissions: this.permissions,
       locale: this.locale,

package/modules/AbstractController.js

@@ -136,7 +136,8 @@ class AbstractController extends Base {
       }
       for (const path in routes[verb]) {
         const routeAdditionalMiddlewares = routeMiddlewaresReg.filter(
-          (middleware) => middleware.path === path,
+          (middleware) =>
+            middleware.path === path && middleware.method === verb,
         );
         let routeObject = routes[verb][path];
         routeObjectClone = merge({}, routeObject);
@@ -188,7 +189,8 @@ class AbstractController extends Base {
               new MiddlewareFunction(this.app, params).getMiddleware(),
           );
         }
-
+        const { controllerValidationAbortEarly } =
+          this.app.getConfig('validate');
         this.router[verb](
           path,
           additionalMiddlewares || [],
@@ -203,7 +205,9 @@ class AbstractController extends Base {
               const bodyAndQuery = merge(req.query, req.body);
 
               try {
-                await routeObject.request.validate(bodyAndQuery);
+                await routeObject.request.validate(bodyAndQuery, {
+                  abortEarly: controllerValidationAbortEarly,
+                });
               } catch (e) {
                 let { errors } = e;
                 // translate it
@@ -214,10 +218,22 @@ class AbstractController extends Base {
                   `Request validation failed with message: ${e.message}. errors: ${errors}`,
                 );
 
+                const errorAnswer = {};
+                if (!e.inner.length) {
+                  errorAnswer[e.path] = errors;
+                } else {
+                  e.inner.forEach((err) => {
+                    errorAnswer[err.path] = err.errors;
+                    if (req.i18n && err.errors) {
+                      errorAnswer[err.path] = err.errors.map((err1) =>
+                        req.i18n.t(err1),
+                      );
+                    }
+                  });
+                }
+
                 return res.status(400).json({
-                  errors: {
-                    [e.path]: errors,
-                  },
+                  errors: errorAnswer,
                 });
               }
               req.appInfo.request = routeObject.request.cast(bodyAndQuery, {

package/modules/Base.d.ts

@@ -3,7 +3,7 @@ import Server from '../server';
 
 declare class Base {
   app: Server['app'];
-  _realLogger: null;
+  #realLogger: null;
 
   constructor(app: Server['app']);
 

package/modules/Base.js

@@ -1,11 +1,11 @@
-/* eslint-disable no-underscore-dangle */
 const fs = require('fs').promises;
 const { join } = require('path');
 
 class Base {
+  #realLogger = null;
+
   constructor(app) {
     this.app = app;
-    this._realLogger = null;
   }
 
   /**
@@ -19,12 +19,12 @@ class Base {
    * Optimzation to lazy load logger. It will be inited only on request
    */
   get logger() {
-    if (!this._realLogger) {
-      this._realLogger = this.getLogger(
+    if (!this.#realLogger) {
+      this.#realLogger = this.getLogger(
         this.constructor.loggerGroup + this.getConstructorName(),
       );
     }
-    return this._realLogger;
+    return this.#realLogger;
   }
 
   /**

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "3.0.13",
+  "version": "3.0.16",
   "description": "Adaptive stone node js framework",
-  "main": "index.js",
+  "main": "src/index.js",
+  "engines": {
+    "node": ">=16.0.0"
+  },
   "repository": {
     "type": "git",
     "url": "https://gitlab.com/adaptivestone/framework"
@@ -55,7 +58,7 @@
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-jest": "^26.0.0",
     "husky": "^7.0.0",
-    "jest": "^27.0.6",
+    "jest": "^28.0.0",
     "lint-staged": "^12.0.0",
     "mongodb-memory-server": "^8.0.2",
     "nodemon": "^2.0.12",