@adaptivestone/framework 5.0.0-beta.10 → 5.0.0-beta.12

package/services/validate/drivers/YupValidator.js

@@ -1,103 +0,0 @@
-import { ValidationError } from 'yup';
-import AbstractValidator from './AbstractValidator.js';
-
-class YupValidator extends AbstractValidator {
-  get fieldsInJsonFormat() {
-    return YupValidator.convertFieldsToJson(this.body);
-  }
-
-  static convertFieldsToJson(fields) {
-    const convertedFields = {};
-    const entries = Object.entries(fields.describe().fields);
-
-    if (!entries?.length) {
-      return convertedFields;
-    }
-    const requiredFields = [];
-
-    for (const [field, fieldProp] of entries) {
-      const isRequired = fieldProp?.tests?.find(
-        (prop) => prop.name === 'required',
-      );
-      if (isRequired) {
-        requiredFields.push(field);
-      }
-    }
-
-    entries.forEach(([key, value]) => {
-      if (!convertedFields[key]) {
-        convertedFields[key] = {};
-      }
-
-      convertedFields[key] = {
-        type: value.type,
-        required: requiredFields?.includes(key),
-      };
-    });
-
-    return convertedFields;
-  }
-
-  async validateFields(data, { query, body, appInfo }) {
-    const yupSchema = this.body;
-    const { controllerValidationAbortEarly } = this.app.getConfig('validate');
-    if (yupSchema) {
-      if (typeof yupSchema.validate !== 'function') {
-        this.logger.error('request.validate should be a function');
-      }
-    }
-
-    try {
-      await yupSchema.validate(data, {
-        abortEarly: controllerValidationAbortEarly,
-        req: { query, body },
-      });
-    } catch (e) {
-      let { errors } = e;
-      // translate it
-      if (appInfo.i18n && errors) {
-        errors = errors.map((err) => appInfo.i18n.t(err, err));
-      }
-      this.logger.error(
-        `Request validation failed with message: ${e.message}. errors: ${errors}`,
-      );
-
-      const errorAnswer = {};
-      if (!e.inner || !e.inner.length) {
-        errorAnswer[e.path] = errors;
-      } else {
-        e.inner.forEach((err) => {
-          errorAnswer[err.path] = err.errors;
-          if (appInfo.i18n && err.errors) {
-            errorAnswer[err.path] = err.errors.map((err1) =>
-              appInfo.i18n.t(err1, err1, err.params),
-            );
-          }
-        });
-      }
-
-      throw new ValidationError({
-        ...errorAnswer,
-      });
-    }
-  }
-
-  async castFields(data, { query, body }) {
-    const yupSchema = this.body;
-    if (yupSchema) {
-      if (typeof yupSchema.cast !== 'function') {
-        this.logger.error('request.cast should be a function');
-      }
-    }
-
-    return yupSchema.cast(data, {
-      stripUnknown: true,
-      req: { query, body },
-    });
-  }
-
-  static get loggerGroup() {
-    return 'YupValidator_';
-  }
-}
-export default YupValidator;

package/tests/globalSetupVitest.js

@@ -1,35 +0,0 @@
-import { MongoMemoryReplSet } from 'mongodb-memory-server';
-
-let isTeardown = false;
-let mongoMemoryServerInstance;
-
-const setup = async () => {
-  console.log('GLOBAL SETUP PREPARE RUNNING...');
-  console.time('GLOBAL TEST PREPARE. DONE');
-  mongoMemoryServerInstance = await MongoMemoryReplSet.create({
-    // binary: { version: '4.4.6' },
-    replSet: { count: 1, storageEngine: 'wiredTiger' },
-  });
-  await mongoMemoryServerInstance.waitUntilRunning();
-  const connectionStringMongo =
-    await mongoMemoryServerInstance.getUri('__DB_TO_REPLACE__');
-  process.env.TEST_MONGO_URI = connectionStringMongo;
-  // console.info('MONGO_URI: ', connectionStringMongo);
-  console.timeEnd('GLOBAL TEST PREPARE. DONE');
-};
-
-const teardown = async () => {
-  if (isTeardown) {
-    throw new Error('teardown called twice');
-  }
-  console.time('GLOBAL TEARDOWN RUNNING. DONE');
-
-  isTeardown = true;
-  console.log('GLOBAL TEARDOWN RUNNING...');
-  await mongoMemoryServerInstance.stop();
-  console.timeEnd('GLOBAL TEARDOWN RUNNING. DONE');
-
-  return Promise.resolve();
-};
-
-export { setup, teardown };

package/tests/setup.js

@@ -1,120 +0,0 @@
-/* eslint-disable no-undef */
-import path from 'node:path';
-import { randomBytes } from 'node:crypto';
-import { MongoMemoryReplSet } from 'mongodb-memory-server';
-import mongoose from 'mongoose';
-import { createClient } from '@redis/client';
-import Server from '../server.js';
-
-import clearRedisNamespace from '../helpers/redis/clearNamespace.js';
-
-mongoose.set('autoIndex', false);
-
-let mongoMemoryServerInstance;
-
-// @ts-ignore
-jest.setTimeout(1000000);
-// @ts-ignore
-beforeAll(async () => {
-  mongoMemoryServerInstance = await MongoMemoryReplSet.create({
-    // binary: { version: '4.4.6' },
-    replSet: { count: 1, storageEngine: 'wiredTiger' },
-  });
-  await mongoMemoryServerInstance.waitUntilRunning();
-  process.env.LOGGER_CONSOLE_LEVEL = 'error';
-  process.env.AUTH_SALT = randomBytes(16).toString('hex');
-
-  const connectionStringMongo = await mongoMemoryServerInstance.getUri();
-  // console.info('MONGO_URI: ', connectionStringMongo);
-  global.server = new Server({
-    folders: {
-      config: process.env.TEST_FOLDER_CONFIG || path.resolve('./config'),
-      controllers:
-        process.env.TEST_FOLDER_CONTROLLERS || path.resolve('./controllers'),
-      models: process.env.TEST_FOLDER_MODELS || path.resolve('./models'),
-      emails:
-        process.env.TEST_FOLDER_EMAIL ||
-        process.env.TEST_FOLDER_EMAILS ||
-        path.resolve('./services/messaging/email/templates'),
-      locales: process.env.TEST_FOLDER_LOCALES || path.resolve('./locales'),
-      commands: process.env.TEST_FOLDER_COMMANDS || path.resolve('./commands'),
-      migrations:
-        process.env.TEST_FOLDER_MIGRATIONS || path.resolve('./migrations'),
-    },
-  });
-  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 = {};
-  }
-  global.server.testingGetUrl = (urlPart) =>
-    `http://127.0.0.1:${global.server.getConfig('http').port}${urlPart}`;
-  if (!global.testSetup.disableUserCreate) {
-    const User = global.server.app.getModel('User');
-    global.user = await User.create({
-      email: 'test@test.com',
-      password: 'testPassword',
-      isVerified: true,
-      name: {
-        nick: 'testUserNickName',
-      },
-    }).catch((e) => {
-      console.error(e);
-      console.info(
-        'That error can happens in case you have custom user model. Please use global.testSetup.disableUserCreate flag to skip user creating',
-      );
-    });
-    global.authToken = await global.user.generateToken();
-  }
-  if (typeof global.testSetup.beforeAll === 'function') {
-    await global.testSetup.beforeAll();
-  }
-  await global.server.startServer();
-});
-
-// @ts-ignore
-beforeEach(() => {
-  if (global.server) {
-    const key = `test-${Math.random().toString(36).substring(7)}`;
-    global.server.app.updateConfig('redis', {
-      namespace: key,
-    });
-  }
-});
-
-// @ts-ignore
-afterEach(async () => {
-  if (global.server) {
-    const { url, namespace } = global.server.getConfig('redis');
-    const redisClient = createClient({ url });
-
-    try {
-      await redisClient.connect();
-      await clearRedisNamespace(redisClient, namespace);
-      await redisClient.disconnect();
-    } catch {
-      // that ok. No redis connection
-    }
-  }
-});
-
-// @ts-ignore
-afterAll(async () => {
-  if (global.server) {
-    global.server.app.httpServer.shutdown();
-    global.server.app.events.emit('shutdown');
-  }
-
-  if (typeof global.testSetup.afterAll === 'function') {
-    await global.testSetup.afterAll();
-  }
-
-  await mongoose.disconnect();
-  await mongoMemoryServerInstance.stop();
-});

package/tests/setupVitest.js

@@ -1,111 +0,0 @@
-import path from 'node:path';
-import crypto from 'node:crypto';
-import { beforeAll, beforeEach, afterEach, afterAll } from 'vitest';
-
-import mongoose from 'mongoose'; // we do not need create indexes on tests
-
-import { createClient } from '@redis/client';
-import clearRedisNamespace from '../helpers/redis/clearNamespace.js';
-import Server from '../server.js';
-
-mongoose.set('autoIndex', false);
-
-beforeAll(async () => {
-  process.env.LOGGER_CONSOLE_LEVEL = 'error';
-  process.env.AUTH_SALT = crypto.randomBytes(16).toString('hex');
-  global.server = new Server({
-    folders: {
-      config: process.env.TEST_FOLDER_CONFIG || path.resolve('./config'),
-      controllers:
-        process.env.TEST_FOLDER_CONTROLLERS || path.resolve('./controllers'),
-      models: process.env.TEST_FOLDER_MODELS || path.resolve('./models'),
-      emails:
-        process.env.TEST_FOLDER_EMAIL ||
-        process.env.TEST_FOLDER_EMAILS ||
-        path.resolve('./services/messaging/email/templates'),
-      locales: process.env.TEST_FOLDER_LOCALES || path.resolve('./locales'),
-      commands: process.env.TEST_FOLDER_COMMANDS || path.resolve('./commands'),
-      migrations:
-        process.env.TEST_FOLDER_MIGRATIONS || path.resolve('./migrations'),
-    },
-  });
-  await global.server.init({ isSkipModelInit: true });
-  const connectionString = process.env.TEST_MONGO_URI.replace(
-    '__DB_TO_REPLACE__',
-    `TEST_${crypto.randomUUID()}`,
-  );
-  global.server.updateConfig('mongo', {
-    connectionString,
-  });
-  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 = {};
-  }
-  global.server.testingGetUrl = (urlPart) =>
-    `http://127.0.0.1:${global.server.getConfig('http').port}${urlPart}`;
-  if (!global.testSetup.disableUserCreate) {
-    const User = global.server.app.getModel('User');
-    global.user = await User.create({
-      email: 'test@test.com',
-      password: 'testPassword',
-      isVerified: true,
-      name: {
-        nick: 'testUserNickName',
-      },
-    }).catch((e) => {
-      console.error(e);
-      console.info(
-        'That error can happens in case you have custom user model. Please use global.testSetup.disableUserCreate flag to skip user creating',
-      );
-    });
-    global.authToken = await global.user.generateToken();
-  }
-  if (typeof global.testSetup.beforeAll === 'function') {
-    await global.testSetup.beforeAll();
-  }
-  await global.server.startServer();
-});
-
-beforeEach(() => {
-  if (global.server) {
-    const key = `test-${Math.random().toString(36).substring(7)}`;
-    global.server.app.updateConfig('redis', {
-      namespace: key,
-    });
-  }
-});
-
-afterEach(async () => {
-  if (global.server) {
-    const { url, namespace } = global.server.getConfig('redis');
-    const redisClient = createClient({ url });
-
-    try {
-      await redisClient.connect();
-      await clearRedisNamespace(redisClient, namespace);
-      await redisClient.disconnect();
-    } catch {
-      // that ok. No redis connection
-    }
-  }
-});
-
-afterAll(async () => {
-  if (global.server) {
-    global.server.app.httpServer.shutdown();
-    global.server.app.events.emit('shutdown');
-  }
-  if (typeof global.testSetup.afterAll === 'function') {
-    await global.testSetup.afterAll();
-  }
-  try {
-    await mongoose.connection.db.dropDatabase(); // clean database after test
-  } catch {
-    // that ok. No mongoose connection
-  }
-
-  await mongoose.disconnect();
-});

package/types/Expand.d.ts

@@ -1,11 +0,0 @@
-export type Expand<T> = T extends object
-  ? T extends infer O
-    ? { [K in keyof O]: O[K] }
-    : never
-  : T;
-
-export type ExpandDeep<T> = T extends object
-  ? T extends infer O
-    ? { [K in keyof O]: ExpandDeep<O[K]> }
-    : never
-  : T;

package/types/ICommandArguments.d.ts

@@ -1,41 +0,0 @@
-// this is from nodejs types
-interface ParseArgsOptionConfig {
-  /**
-   * Type of argument.
-   */
-  type: 'string' | 'boolean';
-  /**
-   * Whether this option can be provided multiple times.
-   * If `true`, all values will be collected in an array.
-   * If `false`, values for the option are last-wins.
-   * @default false.
-   */
-  multiple?: boolean | undefined;
-  /**
-   * A single character alias for the option.
-   */
-  short?: string | undefined;
-  /**
-   * The default option value when it is not set by args.
-   * It must be of the same type as the the `type` property.
-   * When `multiple` is `true`, it must be an array.
-   * @since v18.11.0
-   */
-  default?: string | boolean | string[] | boolean[] | undefined;
-}
-
-interface ParseArgsOptionsConfigExtended extends ParseArgsOptionConfig {
-  /**
-   * A description of the option.
-   */
-  description?: string;
-
-  /**
-   * Is it required?
-   */
-  required?: boolean;
-}
-
-export interface ICommandArguments {
-  [longOption: string]: ParseArgsOptionsConfigExtended;
-}

package/types/TFoldersConfig.d.ts

@@ -1,20 +0,0 @@
-/**
- * @param config path to folder with config files
- * @param models path to folder with moidels files
- * @param controllers path to folder with controllers files
- * @param migrations path to folder with migrations files
- * @param locales path to folder with locales files
- * @param migrations path to folder with migrations files
- * @param [emails] path to folder with emails files. Optional
- */
-type FolderConfig = {
-  config: string;
-  models: string;
-  controllers: string;
-  commands: string;
-  locales: string;
-  migrations: string;
-  emails?: string;
-};
-
-export default FolderConfig;

package/views/404.pug

@@ -1,3 +0,0 @@
-extends layouts/base.pug
-block content
-    | 404 page

package/views/home.pug

@@ -1,3 +0,0 @@
-extends layouts/base.pug
-block content
-     this is s home

package/views/layouts/base.pug

@@ -1,39 +0,0 @@
-doctype html
-html(lang=language)
-    head
-        meta(charset='utf-8')
-        meta(http-equiv='X-UA-Compatible', content='IE=edge')
-        meta(name='viewport', content='width=device-width, initial-scale=1')
-        // Title Of Site
-        title Site title
-        meta(name='description', content='Site description')
-        meta(name='keywords', content='Site keywords')
-
-        meta(name='viewport', content='width=device-width, initial-scale=1, maximum-scale=1')
-
-        // Standard Favicon
-        link(rel='icon', type='image/x-icon', href='/favicon.png')
-        // For non-Retina iPhone, iPod Touch, and Android 2.1+ devices:
-        link(rel='apple-touch-icon-precomposed apple-touch-icon icon', sizes='57x57', href='/favicons/apple-touch-icon-57x57-precomposed.png')
-        // iOS 7 devices:
-        link(rel='apple-touch-icon-precomposed apple-touch-icon icon', sizes='60x60', href='/favicons/apple-touch-icon-60x60-precomposed.png')
-        // For the iPad mini and the first- and second-generation iPad on iOS ≤ 6:
-        link(rel='apple-touch-icon-precomposed apple-touch-icon icon', sizes='72x72', href='/favicons/apple-touch-icon-72x72-precomposed.png')
-        // For the iPad mini and the first- and second-generation iPad on iOS ≥ 7:
-        link(rel='apple-touch-icon-precomposed apple-touch-icon icon', sizes='76x76', href='/favicons/apple-touch-icon-76x76-precomposed.png')
-        // For iPhone with high-resolution Retina display running iOS ≤ 6:
-        link(rel='apple-touch-icon-precomposed apple-touch-icon icon', sizes='114x114', href='/favicons/apple-touch-icon-114x114-precomposed.png')
-        // For iPhone with high-resolution Retina display running iOS ≥ 7:
-        link(rel='apple-touch-icon-precomposed apple-touch-icon icon', sizes='120x120', href='/favicons/apple-touch-icon-120x120-precomposed.png')
-        // For iPad with high-resolution Retina display running iOS ≤ 6:
-        link(rel='apple-touch-icon-precomposed apple-touch-icon icon', sizes='144x144', href='/favicons/apple-touch-icon-144x144-precomposed.png')
-        // For iPad with high-resolution Retina display running iOS ≥ 7:
-        link(rel='apple-touch-icon-precomposed apple-touch-icon icon', sizes='152x152', href='/favicons/apple-touch-icon-152x152-precomposed.png')
-        // For Android :
-        link(rel='apple-touch-icon-precomposed apple-touch-icon icon', sizes='196x196', href='/favicons/apple-touch-icon-196x196-precomposed.png')
-        // Opera Coast
-        link(rel='apple-touch-icon-precomposed apple-touch-icon icon', sizes='228x228', href='/favicons/apple-touch-icon-228x228-precomposed.png')
-
-
-    body
-        block content

package/vitest.config.js

@@ -1,17 +0,0 @@
-// eslint-disable-next-line import-x/no-unresolved
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-  test: {
-    globalSetup: './tests/globalSetupVitest.js',
-    setupFiles: './tests/setupVitest.js',
-    testTimeout: 10000,
-    outputFile: './coverage/junit.rspec.xml',
-    reporters: ['default', 'junit'],
-    coverage: {
-      provider: 'v8',
-      enabled: true,
-      reporter: ['text', 'html', 'clover', 'json'],
-    },
-  },
-});