@joktec/mysql 0.0.96 → 0.0.97
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.
- package/dist/helpers/mysql.helper.js +4 -4
- package/dist/helpers/mysql.helper.js.map +1 -1
- package/dist/mysql.client.d.ts +2 -2
- package/dist/mysql.client.d.ts.map +1 -1
- package/dist/mysql.config.d.ts +4 -5
- package/dist/mysql.config.d.ts.map +1 -1
- package/dist/mysql.config.js +7 -9
- package/dist/mysql.config.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -7
|
@@ -7,7 +7,7 @@ const sequelize_1 = require("sequelize");
|
|
|
7
7
|
const mysql_exception_1 = require("../mysql.exception");
|
|
8
8
|
class MysqlHelper {
|
|
9
9
|
static parseFilter(query) {
|
|
10
|
-
const { condition = {}, keyword
|
|
10
|
+
const { condition = {}, keyword } = query;
|
|
11
11
|
const where = {};
|
|
12
12
|
for (const [key, value] of Object.entries(condition)) {
|
|
13
13
|
if (key === '$and') {
|
|
@@ -26,10 +26,10 @@ class MysqlHelper {
|
|
|
26
26
|
where[key] = value;
|
|
27
27
|
continue;
|
|
28
28
|
}
|
|
29
|
-
const
|
|
30
|
-
if (!
|
|
29
|
+
const keyOrSymbol = key.startsWith('$') ? this.opMapping[key] : key;
|
|
30
|
+
if (!keyOrSymbol)
|
|
31
31
|
throw new mysql_exception_1.MysqlException(`Operator not support`, { key, condition });
|
|
32
|
-
where[
|
|
32
|
+
where[keyOrSymbol] = (0, lodash_1.isObject)(value) ? this.parseFilter(value) : value;
|
|
33
33
|
}
|
|
34
34
|
if (keyword) {
|
|
35
35
|
if (!where[sequelize_1.Op.and])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.helper.js","sourceRoot":"","sources":["../../src/helpers/mysql.helper.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,mCAA2D;AAC3D,yCAAqD;AAErD,wDAAoD;AAEpD,MAAa,WAAW;IAmBtB,MAAM,CAAC,WAAW,CAAC,KAAyB;QAC1C,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mysql.helper.js","sourceRoot":"","sources":["../../src/helpers/mysql.helper.ts"],"names":[],"mappings":"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"}
|
package/dist/mysql.client.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { IBaseRepository, Client, DeepPartial, ICondition } from '@joktec/core';
|
|
2
2
|
import { Model, Sequelize } from 'sequelize-typescript';
|
|
3
3
|
import { MysqlConfig } from './mysql.config';
|
|
4
4
|
export interface MysqlClient extends Client<MysqlConfig, Sequelize> {
|
|
5
5
|
}
|
|
6
|
-
export interface IMysqlRepository<T extends Model<T>, ID> extends
|
|
6
|
+
export interface IMysqlRepository<T extends Model<T>, ID> extends IBaseRepository<T, ID> {
|
|
7
7
|
upsert(condition: ICondition, body: DeepPartial<T>): Promise<T>;
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=mysql.client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.client.d.ts","sourceRoot":"","sources":["../src/mysql.client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mysql.client.d.ts","sourceRoot":"","sources":["../src/mysql.client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC;CAAG;AAEtE,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,SAAQ,eAAe,CAAC,CAAC,EAAE,EAAE,CAAC;IACtF,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACjE"}
|
package/dist/mysql.config.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ClientConfig } from '@joktec/core';
|
|
2
2
|
import { ConnectionOptions } from 'sequelize/types/sequelize';
|
|
3
|
-
import { SequelizeOptions } from 'sequelize-typescript/dist/sequelize/sequelize/sequelize-options';
|
|
4
3
|
export declare class MysqlSlaveConfig implements ConnectionOptions {
|
|
5
4
|
host: string;
|
|
6
5
|
port: number;
|
|
@@ -19,10 +18,10 @@ export declare enum Dialect {
|
|
|
19
18
|
SNOWFLAKE = "snowflake",
|
|
20
19
|
ORACLE = "oracle"
|
|
21
20
|
}
|
|
22
|
-
export declare class MysqlConfig extends ClientConfig
|
|
23
|
-
dialect
|
|
24
|
-
host
|
|
25
|
-
port
|
|
21
|
+
export declare class MysqlConfig extends ClientConfig {
|
|
22
|
+
dialect?: Dialect;
|
|
23
|
+
host?: string;
|
|
24
|
+
port?: number;
|
|
26
25
|
username: string;
|
|
27
26
|
password: string;
|
|
28
27
|
database: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.config.d.ts","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"mysql.config.d.ts","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAqE,MAAM,cAAc,CAAC;AAE/G,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,qBAAa,gBAAiB,YAAW,iBAAiB;IAGxD,IAAI,EAAE,MAAM,CAAC;IAIb,IAAI,EAAE,MAAM,CAAC;IAIb,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;gBAEL,KAAK,EAAE,gBAAgB;CAGpC;AAED,oBAAY,OAAO;IACjB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,SAAS,cAAc;IACvB,MAAM,WAAW;CAClB;AAED,qBAAa,WAAY,SAAQ,YAAY;IAG3C,OAAO,CAAC,EAAE,OAAO,CAAiB;IAIlC,IAAI,CAAC,EAAE,MAAM,CAAe;IAI5B,IAAI,CAAC,EAAE,MAAM,CAAQ;IAIrB,QAAQ,EAAG,MAAM,CAAC;IAIlB,QAAQ,EAAG,MAAM,CAAC;IAIlB,QAAQ,EAAG,MAAM,CAAC;IAIlB,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAIlB,cAAc,CAAC,EAAE,MAAM,CAAS;IAKhC,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAM;gBAErB,KAAK,EAAE,WAAW;CAQ/B"}
|
package/dist/mysql.config.js
CHANGED
|
@@ -57,14 +57,12 @@ var Dialect;
|
|
|
57
57
|
class MysqlConfig extends core_1.ClientConfig {
|
|
58
58
|
constructor(props) {
|
|
59
59
|
super(props);
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
slaves: [],
|
|
67
|
-
});
|
|
60
|
+
this.dialect = Dialect.MYSQL;
|
|
61
|
+
this.host = 'localhost';
|
|
62
|
+
this.port = 3306;
|
|
63
|
+
this.connectTimeout = 20000;
|
|
64
|
+
this.slaves = [];
|
|
65
|
+
Object.assign(this, props);
|
|
68
66
|
if (props?.slaves?.length) {
|
|
69
67
|
const masterConfig = (0, lodash_1.pick)(props, ['host', 'port', 'username', 'password', 'database']);
|
|
70
68
|
this.slaves = props.slaves.map(slave => new MysqlSlaveConfig({ ...masterConfig, ...slave }));
|
|
@@ -73,7 +71,7 @@ class MysqlConfig extends core_1.ClientConfig {
|
|
|
73
71
|
}
|
|
74
72
|
exports.MysqlConfig = MysqlConfig;
|
|
75
73
|
__decorate([
|
|
76
|
-
(0, core_1.
|
|
74
|
+
(0, core_1.IsEnum)(Dialect),
|
|
77
75
|
(0, core_1.IsNotEmpty)(),
|
|
78
76
|
__metadata("design:type", String)
|
|
79
77
|
], MysqlConfig.prototype, "dialect", void 0);
|
package/dist/mysql.config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.config.js","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"mysql.config.js","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA+G;AAC/G,mCAA8B;AAG9B,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;QAxCf,YAAO,GAAa,OAAO,CAAC,KAAK,CAAC;QAIlC,SAAI,GAAY,WAAW,CAAC;QAI5B,SAAI,GAAY,IAAI,CAAC;QAwBrB,mBAAc,GAAY,KAAK,CAAC;QAKhC,WAAM,GAAwB,EAAE,CAAC;QAI/B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3B,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;AAlDD,kCAkDC;AA/CC;IAFC,IAAA,aAAM,EAAC,OAAO,CAAC;IACf,IAAA,iBAAU,GAAE;;4CACqB;AAIlC;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;yCACe;AAI5B;IAFC,IAAA,YAAK,GAAE;IACP,IAAA,iBAAU,GAAE;;yCACQ;AAIrB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;6CACK;AAIlB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;6CACK;AAIlB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;6CACK;AAIlB;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;;mDACmB;AAKhC;IAHC,IAAA,cAAO,GAAE;IACT,IAAA,cAAO,EAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3C,IAAA,iBAAU,GAAE;;2CACoB"}
|