@joktec/mysql 0.0.179 → 0.0.180
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.finder.d.ts","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAmB,MAAM,cAAc,CAAC;AACpF,OAAO,
|
|
1
|
+
{"version":3,"file":"mysql.finder.d.ts","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAmB,MAAM,cAAc,CAAC;AACpF,OAAO,EAEL,eAAe,EAShB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAIvC,qBAAa,WAAW;IACtB,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;IA4D/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"}
|
|
@@ -4,6 +4,7 @@ exports.MysqlFinder = void 0;
|
|
|
4
4
|
const core_1 = require("@joktec/core");
|
|
5
5
|
const typeorm_1 = require("typeorm");
|
|
6
6
|
const mysql_exception_1 = require("../mysql.exception");
|
|
7
|
+
const lodash_1 = require("lodash");
|
|
7
8
|
class MysqlFinder {
|
|
8
9
|
static parseFilter(query) {
|
|
9
10
|
const { condition = {}, keyword } = query;
|
|
@@ -32,15 +33,11 @@ class MysqlFinder {
|
|
|
32
33
|
where[key === '$and' ? 'AND' : 'OR'] = value.map((c) => MysqlFinder.parseCondition(c));
|
|
33
34
|
continue;
|
|
34
35
|
}
|
|
35
|
-
if (value === null || value === undefined) {
|
|
36
|
-
where[key] = (0, typeorm_1.Not)(null);
|
|
37
|
-
continue;
|
|
38
|
-
}
|
|
39
36
|
if (typeof value === 'object') {
|
|
40
37
|
for (const [op, val] of Object.entries(value)) {
|
|
41
38
|
switch (op) {
|
|
42
39
|
case '$eq':
|
|
43
|
-
where[key] = val;
|
|
40
|
+
where[key] = (0, lodash_1.isNil)(value) ? (0, typeorm_1.IsNull)() : (0, typeorm_1.Equal)(val);
|
|
44
41
|
break;
|
|
45
42
|
case '$gt':
|
|
46
43
|
where[key] = (0, typeorm_1.MoreThan)(val);
|
|
@@ -55,10 +52,15 @@ class MysqlFinder {
|
|
|
55
52
|
where[key] = (0, typeorm_1.LessThanOrEqual)(val);
|
|
56
53
|
break;
|
|
57
54
|
case '$ne':
|
|
58
|
-
where[key] = (0, typeorm_1.Not)(val);
|
|
55
|
+
where[key] = (0, lodash_1.isNil)(val) ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.Not)(val);
|
|
59
56
|
break;
|
|
60
57
|
case '$in':
|
|
61
|
-
|
|
58
|
+
if ((0, core_1.toArray)(val).length)
|
|
59
|
+
where[key] = (0, typeorm_1.In)((0, core_1.toArray)(val));
|
|
60
|
+
break;
|
|
61
|
+
case '$nin':
|
|
62
|
+
if ((0, core_1.toArray)(val).length)
|
|
63
|
+
where[key] = (0, typeorm_1.Not)((0, typeorm_1.In)((0, core_1.toArray)(val)));
|
|
62
64
|
break;
|
|
63
65
|
case '$like':
|
|
64
66
|
where[key] = (0, typeorm_1.ILike)(`%${val}%`);
|
|
@@ -69,6 +71,9 @@ class MysqlFinder {
|
|
|
69
71
|
case '$end':
|
|
70
72
|
where[key] = (0, typeorm_1.ILike)(`%${val}`);
|
|
71
73
|
break;
|
|
74
|
+
case '$not':
|
|
75
|
+
where[key] = (0, typeorm_1.Not)(this.parseCondition(val));
|
|
76
|
+
break;
|
|
72
77
|
default:
|
|
73
78
|
throw new mysql_exception_1.MysqlException(`Operator ${op} not supported`, { op, val });
|
|
74
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.finder.js","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":";;;AAAA,uCAAoF;AACpF,
|
|
1
|
+
{"version":3,"file":"mysql.finder.js","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":"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"}
|