@joktec/mysql 0.0.84 → 0.0.85

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -14,7 +14,7 @@ const core_1 = require("@joktec/core");
14
14
  const lodash_1 = require("lodash");
15
15
  class MysqlSlaveConfig {
16
16
  constructor(props) {
17
- Object.assign(this, Object.assign({}, props));
17
+ Object.assign(this, { ...props });
18
18
  }
19
19
  }
20
20
  exports.MysqlSlaveConfig = MysqlSlaveConfig;
@@ -56,12 +56,18 @@ var Dialect;
56
56
  })(Dialect || (exports.Dialect = Dialect = {}));
57
57
  class MysqlConfig extends core_1.ClientConfig {
58
58
  constructor(props) {
59
- var _a;
60
59
  super(props);
61
- Object.assign(this, Object.assign(Object.assign({}, props), { dialect: (props === null || props === void 0 ? void 0 : props.dialect) || Dialect.MYSQL, host: (props === null || props === void 0 ? void 0 : props.host) || 'localhost', port: (0, core_1.toInt)(props === null || props === void 0 ? void 0 : props.port, 3306), connectTimeout: (0, core_1.toInt)(props === null || props === void 0 ? void 0 : props.connectTimeout, 20000), slaves: [] }));
62
- if ((_a = props === null || props === void 0 ? void 0 : props.slaves) === null || _a === void 0 ? void 0 : _a.length) {
60
+ Object.assign(this, {
61
+ ...props,
62
+ dialect: props?.dialect || Dialect.MYSQL,
63
+ host: props?.host || 'localhost',
64
+ port: (0, core_1.toInt)(props?.port, 3306),
65
+ connectTimeout: (0, core_1.toInt)(props?.connectTimeout, 20000),
66
+ slaves: [],
67
+ });
68
+ if (props?.slaves?.length) {
63
69
  const masterConfig = (0, lodash_1.pick)(props, ['host', 'port', 'username', 'password', 'database']);
64
- this.slaves = props.slaves.map(slave => new MysqlSlaveConfig(Object.assign(Object.assign({}, masterConfig), slave)));
70
+ this.slaves = props.slaves.map(slave => new MysqlSlaveConfig({ ...masterConfig, ...slave }));
65
71
  }
66
72
  }
67
73
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.config.js","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mysql.config.js","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA8G;AAC9G,mCAA8B;AAI9B,MAAa,gBAAgB;IAqB3B,YAAY,KAAuB;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;IACpC,CAAC;CACF;AAxBD,4CAwBC;AArBC;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;8CACA;AAIb;IAFC,IAAA,YAAK,GAAE;IACP,IAAA,iBAAU,GAAE;;8CACA;AAIb;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;kDACI;AAIjB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;kDACI;AAIjB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;kDACI;AAOnB,IAAY,OASX;AATD,WAAY,OAAO;IACjB,0BAAe,CAAA;IACf,gCAAqB,CAAA;IACrB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,0BAAe,CAAA;IACf,sBAAW,CAAA;IACX,kCAAuB,CAAA;IACvB,4BAAiB,CAAA;AACnB,CAAC,EATW,OAAO,uBAAP,OAAO,QASlB;AAED,MAAa,WAAY,SAAQ,mBAAY;IA0C3C,YAAY,KAAkB;QAC5B,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,GAAG,KAAK;YACR,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,OAAO,CAAC,KAAK;YACxC,IAAI,EAAE,KAAK,EAAE,IAAI,IAAI,WAAW;YAChC,IAAI,EAAE,IAAA,YAAK,EAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC;YAC9B,cAAc,EAAE,IAAA,YAAK,EAAC,KAAK,EAAE,cAAc,EAAE,KAAK,CAAC;YACnD,MAAM,EAAE,EAAE;SACX,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE;YACzB,MAAM,YAAY,GAAG,IAAA,aAAI,EAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;YACvF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,gBAAgB,CAAC,EAAE,GAAG,YAAY,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;SAC9F;IACH,CAAC;CACF;AA1DD,kCA0DC;AAvDC;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;4CACI;AAIjB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;yCACA;AAIb;IAFC,IAAA,YAAK,GAAE;IACP,IAAA,iBAAU,GAAE;;yCACA;AAIb;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;6CACI;AAIjB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;6CACI;AAIjB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;6CACI;AAIjB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;4CACI;AAIjB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;6CACK;AAIlB;IAFC,IAAA,YAAK,GAAE;IACP,IAAA,iBAAU,GAAE;;mDACW;AAKxB;IAHC,IAAA,cAAO,GAAE;IACT,IAAA,cAAO,EAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3C,IAAA,iBAAU,GAAE;;2CACe"}
@@ -60,7 +60,7 @@ class MysqlRepo {
60
60
  if (!existModel)
61
61
  return null;
62
62
  const options = (0, mysql_utils_1.preHandleQuery)({ condition });
63
- options.force = (0, core_1.toBool)(opts === null || opts === void 0 ? void 0 : opts.force, false);
63
+ options.force = (0, core_1.toBool)(opts?.force, false);
64
64
  await this.model.destroy(options);
65
65
  return existModel;
66
66
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.repo.js","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mysql.repo.js","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.service.d.ts","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAqC,MAAM,cAAc,CAAC;AAExF,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,qBACa,YAAa,SAAQ,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAE,YAAW,WAAW;;cAMpF,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC;IAoBvD,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,QAAQ,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,GAAE,MAAuB,GAAG,SAAS,CAAC,CAAC,CAAC;IAOzF,YAAY,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAC1C,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EACnB,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;CAOzB"}
1
+ {"version":3,"file":"mysql.service.d.ts","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAqC,MAAM,cAAc,CAAC;AAExF,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,qBACa,YAAa,SAAQ,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAE,YAAW,WAAW;;cAMpF,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC;IAmBvD,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,QAAQ,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,GAAE,MAAuB,GAAG,SAAS,CAAC,CAAC,CAAC;IAOzF,YAAY,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAC1C,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EACnB,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;CAOzB"}
@@ -20,15 +20,18 @@ let MysqlService = exports.MysqlService = class MysqlService extends core_1.Abst
20
20
  super('mysql', mysql_config_1.MysqlConfig);
21
21
  }
22
22
  async init(config) {
23
- var _a;
24
- this.logService.info('MysqlConfig: %j', config);
25
23
  const connection = (0, lodash_1.pick)(config, ['host', 'port', 'username', 'password', 'database']);
26
- const options = Object.assign(Object.assign({}, connection), { dialect: config.dialect, dialectOptions: { charset: config.charset, connectTimeout: config.connectTimeout }, logging: (sql, timing) => {
24
+ const options = {
25
+ ...connection,
26
+ dialect: config.dialect,
27
+ dialectOptions: { charset: config.charset, connectTimeout: config.connectTimeout },
28
+ logging: (sql, timing) => {
27
29
  this.logService.debug('SQL statement: %s', sql);
28
30
  this.logService.trace('SQL execute in %j', timing);
29
- } });
30
- if ((_a = config.slaves) === null || _a === void 0 ? void 0 : _a.length) {
31
- options.replication = { write: Object.assign({}, connection), read: config.slaves };
31
+ },
32
+ };
33
+ if (config.slaves?.length) {
34
+ options.replication = { write: { ...connection }, read: config.slaves };
32
35
  }
33
36
  const sequelize = new sequelize_typescript_1.Sequelize(options);
34
37
  this.logService.info('MySQL Service is configured in `%s` connection', config.conId);
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.service.js","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mysql.service.js","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"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"}
@@ -16,7 +16,10 @@ const preHandleQuery = (query) => {
16
16
  const entries = Object.entries(value);
17
17
  for (const [op, val] of entries) {
18
18
  const sqlOp = (0, exports.convertOp)(op);
19
- where[key] = Object.assign(Object.assign({}, where[key]), { [sqlOp]: sqlOp === sequelize_1.Op.like || sqlOp === sequelize_1.Op.notLike ? `%${val}%` : val });
19
+ where[key] = {
20
+ ...where[key],
21
+ [sqlOp]: sqlOp === sequelize_1.Op.like || sqlOp === sequelize_1.Op.notLike ? `%${val}%` : val,
22
+ };
20
23
  }
21
24
  }
22
25
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.utils.js","sourceRoot":"","sources":["../src/mysql.utils.ts"],"names":[],"mappings":";;;AACA,yCAAqD;AAI9C,MAAM,cAAc,GAAG,CAAqB,KAAuB,EAAe,EAAE;IACzF,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1C,MAAM,KAAK,GAAiC,EAAE,CAAC;IAE/C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACpD,IAAI,GAAG,KAAK,MAAM,EAAE;YAClB,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,GAAI,KAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,sBAAc,EAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACvF;aAAM,IAAI,GAAG,KAAK,KAAK,EAAE;YACxB,KAAK,CAAC,cAAE,CAAC,EAAE,CAAC,GAAI,KAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,sBAAc,EAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACtF;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAA8B,CAAC;YACnE,KAAK,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,OAAO,EAAE;gBAC/B,MAAM,KAAK,GAAG,IAAA,iBAAS,EAAC,EAAE,CAAC,CAAC;gBAC5B,KAAK,CAAC,GAAG,CAAC,mCACL,KAAK,CAAC,GAAG,CAAC,KACb,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,cAAE,CAAC,IAAI,IAAI,KAAK,KAAK,cAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GACtE,CAAC;aACH;SACF;aAAM;YACL,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACpB;KACF;IAGD,IAAI,OAAO,EAAE;QACX,IAAI,CAAC,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC;YAAE,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QACvC,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,mBAAO,EAAC,wBAAwB,OAAO,oBAAoB,CAAC,CAAC,CAAC;KAClF;IAED,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC,CAAC;AA9BW,QAAA,cAAc,kBA8BzB;AAEK,MAAM,SAAS,GAAG,CAAC,EAAc,EAAU,EAAE;IAClD,MAAM,OAAO,GAA+B;QAC1C,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,IAAI,EAAE,cAAE,CAAC,GAAG;QACZ,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,IAAI,EAAE,cAAE,CAAC,GAAG;QACZ,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,IAAI,EAAE,cAAE,CAAC,KAAK;QACd,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,KAAK,EAAE,cAAE,CAAC,IAAI;QACd,OAAO,EAAE,cAAE,CAAC,OAAO;KACpB,CAAC;IACF,OAAO,OAAO,CAAC,EAAE,CAAC,IAAI,cAAE,CAAC,EAAE,CAAC;AAC9B,CAAC,CAAC;AAdW,QAAA,SAAS,aAcpB"}
1
+ {"version":3,"file":"mysql.utils.js","sourceRoot":"","sources":["../src/mysql.utils.ts"],"names":[],"mappings":";;;AACA,yCAAqD;AAI9C,MAAM,cAAc,GAAG,CAAqB,KAAuB,EAAe,EAAE;IACzF,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1C,MAAM,KAAK,GAAiC,EAAE,CAAC;IAE/C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACpD,IAAI,GAAG,KAAK,MAAM,EAAE;YAClB,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,GAAI,KAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,sBAAc,EAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACvF;aAAM,IAAI,GAAG,KAAK,KAAK,EAAE;YACxB,KAAK,CAAC,cAAE,CAAC,EAAE,CAAC,GAAI,KAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,sBAAc,EAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACtF;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAA8B,CAAC;YACnE,KAAK,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,OAAO,EAAE;gBAC/B,MAAM,KAAK,GAAG,IAAA,iBAAS,EAAC,EAAE,CAAC,CAAC;gBAC5B,KAAK,CAAC,GAAG,CAAC,GAAG;oBACX,GAAG,KAAK,CAAC,GAAG,CAAC;oBACb,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,cAAE,CAAC,IAAI,IAAI,KAAK,KAAK,cAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG;iBACtE,CAAC;aACH;SACF;aAAM;YACL,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACpB;KACF;IAGD,IAAI,OAAO,EAAE;QACX,IAAI,CAAC,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC;YAAE,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QACvC,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,mBAAO,EAAC,wBAAwB,OAAO,oBAAoB,CAAC,CAAC,CAAC;KAClF;IAED,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC,CAAC;AA9BW,QAAA,cAAc,kBA8BzB;AAEK,MAAM,SAAS,GAAG,CAAC,EAAc,EAAU,EAAE;IAClD,MAAM,OAAO,GAA+B;QAC1C,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,IAAI,EAAE,cAAE,CAAC,GAAG;QACZ,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,IAAI,EAAE,cAAE,CAAC,GAAG;QACZ,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,IAAI,EAAE,cAAE,CAAC,KAAK;QACd,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,KAAK,EAAE,cAAE,CAAC,IAAI;QACd,OAAO,EAAE,cAAE,CAAC,OAAO;KACpB,CAAC;IACF,OAAO,OAAO,CAAC,EAAE,CAAC,IAAI,cAAE,CAAC,EAAE,CAAC;AAC9B,CAAC,CAAC;AAdW,QAAA,SAAS,aAcpB"}