@joktec/mysql 0.2.13 → 0.2.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joktec/mysql",
   "description": "JokTec - MySql Service",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "private": false,
   "license": "MIT",
   "author": "JokTec",
@@ -41,18 +41,18 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@joktec/core": "0.2.11",
-    "@joktec/utils": "0.1.3",
-    "lodash": "^4.17.21",
+    "@joktec/core": "0.2.12",
+    "@joktec/utils": "0.1.4",
+    "lodash": "^4.18.1",
     "mysql": "2.18.1",
-    "mysql2": "^3.14.0",
+    "mysql2": "^3.22.5",
     "reflect-metadata": "0.2.2",
-    "typeorm": "^0.3.26"
+    "typeorm": "^1.0.0"
   },
   "devDependencies": {
-    "@types/lodash": "^4.17.16",
-    "@types/mysql": "^2.15.26",
-    "@types/validator": "^13.12.2"
+    "@types/lodash": "^4.17.24",
+    "@types/mysql": "^2.15.27",
+    "@types/validator": "^13.15.10"
   },
   "lint-staged": {
     "*.ts": [
@@ -72,6 +72,10 @@
     "transform": {
       "^.+\\.(t|s)s$": "ts-jest"
     },
+    "moduleNameMapper": {
+      "^slug$": "<rootDir>/../../../common/utils/src/__mocks__/slug.ts",
+      "^uuid$": "<rootDir>/../../../common/utils/src/__mocks__/uuid.ts"
+    },
     "coverageDirectory": "<rootDir>/../coverage/",
     "collectCoverageFrom": [
       "**/*.{ts,js}",
@@ -79,5 +83,5 @@
       "!**/*.{d,enum}.ts"
     ]
   },
-  "gitHead": "60116851b5a6fed055c912f2ba9dbdb22ad1d8a6"
+  "gitHead": "5795379f82d9751ecf3b791c75784ee9b1e482ef"
 }

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

@@ -1,15 +0,0 @@
-import { IBaseRequest, ICondition, IPopulate } from '@joktec/core';
-import { FindManyOptions } from 'typeorm';
-import { IMysqlRequest, MysqlModel } from '../models';
-export declare class MysqlFinder {
-    static parsePagination<T>(query?: IMysqlRequest<T>): {
-        limit?: number;
-        offset?: number;
-    };
-    static parseFilter<T>(query: IBaseRequest<T>): FindManyOptions<T>;
-    static parseProjection<T extends MysqlModel>(select: string | string[] | Record<string, number | boolean>): FindManyOptions<T>['select'];
-    static parseCondition<T>(condition: ICondition<T>): FindManyOptions<T>['where'];
-    static parseOrder<T>(sort: any): FindManyOptions<T>['order'];
-    static parseRelations<T>(populate: IPopulate<T>): FindManyOptions<T>['relations'];
-}
-//# sourceMappingURL=mysql.finder.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"mysql.finder.d.ts","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGnE,OAAO,EAGL,eAAe,EAShB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGtD,qBAAa,WAAW;IACtB,MAAM,CAAC,eAAe,CAAC,CAAC,EAAE,KAAK,GAAE,aAAa,CAAC,CAAC,CAAM,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAU5F,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IASjE,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,UAAU,EACzC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAC3D,eAAe,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAc/B,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAqE/E,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAQ5D,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;CAalF"}

package/dist/helpers/mysql.finder.js

@@ -1,128 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlFinder = void 0;
-const utils_1 = require("@joktec/utils");
-const lodash_1 = require("lodash");
-const typeorm_1 = require("typeorm");
-const mysql_exception_1 = require("../mysql.exception");
-class MysqlFinder {
-    static parsePagination(query = {}) {
-        const limit = typeof query.limit === 'number' && query.limit > 0 ? query.limit : undefined;
-        const page = typeof query.page === 'number' && query.page > 0 ? query.page : undefined;
-        const offset = typeof query.offset === 'number' && query.offset >= 0 ? query.offset : undefined;
-        if (limit && page)
-            return { limit, offset: (page - 1) * limit };
-        if (limit)
-            return { limit, offset: offset ?? 0 };
-        return {};
-    }
-    static parseFilter(query) {
-        const { condition = {}, keyword } = query;
-        const where = MysqlFinder.parseCondition(condition);
-        if (keyword && typeof where === 'object') {
-            where['name'] = (0, typeorm_1.ILike)(`%${keyword}%`);
-        }
-        return { where };
-    }
-    static parseProjection(select) {
-        if (typeof select === 'object') {
-            return Object.entries(select).reduce((acc, [field, direction]) => {
-                acc[field] = (0, utils_1.toBool)(direction);
-                return acc;
-            }, {});
-        }
-        return (0, utils_1.toArray)(select, { split: ',' }).reduce((acc, field) => {
-            acc[field] = true;
-            return acc;
-        }, {});
-    }
-    static parseCondition(condition) {
-        const where = {};
-        for (const [key, value] of Object.entries(condition)) {
-            if (key === '$and' || key === '$or') {
-                where[key === '$and' ? 'AND' : 'OR'] = value.map((c) => MysqlFinder.parseCondition(c));
-                continue;
-            }
-            if ((0, lodash_1.isNil)(value)) {
-                where[key] = (0, typeorm_1.IsNull)();
-                continue;
-            }
-            if (typeof value === 'object') {
-                const conditions = [];
-                for (const [op, val] of Object.entries(value)) {
-                    switch (op) {
-                        case '$eq':
-                            conditions.push((0, lodash_1.isNil)(val) ? (0, typeorm_1.IsNull)() : (0, typeorm_1.Equal)(val));
-                            break;
-                        case '$gt':
-                            conditions.push((0, typeorm_1.MoreThan)(val));
-                            break;
-                        case '$gte':
-                            conditions.push((0, typeorm_1.MoreThanOrEqual)(val));
-                            break;
-                        case '$lt':
-                            conditions.push((0, typeorm_1.LessThan)(val));
-                            break;
-                        case '$lte':
-                            conditions.push((0, typeorm_1.LessThanOrEqual)(val));
-                            break;
-                        case '$ne':
-                            conditions.push((0, lodash_1.isNil)(val) ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.Not)(val));
-                            break;
-                        case '$in':
-                            if ((0, utils_1.toArray)(val).length)
-                                conditions.push((0, typeorm_1.In)((0, utils_1.toArray)(val)));
-                            break;
-                        case '$nin':
-                            if ((0, utils_1.toArray)(val).length)
-                                conditions.push((0, typeorm_1.Not)((0, typeorm_1.In)((0, utils_1.toArray)(val))));
-                            break;
-                        case '$like':
-                            conditions.push((0, typeorm_1.ILike)(`%${val}%`));
-                            break;
-                        case '$begin':
-                            conditions.push((0, typeorm_1.ILike)(`${val}%`));
-                            break;
-                        case '$end':
-                            conditions.push((0, typeorm_1.ILike)(`%${val}`));
-                            break;
-                        case '$not':
-                            conditions.push((0, typeorm_1.Not)(this.parseCondition(val)));
-                            break;
-                        default:
-                            throw new mysql_exception_1.MysqlException(`Operator ${op} not supported`, { op, val });
-                    }
-                }
-                if (conditions.length > 1)
-                    where[key] = (0, typeorm_1.And)(...conditions);
-                else
-                    where[key] = conditions[0];
-                continue;
-            }
-            where[key] = value;
-        }
-        return where;
-    }
-    static parseOrder(sort) {
-        const order = {};
-        for (const [key, value] of Object.entries(sort)) {
-            order[key] = value === 'asc' ? 'ASC' : 'DESC';
-        }
-        return order;
-    }
-    static parseRelations(populate) {
-        const relations = {};
-        for (const [path, value] of Object.entries(populate)) {
-            if (value === '*') {
-                relations[path] = true;
-                continue;
-            }
-            if (typeof value === 'object') {
-                relations[path] = MysqlFinder.parseRelations(value['populate'] || {});
-            }
-        }
-        return relations;
-    }
-}
-exports.MysqlFinder = MysqlFinder;
-//# sourceMappingURL=mysql.finder.js.map

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

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