@adaptivestone/framework 5.0.0-beta.3 → 5.0.0-beta.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 5.0.0-beta.5
+
+[UPDATE] migrate to eslint 9 and away from aibnb styles (they are abonded)
+
+### 5.0.0-beta.4
+
+[NEW] on shutdown event now after timeout we are forcing to shutdown
+
 ### 5.0.0-beta.2
 
 [UPDATE] update deps

package/cluster.js

@@ -4,7 +4,6 @@ import { cpus } from 'node:os';
 const numCPUs = cpus().length;
 
 if (cluster.isPrimary) {
-  // eslint-disable-next-line no-console
   console.log(`Master ${process.pid} is running`);
   // Fork workers.
   for (let i = 0; i < numCPUs; i += 1) {
@@ -12,7 +11,6 @@ if (cluster.isPrimary) {
   }
 
   cluster.on('exit', (worker, code, signal) => {
-    // eslint-disable-next-line no-console
     console.log(
       `Worker \x1B[45m ${
         worker.process.pid

package/commands/GetOpenApiJson.js

@@ -18,7 +18,7 @@ class GetOpenApiJson extends AbstractCommand {
 
     try {
       jsonFile = JSON.parse(await fs.readFile(jsonFile, 'utf8'));
-    } catch (e) {
+    } catch {
       this.logger.error(
         'No npm package detected. Please start this command via NPM as it depends on package.json',
       );
@@ -123,7 +123,6 @@ class GetOpenApiJson extends AbstractCommand {
 
         let routeName = Object.keys(route)[0];
         if (routeName === '/') {
-          // eslint-disable-next-line no-continue
           continue;
         }
 

package/controllers/Auth.js

@@ -1,4 +1,4 @@
-import yup from 'yup';
+import { object, string } from 'yup';
 import AbstractController from '../modules/AbstractController.js';
 import GetUserByToken from '../services/http/middleware/GetUserByToken.js';
 import RateLimiter from '../services/http/middleware/RateLimiter.js';
@@ -9,58 +9,52 @@ class Auth extends AbstractController {
       post: {
         '/login': {
           handler: this.postLogin,
-          request: yup.object().shape({
-            email: yup.string().email().required('auth.emailProvided'), // if not provided then error will be generated
-            password: yup.string().required('auth.passwordProvided'), // possible to provide values from translation
+          request: object().shape({
+            email: string().email().required('auth.emailProvided'), // if not provided then error will be generated
+            password: string().required('auth.passwordProvided'), // possible to provide values from translation
           }),
         },
         '/register': {
           handler: this.postRegister,
-          request: yup.object().shape({
-            email: yup
-              .string()
+          request: object().shape({
+            email: string()
               .email('auth.emailValid')
               .required('auth.emailProvided'),
-            password: yup
-              .string()
+            password: string()
               .matches(
                 /^[a-zA-Z0-9!@#$%ˆ^&*()_+\-{}[\]<>]+$/,
                 'auth.passwordValid',
               )
               .required('auth.passwordProvided'),
-            nickName: yup
-              .string()
-              .matches(/^[a-zA-Z0-9_\-.]+$/, 'auth.nickNameValid'),
-            firstName: yup.string(),
-            lastName: yup.string(),
+            nickName: string().matches(
+              /^[a-zA-Z0-9_\-.]+$/,
+              'auth.nickNameValid',
+            ),
+            firstName: string(),
+            lastName: string(),
           }),
         },
         '/logout': this.postLogout,
         '/verify': this.verifyUser,
         '/send-recovery-email': {
           handler: this.sendPasswordRecoveryEmail,
-          request: yup
-            .object()
-            .shape({ email: yup.string().email().required() }),
+          request: object().shape({ email: string().email().required() }),
         },
         '/recover-password': {
           handler: this.recoverPassword,
-          request: yup.object().shape({
-            password: yup
-              .string()
+          request: object().shape({
+            password: string()
               .matches(
                 /^[a-zA-Z0-9!@#$%ˆ^&*()_+\-{}[\]<>]+$/,
                 'auth.passwordValid',
               )
               .required(),
-            passwordRecoveryToken: yup.string().required(),
+            passwordRecoveryToken: string().required(),
           }),
         },
         '/send-verification': {
           handler: this.sendVerification,
-          request: yup
-            .object()
-            .shape({ email: yup.string().email().required() }),
+          request: object().shape({ email: string().email().required() }),
         },
       },
     };
@@ -136,7 +130,7 @@ class Auth extends AbstractController {
       user = await User.getUserByVerificationToken(
         req.query.verification_token,
       );
-    } catch (e) {
+    } catch {
       return res.status(400).json({
         message: req.i18n.t('email.alreadyVerifiedOrWrongToken'),
       });

package/eslint.config.js

@@ -0,0 +1,44 @@
+import globals from 'globals';
+import pluginJs from '@eslint/js';
+import importPlugin from 'eslint-plugin-import';
+import vitest from '@vitest/eslint-plugin';
+import eslintConfigPrettier from 'eslint-config-prettier';
+import prettierPlugin from 'eslint-plugin-prettier/recommended';
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+  pluginJs.configs.recommended,
+  importPlugin.flatConfigs.recommended,
+  eslintConfigPrettier,
+  prettierPlugin,
+  {
+    languageOptions: {
+      sourceType: 'module',
+      ecmaVersion: 'latest',
+      globals: {
+        ...globals.es2023,
+        ...globals.node,
+      },
+    },
+  },
+  {
+    rules: {
+      'no-await-in-loop': 'error',
+      'no-param-reassign': 'error',
+      'class-methods-use-this': 'error',
+      'no-shadow': 'error',
+      'prefer-const': 'error',
+      'import/no-extraneous-dependencies': ['error'],
+      'import/first': ['error'],
+    },
+  },
+  {
+    files: ['**/*.test.js'],
+    plugins: {
+      vitest,
+    },
+    rules: {
+      ...vitest.configs.recommended.rules,
+    },
+  },
+];

package/helpers/files.js

@@ -73,7 +73,4 @@ const getFilesPathWithInheritance = async ({
   return filesToLoad;
 };
 
-export {
-  // eslint-disable-next-line import/prefer-default-export
-  getFilesPathWithInheritance,
-};
+export { getFilesPathWithInheritance };

package/helpers/logger.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 const levels = ['error', 'warn', 'info', 'http', 'verbose', 'debug', 'silly'];
 
 const consoleLogger = (level, message) => {

package/helpers/yup.js

@@ -18,7 +18,4 @@ class YupFile extends Schema {
   }
 }
 
-export {
-  // eslint-disable-next-line import/prefer-default-export
-  YupFile,
-};
+export { YupFile };

package/models/User.js

@@ -1,5 +1,3 @@
-/* eslint-disable no-param-reassign */
-
 import { scrypt } from 'node:crypto';
 
 import { promisify } from 'node:util';

package/modules/AbstractCommand.js

@@ -23,7 +23,7 @@ class AbstractCommand extends Base {
    * @returns string
    */
   static getMongoConnectionName(commandName, args) {
-    return `CLI: ${commandName} ${args.join(' ')}`;
+    return `CLI: ${commandName} ${JSON.stringify(args)}`;
   }
 
   /**

package/modules/AbstractController.js

@@ -1,5 +1,3 @@
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable guard-for-in */
 import express from 'express';
 
 import Base from './Base.js';
@@ -88,7 +86,6 @@ class AbstractController extends Base {
         this.logger.error(
           `Method ${verb} not exist for router. Please check your codebase`,
         );
-        // eslint-disable-next-line no-continue
         continue;
       }
       for (const path in routes[verb]) {
@@ -112,7 +109,6 @@ class AbstractController extends Base {
                 routeObject.handler
               }' for controller '${this.getConstructorName()}'`,
             );
-            // eslint-disable-next-line no-continue
             continue;
           }
         }
@@ -300,14 +296,12 @@ class AbstractController extends Base {
         let realPath = path;
         if (typeof realPath !== 'string') {
           this.logger.error(`Path not a string ${realPath}. Please check it`);
-          // eslint-disable-next-line no-continue
           continue;
         }
         if (!realPath.startsWith('/')) {
           method = realPath.split('/')[0]?.toLowerCase();
           if (!method) {
             this.logger.error(`Method not found for ${realPath}`);
-            // eslint-disable-next-line no-continue
             continue;
           }
           realPath = realPath.substring(method.length);
@@ -316,7 +310,6 @@ class AbstractController extends Base {
           this.logger.error(
             `Method ${method} not exist for middleware. Please check your codebase`,
           );
-          // eslint-disable-next-line no-continue
           continue;
         }
         const fullPath = `/${httpPath}/${realPath.toUpperCase()}`

package/modules/AbstractModel.js

@@ -49,6 +49,10 @@ class AbstractModel extends Base {
             this.logger.info(
               `Mongo connection success ${connectionParams.appName}`,
             );
+            mongoose.connection.on('error', (err) => {
+              this.logger.error('Mongo connection error', err);
+              console.error(err);
+            });
 
             callback();
           },

package/modules/Base.js

@@ -21,7 +21,7 @@ class Base {
     let l;
     try {
       l = this.#realLogger;
-    } catch (e) {
+    } catch {
       console.warn(
         `You try to accees logger not from class. that can be ok in case of models.`,
       );

package/modules/BaseCli.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import path from 'node:path';
 import * as url from 'node:url';
 import Base from './Base.js';
@@ -35,7 +34,6 @@ class Cli extends Base {
     console.log('Available commands:');
     let commandsClasses = [];
     for (const c of commands) {
-      // eslint-disable-next-line no-await-in-loop
       commandsClasses.push(import(this.commands[c]));
       // console.log(
       //   ` \x1b[36m${c.padEnd(maxLength)}\x1b[0m - ${f.default.description}`,
@@ -43,7 +41,6 @@ class Cli extends Base {
     }
     commandsClasses = await Promise.all(commandsClasses);
     for (const [key, c] of Object.entries(commands)) {
-      // eslint-disable-next-line no-await-in-loop
       console.log(
         ` \x1b[36m${c.padEnd(maxLength)}\x1b[0m - ${commandsClasses[key].default.description}`,
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "5.0.0-beta.3",
+  "version": "5.0.0-beta.5",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "type": "module",
@@ -18,8 +18,8 @@
     "test": "vitest run",
     "t": "vitest --coverage=false --reporter=default",
     "prettier": "prettier --check '**/*.(js|jsx|ts|tsx|json|css|scss|md)'",
-    "lint": "eslint '**/*.js'",
-    "lint:fix": "eslint '**/*.js' --fix",
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
     "codestyle": "npm run prettier && npm run lint",
     "prepare": "husky",
     "cli": "node cliCommand",
@@ -50,12 +50,14 @@
     "yup": "^1.0.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.19.0",
     "@vitest/coverage-v8": "^3.0.0",
-    "eslint": "^8.0.0",
-    "eslint-config-airbnb-base": "^15.0.0",
+    "@vitest/eslint-plugin": "^1.1.25",
+    "eslint": "^9.0.0",
     "eslint-config-prettier": "^10.0.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-vitest": "^0.4.0",
+    "globals": "^15.14.0",
     "husky": "^9.0.0",
     "lint-staged": "^15.0.0",
     "mongodb-memory-server": "^10.0.0",

package/server.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import EventEmitter from 'node:events';
 import { hrtime, loadEnvFile } from 'node:process';
 import * as url from 'node:url';
@@ -12,7 +11,7 @@ import Cache from './services/cache/Cache.js';
 
 try {
   loadEnvFile();
-} catch (e) {
+} catch {
   console.warn('No env file found. This is ok. But please check youself.');
 }
 
@@ -66,6 +65,15 @@ class Server {
       models: new Map(),
       modelConstructors: new Map(),
     };
+
+    this.app.events.on('shutdown', () => {
+      const forceShutdownTimer = setTimeout(() => {
+        console.error('Shutdown timed out, forcing exit');
+        process.exit(1);
+      }, 5_000);
+      // Unref the timer so it doesn't keep the process alive
+      forceShutdownTimer.unref();
+    });
   }
 
   /**
@@ -314,7 +322,7 @@ class Server {
     function IsConstructor(f) {
       try {
         Reflect.construct(String, [], f);
-      } catch (e) {
+      } catch {
         return false;
       }
       return true;

package/services/cache/Cache.js

@@ -94,7 +94,7 @@ class Cache extends Base {
           }
           return value;
         });
-      } catch (e) {
+      } catch {
         this.logger.warn(
           'Not able to parse json from redis cache. That can be a normal in case you store string here',
         );

package/services/http/HttpServer.js

@@ -43,7 +43,6 @@ class HttpServer extends Base {
     // eslint-disable-next-line no-unused-vars
     this.express.use((err, req, res, next) => {
       // error handling
-      // eslint-disable-next-line no-console
       console.error(err.stack);
       // TODO
       res.status(500).json({ message: 'Something broke!' });

package/services/http/middleware/AbstractMiddleware.js

@@ -1,4 +1,4 @@
-import yup from 'yup';
+import { object } from 'yup';
 import Base from '../../../modules/Base.js';
 
 class AbstractMiddleware extends Base {
@@ -18,13 +18,13 @@ class AbstractMiddleware extends Base {
   // eslint-disable-next-line class-methods-use-this
   get relatedQueryParameters() {
     // For example  yup.object().shape({page: yup.number().required(),limit: yup.number()})
-    return yup.object().shape({});
+    return object().shape({});
   }
 
   // eslint-disable-next-line class-methods-use-this
   get relatedRequestParameters() {
     // For example  yup.object().shape({page: yup.number().required(),limit: yup.number()})
-    return yup.object().shape({});
+    return object().shape({});
   }
 
   get relatedReqParameters() {

package/services/http/middleware/I18n.js

@@ -27,6 +27,7 @@ class I18n extends AbstractMiddleware {
     if (I18NConfig.enabled) {
       this.logger.info('Enabling i18n support');
       this.i18n = i18next;
+      // eslint-disable-next-line import/no-named-as-default-member
       i18next.use(BackendFS).init({
         backend: {
           loadPath: `${this.app.foldersConfig.locales}/{{lng}}/{{ns}}.json`,
@@ -98,7 +99,6 @@ class I18n extends AbstractMiddleware {
     for (const detectorName of this.detectorOrder) {
       const lng = this.detectors[detectorName](req);
       if (!lng) {
-        // eslint-disable-next-line no-continue
         continue;
       }
       if (i18next.services.languageUtils.isSupportedCode(lng)) {

package/services/http/middleware/Pagination.js

@@ -1,4 +1,4 @@
-import yup from 'yup';
+import { object, number } from 'yup';
 import AbstractMiddleware from './AbstractMiddleware.js';
 /**
  * Middleware for reusing pagination
@@ -10,9 +10,9 @@ class Pagination extends AbstractMiddleware {
 
   // eslint-disable-next-line class-methods-use-this
   get relatedQueryParameters() {
-    return yup.object().shape({
-      page: yup.number(),
-      limit: yup.number(),
+    return object().shape({
+      page: number(),
+      limit: number(),
     });
   }
 

package/services/validate/ValidateService.js

@@ -1,4 +1,4 @@
-import yup from 'yup';
+import { isSchema } from 'yup';
 import YupValidator from './drivers/YupValidator.js';
 import CustomValidator from './drivers/CustomValidator.js';
 import Base from '../../modules/Base.js';
@@ -30,7 +30,7 @@ class ValidateService extends Base {
     if (this.isValidatorExists(body)) {
       return body;
     }
-    if (yup.isSchema(body)) {
+    if (isSchema(body)) {
       const yupValidator = new YupValidator(app, body);
       return yupValidator;
     }

package/services/validate/drivers/CustomValidator.js

@@ -1,4 +1,4 @@
-import yup from 'yup';
+import { ValidationError } from 'yup';
 import AbstractValidator from './AbstractValidator.js';
 
 class CustomValidator extends AbstractValidator {
@@ -19,7 +19,7 @@ class CustomValidator extends AbstractValidator {
     } catch (e) {
       this.logger.warn(`CustomValidator validateFields ${e}`);
       if (e.path) {
-        throw new yup.ValidationError({
+        throw new ValidationError({
           [e.path]: e.message,
         });
       }

package/services/validate/drivers/YupValidator.js

@@ -1,4 +1,4 @@
-import yup from 'yup';
+import { ValidationError } from 'yup';
 import AbstractValidator from './AbstractValidator.js';
 
 class YupValidator extends AbstractValidator {
@@ -76,7 +76,7 @@ class YupValidator extends AbstractValidator {
         });
       }
 
-      throw new yup.ValidationError({
+      throw new ValidationError({
         ...errorAnswer,
       });
     }

package/tests/setup.js

@@ -64,9 +64,7 @@ beforeAll(async () => {
         nick: 'testUserNickName',
       },
     }).catch((e) => {
-      // eslint-disable-next-line no-console
       console.error(e);
-      // eslint-disable-next-line no-console
       console.info(
         'That error can happens in case you have custom user model. Please use global.testSetup.disableUserCreate flag to skip user creating',
       );
@@ -97,7 +95,7 @@ afterEach(async () => {
       await redisClient.connect();
       await clearRedisNamespace(redisClient, namespace);
       await redisClient.disconnect();
-    } catch (err) {
+    } catch {
       // that ok. No redis connection
     }
   }

package/tests/setupVitest.js

@@ -57,9 +57,7 @@ beforeAll(async () => {
         nick: 'testUserNickName',
       },
     }).catch((e) => {
-      // eslint-disable-next-line no-console
       console.error(e);
-      // eslint-disable-next-line no-console
       console.info(
         'That error can happens in case you have custom user model. Please use global.testSetup.disableUserCreate flag to skip user creating',
       );
@@ -90,7 +88,7 @@ afterEach(async () => {
       await redisClient.connect();
       await clearRedisNamespace(redisClient, namespace);
       await redisClient.disconnect();
-    } catch (err) {
+    } catch {
       // that ok. No redis connection
     }
   }