@adaptivestone/framework 5.0.0-beta.2 → 5.0.0-beta.21

package/dist/services/validate/drivers/CustomValidator.js

@@ -0,0 +1,48 @@
+import { ValidationError } from 'yup';
+import AbstractValidator from './AbstractValidator.js';
+class CustomValidator extends AbstractValidator {
+    async validateFields(data, { query, body, appInfo }) {
+        if (this.body) {
+            if (typeof this.body.validate !== 'function') {
+                this.logger.error('request.validate should be a function');
+            }
+        }
+        try {
+            await this.body.validate(data, {
+                req: {
+                    query,
+                    body,
+                    appInfo,
+                },
+            });
+        }
+        catch (e) {
+            this.logger.warn(`CustomValidator validateFields ${e}`);
+            if (e.path) {
+                throw new ValidationError({
+                    [e.path]: e.message,
+                });
+            }
+            throw new Error(e);
+        }
+    }
+    async castFields(data, { query, body, appInfo }) {
+        if (this.body) {
+            if (typeof this.body.cast !== 'function') {
+                this.logger.error('request.validate should be a function');
+            }
+        }
+        return this.body.cast(data, {
+            req: {
+                query,
+                body,
+                appInfo,
+            },
+        });
+    }
+    static get loggerGroup() {
+        return 'CustomValidator_';
+    }
+}
+export default CustomValidator;
+//# sourceMappingURL=CustomValidator.js.map

package/dist/services/validate/drivers/CustomValidator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CustomValidator.js","sourceRoot":"","sources":["../../../../src/services/validate/drivers/CustomValidator.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AACtC,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAEvD,MAAM,eAAgB,SAAQ,iBAAiB;IAC7C,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE;QACjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;gBAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC7B,GAAG,EAAE;oBACH,KAAK;oBACL,IAAI;oBACJ,OAAO;iBACR;aACF,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,EAAE,CAAC,CAAC;YACxD,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;gBACX,MAAM,IAAI,eAAe,CAAC;oBACxB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO;iBACpB,CAAC,CAAC;YACL,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE;QAC7C,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAC1B,GAAG,EAAE;gBACH,KAAK;gBACL,IAAI;gBACJ,OAAO;aACR;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;CACF;AAED,eAAe,eAAe,CAAC"}

package/dist/services/validate/drivers/YupValidator.d.ts

@@ -0,0 +1,13 @@
+export default YupValidator;
+declare class YupValidator extends AbstractValidator {
+    validateFields(data: any, { query, body, appInfo }: {
+        query: any;
+        body: any;
+        appInfo: any;
+    }): Promise<void>;
+    castFields(data: any, { query, body }: {
+        query: any;
+        body: any;
+    }): Promise<any>;
+}
+import AbstractValidator from './AbstractValidator.js';

package/dist/services/validate/drivers/YupValidator.js

@@ -0,0 +1,86 @@
+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;
+//# sourceMappingURL=YupValidator.js.map

package/dist/services/validate/drivers/YupValidator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"YupValidator.js","sourceRoot":"","sources":["../../../../src/services/validate/drivers/YupValidator.js"],"names":[],"mappings":"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"}

package/dist/tests/globalSetupVitest.d.ts

@@ -0,0 +1,2 @@
+export function setup(): Promise<void>;
+export function teardown(): Promise<void>;

package/dist/tests/globalSetupVitest.js

@@ -0,0 +1,29 @@
+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 };
+//# sourceMappingURL=globalSetupVitest.js.map

package/dist/tests/globalSetupVitest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"globalSetupVitest.js","sourceRoot":"","sources":["../../src/tests/globalSetupVitest.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,IAAI,UAAU,GAAG,KAAK,CAAC;AACvB,IAAI,yBAAyB,CAAC;AAE9B,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;IACvB,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;IAC/C,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC1C,yBAAyB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;QAC1D,gCAAgC;QAChC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE;KACnD,CAAC,CAAC;IACH,MAAM,yBAAyB,CAAC,gBAAgB,EAAE,CAAC;IACnD,MAAM,qBAAqB,GACzB,MAAM,yBAAyB,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,qBAAqB,CAAC;IACnD,sDAAsD;IACtD,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;IAC1B,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAE9C,UAAU,GAAG,IAAI,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAC1C,MAAM,yBAAyB,CAAC,IAAI,EAAE,CAAC;IACvC,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAEjD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC"}

package/dist/tests/setupVitest.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/setupVitest.js

@@ -0,0 +1,99 @@
+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);
+const basePath = new URL('.', import.meta.url).pathname;
+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(basePath, '../config'),
+            controllers: process.env.TEST_FOLDER_CONTROLLERS ||
+                path.resolve(basePath, '../controllers'),
+            models: process.env.TEST_FOLDER_MODELS || path.resolve(basePath, '../models'),
+            emails: process.env.TEST_FOLDER_EMAIL ||
+                process.env.TEST_FOLDER_EMAILS ||
+                path.resolve(basePath, '../services/messaging/email/templates'),
+            locales: process.env.TEST_FOLDER_LOCALES || path.resolve(basePath, '../locales'),
+            commands: process.env.TEST_FOLDER_COMMANDS ||
+                path.resolve(basePath, '../commands'),
+            migrations: process.env.TEST_FOLDER_MIGRATIONS ||
+                path.resolve(basePath, '../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();
+});
+//# sourceMappingURL=setupVitest.js.map

package/dist/tests/setupVitest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupVitest.js","sourceRoot":"","sources":["../../src/tests/setupVitest.js"],"names":[],"mappings":"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"}

package/package.json

@@ -1,28 +1,35 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "5.0.0-beta.2",
+  "version": "5.0.0-beta.21",
   "description": "Adaptive stone node js framework",
-  "main": "index.js",
   "type": "module",
   "engines": {
-    "node": ">=20.12.0"
+    "node": ">=23.6.0"
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    "./*": "./dist/*"
   },
   "repository": {
     "type": "git",
-    "url": "https://gitlab.com/adaptivestone/framework"
+    "url": "git+https://github.com/adaptivestone/framework.git"
   },
   "homepage": "https://framework.adaptivestone.com/",
   "scripts": {
-    "dev": "node --watch ./index.js",
-    "prod": "node --watch ./cluster.js",
+    "build": "rm -rf dist && tsc",
+    "postbuild": "cp -R ./src/migrations ./dist/migrations",
+    "check:types": "tsc --noEmit",
+    "dev": "node --watch ./src/index.ts",
+    "prod": "node --watch ./src/cluster.ts",
     "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 --flag unstable_native_nodejs_ts_config",
+    "lint:fix": "eslint --fix",
     "codestyle": "npm run prettier && npm run lint",
     "prepare": "husky",
-    "cli": "node cliCommand",
+    "prepublishOnly": "npm run build",
+    "cli": "node cliCommand.ts",
     "benchmark": "h2load -n 10000 -c 50 -p 'http/1.1' http://localhost:3300/",
     "benchmark2": "h2load -n 10000 -c 50  https://localhost:3300/",
     "redis:docker": "docker run --rm  -p 6379:6379 redis"
@@ -30,38 +37,46 @@
   "author": "Andrey Logunov",
   "license": "MIT",
   "dependencies": {
+    "@redis/client": "^5.0.0",
     "deepmerge": "^4.2.2",
     "express": "^5.0.1",
     "formidable": "^3.5.1",
-    "html-to-text": "^9.0.3",
-    "i18next": "^24.0.0",
+    "i18next": "^25.0.0",
     "i18next-fs-backend": "^2.0.0",
-    "juice": "^11.0.0",
-    "minimist": "^1.2.5",
     "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": "^5.0.0",
-    "redis": "^4.3.1",
+    "rate-limiter-flexible": "^7.0.0",
     "winston": "^3.3.3",
     "winston-transport-sentry-node": "^3.0.0",
     "yup": "^1.0.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.24.0",
+    "@types/express": "^5.0.1",
+    "@types/formidable": "^3.4.5",
+    "@types/node": "^22.13.1",
     "@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.24.0",
     "eslint-config-prettier": "^10.0.0",
+    "eslint-plugin-import-x": "^4.6.1",
     "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-vitest": "^0.4.0",
+    "globals": "^16.0.0",
     "husky": "^9.0.0",
-    "lint-staged": "^15.0.0",
+    "lint-staged": "^16.0.0",
     "mongodb-memory-server": "^10.0.0",
     "prettier": "^3.0.0",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.30.1",
     "vitest": "^3.0.0"
   },
+  "peerDependencies": {
+    "@adaptivestone/framework-module-email": "^1.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@adaptivestone/framework-module-email": {
+      "optional": true
+    }
+  },
   "lint-staged": {
     "**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
       "prettier --write"

package/Cli.js

@@ -1,22 +0,0 @@
-import parseArgs from 'minimist';
-import mongoose from 'mongoose';
-import BaseCli from './modules/BaseCli.js';
-import Server from './server.js';
-
-class Cli extends BaseCli {
-  constructor(serverConfig) {
-    mongoose.set('autoIndex', false); // we do not need create indexes on CLI.
-    const server = new Server(serverConfig);
-    super(server);
-    this.args = parseArgs(process.argv.slice(3));
-  }
-
-  async run() {
-    await this.server.init({ isSkipModelInit: true, isSkipModelLoading: true });
-    const command = process.argv[2]?.toLowerCase();
-    await super.run(command, this.args);
-    this.app.events.emit('shutdown');
-  }
-}
-
-export default Cli;

package/cluster.js

@@ -1,27 +0,0 @@
-import cluster from 'node:cluster';
-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) {
-    cluster.fork();
-  }
-
-  cluster.on('exit', (worker, code, signal) => {
-    // eslint-disable-next-line no-console
-    console.log(
-      `Worker \x1B[45m ${
-        worker.process.pid
-      } \x1B[49m \x1B[41m †††† died †††† \x1B[49m. Code: ${
-        signal || code
-      }. Restarting...`,
-    );
-    cluster.fork();
-  });
-} else {
-  import('./server.js');
-}

package/commands/CreateUser.js

@@ -1,75 +0,0 @@
-import AbstractCommand from '../modules/AbstractCommand.js';
-
-// Example: node src/cli createuser --email=somemail@gmail.com  --password=somePassword --roles=user,admin,someOtherRoles
-class CreateUser extends AbstractCommand {
-  static get description() {
-    return 'Create user in a database';
-  }
-
-  async run() {
-    const User = this.app.getModel('User');
-    const { id, email, password, roles, update } = this.args;
-
-    if (!email && !id) {
-      this.logger.error('Input validation failded');
-      this.logger.error('Please add "email" or "id" variables');
-      return false;
-    }
-
-    let user;
-
-    if (id) {
-      user = await User.findOne({ _id: id });
-    } else if (email) {
-      user = await User.findOne({ email });
-    }
-
-    if (user && !update) {
-      this.logger.error(
-        'We are found a user in database. But "update" option is not providing. Exitin',
-      );
-      return false;
-    }
-
-    if (!user && !password) {
-      this.logger.error(
-        'For a new user we alway asking for a password. Please provide it and rerun command',
-      );
-      return false;
-    }
-
-    if (!user && !email) {
-      this.logger.error(
-        'For a new user we alway asking for a email. Please provide it and rerun command',
-      );
-      return false;
-    }
-
-    if (!user) {
-      user = new User();
-    }
-
-    if (password) {
-      user.password = password;
-    }
-    if (email) {
-      user.email = email;
-    }
-
-    if (roles) {
-      user.roles = roles.split(',');
-    }
-
-    await user.save();
-
-    await user.generateToken();
-
-    this.logger.info(
-      `User was created/updated ${JSON.stringify(user, null, 4)}`,
-    );
-
-    return user;
-  }
-}
-
-export default CreateUser;

package/commands/Documentation.js

@@ -1,17 +0,0 @@
-import AbstractCommand from '../modules/AbstractCommand.js';
-import ControllerManager from '../controllers/index.js';
-
-class Documentation extends AbstractCommand {
-  static get description() {
-    return 'Generate documentation (internal)';
-  }
-
-  async run() {
-    const CM = new ControllerManager(this.app);
-    this.app.documentation = [];
-    await CM.initControllers();
-    return this.app.documentation;
-  }
-}
-
-export default Documentation;

package/commands/DropIndex.js

@@ -1,29 +0,0 @@
-import AbstractCommand from '../modules/AbstractCommand.js';
-
-class DropIndex extends AbstractCommand {
-  static get description() {
-    return 'Drop indexes of model';
-  }
-
-  async run() {
-    if (!this.args.model) {
-      this.logger.error('Please provide model name as "--model=BestUserModel"');
-      return false;
-    }
-
-    const Model = this.app.getModel(this.args.model);
-
-    if (!Model) {
-      this.logger.error('Not able to find model');
-      return false;
-    }
-
-    await Model.collection.dropIndexes();
-
-    this.logger.info('Success');
-
-    return true;
-  }
-}
-
-export default DropIndex;

package/commands/GenerateRandomBytes.js

@@ -1,21 +0,0 @@
-import { randomBytes } from 'node:crypto';
-import AbstractCommand from '../modules/AbstractCommand.js';
-
-class GenerateRandomBytes extends AbstractCommand {
-  static get description() {
-    return 'Generate random bytes ising randomBytes from  node:crypto';
-  }
-
-  static isShouldInitModels = false;
-
-  async run() {
-    const sizes = [16, 32, 64, 128, 256];
-    for (const size of sizes) {
-      const bytes = randomBytes(size).toString('hex');
-      this.logger.info(`${size} bytes: ${bytes}`);
-    }
-    return true;
-  }
-}
-
-export default GenerateRandomBytes;