@joktec/mysql 0.0.95 → 0.0.97

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joktec/mysql",
   "description": "JokTec - MySql Service",
-  "version": "0.0.95",
+  "version": "0.0.97",
   "private": false,
   "license": "MIT",
   "author": "JokTec",
@@ -33,14 +33,12 @@
   "scripts": {
     "clean": "rimraf -rf dist",
     "purge": "rimraf -rf node_modules",
-    "dev": "nest start --watch -p tsconfig.json",
     "prebuild": "yarn clean",
     "build": "nest build -p tsconfig.json",
     "prepublishOnly": "yarn build",
     "format": "prettier \"./src/**/*.ts\" --ignore-path ./.prettierignore --write",
     "lint": "eslint --fix \"./src/**/*.ts\"",
     "dep:upgrade": "ncu -p yarn -u",
-    "gen:entity": "./bin/generate-entity.sh && yarn format && yarn lint",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
@@ -48,12 +46,12 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@joktec/core": "0.0.93",
+    "@joktec/core": "0.0.95",
     "lodash": "^4.17.21",
     "mysql": "2.18.1",
-    "mysql2": "^3.6.2",
+    "mysql2": "^3.6.3",
     "reflect-metadata": "*",
-    "sequelize": "^6.33.0",
+    "sequelize": "^6.34.0",
     "sequelize-typescript": "^2.1.5"
   },
   "devDependencies": {
@@ -85,5 +83,5 @@
       "!**/*.{d,enum}.ts"
     ]
   },
-  "gitHead": "8ba28a0c33c4efd362746a7b13d173b2d5833db4"
+  "gitHead": "114dde9fcbefd1a5ea18c14103b254a036c74ceb"
 }

package/dist/__tests__/mysql.utils.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=mysql.utils.spec.d.ts.map

package/dist/__tests__/mysql.utils.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mysql.utils.spec.d.ts","sourceRoot":"","sources":["../../src/__tests__/mysql.utils.spec.ts"],"names":[],"mappings":""}

package/dist/__tests__/mysql.utils.spec.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const globals_1 = require("@jest/globals");
-const sequelize_1 = require("sequelize");
-const mysql_utils_1 = require("../mysql.utils");
-(0, globals_1.describe)('convertOp function', () => {
-    (0, globals_1.it)('should return the correct symbol for $ne operator', () => {
-        const inputOp = '$ne';
-        const expectedOp = sequelize_1.Op.ne;
-        const actualOp = (0, mysql_utils_1.convertOp)(inputOp);
-        (0, globals_1.expect)(actualOp).toBe(expectedOp);
-    });
-    (0, globals_1.it)('should return Op.eq for invalid operator', () => {
-        const inputOp = '$invalid';
-        const expectedOp = sequelize_1.Op.eq;
-        const actualOp = (0, mysql_utils_1.convertOp)(inputOp);
-        (0, globals_1.expect)(actualOp).toBe(expectedOp);
-    });
-    (0, globals_1.it)('should return Op.eq for undefined operator', () => {
-        const inputOp = undefined;
-        const expectedOp = sequelize_1.Op.eq;
-        const actualOp = (0, mysql_utils_1.convertOp)(inputOp);
-        (0, globals_1.expect)(actualOp).toBe(expectedOp);
-    });
-});
-//# sourceMappingURL=mysql.utils.spec.js.map

package/dist/__tests__/mysql.utils.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mysql.utils.spec.js","sourceRoot":"","sources":["../../src/__tests__/mysql.utils.spec.ts"],"names":[],"mappings":";;AAAA,2CAAqD;AACrD,yCAA+B;AAC/B,gDAA2C;AAE3C,IAAA,kBAAQ,EAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAA,YAAE,EAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,OAAO,GAAG,KAAK,CAAC;QACtB,MAAM,UAAU,GAAG,cAAE,CAAC,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,IAAA,uBAAS,EAAC,OAAO,CAAC,CAAC;QACpC,IAAA,gBAAM,EAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,IAAA,YAAE,EAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,OAAO,GAAG,UAAU,CAAC;QAC3B,MAAM,UAAU,GAAG,cAAE,CAAC,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,IAAA,uBAAS,EAAC,OAAc,CAAC,CAAC;QAC3C,IAAA,gBAAM,EAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,IAAA,YAAE,EAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,OAAO,GAAG,SAAS,CAAC;QAC1B,MAAM,UAAU,GAAG,cAAE,CAAC,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,IAAA,uBAAS,EAAC,OAAO,CAAC,CAAC;QACpC,IAAA,gBAAM,EAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/mysql.utils.d.ts

@@ -1,7 +0,0 @@
-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.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mysql.utils.d.ts","sourceRoot":"","sources":["../src/mysql.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,UAAU,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,WAAW,EAAe,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,eAAO,MAAM,cAAc,sDAAkD,WA8B5E,CAAC;AAEF,eAAO,MAAM,SAAS,OAAQ,UAAU,KAAG,MAc1C,CAAC"}

package/dist/mysql.utils.js

@@ -1,53 +0,0 @@
-"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] = {
-                    ...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

package/dist/mysql.utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mysql.utils.js","sourceRoot":"","sources":["../src/mysql.utils.ts"],"names":[],"mappings":";;;AACA,yCAAqD;AAI9C,MAAM,cAAc,GAAG,CAAqB,KAAuB,EAAe,EAAE;IACzF,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1C,MAAM,KAAK,GAAiC,EAAE,CAAC;IAE/C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACpD,IAAI,GAAG,KAAK,MAAM,EAAE;YAClB,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,GAAI,KAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,sBAAc,EAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACvF;aAAM,IAAI,GAAG,KAAK,KAAK,EAAE;YACxB,KAAK,CAAC,cAAE,CAAC,EAAE,CAAC,GAAI,KAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,sBAAc,EAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACtF;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAA8B,CAAC;YACnE,KAAK,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,OAAO,EAAE;gBAC/B,MAAM,KAAK,GAAG,IAAA,iBAAS,EAAC,EAAE,CAAC,CAAC;gBAC5B,KAAK,CAAC,GAAG,CAAC,GAAG;oBACX,GAAG,KAAK,CAAC,GAAG,CAAC;oBACb,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,cAAE,CAAC,IAAI,IAAI,KAAK,KAAK,cAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG;iBACtE,CAAC;aACH;SACF;aAAM;YACL,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACpB;KACF;IAGD,IAAI,OAAO,EAAE;QACX,IAAI,CAAC,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC;YAAE,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QACvC,KAAK,CAAC,cAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,mBAAO,EAAC,wBAAwB,OAAO,oBAAoB,CAAC,CAAC,CAAC;KAClF;IAED,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC,CAAC;AA9BW,QAAA,cAAc,kBA8BzB;AAEK,MAAM,SAAS,GAAG,CAAC,EAAc,EAAU,EAAE;IAClD,MAAM,OAAO,GAA+B;QAC1C,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,IAAI,EAAE,cAAE,CAAC,GAAG;QACZ,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,IAAI,EAAE,cAAE,CAAC,GAAG;QACZ,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,IAAI,EAAE,cAAE,CAAC,KAAK;QACd,GAAG,EAAE,cAAE,CAAC,EAAE;QACV,KAAK,EAAE,cAAE,CAAC,IAAI;QACd,OAAO,EAAE,cAAE,CAAC,OAAO;KACpB,CAAC;IACF,OAAO,OAAO,CAAC,EAAE,CAAC,IAAI,cAAE,CAAC,EAAE,CAAC;AAC9B,CAAC,CAAC;AAdW,QAAA,SAAS,aAcpB"}