@adaptivestone/framework 3.0.14 → 3.0.17

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 3.0.17
+
+[UPDATE] update deps
+
+### 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

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/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);

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.14",
+  "version": "3.0.17",
   "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",

package/tests/setup.js

@@ -15,6 +15,7 @@ beforeAll(async () => {
   await mongoMemoryServerInstance.waitUntilRunning();
   process.env.LOGGER_CONSOLE_LEVEL = 'error';
   const connectionStringMongo = await mongoMemoryServerInstance.getUri();
+  console.info('MONGO_URI: ', connectionStringMongo);
   global.server = new Server({
     folders: {
       config: process.env.TEST_FOLDER_CONFIG || path.resolve('./config'),