@klapeks/micro-db-utils 0.0.12 → 0.0.13

package/dist/connections/cloud/s3.js

@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.S3Connection = void 0;
 var utils_1 = require("@klapeks/utils");
-var quiet_require_1 = require("../quiet.require");
+var quiet_require_1 = require("../../utils/quiet.require");
 var s3ClientModule = (0, quiet_require_1.quietRequire)('@aws-sdk/client-s3');
 var s3PresignerModule = (0, quiet_require_1.quietRequire)('@aws-sdk/s3-request-presigner');
 var logger = new utils_1.Logger("S3/R2");

package/dist/connections/index.d.ts

@@ -1,4 +1,3 @@
-export * from './mysql.connection';
 export * from './nosql/redis';
 export * from './nosql/mongo';
 export * from './kafka';

package/dist/connections/index.js

@@ -1,4 +1,6 @@
 "use strict";
+// RDBMS
+// export * from './mysql.connection';
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -14,8 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// RDBMS
-__exportStar(require("./mysql.connection"), exports);
 // NoSQL
 __exportStar(require("./nosql/redis"), exports);
 __exportStar(require("./nosql/mongo"), exports);

package/dist/connections/kafka/kafka.js

@@ -40,7 +40,7 @@ exports.KafkaConnection = exports.instances = void 0;
 var utils_1 = require("@klapeks/utils");
 var kafka_producer_1 = require("./kafka.producer");
 var kafka_consumer_1 = require("./kafka.consumer");
-var quiet_require_1 = require("../quiet.require");
+var quiet_require_1 = require("../../utils/quiet.require");
 var kafkajsModule = (0, quiet_require_1.quietRequire)('kafkajs');
 var logger = new utils_1.Logger("Kafka");
 exports.instances = {

package/dist/connections/nosql/mongo.js

@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoGeoPoint = exports.MongoDBConnection = exports.cursorOffsetAggregation = exports.flattenForUpdate = void 0;
 var utils_1 = require("@klapeks/utils");
-var quiet_require_1 = require("../quiet.require");
+var quiet_require_1 = require("../../utils/quiet.require");
 var mongooseModule = (0, quiet_require_1.quietRequire)('mongoose');
 function flattenForUpdate(object, prefix) {
     if (prefix === void 0) { prefix = ''; }

package/dist/connections/nosql/redis.js

@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisConnection = void 0;
 var utils_1 = require("@klapeks/utils");
-var quiet_require_1 = require("../quiet.require");
+var quiet_require_1 = require("../../utils/quiet.require");
 var redisModule = (0, quiet_require_1.quietRequire)('redis');
 var logger = new utils_1.Logger("Redis");
 var RedisConnection = /** @class */ (function () {

package/dist/index.d.ts

@@ -1,4 +1,6 @@
+export * from './utils';
+export * from './micro.sql';
+export * from './sql';
 export * from './connections';
 export * from './migrations';
 export * from './selectors';
-export * from './utils';

package/dist/index.js

@@ -14,7 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./utils"), exports);
+__exportStar(require("./micro.sql"), exports);
+__exportStar(require("./sql"), exports);
 __exportStar(require("./connections"), exports);
 __exportStar(require("./migrations"), exports);
 __exportStar(require("./selectors"), exports);
-__exportStar(require("./utils"), exports);

package/dist/micro.sql.d.ts

@@ -0,0 +1,11 @@
+import { DatabaseOptions } from "@klapeks/utils";
+import { ISQLCommandAdapter, SQLAlterCommand, SQLCommandData, SQLEditDataCommands, SQLSelectCommands, SQLTablesCommands, SQLTimeCommandsExpressions } from "./sql";
+import { DataSource, DataSourceOptions } from "typeorm";
+export declare namespace MicroSQL {
+    function dataSourceQuery<T = any>(dataSource: DataSource, cb: ISQLCommandAdapter | SQLCommandData | string | ((dbtype: DatabaseOptions['type'], database: string) => ISQLCommandAdapter | SQLCommandData | string | Promise<ISQLCommandAdapter | SQLCommandData | string>)): Promise<T[]>;
+    function alter(table: string): SQLAlterCommand;
+    function select(table: string): SQLSelectCommands;
+    function editData(table: string): SQLEditDataCommands;
+    function tables(): typeof SQLTablesCommands;
+    function timeExpressions(dbtype: DatabaseOptions['type'] | DataSourceOptions['type']): SQLTimeCommandsExpressions;
+}

package/dist/micro.sql.js

@@ -0,0 +1,87 @@
+"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());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MicroSQL = void 0;
+var sql_1 = require("./sql");
+var MicroSQL;
+(function (MicroSQL) {
+    function dataSourceQuery(dataSource, cb) {
+        return __awaiter(this, void 0, void 0, function () {
+            var dbType, query, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        dbType = dataSource.options.type;
+                        if (!(typeof cb == 'function')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, cb(dbType, dataSource.options.database)];
+                    case 1:
+                        _a = _b.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        _a = cb;
+                        _b.label = 3;
+                    case 3:
+                        query = (_a);
+                        query = (0, sql_1.toRawSQL)(dbType, query);
+                        return [2 /*return*/, dataSource.query(query.query, query.params)];
+                }
+            });
+        });
+    }
+    MicroSQL.dataSourceQuery = dataSourceQuery;
+    function alter(table) {
+        return new sql_1.SQLAlterCommand(table);
+    }
+    MicroSQL.alter = alter;
+    function select(table) {
+        return new sql_1.SQLSelectCommands(table);
+    }
+    MicroSQL.select = select;
+    function editData(table) {
+        return new sql_1.SQLEditDataCommands(table);
+    }
+    MicroSQL.editData = editData;
+    function tables() {
+        return sql_1.SQLTablesCommands;
+    }
+    MicroSQL.tables = tables;
+    function timeExpressions(dbtype) {
+        return new sql_1.SQLTimeCommandsExpressions(dbtype);
+    }
+    MicroSQL.timeExpressions = timeExpressions;
+})(MicroSQL = exports.MicroSQL || (exports.MicroSQL = {}));

package/dist/migrations/index.d.ts

@@ -1 +1,2 @@
 export * from './mysql.migrations';
+export * from './super.migrations';

package/dist/migrations/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./mysql.migrations"), exports);
+__exportStar(require("./super.migrations"), exports);

package/dist/migrations/mysql.migrations.d.ts

@@ -1,7 +1,5 @@
 import { DataSource, EntitySchema } from "typeorm";
 export declare class MySQLMigrations {
-    static get migrationTableName(): string;
     static addMigration(entity: EntitySchema, date: Date, sql: string | string[]): void;
-    private static checkIsCreatesTable;
     static runMigrations(dataSource: DataSource): Promise<void>;
 }

package/dist/migrations/mysql.migrations.js

@@ -35,216 +35,21 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySQLMigrations = void 0;
-var typeorm_1 = require("typeorm");
-var mysql_connection_1 = require("../connections/mysql.connection");
-var utils_1 = require("@klapeks/utils");
-var iso_date_time_1 = require("../utils/iso.date.time");
-// for mysql
-// export type 
-var _migrations = [];
-var logger = new utils_1.Logger("MySQL Migrations");
+var super_migrations_1 = require("./super.migrations");
 var MySQLMigrations = /** @class */ (function () {
     function MySQLMigrations() {
     }
-    Object.defineProperty(MySQLMigrations, "migrationTableName", {
-        get: function () {
-            return process.env.DB_UTILS_MIGRATION_TABLE_NAME || "_kldb_mini_migrations";
-        },
-        enumerable: false,
-        configurable: true
-    });
     MySQLMigrations.addMigration = function (entity, date, sql) {
-        _migrations.push({
-            table: entity.options.tableName || entity.options.name,
-            date: date,
-            sql: sql
-        });
-    };
-    MySQLMigrations.checkIsCreatesTable = function (migrations) {
-        if (!migrations)
-            return false;
-        if (Array.isArray(migrations))
-            return this.checkIsCreatesTable(migrations[0]);
-        return migrations.trim().toLowerCase().startsWith('create table');
+        super_migrations_1.SuperMigrations.addRawMigration('mysql', entity, date, sql);
     };
     MySQLMigrations.runMigrations = function (dataSource) {
-        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var options_1, mysqlInstance_1, getTable_1, hasMigrationTable, migrationRecords_1, runnedMigrationsAmount_1, runTableMigration, tablesToMigrate, _i, tablesToMigrate_1, table, err_1;
-            var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 11, , 12]);
-                        options_1 = (0, utils_1.dataSourceOptions)();
-                        if (options_1.type != 'mysql')
-                            return [2 /*return*/];
-                        mysqlInstance_1 = new mysql_connection_1.RawMySQLConnection(options_1);
-                        return [4 /*yield*/, mysqlInstance_1.takePool()];
-                    case 1:
-                        _b.sent();
-                        getTable_1 = function (table) { return __awaiter(_this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                return [2 /*return*/, mysqlInstance_1.runSQL_One("\n                    SELECT * FROM information_schema.tables\n                    WHERE table_schema = '".concat(options_1.database, "' \n                        AND table_name = '").concat(table, "'\n                    LIMIT 1;\n                "))];
-                            });
-                        }); };
-                        return [4 /*yield*/, getTable_1(this.migrationTableName)];
-                    case 2:
-                        hasMigrationTable = _b.sent();
-                        if (!!hasMigrationTable) return [3 /*break*/, 4];
-                        logger.log("Creating migration table..");
-                        return [4 /*yield*/, mysqlInstance_1.runSQL("\n                    CREATE TABLE ".concat(this.migrationTableName, " (\n                        `table` VARCHAR(255) NOT NULL PRIMARY KEY,\n                        `lastMigrationTime` VARCHAR(128) NOT NULL\n                    )\n                "))];
-                    case 3:
-                        _b.sent();
-                        _b.label = 4;
-                    case 4: return [4 /*yield*/, mysqlInstance_1.runSQL("SELECT * FROM ".concat(this.migrationTableName))];
-                    case 5:
-                        migrationRecords_1 = _b.sent();
-                        runnedMigrationsAmount_1 = 0;
-                        runTableMigration = function (table) { return __awaiter(_this, void 0, void 0, function () {
-                            var todoMigrations, isTableExistsInfo, lastMigrationDate, lastRealMigration, _local_runSQL, _i, todoMigrations_1, migration, migrationName, sqls, _a, sqls_1, sql, sql;
-                            var _this = this;
-                            var _b, _c, _d;
-                            return __generator(this, function (_e) {
-                                switch (_e.label) {
-                                    case 0:
-                                        todoMigrations = _migrations.sort(function (c1, c2) { return c1.date.getTime() - c2.date.getTime(); });
-                                        todoMigrations = __spreadArray([], todoMigrations, true).filter(function (m) { return m.table == table; });
-                                        return [4 /*yield*/, getTable_1(table)];
-                                    case 1:
-                                        isTableExistsInfo = _e.sent();
-                                        if (!(!isTableExistsInfo && !this.checkIsCreatesTable((_b = todoMigrations === null || todoMigrations === void 0 ? void 0 : todoMigrations[0]) === null || _b === void 0 ? void 0 : _b.sql))) return [3 /*break*/, 4];
-                                        logger.log("Table ".concat(table, " not found. Migrations ").concat(todoMigrations === null || todoMigrations === void 0 ? void 0 : todoMigrations.length, " will be skipped"));
-                                        lastMigrationDate = todoMigrations.length ? (_c = todoMigrations === null || todoMigrations === void 0 ? void 0 : todoMigrations[todoMigrations.length - 1]) === null || _c === void 0 ? void 0 : _c.date : undefined;
-                                        if (!((todoMigrations === null || todoMigrations === void 0 ? void 0 : todoMigrations.length) && lastMigrationDate)) return [3 /*break*/, 3];
-                                        return [4 /*yield*/, mysqlInstance_1.runSQL("\n                            INSERT INTO `".concat(this.migrationTableName, "` (`table`, `lastMigrationTime`)\n                            VALUES ('").concat(table, "', '").concat((0, iso_date_time_1.toISODate)(lastMigrationDate), "')\n                            ON DUPLICATE KEY UPDATE `lastMigrationTime` = '").concat((0, iso_date_time_1.toISODate)(lastMigrationDate), "'\n                        "))];
-                                    case 2:
-                                        _e.sent();
-                                        _e.label = 3;
-                                    case 3: return [2 /*return*/];
-                                    case 4:
-                                        lastRealMigration = (_d = migrationRecords_1 === null || migrationRecords_1 === void 0 ? void 0 : migrationRecords_1.find(function (r) { return r.table == table; })) === null || _d === void 0 ? void 0 : _d.lastMigrationTime;
-                                        _local_runSQL = function (sql) { return __awaiter(_this, void 0, void 0, function () {
-                                            return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0:
-                                                        if (!sql.toLowerCase().startsWith("alter table")) return [3 /*break*/, 2];
-                                                        // log error if error
-                                                        return [4 /*yield*/, mysqlInstance_1.runSQL(sql).catch(function (err) {
-                                                                logger.error("Error while alter table:", err);
-                                                            })];
-                                                    case 1:
-                                                        // log error if error
-                                                        _a.sent();
-                                                        return [3 /*break*/, 4];
-                                                    case 2: 
-                                                    // throw error if error
-                                                    return [4 /*yield*/, mysqlInstance_1.runSQL(sql)];
-                                                    case 3:
-                                                        // throw error if error
-                                                        _a.sent();
-                                                        _a.label = 4;
-                                                    case 4: return [2 /*return*/];
-                                                }
-                                            });
-                                        }); };
-                                        _i = 0, todoMigrations_1 = todoMigrations;
-                                        _e.label = 5;
-                                    case 5:
-                                        if (!(_i < todoMigrations_1.length)) return [3 /*break*/, 16];
-                                        migration = todoMigrations_1[_i];
-                                        if (migration.table != table)
-                                            return [3 /*break*/, 15];
-                                        if (lastRealMigration && new Date(lastRealMigration).getTime() >= migration.date.getTime()) {
-                                            return [3 /*break*/, 15];
-                                        }
-                                        runnedMigrationsAmount_1 += 1;
-                                        migrationName = '"' + table + ' ' + (0, iso_date_time_1.toISODate)(migration.date) + '"';
-                                        if (!Array.isArray(migration.sql)) return [3 /*break*/, 10];
-                                        sqls = migration.sql.filter(Boolean).map(function (sql) {
-                                            return utils_1.utils.replaceAll(sql.trim(), "%{table_name}", table);
-                                        });
-                                        logger.log(runnedMigrationsAmount_1, "| Migrations will be runned:", migrationName, '|\n' + utils_1.terminalColors.cyan, sqls);
-                                        _a = 0, sqls_1 = sqls;
-                                        _e.label = 6;
-                                    case 6:
-                                        if (!(_a < sqls_1.length)) return [3 /*break*/, 9];
-                                        sql = sqls_1[_a];
-                                        return [4 /*yield*/, _local_runSQL(sql)];
-                                    case 7:
-                                        _e.sent();
-                                        _e.label = 8;
-                                    case 8:
-                                        _a++;
-                                        return [3 /*break*/, 6];
-                                    case 9: return [3 /*break*/, 12];
-                                    case 10:
-                                        sql = utils_1.utils.replaceAll(migration.sql, "%{table_name}", table);
-                                        logger.log(runnedMigrationsAmount_1, "| Migration will be runned:", migrationName, '|\n' + utils_1.terminalColors.cyan, sql.trim());
-                                        return [4 /*yield*/, _local_runSQL(sql)];
-                                    case 11:
-                                        _e.sent();
-                                        _e.label = 12;
-                                    case 12: return [4 /*yield*/, mysqlInstance_1.runSQL("\n                        INSERT INTO `".concat(this.migrationTableName, "` (`table`, `lastMigrationTime`)\n                        VALUES ('").concat(table, "', '").concat((0, iso_date_time_1.toISODate)(migration.date), "')\n                        ON DUPLICATE KEY UPDATE `lastMigrationTime` = '").concat((0, iso_date_time_1.toISODate)(migration.date), "'\n                    "))];
-                                    case 13:
-                                        _e.sent();
-                                        logger.log(runnedMigrationsAmount_1, "| Migration", migrationName, "successfully done");
-                                        return [4 /*yield*/, utils_1.utils.sleep(100)];
-                                    case 14:
-                                        _e.sent();
-                                        _e.label = 15;
-                                    case 15:
-                                        _i++;
-                                        return [3 /*break*/, 5];
-                                    case 16: return [2 /*return*/];
-                                }
-                            });
-                        }); };
-                        tablesToMigrate = Object.values(dataSource.options.entities || []).map(function (m) {
-                            if (m instanceof typeorm_1.EntitySchema)
-                                return m.options.name;
-                            return undefined;
-                        }).filter(Boolean);
-                        _i = 0, tablesToMigrate_1 = tablesToMigrate;
-                        _b.label = 6;
-                    case 6:
-                        if (!(_i < tablesToMigrate_1.length)) return [3 /*break*/, 9];
-                        table = tablesToMigrate_1[_i];
-                        return [4 /*yield*/, runTableMigration(table)];
-                    case 7:
-                        _b.sent();
-                        _b.label = 8;
-                    case 8:
-                        _i++;
-                        return [3 /*break*/, 6];
-                    case 9:
-                        if (runnedMigrationsAmount_1) {
-                            logger.log("All migrations completed:", runnedMigrationsAmount_1);
-                        }
-                        return [4 /*yield*/, mysqlInstance_1.destroyConnection().catch(function (err) {
-                                logger.error("Error while closing pool:", err);
-                            })];
-                    case 10:
-                        _b.sent();
-                        return [3 /*break*/, 12];
-                    case 11:
-                        err_1 = _b.sent();
-                        if ((_a = err_1 === null || err_1 === void 0 ? void 0 : err_1.sqlMessage) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes("unknown database"))
-                            return [2 /*return*/];
-                        // logger.error("err of musql:", err.sqlMessage);
-                        throw err_1;
-                    case 12: return [2 /*return*/];
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, super_migrations_1.SuperMigrations.runMigrations(dataSource)];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });

package/dist/migrations/super.migrations.d.ts

@@ -0,0 +1,13 @@
+import { DataSource, EntitySchema } from "typeorm";
+import { ISQLCommandAdapter, SQLCommandData } from "../sql";
+import { DatabaseOptions } from "@klapeks/utils";
+type SuperMigrationsSQLParam = string | ISQLCommandAdapter | SQLCommandData | (string | ISQLCommandAdapter | SQLCommandData)[];
+export declare class SuperMigrations {
+    private static _migrations;
+    static get migrationTableName(): string;
+    static addRawMigration(dbtype: DatabaseOptions['type'] | 'all', entity: EntitySchema, date: Date | string, sql: SuperMigrationsSQLParam): void;
+    static addMigration(entity: EntitySchema, date: Date | string, sql: ISQLCommandAdapter | ISQLCommandAdapter[]): void;
+    private static runMigrationForTable;
+    static runMigrations(dataSource: DataSource): Promise<void>;
+}
+export {};