@joktec/mysql 0.0.68 → 0.0.70

package/dist/mysql.repo.js

@@ -1,119 +1,119 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlRepo = void 0;
-const core_1 = require("@joktec/core");
-const mysql_utils_1 = require("./mysql.utils");
-const mysql_exception_1 = require("./mysql.exception");
-class MysqlRepo {
-    constructor(mysqlService, model, conId = core_1.DEFAULT_CON_ID) {
-        this.mysqlService = mysqlService;
-        this.model = model;
-        this.conId = conId;
-    }
-    async onModuleInit() {
-        await this.mysqlService.getModelSync(this.model, this.conId);
-    }
-    async find(query) {
-        const options = (0, mysql_utils_1.preHandleQuery)(query);
-        if (query.select)
-            options.attributes = query.select.split(',');
-        if (query.sort)
-            options.order = Object.entries(query.sort);
-        if (query.limit && query.page) {
-            options.limit = query.limit;
-            options.offset = (query.page - 1) * query.limit;
-        }
-        return this.model.findAll(options);
-    }
-    async count(query) {
-        const options = (0, mysql_utils_1.preHandleQuery)(query);
-        return this.model.count(options);
-    }
-    async findOne(query) {
-        const options = (0, mysql_utils_1.preHandleQuery)(query);
-        if (query.select)
-            options.attributes = 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 model = await this.model.findOne(options);
-        if (!model)
-            return null;
-        const fields = Object.keys(body);
-        return model.update(body, { fields });
-    }
-    async delete(condition, opts) {
-        const existModel = await this.findOne({ condition });
-        if (!existModel)
-            return null;
-        const options = (0, mysql_utils_1.preHandleQuery)({ condition });
-        options.force = (0, core_1.toBool)(opts === null || opts === void 0 ? void 0 : opts.force, false);
-        await this.model.destroy(options);
-        return existModel;
-    }
-    async upsert(condition, body) {
-        const fields = Object.keys(body);
-        const pk = this.model.primaryKeyAttribute;
-        const [row, result] = await this.model.upsert(body, { returning: true, fields, conflictFields: [pk] });
-        if (!row || !result)
-            return null;
-        return row;
-    }
-}
-__decorate([
-    mysql_exception_1.MysqlCatch,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MysqlRepo.prototype, "find", null);
-__decorate([
-    mysql_exception_1.MysqlCatch,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MysqlRepo.prototype, "count", null);
-__decorate([
-    mysql_exception_1.MysqlCatch,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MysqlRepo.prototype, "findOne", null);
-__decorate([
-    mysql_exception_1.MysqlCatch,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MysqlRepo.prototype, "create", null);
-__decorate([
-    mysql_exception_1.MysqlCatch,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", Promise)
-], MysqlRepo.prototype, "update", null);
-__decorate([
-    mysql_exception_1.MysqlCatch,
-    __metadata("design:type", Function),
-    __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, "upsert", null);
-exports.MysqlRepo = MysqlRepo;
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MysqlRepo = void 0;
+const core_1 = require("@joktec/core");
+const mysql_utils_1 = require("./mysql.utils");
+const mysql_exception_1 = require("./mysql.exception");
+class MysqlRepo {
+    constructor(mysqlService, model, conId = core_1.DEFAULT_CON_ID) {
+        this.mysqlService = mysqlService;
+        this.model = model;
+        this.conId = conId;
+    }
+    async onModuleInit() {
+        await this.mysqlService.getModelSync(this.model, this.conId);
+    }
+    async find(query) {
+        const options = (0, mysql_utils_1.preHandleQuery)(query);
+        if (query.select)
+            options.attributes = query.select.split(',');
+        if (query.sort)
+            options.order = Object.entries(query.sort);
+        if (query.limit && query.page) {
+            options.limit = query.limit;
+            options.offset = (query.page - 1) * query.limit;
+        }
+        return this.model.findAll(options);
+    }
+    async count(query) {
+        const options = (0, mysql_utils_1.preHandleQuery)(query);
+        return this.model.count(options);
+    }
+    async findOne(query) {
+        const options = (0, mysql_utils_1.preHandleQuery)(query);
+        if (query.select)
+            options.attributes = 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 model = await this.model.findOne(options);
+        if (!model)
+            return null;
+        const fields = Object.keys(body);
+        return model.update(body, { fields });
+    }
+    async delete(condition, opts) {
+        const existModel = await this.findOne({ condition });
+        if (!existModel)
+            return null;
+        const options = (0, mysql_utils_1.preHandleQuery)({ condition });
+        options.force = (0, core_1.toBool)(opts === null || opts === void 0 ? void 0 : opts.force, false);
+        await this.model.destroy(options);
+        return existModel;
+    }
+    async upsert(condition, body) {
+        const fields = Object.keys(body);
+        const pk = this.model.primaryKeyAttribute;
+        const [row, result] = await this.model.upsert(body, { returning: true, fields, conflictFields: [pk] });
+        if (!row || !result)
+            return null;
+        return row;
+    }
+}
+__decorate([
+    mysql_exception_1.MysqlCatch,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], MysqlRepo.prototype, "find", null);
+__decorate([
+    mysql_exception_1.MysqlCatch,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], MysqlRepo.prototype, "count", null);
+__decorate([
+    mysql_exception_1.MysqlCatch,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], MysqlRepo.prototype, "findOne", null);
+__decorate([
+    mysql_exception_1.MysqlCatch,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], MysqlRepo.prototype, "create", null);
+__decorate([
+    mysql_exception_1.MysqlCatch,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], MysqlRepo.prototype, "update", null);
+__decorate([
+    mysql_exception_1.MysqlCatch,
+    __metadata("design:type", Function),
+    __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, "upsert", null);
+exports.MysqlRepo = MysqlRepo;
 //# sourceMappingURL=mysql.repo.js.map

package/dist/mysql.service.d.ts

@@ -1,13 +1,13 @@
-import { AbstractClientService } from '@joktec/core';
-import { MysqlConfig } from './mysql.config';
-import { MysqlClient } from './mysql.client';
-import { Model, ModelCtor, Sequelize } from 'sequelize-typescript';
-export declare class MysqlService extends AbstractClientService<MysqlConfig, Sequelize> implements MysqlClient {
-    constructor();
-    protected init(config: MysqlConfig): Promise<Sequelize>;
-    start(client: Sequelize, conId?: string): Promise<void>;
-    stop(client: Sequelize, conId?: string): Promise<void>;
-    getModel<T extends Model<T>>(model: ModelCtor<T>, conId?: string): ModelCtor<T>;
-    getModelSync<T extends Model<T>>(model: ModelCtor<T>, conId?: string): Promise<ModelCtor<T>>;
-}
+import { AbstractClientService } from '@joktec/core';
+import { MysqlConfig } from './mysql.config';
+import { MysqlClient } from './mysql.client';
+import { Model, ModelCtor, Sequelize } from 'sequelize-typescript';
+export declare class MysqlService extends AbstractClientService<MysqlConfig, Sequelize> implements MysqlClient {
+    constructor();
+    protected init(config: MysqlConfig): Promise<Sequelize>;
+    start(client: Sequelize, conId?: string): Promise<void>;
+    stop(client: Sequelize, conId?: string): Promise<void>;
+    getModel<T extends Model<T>>(model: ModelCtor<T>, conId?: string): ModelCtor<T>;
+    getModelSync<T extends Model<T>>(model: ModelCtor<T>, conId?: string): Promise<ModelCtor<T>>;
+}
 //# sourceMappingURL=mysql.service.d.ts.map

package/dist/mysql.service.js

@@ -1,82 +1,82 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlService = void 0;
-const core_1 = require("@joktec/core");
-const mysql_config_1 = require("./mysql.config");
-const sequelize_typescript_1 = require("sequelize-typescript");
-const lodash_1 = require("lodash");
-const RETRY_OPTS = 'mysql.retry';
-let MysqlService = class MysqlService extends core_1.AbstractClientService {
-    constructor() {
-        super('mysql', mysql_config_1.MysqlConfig);
-    }
-    async init(config) {
-        var _a;
-        this.logService.info('MysqlConfig: %j', config);
-        const connection = (0, lodash_1.pick)(config, ['host', 'port', 'username', 'password', 'database']);
-        const options = Object.assign(Object.assign({}, connection), { dialect: config.dialect, dialectOptions: { charset: config.charset, connectTimeout: config.connectTimeout }, logging: (sql, timing) => {
-                this.logService.debug('SQL statement: %s', sql);
-                this.logService.trace('SQL execute in %j', timing);
-            } });
-        if ((_a = config.slaves) === null || _a === void 0 ? void 0 : _a.length) {
-            options.replication = { write: Object.assign({}, connection), read: config.slaves };
-        }
-        const sequelize = new sequelize_typescript_1.Sequelize(options);
-        this.logService.info('MySQL Service is configured in `%s` connection', config.conId);
-        return sequelize;
-    }
-    async start(client, conId = core_1.DEFAULT_CON_ID) {
-        const config = this.getConfig(conId);
-        try {
-            await client.authenticate();
-            this.logService.info('MySQL Service have been start on host %s', config.host);
-        }
-        catch (err) {
-            this.logService.error(err, 'MySQL Service failed to start on host %s', config.host);
-        }
-    }
-    async stop(client, conId = core_1.DEFAULT_CON_ID) {
-        const config = this.getConfig(conId);
-        try {
-            await client.close();
-            this.logService.warn('MySQL Service have been stop on host %s', config.host);
-        }
-        catch (err) {
-            this.logService.error(err, 'MySQL Service failed to stop on host %s', config.host);
-        }
-    }
-    getModel(model, conId = core_1.DEFAULT_CON_ID) {
-        if (!this.getClient(conId).isDefined(model.name)) {
-            this.getClient(conId).addModels([model]);
-        }
-        return model;
-    }
-    async getModelSync(model, conId = core_1.DEFAULT_CON_ID) {
-        if (!this.getClient(conId).isDefined(model.name)) {
-            this.getClient(conId).addModels([model]);
-            await model.sync({ alter: { drop: false } });
-        }
-        return model;
-    }
-};
-__decorate([
-    (0, core_1.Retry)(RETRY_OPTS),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [mysql_config_1.MysqlConfig]),
-    __metadata("design:returntype", Promise)
-], MysqlService.prototype, "init", null);
-MysqlService = __decorate([
-    (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [])
-], MysqlService);
-exports.MysqlService = MysqlService;
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MysqlService = void 0;
+const core_1 = require("@joktec/core");
+const mysql_config_1 = require("./mysql.config");
+const sequelize_typescript_1 = require("sequelize-typescript");
+const lodash_1 = require("lodash");
+const RETRY_OPTS = 'mysql.retry';
+let MysqlService = class MysqlService extends core_1.AbstractClientService {
+    constructor() {
+        super('mysql', mysql_config_1.MysqlConfig);
+    }
+    async init(config) {
+        var _a;
+        this.logService.info('MysqlConfig: %j', config);
+        const connection = (0, lodash_1.pick)(config, ['host', 'port', 'username', 'password', 'database']);
+        const options = Object.assign(Object.assign({}, connection), { dialect: config.dialect, dialectOptions: { charset: config.charset, connectTimeout: config.connectTimeout }, logging: (sql, timing) => {
+                this.logService.debug('SQL statement: %s', sql);
+                this.logService.trace('SQL execute in %j', timing);
+            } });
+        if ((_a = config.slaves) === null || _a === void 0 ? void 0 : _a.length) {
+            options.replication = { write: Object.assign({}, connection), read: config.slaves };
+        }
+        const sequelize = new sequelize_typescript_1.Sequelize(options);
+        this.logService.info('MySQL Service is configured in `%s` connection', config.conId);
+        return sequelize;
+    }
+    async start(client, conId = core_1.DEFAULT_CON_ID) {
+        const config = this.getConfig(conId);
+        try {
+            await client.authenticate();
+            this.logService.info('MySQL Service have been start on host %s', config.host);
+        }
+        catch (err) {
+            this.logService.error(err, 'MySQL Service failed to start on host %s', config.host);
+        }
+    }
+    async stop(client, conId = core_1.DEFAULT_CON_ID) {
+        const config = this.getConfig(conId);
+        try {
+            await client.close();
+            this.logService.warn('MySQL Service have been stop on host %s', config.host);
+        }
+        catch (err) {
+            this.logService.error(err, 'MySQL Service failed to stop on host %s', config.host);
+        }
+    }
+    getModel(model, conId = core_1.DEFAULT_CON_ID) {
+        if (!this.getClient(conId).isDefined(model.name)) {
+            this.getClient(conId).addModels([model]);
+        }
+        return model;
+    }
+    async getModelSync(model, conId = core_1.DEFAULT_CON_ID) {
+        if (!this.getClient(conId).isDefined(model.name)) {
+            this.getClient(conId).addModels([model]);
+            await model.sync({ alter: { drop: false } });
+        }
+        return model;
+    }
+};
+__decorate([
+    (0, core_1.Retry)(RETRY_OPTS),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [mysql_config_1.MysqlConfig]),
+    __metadata("design:returntype", Promise)
+], MysqlService.prototype, "init", null);
+MysqlService = __decorate([
+    (0, core_1.Injectable)(),
+    __metadata("design:paramtypes", [])
+], MysqlService);
+exports.MysqlService = MysqlService;
 //# sourceMappingURL=mysql.service.js.map

package/dist/mysql.utils.d.ts

@@ -1,7 +1,7 @@
-import { IOperation } from '@joktec/core';
-import { FindOptions } from 'sequelize';
-import { Model } from 'sequelize-typescript';
-import { IMysqlRequest } from './models';
-export declare const preHandleQuery: <T extends Model<T, T>>(query: IMysqlRequest<T>) => FindOptions;
-export declare const convertOp: (op: IOperation) => symbol;
+import { IOperation } from '@joktec/core';
+import { FindOptions } from 'sequelize';
+import { Model } from 'sequelize-typescript';
+import { IMysqlRequest } from './models';
+export declare const preHandleQuery: <T extends Model<T, T>>(query: IMysqlRequest<T>) => FindOptions;
+export declare const convertOp: (op: IOperation) => symbol;
 //# sourceMappingURL=mysql.utils.d.ts.map

package/dist/mysql.utils.js

@@ -1,50 +1,50 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertOp = exports.preHandleQuery = void 0;
-const sequelize_1 = require("sequelize");
-const preHandleQuery = (query) => {
-    const { condition = {}, keyword } = query;
-    const where = {};
-    for (const [key, value] of Object.entries(condition)) {
-        if (key === '$and') {
-            where[sequelize_1.Op.and] = value.map(c => (0, exports.preHandleQuery)({ condition: c }));
-        }
-        else if (key === '$or') {
-            where[sequelize_1.Op.or] = value.map(c => (0, exports.preHandleQuery)({ condition: c }));
-        }
-        else if (typeof value === 'object') {
-            const entries = Object.entries(value);
-            for (const [op, val] of entries) {
-                const sqlOp = (0, exports.convertOp)(op);
-                where[key] = Object.assign(Object.assign({}, where[key]), { [sqlOp]: sqlOp === sequelize_1.Op.like || sqlOp === sequelize_1.Op.notLike ? `%${val}%` : val });
-            }
-        }
-        else {
-            where[key] = 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.preHandleQuery = preHandleQuery;
-const convertOp = (op) => {
-    const mapping = {
-        $ne: sequelize_1.Op.ne,
-        $gt: sequelize_1.Op.gt,
-        $gte: sequelize_1.Op.gte,
-        $lt: sequelize_1.Op.lt,
-        $lte: sequelize_1.Op.lte,
-        $in: sequelize_1.Op.in,
-        $nin: sequelize_1.Op.notIn,
-        $eq: sequelize_1.Op.eq,
-        $like: sequelize_1.Op.like,
-        $unlike: sequelize_1.Op.notLike,
-    };
-    return mapping[op] || sequelize_1.Op.eq;
-};
-exports.convertOp = convertOp;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertOp = exports.preHandleQuery = void 0;
+const sequelize_1 = require("sequelize");
+const preHandleQuery = (query) => {
+    const { condition = {}, keyword } = query;
+    const where = {};
+    for (const [key, value] of Object.entries(condition)) {
+        if (key === '$and') {
+            where[sequelize_1.Op.and] = value.map(c => (0, exports.preHandleQuery)({ condition: c }));
+        }
+        else if (key === '$or') {
+            where[sequelize_1.Op.or] = value.map(c => (0, exports.preHandleQuery)({ condition: c }));
+        }
+        else if (typeof value === 'object') {
+            const entries = Object.entries(value);
+            for (const [op, val] of entries) {
+                const sqlOp = (0, exports.convertOp)(op);
+                where[key] = Object.assign(Object.assign({}, where[key]), { [sqlOp]: sqlOp === sequelize_1.Op.like || sqlOp === sequelize_1.Op.notLike ? `%${val}%` : val });
+            }
+        }
+        else {
+            where[key] = 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.preHandleQuery = preHandleQuery;
+const convertOp = (op) => {
+    const mapping = {
+        $ne: sequelize_1.Op.ne,
+        $gt: sequelize_1.Op.gt,
+        $gte: sequelize_1.Op.gte,
+        $lt: sequelize_1.Op.lt,
+        $lte: sequelize_1.Op.lte,
+        $in: sequelize_1.Op.in,
+        $nin: sequelize_1.Op.notIn,
+        $eq: sequelize_1.Op.eq,
+        $like: sequelize_1.Op.like,
+        $unlike: sequelize_1.Op.notLike,
+    };
+    return mapping[op] || sequelize_1.Op.eq;
+};
+exports.convertOp = convertOp;
 //# sourceMappingURL=mysql.utils.js.map