@adaptivestone/framework 4.11.4 → 5.0.0-alpha.2

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "4.11.4",
+  "version": "5.0.0-alpha.2",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
+  "type": "module",
   "engines": {
     "node": ">=18.17.0"
   },
@@ -19,7 +20,7 @@
     "lint": "eslint '**/*.js'",
     "lint:fix": "eslint '**/*.js' --fix",
     "codestyle": "npm run prettier && npm run lint",
-    "prepare": "husky install",
+    "prepare": "husky",
     "cli": "node cliCommand",
     "benchmark": "h2load -n 10000 -c 50 -p 'http/1.1' http://localhost:3300/",
     "benchmark2": "h2load -n 10000 -c 50  https://localhost:3300/",
@@ -36,33 +37,33 @@
     "i18next": "^23.2.8",
     "i18next-chained-backend": "^4.0.0",
     "i18next-fs-backend": "^2.0.0",
-    "juice": "^9.0.0",
-    "mime": "^3.0.0",
+    "juice": "^10.0.0",
+    "mime": "^4.0.0",
     "minimist": "^1.2.5",
-    "mongoose": "^7.0.0",
+    "mongoose": "^8.0.0",
     "nodemailer": "^6.6.3",
     "nodemailer-sendmail-transport": "^1.0.2",
     "nodemailer-stub-transport": "^1.1.0",
     "pug": "^3.0.2",
-    "rate-limiter-flexible": "^3.0.0",
+    "rate-limiter-flexible": "^4.0.0",
     "redis": "^4.3.1",
     "winston": "^3.3.3",
     "winston-transport-sentry-node": "^2.0.0",
     "yup": "^1.0.0"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^0.34.3",
+    "@vitest/coverage-v8": "^1.0.0",
     "eslint": "^8.0.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-vitest": "^0.3.1",
-    "husky": "^8.0.0",
+    "husky": "^9.0.0",
     "lint-staged": "^15.0.0",
     "mongodb-memory-server": "^9.0.0",
     "nodemon": "^3.0.1",
     "prettier": "^3.0.0",
-    "vitest": "^0.34.3"
+    "vitest": "^1.0.0"
   },
   "lint-staged": {
     "**/*.{js,jsx,ts,tsx,json,css,scss,md}": [

package/server.js

@@ -1,14 +1,15 @@
 /* eslint-disable no-console */
-const EventEmitter = require('node:events');
-const { hrtime } = require('node:process');
-
-require('dotenv').config();
-const merge = require('deepmerge');
-const winston = require('winston');
-const { getFilesPathWithInheritance } = require('./helpers/files');
-const { consoleLogger } = require('./helpers/logger');
-
-const Cache = require('./services/cache/Cache');
+import EventEmitter from 'node:events';
+import { hrtime } from 'node:process';
+import * as url from 'node:url';
+import path from 'node:path';
+
+import 'dotenv/config';
+import merge from 'deepmerge';
+import winston from 'winston';
+import { getFilesPathWithInheritance } from './helpers/files.js';
+import { consoleLogger } from './helpers/logger.js';
+import Cache from './services/cache/Cache.js';
 
 /**
  * Main framework class.
@@ -139,8 +140,9 @@ class Server {
   }
 
   async #initConfigFiles() {
+    const dirname = url.fileURLToPath(new URL('.', import.meta.url));
     const files = await getFilesPathWithInheritance({
-      internalFolder: `${__dirname}/config`,
+      internalFolder: path.join(dirname, '/config'),
       externalFolder: this.app.foldersConfig.config,
       loggerFileType: 'CONFIG',
       logger: (m) => consoleLogger('info', m),
@@ -192,8 +194,9 @@ class Server {
   }
 
   async #loadModelFiles() {
+    const dirname = url.fileURLToPath(new URL('.', import.meta.url));
     const files = await getFilesPathWithInheritance({
-      internalFolder: `${__dirname}/models`,
+      internalFolder: path.join(dirname, '/models'),
       externalFolder: this.app.foldersConfig.models,
       loggerFileType: 'MODEL',
       logger: (m) => consoleLogger('info', m),
@@ -395,4 +398,4 @@ class Server {
   }
 }
 
-module.exports = Server;
+export default Server;

package/services/cache/Cache.js

@@ -1,4 +1,4 @@
-const Base = require('../../modules/Base');
+import Base from '../../modules/Base.js';
 
 class Cache extends Base {
   constructor(app) {
@@ -117,4 +117,4 @@ class Cache extends Base {
   }
 }
 
-module.exports = Cache;
+export default Cache;

package/services/documentation/DocumentationGenerator.js

@@ -1,5 +1,5 @@
-const Base = require('../../modules/Base');
-const ValidateService = require('../validate/ValidateService');
+import Base from '../../modules/Base.js';
+import ValidateService from '../validate/ValidateService.js';
 
 class DocumentationGenerator extends Base {
   // eslint-disable-next-line class-methods-use-this
@@ -166,4 +166,4 @@ class DocumentationGenerator extends Base {
   }
 }
 
-module.exports = DocumentationGenerator;
+export default DocumentationGenerator;

package/services/http/HttpServer.js

@@ -1,15 +1,14 @@
-const http = require('node:http');
-const path = require('node:path');
-const express = require('express');
-
-const RequestLoggerMiddleware = require('./middleware/RequestLogger');
-const I18nMiddleware = require('./middleware/I18n');
-const PrepareAppInfoMiddleware = require('./middleware/PrepareAppInfo');
-const RequestParserMiddleware = require('./middleware/RequestParser');
-const StaticFilesMiddleware = require('./middleware/StaticFiles');
-const Cors = require('./middleware/Cors');
-
-const Base = require('../../modules/Base');
+import http from 'node:http';
+import path from 'node:path';
+import * as url from 'node:url';
+import express from 'express';
+import RequestLoggerMiddleware from './middleware/RequestLogger.js';
+import I18nMiddleware from './middleware/I18n.js';
+import PrepareAppInfoMiddleware from './middleware/PrepareAppInfo.js';
+import RequestParserMiddleware from './middleware/RequestParser.js';
+import StaticFilesMiddleware from './middleware/StaticFiles.js';
+import Cors from './middleware/Cors.js';
+import Base from '../../modules/Base.js';
 
 /**
  * HTTP server based on Express
@@ -19,9 +18,10 @@ class HttpServer extends Base {
     super(app);
     this.express = express();
     this.express.disable('x-powered-by');
+    const dirname = url.fileURLToPath(new URL('.', import.meta.url));
     this.express.set('views', [
       this.app.foldersConfig.views,
-      path.join(__dirname, '../../views'),
+      path.join(dirname, '../../views'),
     ]);
     this.express.set('view engine', 'pug');
 
@@ -40,7 +40,7 @@ class HttpServer extends Base {
       new StaticFilesMiddleware(this.app, {
         folders: [
           this.app.foldersConfig.public,
-          path.join(__dirname, '../../public/files'),
+          path.join(dirname, '../../public/files'),
         ],
       }).getMiddleware(),
     );
@@ -101,4 +101,4 @@ class HttpServer extends Base {
   }
 }
 
-module.exports = HttpServer;
+export default HttpServer;

package/services/http/middleware/AbstractMiddleware.js

@@ -1,5 +1,5 @@
-const yup = require('yup');
-const Base = require('../../../modules/Base');
+import yup from 'yup';
+import Base from '../../../modules/Base.js';
 
 class AbstractMiddleware extends Base {
   constructor(app, params) {
@@ -48,4 +48,4 @@ class AbstractMiddleware extends Base {
   }
 }
 
-module.exports = AbstractMiddleware;
+export default AbstractMiddleware;

package/services/http/middleware/Auth.js

@@ -1,4 +1,4 @@
-const AbstractMiddleware = require('./AbstractMiddleware');
+import AbstractMiddleware from './AbstractMiddleware.js';
 
 class AuthMiddleware extends AbstractMiddleware {
   static get description() {
@@ -17,4 +17,4 @@ class AuthMiddleware extends AbstractMiddleware {
   }
 }
 
-module.exports = AuthMiddleware;
+export default AuthMiddleware;

package/services/http/middleware/Auth.test.js

@@ -1,5 +1,5 @@
 import { beforeAll, describe, it, expect } from 'vitest';
-import Auth from './Auth';
+import Auth from './Auth.js';
 
 describe('atuh middleware methods', () => {
   let middleware;

package/services/http/middleware/Cors.js

@@ -1,4 +1,4 @@
-const AbstractMiddleware = require('./AbstractMiddleware');
+import AbstractMiddleware from './AbstractMiddleware.js';
 
 class Cors extends AbstractMiddleware {
   constructor(app, params) {
@@ -43,4 +43,4 @@ class Cors extends AbstractMiddleware {
   }
 }
 
-module.exports = Cors;
+export default Cors;

package/services/http/middleware/Cors.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import Cors from './Cors';
+import Cors from './Cors.js';
 
 describe('cors middleware methods', () => {
   it('have description fields', async () => {

package/services/http/middleware/GetUserByToken.js

@@ -1,4 +1,4 @@
-const AbstractMiddleware = require('./AbstractMiddleware');
+import AbstractMiddleware from './AbstractMiddleware.js';
 
 class GetUserByToken extends AbstractMiddleware {
   static get description() {
@@ -43,4 +43,4 @@ class GetUserByToken extends AbstractMiddleware {
   }
 }
 
-module.exports = GetUserByToken;
+export default GetUserByToken;

package/services/http/middleware/GetUserByToken.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import GetUserByToken from './GetUserByToken';
+import GetUserByToken from './GetUserByToken.js';
 
 describe('getUserByToken middleware methods', () => {
   it('have description fields', async () => {

package/services/http/middleware/I18n.js

@@ -1,8 +1,7 @@
-const i18next = require('i18next');
-const BackendFS = require('i18next-fs-backend');
-const Backend = require('i18next-chained-backend');
-
-const AbstractMiddleware = require('./AbstractMiddleware');
+import i18next from 'i18next';
+import BackendFS from 'i18next-fs-backend';
+import Backend from 'i18next-chained-backend';
+import AbstractMiddleware from './AbstractMiddleware.js';
 
 class I18n extends AbstractMiddleware {
   constructor(app, params) {
@@ -116,4 +115,4 @@ class I18n extends AbstractMiddleware {
   }
 }
 
-module.exports = I18n;
+export default I18n;

package/services/http/middleware/I18n.test.js

@@ -1,5 +1,5 @@
 import { beforeAll, describe, it, expect } from 'vitest';
-import I18n from './I18n';
+import I18n from './I18n.js';
 
 describe('i18n middleware methods', () => {
   let middleware;

package/services/http/middleware/Pagination.js

@@ -1,5 +1,5 @@
-const yup = require('yup');
-const AbstractMiddleware = require('./AbstractMiddleware');
+import yup from 'yup';
+import AbstractMiddleware from './AbstractMiddleware.js';
 /**
  * Middleware for reusing pagination
  */
@@ -53,4 +53,4 @@ class Pagination extends AbstractMiddleware {
   }
 }
 
-module.exports = Pagination;
+export default Pagination;

package/services/http/middleware/PrepareAppInfo.js

@@ -1,4 +1,4 @@
-const AbstractMiddleware = require('./AbstractMiddleware');
+import AbstractMiddleware from './AbstractMiddleware.js';
 
 class PrepareAppInfo extends AbstractMiddleware {
   static get description() {
@@ -15,4 +15,4 @@ class PrepareAppInfo extends AbstractMiddleware {
   }
 }
 
-module.exports = PrepareAppInfo;
+export default PrepareAppInfo;

package/services/http/middleware/PrepareAppInfo.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import PrepareAppInfo from './PrepareAppInfo';
+import PrepareAppInfo from './PrepareAppInfo.js';
 
 describe('prepareAppInfo methods', () => {
   it('have description fields', async () => {

package/services/http/middleware/RateLimiter.js

@@ -1,13 +1,12 @@
-const {
+import {
   RateLimiterMemory,
   RateLimiterRedis,
   RateLimiterMongo,
-} = require('rate-limiter-flexible');
-const merge = require('deepmerge');
-const redis = require('redis');
-const mongoose = require('mongoose');
-
-const AbstractMiddleware = require('./AbstractMiddleware');
+} from 'rate-limiter-flexible';
+import merge from 'deepmerge';
+import redis from 'redis';
+import mongoose from 'mongoose';
+import AbstractMiddleware from './AbstractMiddleware.js';
 
 class RateLimiter extends AbstractMiddleware {
   static get description() {
@@ -126,4 +125,4 @@ class RateLimiter extends AbstractMiddleware {
   }
 }
 
-module.exports = RateLimiter;
+export default RateLimiter;

package/services/http/middleware/RateLimiter.test.js

@@ -2,7 +2,7 @@ import { setTimeout } from 'node:timers/promises';
 import crypto from 'node:crypto';
 import { beforeAll, afterAll, describe, it, expect } from 'vitest';
 
-import RateLimiter from './RateLimiter';
+import RateLimiter from './RateLimiter.js';
 
 let mongoRateLimiter;
 

package/services/http/middleware/RequestLogger.js

@@ -1,4 +1,4 @@
-const AbstractMiddleware = require('./AbstractMiddleware');
+import AbstractMiddleware from './AbstractMiddleware.js';
 
 class RequestLogger extends AbstractMiddleware {
   static get description() {
@@ -19,4 +19,4 @@ class RequestLogger extends AbstractMiddleware {
   }
 }
 
-module.exports = RequestLogger;
+export default RequestLogger;

package/services/http/middleware/RequestParser.js

@@ -1,6 +1,5 @@
-const formidable = require('formidable').default;
-
-const AbstractMiddleware = require('./AbstractMiddleware');
+import formidable from 'formidable';
+import AbstractMiddleware from './AbstractMiddleware.js';
 
 class RequestParser extends AbstractMiddleware {
   static get description() {
@@ -35,4 +34,4 @@ class RequestParser extends AbstractMiddleware {
   }
 }
 
-module.exports = RequestParser;
+export default RequestParser;

package/services/http/middleware/RequestParser.test.js

@@ -1,10 +1,8 @@
 import { createServer } from 'node:http';
 import { describe, it, expect } from 'vitest';
+import { PersistentFile } from 'formidable';
 
-import RequestParser from './RequestParser';
-
-// TODO change on ESM
-const formidable = require('formidable');
+import RequestParser from './RequestParser.js';
 
 describe('reqest parser limiter methods', () => {
   it('have description fields', async () => {
@@ -26,7 +24,7 @@ describe('reqest parser limiter methods', () => {
           expect(req.body.title).toBeDefined();
           expect(req.body.multipleFiles).toBeDefined();
           expect(
-            req.body.multipleFiles[0] instanceof formidable.PersistentFile,
+            req.body.multipleFiles[0] instanceof PersistentFile,
           ).toBeTruthy();
 
           res.writeHead(200);

package/services/http/middleware/Role.js

@@ -1,4 +1,4 @@
-const AbstractMiddleware = require('./AbstractMiddleware');
+import AbstractMiddleware from './AbstractMiddleware.js';
 
 class RoleMiddleware extends AbstractMiddleware {
   static get description() {
@@ -26,4 +26,4 @@ class RoleMiddleware extends AbstractMiddleware {
   }
 }
 
-module.exports = RoleMiddleware;
+export default RoleMiddleware;

package/services/http/middleware/Role.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import Role from './Role';
+import Role from './Role.js';
 
 describe('role middleware methods', () => {
   it('have description fields', async () => {

package/services/http/middleware/StaticFiles.js

@@ -1,9 +1,8 @@
-const fsPromises = require('node:fs/promises');
-const fs = require('node:fs');
-const path = require('node:path');
-const mime = require('mime');
-
-const AbstractMiddleware = require('./AbstractMiddleware');
+import fsPromises from 'node:fs/promises';
+import fs from 'node:fs';
+import path from 'node:path';
+import mime from 'mime';
+import AbstractMiddleware from './AbstractMiddleware.js';
 /**
  * Middleware for static files
  */
@@ -57,4 +56,4 @@ class StaticFiles extends AbstractMiddleware {
   }
 }
 
-module.exports = StaticFiles;
+export default StaticFiles;

package/services/messaging/email/index.js

@@ -1,19 +1,20 @@
-const fs = require('node:fs');
-const path = require('node:path');
-const { promisify } = require('node:util');
-const nodemailer = require('nodemailer');
-const sendMail = require('nodemailer-sendmail-transport');
-const stub = require('nodemailer-stub-transport');
-const pug = require('pug');
-const juice = require('juice');
-const { convert } = require('html-to-text');
+import fs from 'node:fs';
+import path from 'node:path';
+import * as url from 'node:url';
+import { promisify } from 'node:util';
+import nodemailer from 'nodemailer';
+import sendMail from 'nodemailer-sendmail-transport';
+import stub from 'nodemailer-stub-transport';
+import pug from 'pug';
+import juice from 'juice';
+import { convert } from 'html-to-text';
+import Base from '../../../modules/Base.js';
 
 const mailTransports = {
   sendMail,
   stub,
   smtp: (data) => data,
 };
-const Base = require('../../../modules/Base');
 
 class Mail extends Base {
   /**
@@ -25,6 +26,7 @@ class Mail extends Base {
    */
   constructor(app, template, templateData = {}, i18n = null) {
     super(app);
+    const dirname = url.fileURLToPath(new URL('.', import.meta.url));
     if (!path.isAbsolute(template)) {
       if (
         fs.existsSync(
@@ -35,11 +37,16 @@ class Mail extends Base {
           template,
         )}`;
       } else if (
-        fs.existsSync(`${__dirname}/templates/${path.basename(template)}`)
+        fs.existsSync(
+          path.join(dirname, `/templates/${path.basename(template)}`),
+        )
       ) {
-        this.template = `${__dirname}/templates/${path.basename(template)}`;
+        this.template = path.join(
+          dirname,
+          `/templates/${path.basename(template)}`,
+        );
       } else {
-        this.template = `${__dirname}/templates/emptyTemplate`;
+        this.template = path.join(dirname, `/templates/emptyTemplate`);
         this.logger.error(
           `Template '${template}' not found. Using 'emptyTemplate' as a fallback`,
         );
@@ -215,4 +222,4 @@ class Mail extends Base {
   }
 }
 
-module.exports = Mail;
+export default Mail;

package/services/messaging/index.js

@@ -1,5 +1,3 @@
-const email = require('./email');
+import email from './email/index.js';
 
-module.exports = {
-  email,
-};
+export { email };

package/services/validate/ValidateService.js

@@ -1,7 +1,7 @@
-const yup = require('yup');
-const YupValidator = require('./drivers/YupValidator');
-const CustomValidator = require('./drivers/CustomValidator');
-const Base = require('../../modules/Base');
+import yup from 'yup';
+import YupValidator from './drivers/YupValidator.js';
+import CustomValidator from './drivers/CustomValidator.js';
+import Base from '../../modules/Base.js';
 
 class ValidateService extends Base {
   constructor(app, validator) {
@@ -154,4 +154,4 @@ class ValidateService extends Base {
   }
 }
 
-module.exports = ValidateService;
+export default ValidateService;

package/services/validate/ValidateService.test.js

@@ -1,9 +1,9 @@
 import { describe, it, expect } from 'vitest';
 
-const yup = require('yup');
-const ValidateService = require('./ValidateService');
-const YupValidator = require('./drivers/YupValidator');
-const CustomValidator = require('./drivers/CustomValidator');
+import yup from 'yup';
+import ValidateService from './ValidateService.js';
+import YupValidator from './drivers/YupValidator.js';
+import CustomValidator from './drivers/CustomValidator.js';
 
 describe('validate service', () => {
   describe('validateSchema funtion', () => {

package/services/validate/drivers/AbstractValidator.js

@@ -1,4 +1,4 @@
-const Base = require('../../../modules/Base');
+import Base from '../../../modules/Base.js';
 
 class AbstractValidator extends Base {
   constructor(app, body) {
@@ -34,4 +34,4 @@ class AbstractValidator extends Base {
     return 'AbstractValidator_';
   }
 }
-module.exports = AbstractValidator;
+export default AbstractValidator;

package/services/validate/drivers/CustomValidator.js

@@ -1,6 +1,5 @@
-const yup = require('yup');
-
-const AbstractValidator = require('./AbstractValidator');
+import yup from 'yup';
+import AbstractValidator from './AbstractValidator.js';
 
 class CustomValidator extends AbstractValidator {
   async validateFields(data, { query, body, appInfo }) {
@@ -49,4 +48,4 @@ class CustomValidator extends AbstractValidator {
   }
 }
 
-module.exports = CustomValidator;
+export default CustomValidator;

package/services/validate/drivers/YupValidator.js

@@ -1,5 +1,5 @@
-const yup = require('yup');
-const AbstractValidator = require('./AbstractValidator');
+import yup from 'yup';
+import AbstractValidator from './AbstractValidator.js';
 
 class YupValidator extends AbstractValidator {
   get fieldsInJsonFormat() {
@@ -100,4 +100,4 @@ class YupValidator extends AbstractValidator {
     return 'YupValidator_';
   }
 }
-module.exports = YupValidator;
+export default YupValidator;

package/tests/globalSetupVitest.js

@@ -1,4 +1,4 @@
-const { MongoMemoryReplSet } = require('mongodb-memory-server');
+import { MongoMemoryReplSet } from 'mongodb-memory-server';
 
 let isTeardown = false;
 let mongoMemoryServerInstance;