@joktec/mysql 0.0.94 → 0.0.96

package/dist/helpers/index.d.ts

@@ -0,0 +1,2 @@
+export * from './mysql.helper';
+//# sourceMappingURL=index.d.ts.map

package/dist/helpers/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC"}

package/dist/helpers/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./mysql.helper"), exports);
+//# sourceMappingURL=index.js.map

package/dist/helpers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B"}

package/dist/helpers/mysql.helper.d.ts

@@ -0,0 +1,7 @@
+import { FindOptions } from 'sequelize';
+import { IMysqlRequest } from '../models';
+export declare class MysqlHelper {
+    static opMapping: Record<string, symbol>;
+    static parseFilter(query: IMysqlRequest<any>): FindOptions;
+}
+//# sourceMappingURL=mysql.helper.d.ts.map

package/dist/helpers/mysql.helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mysql.helper.d.ts","sourceRoot":"","sources":["../../src/helpers/mysql.helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAe,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAG1C,qBAAa,WAAW;IACtB,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBtC;IAEF,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,WAAW;CAqC3D"}

package/dist/helpers/mysql.helper.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MysqlHelper = void 0;
+const core_1 = require("@joktec/core");
+const lodash_1 = require("lodash");
+const sequelize_1 = require("sequelize");
+const mysql_exception_1 = require("../mysql.exception");
+class MysqlHelper {
+    static parseFilter(query) {
+        const { condition = {}, keyword, near } = query;
+        const where = {};
+        for (const [key, value] of Object.entries(condition)) {
+            if (key === '$and') {
+                where[sequelize_1.Op.and] = (0, core_1.toArray)(value).map(c => this.parseFilter(c));
+                continue;
+            }
+            if (key === '$or') {
+                where[sequelize_1.Op.or] = (0, core_1.toArray)(value).map(c => this.parseFilter(c));
+                continue;
+            }
+            if ((0, lodash_1.isNil)(value)) {
+                where[key][sequelize_1.Op.is] = null;
+                continue;
+            }
+            if ((0, lodash_1.isDate)(value) || (0, lodash_1.isRegExp)(value)) {
+                where[key] = value;
+                continue;
+            }
+            const op = this.opMapping[key];
+            if (!op)
+                throw new mysql_exception_1.MysqlException(`Operator not support`, { key, condition });
+            where[op] = (0, lodash_1.isObject)(value) ? this.parseFilter(value) : value;
+        }
+        if (keyword) {
+            if (!where[sequelize_1.Op.and])
+                where[sequelize_1.Op.and] = [];
+            where[sequelize_1.Op.and].push((0, sequelize_1.literal)(`MATCH(name) AGAINST('${keyword}' IN BOOLEAN MODE)`));
+        }
+        return { where };
+    }
+}
+exports.MysqlHelper = MysqlHelper;
+MysqlHelper.opMapping = {
+    $and: sequelize_1.Op.and,
+    $or: sequelize_1.Op.or,
+    $eq: sequelize_1.Op.eq,
+    $gt: sequelize_1.Op.gt,
+    $gte: sequelize_1.Op.gte,
+    $lt: sequelize_1.Op.lt,
+    $lte: sequelize_1.Op.lte,
+    $ne: sequelize_1.Op.ne,
+    $in: sequelize_1.Op.in,
+    $nin: sequelize_1.Op.notIn,
+    $all: sequelize_1.Op.all,
+    $not: sequelize_1.Op.not,
+    $like: sequelize_1.Op.substring,
+    $begin: sequelize_1.Op.startsWith,
+    $end: sequelize_1.Op.endsWith,
+};
+//# sourceMappingURL=mysql.helper.js.map

package/dist/helpers/mysql.helper.js.map

@@ -0,0 +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,IAAI,EAAE,GAAG,KAAK,CAAC;QAChD,MAAM,KAAK,GAAiC,EAAE,CAAC;QAC/C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YACpD,IAAI,GAAG,KAAK,MAAM,EAAE;gBAClB,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,GAAG,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7D,SAAS;aACV;YAED,IAAI,GAAG,KAAK,KAAK,EAAE;gBACjB,KAAK,CAAC,cAAE,CAAC,EAAE,CAAC,GAAG,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,SAAS;aACV;YAED,IAAI,IAAA,cAAK,EAAC,KAAK,CAAC,EAAE;gBAChB,KAAK,CAAC,GAAG,CAAC,CAAC,cAAE,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;gBACzB,SAAS;aACV;YAED,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;gBACpC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACnB,SAAS;aACV;YAED,MAAM,EAAE,GAAW,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACvC,IAAI,CAAC,EAAE;gBAAE,MAAM,IAAI,gCAAc,CAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;YAC9E,KAAK,CAAC,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;SAC/D;QAGD,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC;gBAAE,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACvC,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,mBAAO,EAAC,wBAAwB,OAAO,oBAAoB,CAAC,CAAC,CAAC;SAClF;QAED,OAAO,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;;AAvDH,kCAwDC;AAvDQ,qBAAS,GAA2B;IACzC,IAAI,EAAE,cAAE,CAAC,GAAG;IACZ,GAAG,EAAE,cAAE,CAAC,EAAE;IACV,GAAG,EAAE,cAAE,CAAC,EAAE;IACV,GAAG,EAAE,cAAE,CAAC,EAAE;IACV,IAAI,EAAE,cAAE,CAAC,GAAG;IACZ,GAAG,EAAE,cAAE,CAAC,EAAE;IACV,IAAI,EAAE,cAAE,CAAC,GAAG;IACZ,GAAG,EAAE,cAAE,CAAC,EAAE;IACV,GAAG,EAAE,cAAE,CAAC,EAAE;IACV,IAAI,EAAE,cAAE,CAAC,KAAK;IACd,IAAI,EAAE,cAAE,CAAC,GAAG;IACZ,IAAI,EAAE,cAAE,CAAC,GAAG;IACZ,KAAK,EAAE,cAAE,CAAC,SAAS;IACnB,MAAM,EAAE,cAAE,CAAC,UAAU;IACrB,IAAI,EAAE,cAAE,CAAC,QAAQ;CAClB,CAAC"}

package/dist/index.d.ts

@@ -2,7 +2,6 @@ export * from './mysql.module';
 export * from './mysql.client';
 export * from './mysql.service';
 export * from './mysql.config';
-export * from './mysql.utils';
 export * from './mysql.repo';
 export * from './mysql.exception';
 export * from './models';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC"}

package/dist/index.js

@@ -19,7 +19,6 @@ __exportStar(require("./mysql.module"), exports);
 __exportStar(require("./mysql.client"), exports);
 __exportStar(require("./mysql.service"), exports);
 __exportStar(require("./mysql.config"), exports);
-__exportStar(require("./mysql.utils"), exports);
 __exportStar(require("./mysql.repo"), exports);
 __exportStar(require("./mysql.exception"), exports);
 __exportStar(require("./models"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,iDAA+B;AAC/B,gDAA8B;AAC9B,+CAA6B;AAC7B,oDAAkC;AAClC,2CAAyB;AACzB,uDAAqC;AACrC,uCAA+B;AAAtB,+FAAA,EAAE,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,iDAA+B;AAC/B,+CAA6B;AAC7B,oDAAkC;AAClC,2CAAyB;AACzB,uDAAqC;AACrC,uCAA+B;AAAtB,+FAAA,EAAE,OAAA"}

package/dist/models/mysql.model.d.ts

@@ -1,5 +1,6 @@
 import { Model } from 'sequelize-typescript';
-export declare abstract class MysqlModel<T> extends Model<T> {
+export declare class MysqlModel<T> extends Model<T> {
+    id?: number | any;
     createdAt?: Date;
     updatedAt?: Date;
     deletedAt?: Date;

package/dist/models/mysql.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.model.d.ts","sourceRoot":"","sources":["../../src/models/mysql.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,KAAK,EAAa,MAAM,sBAAsB,CAAC;AAE9E,8BAAsB,UAAU,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;IAIlD,SAAS,CAAC,EAAE,IAAI,CAAC;IAKjB,SAAS,CAAC,EAAE,IAAI,CAAC;IAKjB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB"}
+{"version":3,"file":"mysql.model.d.ts","sourceRoot":"","sources":["../../src/models/mysql.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,KAAK,EAAa,MAAM,sBAAsB,CAAC;AAE9E,qBAAa,UAAU,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;IACzC,EAAE,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IAKlB,SAAS,CAAC,EAAE,IAAI,CAAC;IAKjB,SAAS,CAAC,EAAE,IAAI,CAAC;IAKjB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB"}

package/dist/models/mysql.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.model.js","sourceRoot":"","sources":["../../src/models/mysql.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAkD;AAClD,+DAA8E;AAE9E,MAAsB,UAAc,SAAQ,4BAAQ;CAenD;AAfD,gCAeC;AAXC;IAHC,gCAAS;IACT,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC;AAKjB;IAHC,gCAAS;IACT,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC;AAKjB;IAHC,gCAAS;IACT,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC"}
+{"version":3,"file":"mysql.model.js","sourceRoot":"","sources":["../../src/models/mysql.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAkD;AAClD,+DAA8E;AAE9E,MAAa,UAAc,SAAQ,4BAAQ;CAiB1C;AAjBD,gCAiBC;AAXC;IAHC,gCAAS;IACT,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC;AAKjB;IAHC,gCAAS;IACT,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC;AAKjB;IAHC,gCAAS;IACT,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC"}

package/dist/models/mysql.request.d.ts

@@ -1,11 +1,11 @@
 import { IBaseRequest, IDataType } from '@joktec/core';
-import { Model } from 'sequelize-typescript';
+import { MysqlModel } from './mysql.model';
 export type MysqlId = string | number | bigint;
 export type ArrayBinding = Array<IDataType>;
 export type DictBinding = {
     [key: string]: IDataType;
 };
 export type RawBinding = ArrayBinding | DictBinding;
-export interface IMysqlRequest<T extends Model<T>> extends IBaseRequest<T> {
+export interface IMysqlRequest<T extends MysqlModel<T>> extends IBaseRequest<T> {
 }
 //# sourceMappingURL=mysql.request.d.ts.map

package/dist/models/mysql.request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.request.d.ts","sourceRoot":"","sources":["../../src/models/mysql.request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE7C,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAC/C,MAAM,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,MAAM,WAAW,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AACvD,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,WAAW,CAAC;AAEpD,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;CAAG"}
+{"version":3,"file":"mysql.request.d.ts","sourceRoot":"","sources":["../../src/models/mysql.request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAC/C,MAAM,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,MAAM,WAAW,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AACvD,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,WAAW,CAAC;AAEpD,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;CAAG"}

package/dist/mysql.config.d.ts

@@ -1,6 +1,6 @@
 import { ClientConfig } from '@joktec/core';
-import { SequelizeOptions } from 'sequelize-typescript/dist/sequelize/sequelize/sequelize-options';
 import { ConnectionOptions } from 'sequelize/types/sequelize';
+import { SequelizeOptions } from 'sequelize-typescript/dist/sequelize/sequelize/sequelize-options';
 export declare class MysqlSlaveConfig implements ConnectionOptions {
     host: string;
     port: number;

package/dist/mysql.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.config.d.ts","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoE,MAAM,cAAc,CAAC;AAE9G,OAAO,EAAE,gBAAgB,EAAE,MAAM,iEAAiE,CAAC;AACnG,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,YAAa,YAAW,gBAAgB;IAGvE,OAAO,EAAE,OAAO,CAAC;IAIjB,IAAI,EAAE,MAAM,CAAC;IAIb,IAAI,EAAE,MAAM,CAAC;IAIb,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;IAIjB,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAIlB,cAAc,CAAC,EAAE,MAAM,CAAC;IAKxB,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC;gBAEhB,KAAK,EAAE,WAAW;CAgB/B"}
+{"version":3,"file":"mysql.config.d.ts","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoE,MAAM,cAAc,CAAC;AAE9G,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iEAAiE,CAAC;AAEnG,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,YAAa,YAAW,gBAAgB;IAGvE,OAAO,EAAE,OAAO,CAAC;IAIjB,IAAI,EAAE,MAAM,CAAC;IAIb,IAAI,EAAE,MAAM,CAAC;IAIb,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;IAIjB,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAIlB,cAAc,CAAC,EAAE,MAAM,CAAC;IAKxB,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC;gBAEhB,KAAK,EAAE,WAAW;CAgB/B"}

package/dist/mysql.repo.d.ts

@@ -14,12 +14,15 @@ export declare abstract class MysqlRepo<T extends Model<T>, ID = MysqlId> implem
     find(query: IMysqlRequest<T>): Promise<T[]>;
     count(query: IMysqlRequest<T>): Promise<number>;
     findOne(query: IMysqlRequest<T>): Promise<T>;
-    create(body: T): Promise<T>;
+    create(body: Model<T>): Promise<T>;
     update(condition: ICondition<T>, body: DeepPartial<T>): Promise<T>;
     delete(condition: ICondition<T>, opts?: {
         force?: boolean;
         userId?: ID;
     }): Promise<T>;
+    restore(condition: ICondition<T>, opts?: {
+        userId?: ID;
+    }): Promise<T>;
     upsert(condition: ICondition<T>, body: DeepPartial<T>): Promise<T>;
 }
 //# sourceMappingURL=mysql.repo.d.ts.map

package/dist/mysql.repo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.repo.d.ts","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAkB,UAAU,EAAE,UAAU,EAAE,YAAY,EAAU,MAAM,cAAc,CAAC;AAIxH,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,8BAAsB,SAAS,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,OAAO,CAAE,YAAW,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,YAAY;IAK9G,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAE,MAAM;IANf,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAE3C,SAAS,aACG,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EACnB,KAAK,GAAE,MAAuB;IAGpC,YAAY;IAMZ,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAY3C,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAM/C,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAO5C,MAAM,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAK3B,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IASlE,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAWrF,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAOzE"}
+{"version":3,"file":"mysql.repo.d.ts","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,WAAW,EAEX,UAAU,EAEV,UAAU,EACV,YAAY,EAIb,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,8BACsB,SAAS,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,OAAO,CAAE,YAAW,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,YAAY;IAK9G,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAE,MAAM;IANf,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAE3C,SAAS,aACG,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EACnB,KAAK,GAAE,MAAuB;IAGpC,YAAY;IAMZ,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAa3C,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAM/C,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAO5C,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAKlC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IASlE,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAWrF,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAUrE,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAOzE"}

package/dist/mysql.repo.js

@@ -11,10 +11,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlRepo = void 0;
 const core_1 = require("@joktec/core");
-const common_1 = require("@nestjs/common");
+const sequelize_typescript_1 = require("sequelize-typescript");
+const helpers_1 = require("./helpers");
 const mysql_exception_1 = require("./mysql.exception");
-const mysql_utils_1 = require("./mysql.utils");
-class MysqlRepo {
+const mysql_service_1 = require("./mysql.service");
+let MysqlRepo = class MysqlRepo {
     constructor(mysqlService, model, conId = core_1.DEFAULT_CON_ID) {
         this.mysqlService = mysqlService;
         this.model = model;
@@ -25,11 +26,13 @@ class MysqlRepo {
         await this.mysqlService.getModelSync(this.model, this.conId);
     }
     async find(query) {
-        const options = (0, mysql_utils_1.preHandleQuery)(query);
+        const options = helpers_1.MysqlHelper.parseFilter(query);
         if (query.select)
-            options.attributes = query.select.split(',');
+            options.attributes = (0, core_1.toArray)(query.select, { split: ',' });
         if (query.sort)
             options.order = Object.entries(query.sort);
+        if (query.limit)
+            options.limit = query.limit;
         if (query.limit && query.page) {
             options.limit = query.limit;
             options.offset = (query.page - 1) * query.limit;
@@ -37,20 +40,20 @@ class MysqlRepo {
         return this.model.findAll(options);
     }
     async count(query) {
-        const options = (0, mysql_utils_1.preHandleQuery)(query);
+        const options = helpers_1.MysqlHelper.parseFilter(query);
         return this.model.count(options);
     }
     async findOne(query) {
-        const options = (0, mysql_utils_1.preHandleQuery)(query);
+        const options = helpers_1.MysqlHelper.parseFilter(query);
         if (query.select)
-            options.attributes = query.select.split(',');
+            options.attributes = (0, core_1.toArray)(query.select, { split: ',' });
         return this.model.findOne(options);
     }
     async create(body) {
         return this.model.create(body);
     }
     async update(condition, body) {
-        const options = (0, mysql_utils_1.preHandleQuery)({ condition });
+        const options = helpers_1.MysqlHelper.parseFilter({ condition });
         const model = await this.model.findOne(options);
         if (!model)
             return null;
@@ -61,11 +64,19 @@ class MysqlRepo {
         const existModel = await this.findOne({ condition });
         if (!existModel)
             return null;
-        const options = (0, mysql_utils_1.preHandleQuery)({ condition });
+        const options = helpers_1.MysqlHelper.parseFilter({ condition });
         options.force = (0, core_1.toBool)(opts?.force, false);
         await this.model.destroy(options);
         return existModel;
     }
+    async restore(condition, opts) {
+        const options = helpers_1.MysqlHelper.parseFilter({ condition });
+        await this.model.restore(options);
+        if (!opts?.userId) {
+            return this.findOne({ condition });
+        }
+        return this.update(condition, { updatedAt: opts?.userId });
+    }
     async upsert(condition, body) {
         const fields = Object.keys(body);
         const pk = this.model.primaryKeyAttribute;
@@ -74,14 +85,14 @@ class MysqlRepo {
             return null;
         return row;
     }
-}
+};
 exports.MysqlRepo = MysqlRepo;
 __decorate([
-    (0, common_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.ConfigService)
 ], MysqlRepo.prototype, "configService", void 0);
 __decorate([
-    (0, common_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.LogService)
 ], MysqlRepo.prototype, "logService", void 0);
 __decorate([
@@ -105,7 +116,7 @@ __decorate([
 __decorate([
     mysql_exception_1.MysqlCatch,
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [sequelize_typescript_1.Model]),
     __metadata("design:returntype", Promise)
 ], MysqlRepo.prototype, "create", null);
 __decorate([
@@ -120,10 +131,20 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], MysqlRepo.prototype, "delete", null);
+__decorate([
+    mysql_exception_1.MysqlCatch,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], MysqlRepo.prototype, "restore", null);
 __decorate([
     mysql_exception_1.MysqlCatch,
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], MysqlRepo.prototype, "upsert", null);
+exports.MysqlRepo = MysqlRepo = __decorate([
+    (0, core_1.Injectable)(),
+    __metadata("design:paramtypes", [mysql_service_1.MysqlService, Object, String])
+], MysqlRepo);
 //# sourceMappingURL=mysql.repo.js.map

package/dist/mysql.repo.js.map

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