@adaptivestone/framework 4.8.0 → 4.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "4.8.0",
+  "version": "4.8.2",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "engines": {
@@ -55,6 +55,7 @@
     "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",
     "lint-staged": "^14.0.0",

package/server.d.ts

@@ -49,7 +49,15 @@ declare class Server {
    * Do an initialization (config reading,  etc)
    * @returns {Promise}
    */
-  init(): Promise<boolean>;
+  init(
+    options: { isSkipModelInit: boolean } = { isSkipModelInit: false },
+  ): Promise<boolean>;
+
+  /**
+   * Load model and init them
+   * @returns {Promise}
+   */
+  initAllModels(): Promise<void>;
 
   /**
    * Return config from {configName} (file name) on config folder.

package/server.js

@@ -88,13 +88,19 @@ class Server {
    * Do an initialization (config reading,  etc)
    * @returns {Promise}
    */
-  async init() {
+  async init({ isSkipModelInit = false } = {}) {
     if (this.#isInited) {
       return true;
     }
 
     console.time('Server init. Done');
+    console.time('Loading config and model files. Time');
     await Promise.all([this.#initConfigFiles(), this.#loadModelFiles()]);
+    console.timeEnd('Loading config and model files. Time');
+
+    if (!isSkipModelInit) {
+      await this.initAllModels();
+    }
 
     this.#isInited = true;
 
@@ -103,6 +109,35 @@ class Server {
     return true;
   }
 
+  /**
+   * Load model and init them
+   * @returns {Promise}
+   */
+  async initAllModels() {
+    console.time('Initing models. Time');
+
+    if (this.app.getConfig('mongo').connectionString) {
+      for (const [modelName, ModelConstructor] of this.cache
+        .modelConstructors) {
+        try {
+          const model = new ModelConstructor(this.app);
+          this.cache.models.set(modelName, model.mongooseModel);
+        } catch (e) {
+          this.app.logger.error(
+            `Problem with model ${modelName}, ${e.message}`,
+          );
+          this.app.logger.error(e);
+        }
+      }
+    } else {
+      this.app.logger.info(
+        'Skipping inited models as we have no mongo connection string',
+      );
+    }
+
+    console.timeEnd('Initing models. Time');
+  }
+
   async #initConfigFiles() {
     const files = await getFilesPathWithInheritance({
       internalFolder: `${__dirname}/config`,
@@ -207,12 +242,11 @@ class Server {
    * @returns {Object} config object. Structure depends of config file
    */
   getConfig(configName) {
-    if (!this.#isInited) {
-      throw new Error('You should call Server.init() before using it');
-    }
-
     if (!this.cache.configs.has(configName)) {
-      this.logger.warn(
+      if (!this.#isInited) {
+        throw new Error('You should call Server.init() before using getConfig');
+      }
+      this.app.logger.warn(
         `You asked for config ${configName} that not exists. Please check you codebase `,
       );
       return {};
@@ -321,20 +355,17 @@ class Server {
         `Probably your model name '${modelName}' in plural from. Try to avoid plural form`,
       );
     }
+    if (!this.#isInited) {
+      this.app.logger.error(
+        new Error('You should call Server.init() before using getModel'),
+      );
+      return false;
+    }
     if (!this.cache.models.has(modelName)) {
-      const Model = this.cache.modelConstructors.get(modelName);
-      if (!Model) {
-        this.app.logger.error(`Model not found: ${modelName}`);
-        return false;
-      }
-      try {
-        const model = new Model(this.app);
-
-        this.cache.models.set(modelName, model.mongooseModel);
-      } catch (e) {
-        this.app.logger.error(`Problem with model ${modelName}, ${e.message}`);
-        this.app.logger.error(e);
-      }
+      this.app.logger.warn(
+        `You asked for model ${modelName} that not exists. Please check you codebase `,
+      );
+      return {};
     }
     return this.cache.models.get(modelName);
   }

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

@@ -87,7 +87,7 @@ describe('i18n middleware methods', () => {
       appInfo: {},
     };
     await middleware.middleware(req, {}, nextFunction);
-    expect(isCalled).toBe(true);
+    expect(isCalled).toBeTruthy();
     expect(req.appInfo.i18n).toBeDefined();
     expect(req.appInfo.i18n.t('aaaaa')).toBe('aaaaa');
     expect(req.i18n.t('aaaaa')).toBe('aaaaa'); // proxy test

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

@@ -113,7 +113,7 @@ describe('rate limiter methods', () => {
       () => {},
     );
     expect(status).toBe(500);
-    expect(isSend).toBe(true);
+    expect(isSend).toBeTruthy();
   });
 
   const makeOneRequest = async ({ rateLimiter, driver, request }) => {
@@ -154,7 +154,7 @@ describe('rate limiter methods', () => {
       rateLimiter: mongoRateLimiter,
       request: { ip: '10.10.0.1' },
     });
-    expect(isNextCalled).toBe(true);
+    expect(isNextCalled).toBeTruthy();
   });
 
   it('middleware should works with a memory drivers', async () => {
@@ -163,7 +163,7 @@ describe('rate limiter methods', () => {
       driver: 'memory',
       request: { ip: '10.10.0.1' },
     });
-    expect(isNextCalled).toBe(true);
+    expect(isNextCalled).toBeTruthy();
   });
 
   it('middleware should works with a redis drivers', async () => {
@@ -172,7 +172,7 @@ describe('rate limiter methods', () => {
       driver: 'redis',
       request: { ip: '10.10.0.1' },
     });
-    expect(isNextCalled).toBe(true);
+    expect(isNextCalled).toBeTruthy();
   });
 
   it('middleware should rate limits for us. mongo driver', async () => {
@@ -188,7 +188,7 @@ describe('rate limiter methods', () => {
     const isSend = data.find((obj) => obj.isSend);
 
     expect(status.status).toBe(429);
-    expect(isSend.isSend).toBe(true);
+    expect(isSend.isSend).toBeTruthy();
   });
 
   it('middleware should rate limits for us. memory driver', async () => {
@@ -208,7 +208,7 @@ describe('rate limiter methods', () => {
     const isSend = data.find((obj) => obj.isSend);
 
     expect(status.status).toBe(429);
-    expect(isSend.isSend).toBe(true);
+    expect(isSend.isSend).toBeTruthy();
   });
 
   it('middleware should rate limits for us. redis driver', async () => {
@@ -228,6 +228,6 @@ describe('rate limiter methods', () => {
     const isSend = data.find((obj) => obj.isSend);
 
     expect(status.status).toBe(429);
-    expect(isSend.isSend).toBe(true);
+    expect(isSend.isSend).toBeTruthy();
   });
 });

package/services/validate/ValidateService.test.js

@@ -45,21 +45,21 @@ describe('validate service', () => {
       expect.assertions(1);
       const validator = 'not an object';
       const result = ValidateService.isValidatorExists(validator);
-      expect(result).toBe(false);
+      expect(result).toBeFalsy();
     });
 
     it('returns true if validator is an instance of one of the drivers', () => {
       expect.assertions(1);
       const validator = new ValidateService.drivers.YupValidator();
       const result = ValidateService.isValidatorExists(validator);
-      expect(result).toBe(true);
+      expect(result).toBeTruthy();
     });
 
     it('returns false if validator is not an instance of any of the drivers', () => {
       expect.assertions(1);
       const validator = {};
       const result = ValidateService.isValidatorExists(validator);
-      expect(result).toBe(false);
+      expect(result).toBeFalsy();
     });
   });
 

package/tests/setup.js

@@ -38,12 +38,14 @@ beforeAll(async () => {
         process.env.TEST_FOLDER_MIGRATIONS || path.resolve('./migrations'),
     },
   });
-  await global.server.init();
+  await global.server.init({ isSkipModelInit: true });
   global.server.updateConfig('mongo', {
     connectionString: connectionStringMongo,
   });
   global.server.updateConfig('http', { port: 0 }); // allow to use random
   global.server.updateConfig('mail', { transport: 'stub' });
+  await global.server.initAllModels();
+
   if (!global.testSetup) {
     global.testSetup = {};
   }

package/tests/setupVitest.js

@@ -12,7 +12,6 @@ const Server = require('../server');
 
 const clearRedisNamespace = require('../helpers/redis/clearNamespace');
 
-// eslint-disable-next-line vitest/no-hooks, vitest/require-top-level-describe
 beforeAll(async () => {
   mongoMemoryServerInstance = await MongoMemoryReplSet.create({
     // binary: { version: '4.4.6' },
@@ -40,12 +39,14 @@ beforeAll(async () => {
         process.env.TEST_FOLDER_MIGRATIONS || path.resolve('./migrations'),
     },
   });
-  await global.server.init();
+  await global.server.init({ isSkipModelInit: true });
   global.server.updateConfig('mongo', {
     connectionString: connectionStringMongo,
   });
   global.server.updateConfig('http', { port: 0 }); // allow to use random
   global.server.updateConfig('mail', { transport: 'stub' });
+  await global.server.initAllModels();
+
   if (!global.testSetup) {
     global.testSetup = {};
   }
@@ -76,7 +77,6 @@ beforeAll(async () => {
   await global.server.startServer();
 });
 
-// eslint-disable-next-line vitest/no-hooks, vitest/require-top-level-describe
 beforeEach(() => {
   if (global.server) {
     const key = `test-${Math.random().toString(36).substring(7)}`;
@@ -86,7 +86,6 @@ beforeEach(() => {
   }
 });
 
-// eslint-disable-next-line vitest/no-hooks, vitest/require-top-level-describe
 afterEach(async () => {
   if (global.server) {
     const { url, namespace } = global.server.getConfig('redis');
@@ -102,7 +101,6 @@ afterEach(async () => {
   }
 });
 
-// eslint-disable-next-line vitest/no-hooks, vitest/require-top-level-describe
 afterAll(async () => {
   if (global.server) {
     global.server.app.httpServer.shutdown();