@biorate/migrations 1.163.0 → 1.165.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@biorate/migrations",
-  "version": "1.163.0",
+  "version": "1.165.0",
   "description": "Migrations tools",
-  "main": "dist",
+  "main": "dist/index.js",
   "scripts": {
     "build": "npx tsc -p ./tsconfig.build.json --outDir ./dist",
-    "test": "npx nyc --reporter=lcov --reporter=text-summary -- npx mocha --exit -r ts-node/register tests/**/*.spec.ts",
+    "test": "npx vitest run --coverage",
     "prepublishOnly": "pnpm run build"
   },
   "repository": {
@@ -23,24 +23,24 @@
   "author": "llevkin",
   "license": "MIT",
   "dependencies": {
-    "@biorate/amqp": "1.156.2",
-    "@biorate/clickhouse": "1.156.2",
-    "@biorate/config": "1.156.2",
-    "@biorate/config-loader": "1.156.2",
-    "@biorate/config-loader-env": "1.158.0",
-    "@biorate/config-loader-fs": "1.156.2",
-    "@biorate/config-loader-vault": "1.156.2",
-    "@biorate/connector": "1.156.2",
-    "@biorate/errors": "1.102.0",
-    "@biorate/inversion": "1.156.2",
-    "@biorate/kafkajs": "1.156.2",
-    "@biorate/minio": "1.156.2",
-    "@biorate/mongodb": "1.156.2",
-    "@biorate/proxy": "1.156.2",
-    "@biorate/schema-registry": "1.163.0",
-    "@biorate/sequelize": "1.156.2",
-    "@biorate/tools": "1.102.1",
-    "@biorate/vault": "1.156.2"
+    "@biorate/amqp": "1.158.0",
+    "@biorate/clickhouse": "1.158.0",
+    "@biorate/config": "2.1.0",
+    "@biorate/config-loader": "1.158.0",
+    "@biorate/config-loader-env": "1.160.0",
+    "@biorate/config-loader-fs": "1.158.0",
+    "@biorate/config-loader-vault": "1.158.0",
+    "@biorate/connector": "2.1.0",
+    "@biorate/errors": "2.1.0",
+    "@biorate/inversion": "2.1.0",
+    "@biorate/kafkajs": "1.158.0",
+    "@biorate/minio": "1.158.0",
+    "@biorate/mongodb": "1.158.0",
+    "@biorate/proxy": "1.158.0",
+    "@biorate/schema-registry": "2.1.0",
+    "@biorate/sequelize": "1.158.0",
+    "@biorate/tools": "2.1.0",
+    "@biorate/vault": "1.158.0"
   },
-  "gitHead": "cda7045a715bdb95b6b1d4962e957f9eb30d9450"
+  "gitHead": "0126537d1b25654e1216019fb9f25cf248aac213"
 }

package/src/default.config.ts

@@ -1,64 +1,4 @@
-import { container, Types } from '@biorate/inversion';
-import { IConfig, Config } from '@biorate/config';
-import { ConfigLoader } from '@biorate/config-loader';
-import { ConfigLoaderEnv } from '@biorate/config-loader-env';
-import { ConfigLoaderFs } from '@biorate/config-loader-fs';
-import { ConfigLoaderVault } from '@biorate/config-loader-vault';
-import { IVaultConnector, VaultConnector } from '@biorate/vault';
-import { ISequelizeConnector, SequelizeConnector } from '@biorate/sequelize';
-import { IMinioConnector, MinioConnector } from '@biorate/minio';
-import { IMongoDBConnector, MongoDBConnector } from '@biorate/mongodb';
-import { IClickhouseConnector, ClickhouseConnector } from '@biorate/clickhouse';
-import { IAmqpConnector, AmqpConnector } from '@biorate/amqp';
-import { IKafkaJSAdminConnector, KafkaJSAdminConnector } from '@biorate/kafkajs';
-import { IProxyConnector, ProxyConnector } from '@biorate/proxy';
-import {
-  ISchemaRegistryConnector,
-  SchemaRegistryConnector,
-} from '@biorate/schema-registry';
+import { container } from '@biorate/inversion';
 import { Root } from './';
-import * as Migrations from './types';
 
-container.bind<IConfig>(Types.Config).to(Config).inSingletonScope();
-container
-  .bind<ConfigLoader>(Types.ConfigLoaderEnv)
-  .to(ConfigLoaderEnv)
-  .inSingletonScope();
-container.bind<ConfigLoader>(Types.ConfigLoaderFs).to(ConfigLoaderFs).inSingletonScope();
-container
-  .bind<ConfigLoader>(Types.ConfigLoaderVault)
-  .to(ConfigLoaderVault)
-  .inSingletonScope();
-container.bind<IVaultConnector>(Types.Vault).to(VaultConnector).inSingletonScope();
-container
-  .bind<ISequelizeConnector>(Types.Sequelize)
-  .to(SequelizeConnector)
-  .inSingletonScope();
-container.bind<IMinioConnector>(Types.Minio).to(MinioConnector).inSingletonScope();
-container.bind<IMongoDBConnector>(Types.Mongodb).to(MongoDBConnector).inSingletonScope();
-container
-  .bind<IClickhouseConnector>(Types.Clickhouse)
-  .to(ClickhouseConnector)
-  .inSingletonScope();
-container.bind<IAmqpConnector>(Types.Amqp).to(AmqpConnector).inSingletonScope();
-container
-  .bind<IKafkaJSAdminConnector>(Types.Kafka)
-  .to(KafkaJSAdminConnector)
-  .inSingletonScope();
-container.bind<IProxyConnector>(Types.Proxy).to(ProxyConnector).inSingletonScope();
-container
-  .bind<ISchemaRegistryConnector>(Types.SchemaRegistry)
-  .to(SchemaRegistryConnector)
-  .inSingletonScope();
-container.bind<Migrations.Sequelize>(Migrations.Sequelize).toSelf().inSingletonScope();
-container.bind<Migrations.Minio>(Migrations.Minio).toSelf().inSingletonScope();
-container.bind<Migrations.Mongodb>(Migrations.Mongodb).toSelf().inSingletonScope();
-container.bind<Migrations.Kafka>(Migrations.Kafka).toSelf().inSingletonScope();
-container.bind<Migrations.Clickhouse>(Migrations.Clickhouse).toSelf().inSingletonScope();
-container.bind<Migrations.Amqp>(Migrations.Amqp).toSelf().inSingletonScope();
-container
-  .bind<Migrations.SchemaRegistry>(Migrations.SchemaRegistry)
-  .toSelf()
-  .inSingletonScope();
-container.bind<Root>(Root).toSelf().inSingletonScope();
 container.get<Root>(Root).$run().catch(console.error);

package/src/root.ts

@@ -1,12 +1,26 @@
-import { init, injectable, inject, Types, Core } from '@biorate/inversion';
-import { IConfig } from '@biorate/config';
+import { EventEmitter } from 'events';
+import { init, injectable, inject, Types, Core, container } from '@biorate/inversion';
+import { Config, IConfig } from '@biorate/config';
 import { ConfigLoader } from '@biorate/config-loader';
-import { IVaultConnector } from '@biorate/vault';
-import { IProxyConnector } from '@biorate/proxy';
+import { IVaultConnector, VaultConnector } from '@biorate/vault';
+import { IProxyConnector, ProxyConnector } from '@biorate/proxy';
 import * as Migrations from './types';
+import { ConfigLoaderEnv } from '@biorate/config-loader-env';
+import { ConfigLoaderFs } from '@biorate/config-loader-fs';
+import { ConfigLoaderVault } from '@biorate/config-loader-vault';
+import { ISequelizeConnector, SequelizeConnector } from '@biorate/sequelize';
+import { IMinioConnector, MinioConnector } from '@biorate/minio';
+import { IMongoDBConnector, MongoDBConnector } from '@biorate/mongodb';
+import { ClickhouseConnector, IClickhouseConnector } from '@biorate/clickhouse';
+import { AmqpConnector, IAmqpConnector } from '@biorate/amqp';
+import { IKafkaJSAdminConnector, KafkaJSAdminConnector } from '@biorate/kafkajs';
+import {
+  ISchemaRegistryConnector,
+  SchemaRegistryConnector,
+} from '@biorate/schema-registry';
 
 @injectable()
-export class Root extends Core() {
+export class Root extends Core(EventEmitter) {
   @inject(Types.Config) public readonly config: IConfig;
 
   @inject(Types.ConfigLoaderEnv) public readonly configLoaderEnv: ConfigLoader;
@@ -35,9 +49,52 @@ export class Root extends Core() {
   public readonly schemaRegistry: Migrations.SchemaRegistry;
 
   @init() protected async initialize() {
-    process.exit();
+    this.emit('end')
   }
 }
 
 // @ts-ignore
 Core.log = null;
+
+container.bind<IConfig>(Types.Config).to(Config).inSingletonScope();
+container
+  .bind<ConfigLoader>(Types.ConfigLoaderEnv)
+  .to(ConfigLoaderEnv)
+  .inSingletonScope();
+container.bind<ConfigLoader>(Types.ConfigLoaderFs).to(ConfigLoaderFs).inSingletonScope();
+container
+  .bind<ConfigLoader>(Types.ConfigLoaderVault)
+  .to(ConfigLoaderVault)
+  .inSingletonScope();
+container.bind<IVaultConnector>(Types.Vault).to(VaultConnector).inSingletonScope();
+container
+  .bind<ISequelizeConnector>(Types.Sequelize)
+  .to(SequelizeConnector)
+  .inSingletonScope();
+container.bind<IMinioConnector>(Types.Minio).to(MinioConnector).inSingletonScope();
+container.bind<IMongoDBConnector>(Types.Mongodb).to(MongoDBConnector).inSingletonScope();
+container
+  .bind<IClickhouseConnector>(Types.Clickhouse)
+  .to(ClickhouseConnector)
+  .inSingletonScope();
+container.bind<IAmqpConnector>(Types.Amqp).to(AmqpConnector).inSingletonScope();
+container
+  .bind<IKafkaJSAdminConnector>(Types.Kafka)
+  .to(KafkaJSAdminConnector)
+  .inSingletonScope();
+container.bind<IProxyConnector>(Types.Proxy).to(ProxyConnector).inSingletonScope();
+container
+  .bind<ISchemaRegistryConnector>(Types.SchemaRegistry)
+  .to(SchemaRegistryConnector)
+  .inSingletonScope();
+container.bind<Migrations.Sequelize>(Migrations.Sequelize).toSelf().inSingletonScope();
+container.bind<Migrations.Minio>(Migrations.Minio).toSelf().inSingletonScope();
+container.bind<Migrations.Mongodb>(Migrations.Mongodb).toSelf().inSingletonScope();
+container.bind<Migrations.Kafka>(Migrations.Kafka).toSelf().inSingletonScope();
+container.bind<Migrations.Clickhouse>(Migrations.Clickhouse).toSelf().inSingletonScope();
+container.bind<Migrations.Amqp>(Migrations.Amqp).toSelf().inSingletonScope();
+container
+  .bind<Migrations.SchemaRegistry>(Migrations.SchemaRegistry)
+  .toSelf()
+  .inSingletonScope();
+container.bind<Root>(Root).toSelf().inSingletonScope();

package/src/types/mongodb.ts

@@ -16,11 +16,6 @@ export class Mongodb extends Migration {
       async (config, connection, paths) =>
         await this.forEachPath(paths, async (file, name) => {
           try {
-            await connection
-              .collection<{ _id: string }>(
-                this.config.get<string>('migrations.tableName', 'migrations'),
-              )
-              .insertOne({ _id: name });
             await (
               require(file) as (
                 connection: IMongoDBConnection,
@@ -28,6 +23,11 @@ export class Mongodb extends Migration {
                 globalConfig: IConfig,
               ) => Promise<void>
             )(connection, config, this.config);
+            await connection
+              .collection<{ _id: string }>(
+                this.config.get<string>('migrations.tableName', 'migrations'),
+              )
+              .insertOne({ _id: name });
             this.log(config.name, name);
           } catch (e) {}
         }),