@node-c/persistance-clickhouse 1.0.0-alpha6 → 1.0.0-alpha61

package/dist/connectionModule/clickhouse.connection.module.js

@@ -1,7 +1,16 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClickHouseConnectionModule = void 0;
-const nestjs_clickhouse_1 = require("@depyronick/nestjs-clickhouse");
+const client_1 = require("@clickhouse/client");
 const core_1 = require("@node-c/core");
 const definitions_1 = require("../common/definitions");
 class ClickHouseConnectionModule {
@@ -15,18 +24,43 @@ class ClickHouseConnectionModule {
             providers: [
                 {
                     provide: clientName,
-                    useFactory: (configProvider) => {
+                    useFactory: (configProvider) => __awaiter(this, void 0, void 0, function* () {
                         const persistanceConfig = configProvider.config.persistance;
-                        const { database, host, password, port, user } = persistanceConfig[persistanceModuleName];
-                        return new nestjs_clickhouse_1.ClickHouseClient({
+                        const { application, database, failOnConnectionError = true, host, password, port, protocol, requestTimeout, useHostParam, user } = persistanceConfig[persistanceModuleName];
+                        const connectionOptions = {
                             database,
-                            host,
-                            name: clientName,
                             password,
-                            port,
                             username: user
-                        });
-                    },
+                        };
+                        const url = `${protocol || 'http'}://${host}:${port}`;
+                        let client;
+                        if (application) {
+                            connectionOptions.application = application;
+                        }
+                        if (requestTimeout) {
+                            connectionOptions.request_timeout = requestTimeout;
+                        }
+                        if (useHostParam) {
+                            connectionOptions.host = url;
+                        }
+                        else {
+                            connectionOptions.url = url;
+                        }
+                        try {
+                            client = (0, client_1.createClient)(connectionOptions);
+                            const pingResult = yield client.ping({ select: true });
+                            if (!pingResult.success) {
+                                throw new Error(JSON.stringify(pingResult));
+                            }
+                        }
+                        catch (err) {
+                            console.error(`[ClickHouseConnectionModule][${persistanceModuleName}]: Error connecting to ClickHouse:`, err);
+                            if (failOnConnectionError) {
+                                throw err;
+                            }
+                        }
+                        return client;
+                    }),
                     inject: [core_1.ConfigProviderService]
                 }
             ],

package/dist/connectionModule/clickhouse.connection.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse.connection.module.js","sourceRoot":"","sources":["../../src/connectionModule/clickhouse.connection.module.ts"],"names":[],"mappings":";;;AAAA,qEAAiE;AAGjE,uCAA8E;AAI9E,uDAAkD;AAElD,MAAa,0BAA0B;IACrC,MAAM,CAAC,QAAQ,CAAC,OAA0C;QACxD,MAAM,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC;QAC1C,MAAM,UAAU,GAAG,GAAG,uBAAS,CAAC,wBAAwB,GAAG,qBAAqB,EAAE,CAAC;QACnF,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,0BAA0B;YAClC,OAAO,EAAE,EAAE;YACX,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,UAAU;oBACnB,UAAU,EAAE,CAAC,cAAqC,EAAE,EAAE;wBACpD,MAAM,iBAAiB,GAAG,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC;wBAC5D,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAChE,qBAAuD,CAC7B,CAAC;wBAC7B,OAAO,IAAI,oCAAgB,CAAC;4BAC1B,QAAQ;4BACR,IAAI;4BACJ,IAAI,EAAE,UAAU;4BAChB,QAAQ;4BACR,IAAI;4BACJ,QAAQ,EAAE,IAAI;yBACf,CAAC,CAAC;oBACL,CAAC;oBACD,MAAM,EAAE,CAAC,4BAAqB,CAAC;iBAChC;aACF;YACD,OAAO,EAAE,CAAC,UAAU,CAAC;SACtB,CAAC;IACJ,CAAC;CACF;AA/BD,gEA+BC"}
+{"version":3,"file":"clickhouse.connection.module.js","sourceRoot":"","sources":["../../src/connectionModule/clickhouse.connection.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoE;AAIpE,uCAA8E;AAI9E,uDAAkD;AAElD,MAAa,0BAA0B;IACrC,MAAM,CAAC,QAAQ,CAAC,OAA0C;QACxD,MAAM,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC;QAC1C,MAAM,UAAU,GAAG,GAAG,uBAAS,CAAC,wBAAwB,GAAG,qBAAqB,EAAE,CAAC;QACnF,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,0BAA0B;YAClC,OAAO,EAAE,EAAE;YACX,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,UAAU;oBACnB,UAAU,EAAE,CAAO,cAAqC,EAAE,EAAE;wBAC1D,MAAM,iBAAiB,GAAG,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC;wBAC5D,MAAM,EACJ,WAAW,EACX,QAAQ,EACR,qBAAqB,GAAG,IAAI,EAC5B,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,IAAI,EACL,GAAG,iBAAiB,CAAC,qBAAuD,CAA4B,CAAC;wBAC1G,MAAM,iBAAiB,GAAsC;4BAC3D,QAAQ;4BACR,QAAQ;4BACR,QAAQ,EAAE,IAAI;yBACf,CAAC;wBACF,MAAM,GAAG,GAAG,GAAG,QAAQ,IAAI,MAAM,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;wBACtD,IAAI,MAAwB,CAAC;wBAC7B,IAAI,WAAW,EAAE,CAAC;4BAChB,iBAAiB,CAAC,WAAW,GAAG,WAAW,CAAC;wBAC9C,CAAC;wBACD,IAAI,cAAc,EAAE,CAAC;4BACnB,iBAAiB,CAAC,eAAe,GAAG,cAAc,CAAC;wBACrD,CAAC;wBACD,IAAI,YAAY,EAAE,CAAC;4BACjB,iBAAiB,CAAC,IAAI,GAAG,GAAG,CAAC;wBAC/B,CAAC;6BAAM,CAAC;4BACN,iBAAiB,CAAC,GAAG,GAAG,GAAG,CAAC;wBAC9B,CAAC;wBACD,IAAI,CAAC;4BACH,MAAM,GAAG,IAAA,qBAAY,EAAC,iBAAiB,CAAC,CAAC;4BACzC,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;4BACvD,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gCACxB,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;4BAC9C,CAAC;wBACH,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,OAAO,CAAC,KAAK,CACX,gCAAgC,qBAAqB,oCAAoC,EACzF,GAAG,CACJ,CAAC;4BACF,IAAI,qBAAqB,EAAE,CAAC;gCAC1B,MAAM,GAAG,CAAC;4BACZ,CAAC;wBACH,CAAC;wBACD,OAAO,MAAO,CAAC;oBACjB,CAAC,CAAA;oBACD,MAAM,EAAE,CAAC,4BAAqB,CAAC;iBAChC;aACF;YACD,OAAO,EAAE,CAAC,UAAU,CAAC;SACtB,CAAC;IACJ,CAAC;CACF;AAlED,gEAkEC"}

package/dist/entityManager/clickhouse.entity.manager.d.ts

@@ -1,4 +1,4 @@
-import { ClickHouseClient } from '@depyronick/nestjs-clickhouse';
+import { ClickHouseClient } from '@clickhouse/client';
 import { GenericObject } from '@node-c/core';
 import { RDBEntityManager, RDBRepository } from '@node-c/persistance-rdb';
 export declare class ClickHouseEntityManager implements RDBEntityManager {
@@ -6,11 +6,11 @@ export declare class ClickHouseEntityManager implements RDBEntityManager {
     protected repository: RDBRepository<GenericObject<unknown>>;
     constructor(client: ClickHouseClient, repository: RDBRepository<GenericObject<unknown>>);
     getRepository<Entity extends GenericObject<unknown>>(_target: string): RDBRepository<Entity>;
-    insert(data: Partial<unknown>[]): Promise<unknown>;
-    query(query: string, params?: {
+    insert(data: Record<string, unknown>[]): Promise<unknown>;
+    query<ReturnData = unknown>(query: string, params?: {
         field: string;
         value: string | number;
-    }[]): Promise<unknown>;
+    }[]): Promise<ReturnData>;
     save<Entity extends GenericObject<unknown> = GenericObject<unknown>>(_target: unknown, data: Partial<Entity> | Partial<Entity[]>, options?: unknown): Promise<unknown>;
     transaction(callback: (_em: ClickHouseEntityManager) => Promise<unknown>): Promise<unknown>;
 }

package/dist/entityManager/clickhouse.entity.manager.js

@@ -11,9 +11,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClickHouseEntityManager = void 0;
-const nestjs_clickhouse_1 = require("@depyronick/nestjs-clickhouse");
+const client_1 = require("@clickhouse/client");
 const common_1 = require("@nestjs/common");
 const persistance_rdb_1 = require("@node-c/persistance-rdb");
 const definitions_1 = require("../common/definitions");
@@ -26,15 +35,23 @@ let ClickHouseEntityManager = class ClickHouseEntityManager {
         return this.repository;
     }
     insert(data) {
-        return this.client.insertPromise(this.repository.metadata.tableName, data);
+        return this.client.insert({
+            format: 'JSONEachRow',
+            table: this.repository.metadata.tableName,
+            values: data
+        });
     }
     query(query, params) {
-        let queryParams = undefined;
-        if (params === null || params === void 0 ? void 0 : params.length) {
-            queryParams = {};
-            params.forEach(item => (queryParams[item.field] = item.value));
-        }
-        return this.client.queryPromise(query, queryParams);
+        return __awaiter(this, void 0, void 0, function* () {
+            let queryParams = undefined;
+            if (params === null || params === void 0 ? void 0 : params.length) {
+                queryParams = {};
+                params.forEach(item => (queryParams[item.field] = item.value));
+            }
+            const results = yield this.client.query({ format: 'JSON', query, query_params: queryParams });
+            const jsonData = yield results.json();
+            return jsonData;
+        });
     }
     save(_target, data, options) {
         return this.repository.save(data, options);
@@ -48,7 +65,7 @@ exports.ClickHouseEntityManager = ClickHouseEntityManager = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)(definitions_1.Constants.CLICKHOUSE_CLIENT)),
     __param(1, (0, common_1.Inject)(persistance_rdb_1.Constants.RDB_ENTITY_REPOSITORY)),
-    __metadata("design:paramtypes", [nestjs_clickhouse_1.ClickHouseClient,
+    __metadata("design:paramtypes", [client_1.ClickHouseClient,
         persistance_rdb_1.RDBRepository])
 ], ClickHouseEntityManager);
 //# sourceMappingURL=clickhouse.entity.manager.js.map

package/dist/entityManager/clickhouse.entity.manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse.entity.manager.js","sourceRoot":"","sources":["../../src/entityManager/clickhouse.entity.manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qEAAiE;AACjE,2CAAoD;AAGpD,6DAAqG;AAErG,uDAAkD;AAG3C,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAClC,YAGY,MAAwB,EAGxB,UAAiD;QAHjD,WAAM,GAAN,MAAM,CAAkB;QAGxB,eAAU,GAAV,UAAU,CAAuC;IAC1D,CAAC;IAGJ,aAAa,CAAwC,OAAe;QAClE,OAAO,IAAI,CAAC,UAAmC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,IAAwB;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,KAAa,EAAE,MAAoD;QACvE,IAAI,WAAW,GAAgD,SAAS,CAAC;QACzE,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE,CAAC;YACnB,WAAW,GAAG,EAAE,CAAC;YACjB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAGD,IAAI,CACF,OAAgB,EAChB,IAAyC,EACzC,OAAiB;QAEjB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAGD,WAAW,CAAC,QAA4D;QACtE,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;CACF,CAAA;AAzCY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,uBAAS,CAAC,iBAAiB,CAAC,CAAA;IAGnC,WAAA,IAAA,eAAM,EAAC,2BAAY,CAAC,qBAAqB,CAAC,CAAA;qCADzB,oCAAgB;QAGZ,+BAAa;GAP1B,uBAAuB,CAyCnC"}
+{"version":3,"file":"clickhouse.entity.manager.js","sourceRoot":"","sources":["../../src/entityManager/clickhouse.entity.manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAsD;AACtD,2CAAoD;AAGpD,6DAAqG;AAErG,uDAAkD;AAG3C,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAClC,YAGY,MAAwB,EAGxB,UAAiD;QAHjD,WAAM,GAAN,MAAM,CAAkB;QAGxB,eAAU,GAAV,UAAU,CAAuC;IAC1D,CAAC;IAGJ,aAAa,CAAwC,OAAe;QAClE,OAAO,IAAI,CAAC,UAAmC,CAAC;IAClD,CAAC;IAGD,MAAM,CAAC,IAA+B;QACpC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;YACxB,MAAM,EAAE,aAAa;YACrB,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS;YACzC,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;IACL,CAAC;IAEK,KAAK,CACT,KAAa,EACb,MAAoD;;YAEpD,IAAI,WAAW,GAAgD,SAAS,CAAC;YACzE,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE,CAAC;gBACnB,WAAW,GAAG,EAAE,CAAC;gBACjB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAClE,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;YAC9F,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YACtC,OAAO,QAAsB,CAAC;QAChC,CAAC;KAAA;IAGD,IAAI,CACF,OAAgB,EAChB,IAAyC,EACzC,OAAiB;QAEjB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAGD,WAAW,CAAC,QAA4D;QACtE,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;CACF,CAAA;AAnDY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,uBAAS,CAAC,iBAAiB,CAAC,CAAA;IAGnC,WAAA,IAAA,eAAM,EAAC,2BAAY,CAAC,qBAAqB,CAAC,CAAA;qCADzB,yBAAgB;QAGZ,+BAAa;GAP1B,uBAAuB,CAmDnC"}

package/dist/entityService/clickhouse.entity.service.d.ts

@@ -1,10 +1,11 @@
-import { GenericObject } from '@node-c/core';
+import { ConfigProviderService, GenericObject, PersistanceDefaultData } from '@node-c/core';
 import { RDBEntityService, SQLQueryBuilderService } from '@node-c/persistance-rdb';
 import { ClickHouseDBEntitySchema, ClickHouseDBRepository } from '../repository';
-export declare class ClickHouseDBEntityService<Entity extends GenericObject> extends RDBEntityService<Entity> {
+export declare class ClickHouseDBEntityService<Entity extends GenericObject, Data extends PersistanceDefaultData<Entity> = PersistanceDefaultData<Entity>> extends RDBEntityService<Entity, Data> {
+    protected configProvider: ConfigProviderService;
     protected qb: SQLQueryBuilderService;
     protected repository: ClickHouseDBRepository<Entity>;
-    protected schema: ClickHouseDBEntitySchema;
+    protected schema: ClickHouseDBEntitySchema<Entity>;
     protected primaryKeys: string[];
-    constructor(qb: SQLQueryBuilderService, repository: ClickHouseDBRepository<Entity>, schema: ClickHouseDBEntitySchema);
+    constructor(configProvider: ConfigProviderService, qb: SQLQueryBuilderService, repository: ClickHouseDBRepository<Entity>, schema: ClickHouseDBEntitySchema<Entity>);
 }

package/dist/entityService/clickhouse.entity.service.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClickHouseDBEntityService = void 0;
 const persistance_rdb_1 = require("@node-c/persistance-rdb");
 class ClickHouseDBEntityService extends persistance_rdb_1.RDBEntityService {
-    constructor(qb, repository, schema) {
-        super(qb, repository, schema);
+    constructor(configProvider, qb, repository, schema) {
+        super(configProvider, qb, repository, schema);
+        this.configProvider = configProvider;
         this.qb = qb;
         this.repository = repository;
         this.schema = schema;

package/dist/entityService/clickhouse.entity.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse.entity.service.js","sourceRoot":"","sources":["../../src/entityService/clickhouse.entity.service.ts"],"names":[],"mappings":";;;AACA,6DAAmF;AAInF,MAAa,yBAAwD,SAAQ,kCAAwB;IAGnG,YAEY,EAA0B,EAE1B,UAA0C,EAC1C,MAAgC;QAE1C,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QALpB,OAAE,GAAF,EAAE,CAAwB;QAE1B,eAAU,GAAV,UAAU,CAAgC;QAC1C,WAAM,GAAN,MAAM,CAA0B;QAG1C,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;IAC5C,CAAC;CACF;AAbD,8DAaC"}
+{"version":3,"file":"clickhouse.entity.service.js","sourceRoot":"","sources":["../../src/entityService/clickhouse.entity.service.ts"],"names":[],"mappings":";;;AACA,6DAAmF;AAInF,MAAa,yBAGX,SAAQ,kCAA8B;IAGtC,YACY,cAAqC,EACrC,EAA0B,EAC1B,UAA0C,EAC1C,MAAwC;QAElD,KAAK,CAAC,cAAc,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QALpC,mBAAc,GAAd,cAAc,CAAuB;QACrC,OAAE,GAAF,EAAE,CAAwB;QAC1B,eAAU,GAAV,UAAU,CAAgC;QAC1C,WAAM,GAAN,MAAM,CAAkC;QAGlD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;IAC5C,CAAC;CACF;AAfD,8DAeC"}

package/dist/module/clickhouse.module.definitions.d.ts

@@ -1,6 +1,7 @@
 import { ModuleMetadata } from '@nestjs/common';
 import { GenericObject } from '@node-c/core';
 export interface ClickHouseDBModuleOptions {
+    entityModuleRegisterOptions?: unknown;
     exports?: ModuleMetadata['exports'];
     folderData: GenericObject<unknown>;
     imports?: {
@@ -11,4 +12,5 @@ export interface ClickHouseDBModuleOptions {
     moduleClass: unknown;
     moduleName: string;
     providers?: ModuleMetadata['providers'];
+    registerOptionsPerEntityModule?: GenericObject;
 }

package/dist/module/clickhouse.module.js

@@ -8,7 +8,10 @@ class ClickHouseDBModule {
     static register(options) {
         const { folderData, imports: additionalImports, moduleClass, moduleName } = options;
         const { atEnd: importsAtEnd, postORM: importsPostORM, preORM: importsPreORM } = additionalImports || {};
-        const { modules } = (0, core_1.loadDynamicModules)(folderData);
+        const { modules } = (0, core_1.loadDynamicModules)(folderData, {
+            moduleRegisterOptions: options.entityModuleRegisterOptions,
+            registerOptionsPerModule: options.registerOptionsPerEntityModule
+        });
         return {
             global: true,
             module: moduleClass,

package/dist/module/clickhouse.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse.module.js","sourceRoot":"","sources":["../../src/module/clickhouse.module.ts"],"names":[],"mappings":";;;AAEA,uCAAkD;AAClD,6DAAgE;AAIhE,0DAAiE;AAEjE,MAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,OAAkC;QAChD,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACpF,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,IAAI,EAAE,CAAC;QACxG,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,yBAAkB,EAAC,UAAU,CAAC,CAAC;QACnD,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,WAAsC;YAC9C,OAAO,EAAE;gBACP,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;gBACxB,6CAA0B,CAAC,QAAQ,CAAC,EAAE,qBAAqB,EAAE,UAAU,EAAE,CAAC;gBAC1E,uCAAqB,CAAC,QAAQ,CAAC,EAAE,qBAAqB,EAAE,UAAU,EAAE,CAAC;gBACrE,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;gBACzB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;gBAClB,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;aACxB;YACD,SAAS,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;YACzC,OAAO,EAAE,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC;IACJ,CAAC;CACF;AApBD,gDAoBC"}
+{"version":3,"file":"clickhouse.module.js","sourceRoot":"","sources":["../../src/module/clickhouse.module.ts"],"names":[],"mappings":";;;AAEA,uCAAkD;AAClD,6DAAgE;AAIhE,0DAAiE;AAEjE,MAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,OAAkC;QAChD,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACpF,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,IAAI,EAAE,CAAC;QACxG,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,yBAAkB,EAAC,UAAU,EAAE;YACjD,qBAAqB,EAAE,OAAO,CAAC,2BAA2B;YAC1D,wBAAwB,EAAE,OAAO,CAAC,8BAA8B;SACjE,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,WAAsC;YAC9C,OAAO,EAAE;gBACP,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;gBACxB,6CAA0B,CAAC,QAAQ,CAAC,EAAE,qBAAqB,EAAE,UAAU,EAAE,CAAC;gBAC1E,uCAAqB,CAAC,QAAQ,CAAC,EAAE,qBAAqB,EAAE,UAAU,EAAE,CAAC;gBACrE,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;gBACzB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;gBAClB,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;aACxB;YACD,SAAS,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;YACzC,OAAO,EAAE,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC;IACJ,CAAC;CACF;AAvBD,gDAuBC"}

package/dist/ormQueryBuilder/clickhouse.selectQueryBuilder.d.ts

@@ -4,14 +4,14 @@ import { ClickHouseEntityManager } from '../entityManager';
 import { ClickHouseDBEntitySchema } from '../repository/clickhouse.repository.definitions';
 export declare class ClickHouseSelectQueryBuilder<Entity extends GenericObject<unknown>> implements OrmSelectQueryBuilder<Entity> {
     protected manager: ClickHouseEntityManager;
-    protected schema: ClickHouseDBEntitySchema;
+    protected schema: ClickHouseDBEntitySchema<Entity>;
     protected deletedColumn?: string;
     protected limitClause: string;
     protected offsetClause: string;
     protected orderByClause: string;
     protected whereClause: string;
     protected withDeletedEnabled: boolean;
-    constructor(manager: ClickHouseEntityManager, schema: ClickHouseDBEntitySchema);
+    constructor(manager: ClickHouseEntityManager, schema: ClickHouseDBEntitySchema<Entity>);
     protected addDeletedToWhereClause(): string;
     addOrderBy(field: string, direction: PersistanceOrderByDirection): ClickHouseSelectQueryBuilder<Entity>;
     andWhere(query: string, params?: GenericObject<unknown>): ClickHouseSelectQueryBuilder<Entity>;

package/dist/ormQueryBuilder/clickhouse.selectQueryBuilder.js

@@ -46,20 +46,27 @@ class ClickHouseSelectQueryBuilder {
         throw new core_1.ApplicationError('Method ClickHouseSelectQueryBuilder.delete not implemented.');
     }
     getCount() {
-        const { limitClause, offsetClause, orderByClause, schema: { options: { name, tableName } } } = this;
-        return this.manager.query(`select count() from \`${tableName}\` as \`${name}\` ` +
-            `${this.addDeletedToWhereClause()} ${orderByClause} ${limitClause} ${offsetClause}`);
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const { limitClause, offsetClause, orderByClause, schema: { options: { name, tableName } } } = this;
+            const result = yield this.manager.query(`select count() from \`${tableName}\` as \`${name}\` ` +
+                `${this.addDeletedToWhereClause()} ${orderByClause} ${limitClause} ${offsetClause}`);
+            return parseInt((_a = result.data[0]) === null || _a === void 0 ? void 0 : _a['count()'], 10);
+        });
     }
     getMany() {
-        const { limitClause, offsetClause, orderByClause, schema: { options: { name, tableName } } } = this;
-        return this.manager.query(`select * from \`${tableName}\` as \`${name}\` ` +
-            `${this.addDeletedToWhereClause()} ${orderByClause} ${limitClause} ${offsetClause}`);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { limitClause, offsetClause, orderByClause, schema: { options: { name, tableName } } } = this;
+            const result = yield this.manager.query(`select * from \`${tableName}\` as \`${name}\` ` +
+                `${this.addDeletedToWhereClause()} ${orderByClause} ${limitClause} ${offsetClause}`);
+            return result.data;
+        });
     }
     getOne() {
         return __awaiter(this, void 0, void 0, function* () {
             const { orderByClause, schema: { options: { name, tableName } } } = this;
-            const result = this.manager.query(`select * from \`${tableName}\` as \`${name}\` ${this.addDeletedToWhereClause()} ${orderByClause} limit 1`);
-            return result || null;
+            const result = yield this.manager.query(`select * from \`${tableName}\` as \`${name}\` ${this.addDeletedToWhereClause()} ${orderByClause} limit 1`);
+            return result.data || null;
         });
     }
     leftJoinAndSelect(..._args) {

package/dist/ormQueryBuilder/clickhouse.selectQueryBuilder.js.map

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

package/dist/repository/clickhouse.repository.d.ts

@@ -4,7 +4,7 @@ import { ClickHouseDBEntitySchema } from './clickhouse.repository.definitions';
 import { ClickHouseEntityManager } from '../entityManager';
 import { ClickHouseSelectQueryBuilder } from '../ormQueryBuilder';
 export declare class ClickHouseDBRepository<Entity extends GenericObject<unknown>> implements RDBRepository<Entity> {
-    protected entitySchema: ClickHouseDBEntitySchema;
+    protected entitySchema: ClickHouseDBEntitySchema<Entity>;
     readonly manager: ClickHouseEntityManager;
     readonly metadata: {
         name: string;
@@ -12,7 +12,7 @@ export declare class ClickHouseDBRepository<Entity extends GenericObject<unknown
     };
     readonly primaryKeys: string[];
     readonly target: string;
-    constructor(entitySchema: ClickHouseDBEntitySchema, manager: ClickHouseEntityManager);
+    constructor(entitySchema: ClickHouseDBEntitySchema<Entity>, manager: ClickHouseEntityManager);
     createQueryBuilder(_entityName: string, _queryRunner?: unknown): ClickHouseSelectQueryBuilder<Entity>;
     save(data: Partial<Entity> | Partial<Entity[]>, _options?: unknown): Promise<unknown>;
 }

package/dist/repository/clickhouse.repository.definitions.d.ts

@@ -1,8 +1,9 @@
+import { GenericObject } from '@node-c/core';
 import { RDBEntitySchema } from '@node-c/persistance-rdb';
-export interface ClickHouseDBEntitySchema extends RDBEntitySchema {
+export interface ClickHouseDBEntitySchema<EntityClass extends GenericObject<unknown>> extends RDBEntitySchema {
     options: {
         columns: {
-            [columnName: string]: ClickHouseDBEntitySchemaColumnOptions;
+            [columnName in keyof EntityClass]: ClickHouseDBEntitySchemaColumnOptions;
         };
         name: string;
         paranoid?: boolean;
@@ -21,12 +22,14 @@ export declare enum ClickHouseDBEntitySchemaColumnType {
     BigInteger = "BIGINT",
     Boolean = "BOOL",
     DateTime = "DATETIME",
+    Enum = "ENUM",
     Integer = "INT",
+    JSON = "JSON",
     Text = "TEXT",
     UUID = "UUID",
     Varchar = "VARCHAR"
 }
-export interface ClickHouseDBRepositoryModuleOptions {
-    entitySchema: ClickHouseDBEntitySchema;
+export interface ClickHouseDBRepositoryModuleOptions<EntityClass extends GenericObject<unknown>> {
+    entitySchema: ClickHouseDBEntitySchema<EntityClass>;
     persistanceModuleName: string;
 }

package/dist/repository/clickhouse.repository.definitions.js

@@ -6,7 +6,9 @@ var ClickHouseDBEntitySchemaColumnType;
     ClickHouseDBEntitySchemaColumnType["BigInteger"] = "BIGINT";
     ClickHouseDBEntitySchemaColumnType["Boolean"] = "BOOL";
     ClickHouseDBEntitySchemaColumnType["DateTime"] = "DATETIME";
+    ClickHouseDBEntitySchemaColumnType["Enum"] = "ENUM";
     ClickHouseDBEntitySchemaColumnType["Integer"] = "INT";
+    ClickHouseDBEntitySchemaColumnType["JSON"] = "JSON";
     ClickHouseDBEntitySchemaColumnType["Text"] = "TEXT";
     ClickHouseDBEntitySchemaColumnType["UUID"] = "UUID";
     ClickHouseDBEntitySchemaColumnType["Varchar"] = "VARCHAR";

package/dist/repository/clickhouse.repository.definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse.repository.definitions.js","sourceRoot":"","sources":["../../src/repository/clickhouse.repository.definitions.ts"],"names":[],"mappings":";;;AAsBA,IAAY,kCAeX;AAfD,WAAY,kCAAkC;IAE5C,2DAAqB,CAAA;IAErB,sDAAgB,CAAA;IAEhB,2DAAqB,CAAA;IAErB,qDAAe,CAAA;IAEf,mDAAa,CAAA;IAEb,mDAAa,CAAA;IAEb,yDAAmB,CAAA;AACrB,CAAC,EAfW,kCAAkC,kDAAlC,kCAAkC,QAe7C"}
+{"version":3,"file":"clickhouse.repository.definitions.js","sourceRoot":"","sources":["../../src/repository/clickhouse.repository.definitions.ts"],"names":[],"mappings":";;;AAwBA,IAAY,kCAmBX;AAnBD,WAAY,kCAAkC;IAE5C,2DAAqB,CAAA;IAErB,sDAAgB,CAAA;IAEhB,2DAAqB,CAAA;IAErB,mDAAa,CAAA;IAEb,qDAAe,CAAA;IAEf,mDAAa,CAAA;IAEb,mDAAa,CAAA;IAEb,mDAAa,CAAA;IAEb,yDAAmB,CAAA;AACrB,CAAC,EAnBW,kCAAkC,kDAAlC,kCAAkC,QAmB7C"}

package/dist/repository/clickhouse.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse.repository.js","sourceRoot":"","sources":["../../src/repository/clickhouse.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAgE;AAGhE,6DAAmF;AAInF,oDAA2D;AAC3D,wDAAkE;AAI3D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAKjC,YAEY,YAAsC,EAGhC,OAAgC;;QAHtC,iBAAY,GAAZ,YAAY,CAA0B;QAGhC,YAAO,GAAP,OAAO,CAAyB;QAEhD,MAAM,EACJ,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EACtC,GAAG,YAAY,CAAC;QACjB,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACpC,KAAK,MAAM,UAAU,IAAI,OAAO,EAAE,CAAC;YACjC,IAAI,MAAA,OAAO,CAAC,UAAU,CAAC,0CAAE,OAAO,EAAE,CAAC;gBACjC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAGD,kBAAkB,CAAC,WAAmB,EAAE,YAAsB;QAC5D,OAAO,IAAI,8CAA4B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3E,CAAC;IAID,IAAI,CAAC,IAAyC,EAAE,QAAkB;QAEhE,MAAM,SAAS,GAAG,CAAC,IAAI,YAAY,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAa,CAAC;QAmBtE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AAvDY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,eAAM,EAAC,2BAAY,CAAC,2BAA2B,CAAC,CAAA;IAEhD,WAAA,IAAA,eAAM,EAAC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,uCAAuB,CAAC,CAAC,CAAA;6CAEzB,uCAAuB;GAVvC,sBAAsB,CAuDlC"}
+{"version":3,"file":"clickhouse.repository.js","sourceRoot":"","sources":["../../src/repository/clickhouse.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAgE;AAGhE,6DAAmF;AAInF,oDAA2D;AAC3D,wDAAkE;AAI3D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAKjC,YAEY,YAA8C,EAGxC,OAAgC;;QAHtC,iBAAY,GAAZ,YAAY,CAAkC;QAGxC,YAAO,GAAP,OAAO,CAAyB;QAEhD,MAAM,EACJ,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EACtC,GAAG,YAAY,CAAC;QACjB,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACpC,KAAK,MAAM,UAAU,IAAI,OAAO,EAAE,CAAC;YACjC,IAAI,MAAA,OAAO,CAAC,UAAU,CAAC,0CAAE,OAAO,EAAE,CAAC;gBACjC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAGD,kBAAkB,CAAC,WAAmB,EAAE,YAAsB;QAC5D,OAAO,IAAI,8CAA4B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3E,CAAC;IAID,IAAI,CAAC,IAAyC,EAAE,QAAkB;QAEhE,MAAM,SAAS,GAAG,CAAC,IAAI,YAAY,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAa,CAAC;QAmBtE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AAvDY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,eAAM,EAAC,2BAAY,CAAC,2BAA2B,CAAC,CAAA;IAEhD,WAAA,IAAA,eAAM,EAAC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,uCAAuB,CAAC,CAAC,CAAA;6CAEzB,uCAAuB;GAVvC,sBAAsB,CAuDlC"}

package/dist/repository/clickhouse.repository.module.d.ts

@@ -2,5 +2,5 @@ import { DynamicModule } from '@nestjs/common';
 import { GenericObject } from '@node-c/core';
 import { ClickHouseDBRepositoryModuleOptions } from './clickhouse.repository.definitions';
 export declare class ClickHouseDBRepositoryModule {
-    static register<Entity extends GenericObject<unknown>>(options: ClickHouseDBRepositoryModuleOptions): DynamicModule;
+    static register<Entity extends GenericObject<unknown>>(options: ClickHouseDBRepositoryModuleOptions<Entity>): DynamicModule;
 }

package/dist/repository/clickhouse.repository.module.js

@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var ClickHouseDBRepositoryModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClickHouseDBRepositoryModule = void 0;
-const nestjs_clickhouse_1 = require("@depyronick/nestjs-clickhouse");
 const common_1 = require("@nestjs/common");
 const persistance_rdb_1 = require("@node-c/persistance-rdb");
 const clickhouse_repository_1 = require("./clickhouse.repository");
@@ -20,7 +19,6 @@ let ClickHouseDBRepositoryModule = ClickHouseDBRepositoryModule_1 = class ClickH
         const clientName = `${definitions_1.Constants.CLICKHOUSE_CLIENT_PREFIX}${persistanceModuleName}`;
         return {
             module: ClickHouseDBRepositoryModule_1,
-            imports: [nestjs_clickhouse_1.ClickHouseModule],
             providers: [
                 {
                     provide: persistance_rdb_1.SQLQueryBuilderService,

package/dist/repository/clickhouse.repository.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse.repository.module.js","sourceRoot":"","sources":["../../src/repository/clickhouse.repository.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,qEAAmF;AACnF,2CAAuD;AAGvD,6DAA4F;AAE5F,mEAAiE;AAGjE,uDAAkD;AAClD,oDAA2D;AAGpD,IAAM,4BAA4B,oCAAlC,MAAM,4BAA4B;IACvC,MAAM,CAAC,QAAQ,CAAwC,OAA4C;QACjG,MAAM,EAAE,YAAY,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC;QACxD,MAAM,UAAU,GAAG,GAAG,uBAAS,CAAC,wBAAwB,GAAG,qBAAqB,EAAE,CAAC;QACnF,OAAO;YACL,MAAM,EAAE,8BAA4B;YACpC,OAAO,EAAE,CAAC,oCAAgB,CAAC;YAC3B,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,wCAAsB;oBAC/B,UAAU,EAAE,CAAC,sBAA8C,EAAE,EAAE,CAAC,sBAAsB;oBACtF,MAAM,EAAE,CAAC,GAAG,qBAAqB,GAAG,2BAAY,CAAC,gCAAgC,EAAE,CAAC;iBACrF;gBACD;oBACE,OAAO,EAAE,uBAAS,CAAC,iBAAiB;oBACpC,UAAU,EAAE,CAAC,gBAAkC,EAAE,EAAE,CAAC,gBAAgB;oBACpE,MAAM,EAAE,CAAC,UAAU,CAAC;iBACrB;gBACD;oBACE,OAAO,EAAE,2BAAY,CAAC,2BAA2B;oBACjD,QAAQ,EAAE,YAAY;iBACvB;gBACD,uCAAuB;gBACvB,CAAA,8CAA8B,CAAA;gBAC9B;oBACE,OAAO,EAAE,2BAAY,CAAC,qBAAqB;oBAC3C,WAAW,EAAE,CAAA,8CAA8B,CAAA;iBAC5C;aACF;YACD,OAAO,EAAE;gBACP,wCAAsB;gBACtB;oBACE,OAAO,EAAE,2BAAY,CAAC,qBAAqB;oBAC3C,WAAW,EAAE,CAAA,8CAA8B,CAAA;iBAC5C;gBACD;oBACE,OAAO,EAAE,uBAAS,CAAC,iBAAiB;oBACpC,UAAU,EAAE,CAAC,gBAAkC,EAAE,EAAE,CAAC,gBAAgB;oBACpE,MAAM,EAAE,CAAC,UAAU,CAAC;iBACrB;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AA3CY,oEAA4B;uCAA5B,4BAA4B;IADxC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,4BAA4B,CA2CxC"}
+{"version":3,"file":"clickhouse.repository.module.js","sourceRoot":"","sources":["../../src/repository/clickhouse.repository.module.ts"],"names":[],"mappings":";;;;;;;;;;AACA,2CAAuD;AAGvD,6DAA4F;AAE5F,mEAAiE;AAGjE,uDAAkD;AAClD,oDAA2D;AAGpD,IAAM,4BAA4B,oCAAlC,MAAM,4BAA4B;IACvC,MAAM,CAAC,QAAQ,CACb,OAAoD;QAEpD,MAAM,EAAE,YAAY,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC;QACxD,MAAM,UAAU,GAAG,GAAG,uBAAS,CAAC,wBAAwB,GAAG,qBAAqB,EAAE,CAAC;QACnF,OAAO;YACL,MAAM,EAAE,8BAA4B;YACpC,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,wCAAsB;oBAC/B,UAAU,EAAE,CAAC,sBAA8C,EAAE,EAAE,CAAC,sBAAsB;oBACtF,MAAM,EAAE,CAAC,GAAG,qBAAqB,GAAG,2BAAY,CAAC,gCAAgC,EAAE,CAAC;iBACrF;gBACD;oBACE,OAAO,EAAE,uBAAS,CAAC,iBAAiB;oBACpC,UAAU,EAAE,CAAC,gBAAkC,EAAE,EAAE,CAAC,gBAAgB;oBACpE,MAAM,EAAE,CAAC,UAAU,CAAC;iBACrB;gBACD;oBACE,OAAO,EAAE,2BAAY,CAAC,2BAA2B;oBACjD,QAAQ,EAAE,YAAY;iBACvB;gBACD,uCAAuB;gBACvB,CAAA,8CAA8B,CAAA;gBAC9B;oBACE,OAAO,EAAE,2BAAY,CAAC,qBAAqB;oBAC3C,WAAW,EAAE,CAAA,8CAA8B,CAAA;iBAC5C;aACF;YACD,OAAO,EAAE;gBACP,wCAAsB;gBACtB;oBACE,OAAO,EAAE,2BAAY,CAAC,qBAAqB;oBAC3C,WAAW,EAAE,CAAA,8CAA8B,CAAA;iBAC5C;gBACD;oBACE,OAAO,EAAE,uBAAS,CAAC,iBAAiB;oBACpC,UAAU,EAAE,CAAC,gBAAkC,EAAE,EAAE,CAAC,gBAAgB;oBACpE,MAAM,EAAE,CAAC,UAAU,CAAC;iBACrB;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AA5CY,oEAA4B;uCAA5B,4BAA4B;IADxC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,4BAA4B,CA4CxC"}

package/package.json

@@ -1,22 +1,23 @@
 {
   "name": "@node-c/persistance-clickhouse",
-  "version": "1.0.0-alpha6",
+  "version": "1.0.0-alpha61",
   "license": "MIT",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
+    "build:clean": "rm -rf dist/* && rm -f *.tsbuildinfo && npm run build",
     "check-types": "tsc -p tsconfig.build.json --noEmit",
     "dev": "tsc -p tsconfig.build.json --watch",
-    "publish-package": "rm -rf dist/* && rm -f *.tsbuildinfo && npm run build && npm publish --access public",
+    "publish-package": "npm run build:clean && npm publish --access public",
     "test": "vitest --config src/vitest.config.ts",
     "test:coverage": "vitest --config src/vitest.config.ts --coverage"
   },
   "dependencies": {
-    "@depyronick/nestjs-clickhouse": "^2.0.2",
+    "@clickhouse/client": "^1.12.1",
     "@nestjs/common": "^10.4.12",
     "@nestjs/typeorm": "^10.0.2",
-    "@node-c/core": "^1.0.0-alpha6",
-    "@node-c/persistance-rdb": "^1.0.0-alpha6",
+    "@node-c/core": "^1.0.0-alpha61",
+    "@node-c/persistance-rdb": "^1.0.0-alpha61",
     "class-validator": "^0.14.1",
     "typeorm": "^0.3.20",
     "uuid": "^11.0.5"