@joktec/mysql 0.0.172 → 0.0.174

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,EACL,aAAa,EACb,WAAW,EAEX,UAAU,EAGV,UAAU,EACV,YAAY,EAGb,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAGxD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,8BACsB,SAAS,CAAC,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,OAAO,CACnE,YAAW,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,YAAY,EAAE,sBAAsB;IAMtE,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;IAIlB,sBAAsB;IAItB,IAAI,UAAU,IAAI,UAAU,CAAC,CAAC,CAAC,CAE9B;IAGK,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,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAMzE,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAO5C,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAQrD,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,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;CAUzE"}
+{"version":3,"file":"mysql.repo.d.ts","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"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"}

package/dist/mysql.repo.js

@@ -11,7 +11,7 @@ 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 sequelize_typescript_1 = require("sequelize-typescript");
+const lodash_1 = require("lodash");
 const helpers_1 = require("./helpers");
 const mysql_exception_1 = require("./mysql.exception");
 const mysql_service_1 = require("./mysql.service");
@@ -24,85 +24,109 @@ let MysqlRepo = class MysqlRepo {
     async onModuleInit() {
         this.logService.setContext(this.constructor.name);
     }
-    onApplicationBootstrap() {
-        this.model = this.mysqlService.getModel(this.model, this.conId);
-    }
+    onApplicationBootstrap() { }
     get repository() {
         return this.mysqlService.getRepository(this.model, this.conId);
     }
-    async find(query) {
+    transform(docs) {
+        if ((0, lodash_1.isNil)(docs))
+            return null;
+        if ((0, lodash_1.isArray)(docs) && !docs.length)
+            return [];
+        const transformDocs = (0, core_1.plainToInstance)(this.model, (0, core_1.toArray)(docs));
+        return ((0, lodash_1.isArray)(docs) ? transformDocs : transformDocs[0]);
+    }
+    qb(query = {}, opts = {}) {
         const options = helpers_1.MysqlHelper.parseFilter(query);
         if (query.select)
-            options.attributes = (0, core_1.toArray)(query.select, { split: ',' });
+            options.select = helpers_1.MysqlHelper.parseProjection(query.select);
         if (query.sort)
-            options.order = Object.entries(query.sort);
+            options.order = helpers_1.MysqlHelper.parseOrder(query.sort);
         if (query.limit)
-            options.limit = query.limit;
+            options.take = query.limit;
         if (query.limit && query.page) {
-            options.limit = query.limit;
-            options.offset = (query.page - 1) * query.limit;
+            options.take = query.limit;
+            options.skip = (query.page - 1) * query.limit;
         }
-        return this.model.findAll(options);
+        if (query.populate)
+            options.relations = helpers_1.MysqlHelper.parseRelations(query.populate);
+        return { ...opts, ...options };
     }
-    async count(query) {
-        const options = helpers_1.MysqlHelper.parseFilter(query);
-        return this.model.count(options);
+    whereById(pkValue) {
+        const primaryColumns = this.repository.metadata.primaryColumns.map(pk => pk.propertyName);
+        return primaryColumns.reduce((curr, acc) => {
+            curr[acc] = pkValue;
+            return curr;
+        }, {});
     }
-    async paginate(query) {
-        const [items, total] = await Promise.all([this.find(query), this.count(query)]);
+    async paginate(query, opts = {}) {
+        const findQuery = { ...query };
+        const countQuery = (0, lodash_1.omit)(query, ['select', 'page', 'limit', 'offset', 'sort']);
+        const [items, total] = await Promise.all([this.find(findQuery, opts), this.count(countQuery, opts)]);
         return { items, total };
     }
-    async findOne(query) {
-        const options = helpers_1.MysqlHelper.parseFilter(query);
-        if (query.select)
-            options.attributes = (0, core_1.toArray)(query.select, { split: ',' });
-        return this.model.findOne(options);
+    async find(query, opts = {}) {
+        const options = this.qb(query, opts);
+        const docs = await this.repository.find(options);
+        return this.transform(docs);
     }
-    async findById(id, query) {
-        query.condition = { [this.model.primaryKeyAttribute]: id };
-        const options = helpers_1.MysqlHelper.parseFilter(query);
-        if (query.select)
-            options.attributes = (0, core_1.toArray)(query.select, { split: ',' });
-        return this.model.findOne(options);
+    async count(query, opts = {}) {
+        const options = this.qb(query, opts);
+        return this.repository.count(options);
     }
-    async create(body) {
-        return this.model.build(body, { isNewRecord: true }).save();
+    async findOne(cond, query = {}, opts = {}) {
+        const condition = {};
+        if (!(0, lodash_1.isObject)(cond))
+            Object.assign(condition, { ...this.whereById(cond) });
+        else
+            Object.assign(condition, cond);
+        const mergeQuery = Object.assign({}, query, { condition });
+        const options = this.qb(mergeQuery, opts);
+        const doc = await this.repository.findOne(options);
+        return this.transform(doc);
     }
-    async update(condition, body) {
-        const options = helpers_1.MysqlHelper.parseFilter({ condition });
-        const model = await this.model.findOne(options);
-        if (!model)
+    async create(body, opts = {}) {
+        const transformBody = this.transform(body);
+        const entity = this.repository.create(transformBody);
+        return this.repository.save(entity, opts);
+    }
+    async update(cond, body, options = {}) {
+        const condition = {};
+        if (!(0, lodash_1.isObject)(cond))
+            Object.assign(condition, { ...this.whereById(cond) });
+        else
+            Object.assign(condition, cond);
+        const entity = await this.findOne(condition, options);
+        if (!entity)
             return null;
-        const fields = Object.keys(body);
-        return model.update(body, { fields });
+        const transformBody = this.transform({ ...entity, ...body });
+        const doc = await this.repository.save(transformBody, options);
+        return this.transform(doc);
     }
-    async delete(condition, opts) {
-        const existModel = await this.findOne({ condition });
-        if (!existModel)
+    async delete(cond, opts = {}) {
+        const entity = await this.findOne(cond, opts);
+        if (!entity)
             return null;
-        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(body, onConflicts) {
-        const fields = Object.keys(body);
-        const [row, result] = await this.model.upsert(body, {
-            returning: true,
-            fields,
-            conflictFields: onConflicts,
-        });
-        if (!row || !result)
+        const func = opts?.force ? this.repository.remove : this.repository.softRemove;
+        const doc = await func(entity);
+        return this.transform(doc);
+    }
+    async restore(cond, opts = {}) {
+        const entity = await this.findOne(cond, opts);
+        if (!entity)
             return null;
-        return row;
+        const doc = await this.repository.recover(entity);
+        return this.transform(doc);
+    }
+    async upsert(body, onConflicts, opts = {}) {
+        const transformBody = this.repository.create(body);
+        const result = await this.repository.upsert(transformBody, { ...opts, conflictPaths: onConflicts });
+        return this.transform(result.generatedMaps[0]);
+    }
+    async bulkUpsert(body, onConflicts, opts = {}) {
+        const transformBody = this.repository.create(body);
+        const result = await this.repository.upsert(transformBody, { ...opts, conflictPaths: onConflicts });
+        return this.transform(result.generatedMaps);
     }
 };
 exports.MysqlRepo = MysqlRepo;
@@ -117,25 +141,25 @@ __decorate([
 __decorate([
     mysql_exception_1.MysqlCatch,
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
-], MysqlRepo.prototype, "find", null);
+], MysqlRepo.prototype, "paginate", null);
 __decorate([
     mysql_exception_1.MysqlCatch,
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
-], MysqlRepo.prototype, "count", null);
+], MysqlRepo.prototype, "find", null);
 __decorate([
     mysql_exception_1.MysqlCatch,
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
-], MysqlRepo.prototype, "paginate", null);
+], MysqlRepo.prototype, "count", null);
 __decorate([
     mysql_exception_1.MysqlCatch,
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], MysqlRepo.prototype, "findOne", null);
 __decorate([
@@ -143,17 +167,11 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
-], MysqlRepo.prototype, "findById", null);
-__decorate([
-    mysql_exception_1.MysqlCatch,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [sequelize_typescript_1.Model]),
-    __metadata("design:returntype", Promise)
 ], MysqlRepo.prototype, "create", null);
 __decorate([
     mysql_exception_1.MysqlCatch,
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], MysqlRepo.prototype, "update", null);
 __decorate([
@@ -171,9 +189,15 @@ __decorate([
 __decorate([
     mysql_exception_1.MysqlCatch,
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Array]),
+    __metadata("design:paramtypes", [Object, Array, Object]),
     __metadata("design:returntype", Promise)
 ], MysqlRepo.prototype, "upsert", null);
+__decorate([
+    mysql_exception_1.MysqlCatch,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, Array, Object]),
+    __metadata("design:returntype", Promise)
+], MysqlRepo.prototype, "bulkUpsert", null);
 exports.MysqlRepo = MysqlRepo = __decorate([
     (0, core_1.Injectable)(),
     __metadata("design:paramtypes", [mysql_service_1.MysqlService, Object, String])

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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"}

package/dist/mysql.service.d.ts

@@ -1,14 +1,14 @@
-import { AbstractClientService } from '@joktec/core';
-import { Model, ModelCtor, Repository, Sequelize } from 'sequelize-typescript';
+import { AbstractClientService, Constructor } from '@joktec/core';
+import { DataSource, Repository } from 'typeorm';
+import { MysqlModel } from './models';
 import { MysqlClient, MysqlModelRegistry } from './mysql.client';
 import { MysqlConfig } from './mysql.config';
-export declare class MysqlService extends AbstractClientService<MysqlConfig, Sequelize> implements MysqlClient {
+export declare class MysqlService extends AbstractClientService<MysqlConfig, DataSource> implements MysqlClient {
     private modelRegistry;
     constructor(modelRegistry: MysqlModelRegistry);
-    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: string | ModelCtor<T>, conId?: string): ModelCtor<T>;
-    getRepository<T extends Model<T>>(model: ModelCtor<T>, conId?: string): Repository<T>;
+    protected init(config: MysqlConfig): Promise<DataSource>;
+    start(client: DataSource, conId?: string): Promise<void>;
+    stop(client: DataSource, conId?: string): Promise<void>;
+    getRepository<T extends MysqlModel>(entityClass: Constructor<T>, conId?: string): Repository<T>;
 }
 //# sourceMappingURL=mysql.service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mysql.service.d.ts","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAA4D,MAAM,cAAc,CAAC;AAE/G,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAoB,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAsB,WAAW,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,qBACa,YAAa,SAAQ,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAE,YAAW,WAAW;IAC5D,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,kBAAkB;cAKjE,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC;IAsBvD,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IASrE,QAAQ,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,GAAE,MAAuB,GAAG,SAAS,CAAC,CAAC,CAAC;IAIxG,aAAa,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,GAAE,MAAuB,GAAG,UAAU,CAAC,CAAC,CAAC;CAG7G"}
+{"version":3,"file":"mysql.service.d.ts","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAA6C,MAAM,cAAc,CAAC;AAE7G,OAAO,EAAgB,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAG/D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAsB,WAAW,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,qBACa,YAAa,SAAQ,qBAAqB,CAAC,WAAW,EAAE,UAAU,CAAE,YAAW,WAAW;IAC7D,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,kBAAkB;cAKjE,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAkBxD,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBxE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAStE,aAAa,CAAC,CAAC,SAAS,UAAU,EACvC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAC3B,KAAK,GAAE,MAAuB,GAC7B,UAAU,CAAC,CAAC,CAAC;CAGjB"}

package/dist/mysql.service.js

@@ -15,7 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlService = void 0;
 const core_1 = require("@joktec/core");
 const lodash_1 = require("lodash");
-const sequelize_typescript_1 = require("sequelize-typescript");
+const typeorm_1 = require("typeorm");
+const typeorm_naming_strategies_1 = require("typeorm-naming-strategies");
 const mysql_client_1 = require("./mysql.client");
 const mysql_config_1 = require("./mysql.config");
 const RETRY_OPTS = 'mysql.retry';
@@ -27,33 +28,26 @@ let MysqlService = class MysqlService extends core_1.AbstractClientService {
     async init(config) {
         const connection = (0, lodash_1.pick)(config, ['host', 'port', 'username', 'password', 'database']);
         const options = {
-            ...connection,
-            dialect: config.dialect,
-            dialectOptions: { charset: config.charset, connectTimeout: config.connectTimeout },
-            repositoryMode: true,
-            benchmark: config.debug,
-            logging: (sql, timing) => {
-                if (config.debug) {
-                    this.logService.info('SQL statement (%s): %s', (0, core_1.getTimeString)(timing), sql);
-                }
-            },
+            ...config,
+            type: config.dialect,
+            namingStrategy: new typeorm_naming_strategies_1.SnakeNamingStrategy(),
+            entities: [...this.modelRegistry[config.conId]],
         };
         if (config.slaves?.length) {
-            options.replication = { write: { ...connection }, read: config.slaves };
+            options['replication'] = { master: { ...connection }, slaves: [...config.slaves] };
         }
-        const sequelize = new sequelize_typescript_1.Sequelize(options);
+        const AppDataSource = new typeorm_1.DataSource(options);
         this.logService.info('`%s` Connection to MySQL established on host %s', config.conId, config.host);
-        return sequelize;
+        return AppDataSource;
     }
     async start(client, conId = core_1.DEFAULT_CON_ID) {
         const config = this.getConfig(conId);
         try {
-            await client.authenticate();
+            await client.initialize();
             this.logService.info('`%s` Connected to MySQL successfully', conId);
             if (this.modelRegistry[conId]) {
-                client.addModels(this.modelRegistry[conId]);
                 if (config.sync) {
-                    await client.sync({ alter: { drop: false } });
+                    await client.synchronize(true);
                     this.logService.info('`%s` Sync MySQL schema successfully', conId);
                 }
             }
@@ -64,18 +58,15 @@ let MysqlService = class MysqlService extends core_1.AbstractClientService {
     }
     async stop(client, conId = core_1.DEFAULT_CON_ID) {
         try {
-            await client.close();
+            await client.destroy();
             this.logService.warn('`%s` Close connection to MySQL successfully', conId);
         }
         catch (err) {
             this.logService.error(err, '`%s` Error when close connection to MySQL', conId);
         }
     }
-    getModel(model, conId = core_1.DEFAULT_CON_ID) {
-        return this.getClient(conId).model(model);
-    }
-    getRepository(model, conId = core_1.DEFAULT_CON_ID) {
-        return this.getClient(conId).getRepository(model);
+    getRepository(entityClass, conId = core_1.DEFAULT_CON_ID) {
+        return this.getClient(conId).getRepository(entityClass);
     }
 };
 exports.MysqlService = MysqlService;

package/dist/mysql.service.js.map

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