@amanat-qa/utils-frontend 1.0.9 → 1.1.1

package/dist/DB/baseDB.js

@@ -1,12 +1,6 @@
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
@@ -16,70 +10,36 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _classPrivateFieldLooseBase(e, t) { if (!{}.hasOwnProperty.call(e, t)) throw new TypeError("attempted to use private field on non-instance"); return e; }
-var id = 0;
-function _classPrivateFieldLooseKey(e) { return "__private_" + id++ + "_" + e; }
-var mysql = require('mysql2/promise');
-var _host = /*#__PURE__*/_classPrivateFieldLooseKey("host");
-var _user = /*#__PURE__*/_classPrivateFieldLooseKey("user");
-var _port = /*#__PURE__*/_classPrivateFieldLooseKey("port");
-var _password = /*#__PURE__*/_classPrivateFieldLooseKey("password");
-var _database = /*#__PURE__*/_classPrivateFieldLooseKey("database");
-var _connection = /*#__PURE__*/_classPrivateFieldLooseKey("connection");
+var _require = require('sequelize'),
+  Sequelize = _require.Sequelize;
+var Logger = require('../log/logger');
 var BaseDB = /*#__PURE__*/function () {
-  function BaseDB(host, user, password, database, port) {
+  function BaseDB(database) {
     _classCallCheck(this, BaseDB);
-    Object.defineProperty(this, _host, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _user, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _port, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _password, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _database, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _connection, {
-      writable: true,
-      value: void 0
+    this.sequelize = new Sequelize(database, process.env.DB_USERNAME, process.env.DB_PASSWORD, {
+      host: process.env.DB_HOST,
+      port: process.env.DB_PORT,
+      dialect: 'mysql',
+      logging: function logging(msg) {
+        return Logger.log("[sql] \u25B6 ".concat(msg));
+      }
     });
-    _classPrivateFieldLooseBase(this, _host)[_host] = host;
-    _classPrivateFieldLooseBase(this, _user)[_user] = user;
-    _classPrivateFieldLooseBase(this, _password)[_password] = password;
-    _classPrivateFieldLooseBase(this, _database)[_database] = database;
-    _classPrivateFieldLooseBase(this, _port)[_port] = port;
   }
   return _createClass(BaseDB, [{
     key: "createConnection",
     value: function () {
       var _createConnection = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-        var logs;
+        var log;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              logs = ["[inf] \u25B6 connect to ".concat(_classPrivateFieldLooseBase(this, _database)[_database], " database")];
+              log = "[inf] \u25B6 connect to ".concat(this.sequelize.getDatabaseName(), " database");
+              Logger.log(log);
               _context.n = 1;
-              return mysql.createConnection({
-                host: _classPrivateFieldLooseBase(this, _host)[_host],
-                user: _classPrivateFieldLooseBase(this, _user)[_user],
-                password: _classPrivateFieldLooseBase(this, _password)[_password],
-                database: _classPrivateFieldLooseBase(this, _database)[_database],
-                port: _classPrivateFieldLooseBase(this, _port)[_port]
-              });
+              return this.sequelize.authenticate();
             case 1:
-              _classPrivateFieldLooseBase(this, _connection)[_connection] = _context.v;
               return _context.a(2, {
-                logs: logs
+                logs: [log]
               });
           }
         }, _callee, this);
@@ -93,16 +53,17 @@ var BaseDB = /*#__PURE__*/function () {
     key: "closeConnection",
     value: function () {
       var _closeConnection = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
-        var logs;
+        var log;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              logs = ["[inf] \u25B6 close connection to ".concat(_classPrivateFieldLooseBase(this, _database)[_database], " database")];
+              log = "[inf] \u25B6 close connection to ".concat(this.sequelize.getDatabaseName(), " database");
+              Logger.log(log);
               _context2.n = 1;
-              return _classPrivateFieldLooseBase(this, _connection)[_connection].end();
+              return this.sequelize.close();
             case 1:
               return _context2.a(2, {
-                logs: logs
+                logs: [log]
               });
           }
         }, _callee2, this);
@@ -112,69 +73,6 @@ var BaseDB = /*#__PURE__*/function () {
       }
       return closeConnection;
     }()
-  }, {
-    key: "sqlQuery",
-    value: function () {
-      var _sqlQuery = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(query, values) {
-        var _yield$_classPrivateF, _yield$_classPrivateF2, rows;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
-            case 0:
-              _context3.n = 1;
-              return _classPrivateFieldLooseBase(this, _connection)[_connection].query(query, values);
-            case 1:
-              _yield$_classPrivateF = _context3.v;
-              _yield$_classPrivateF2 = _slicedToArray(_yield$_classPrivateF, 1);
-              rows = _yield$_classPrivateF2[0];
-              return _context3.a(2, rows);
-          }
-        }, _callee3, this);
-      }));
-      function sqlQuery(_x, _x2) {
-        return _sqlQuery.apply(this, arguments);
-      }
-      return sqlQuery;
-    }()
-  }, {
-    key: "sqlSelect",
-    value: function () {
-      var _sqlSelect = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(tableName) {
-        var target,
-          conditions,
-          values,
-          options,
-          logs,
-          query,
-          rows,
-          _args4 = arguments;
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
-            case 0:
-              target = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : '*';
-              conditions = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : '';
-              values = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : [];
-              options = _args4.length > 4 && _args4[4] !== undefined ? _args4[4] : {
-                hasLogger: true
-              };
-              logs = [];
-              if (options.hasLogger) logs.push("[inf] \u25B6 select ".concat(target, " from ").concat(tableName, " table"));
-              query = "SELECT ".concat(target, " FROM ").concat(tableName, " ").concat(conditions, ";");
-              _context4.n = 1;
-              return this.sqlQuery(query, values);
-            case 1:
-              rows = _context4.v;
-              return _context4.a(2, {
-                rows: rows,
-                logs: logs
-              });
-          }
-        }, _callee4, this);
-      }));
-      function sqlSelect(_x3) {
-        return _sqlSelect.apply(this, arguments);
-      }
-      return sqlSelect;
-    }()
   }]);
 }();
 module.exports = BaseDB;

package/dist/DB/baseModel.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _require = require('sequelize'),
+  DataTypes = _require.DataTypes;
+module.exports = {
+  attributes: {
+    id: {
+      type: DataTypes.BIGINT.UNSIGNED,
+      primaryKey: true,
+      autoIncrement: true
+    }
+  },
+  getOptions: function getOptions() {
+    var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      tableName = _ref.tableName,
+      _ref$withSoftDelete = _ref.withSoftDelete,
+      withSoftDelete = _ref$withSoftDelete === void 0 ? false : _ref$withSoftDelete;
+    var options = {
+      timestamps: true,
+      underscored: true,
+      createdAt: 'created_at',
+      updatedAt: 'updated_at',
+      tableName: tableName
+    };
+    if (withSoftDelete) {
+      options.paranoid = true;
+      options.deletedAt = 'deleted_at';
+    }
+    return options;
+  }
+};

package/dist/index.js

@@ -4,6 +4,7 @@
 
 exports.BaseAPI = require('./API/baseAPI');
 exports.BaseDB = require('./DB/baseDB');
+exports.baseModel = require('./DB/baseModel');
 exports.JSONLoader = require('./data/JSONLoader');
 exports.DataUtils = require('./data/dataUtils');
 exports.filesParser = require('./data/filesParser');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amanat-qa/utils-frontend",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "publishConfig": {
     "access": "public"
   },
@@ -12,17 +12,18 @@
   "license": "MIT",
   "main": "./dist/index.js",
   "exports": {
-    ".": "./dist/index.js",
-    "./baseAPI": "./dist/API/baseAPI.js",
-    "./baseDB": "./dist/DB/baseDB.js",
-    "./JSONLoader": "./dist/data/JSONLoader.js",
-    "./dataUtils": "./dist/data/dataUtils.js",
-    "./filesParser": "./dist/data/filesParser.js",
-    "./gitlabCIGenerator": "./dist/data/gitlabCIGenerator.js",
-    "./logger": "./dist/log/logger.js",
-    "./randomizer": "./dist/random/randomizer.js",
-    "./strUtils": "./dist/str/strUtils.js",
-    "./timeUtils": "./dist/time/timeUtils.js"
+    ".": "./src/index.js",
+    "./baseAPI": "./src/API/baseAPI.js",
+    "./baseDB": "./src/DB/baseDB.js",
+    "./baseModel": "./src/DB/baseModel.js",
+    "./JSONLoader": "./src/data/JSONLoader.js",
+    "./dataUtils": "./src/data/dataUtils.js",
+    "./filesParser": "./src/data/filesParser.js",
+    "./gitlabCIGenerator": "./src/data/gitlabCIGenerator.js",
+    "./logger": "./src/log/logger.js",
+    "./randomizer": "./src/random/randomizer.js",
+    "./strUtils": "./src/str/strUtils.js",
+    "./timeUtils": "./src/time/timeUtils.js"
   },
   "scripts": {
     "build": "babel src --out-dir dist --extensions .js",
@@ -34,7 +35,8 @@
     "js-yaml": "*",
     "moment": "*",
     "mysql2": "*",
-    "xml2js": "*"
+    "xml2js": "*",
+    "sequelize": "*"
   },
   "devDependencies": {
     "@babel/cli": "^7.28.3",