@volcanicminds/typeorm 0.0.11 → 0.0.13
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.
- package/README.md +0 -2
- package/dist/index.d.ts +2 -2
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/lib/loader/userManager.d.ts +4 -0
- package/dist/lib/loader/userManager.js +21 -4
- package/dist/lib/loader/userManager.js.map +1 -1
- package/dist/lib/query.d.ts +5 -3
- package/dist/lib/query.js +78 -71
- package/dist/lib/query.js.map +1 -1
- package/esm/index.d.ts +2 -2
- package/esm/index.js +4 -2
- package/esm/index.js.map +1 -1
- package/esm/lib/loader/userManager.d.ts +4 -0
- package/esm/lib/loader/userManager.js +13 -4
- package/esm/lib/loader/userManager.js.map +1 -1
- package/esm/lib/query.d.ts +5 -3
- package/esm/lib/query.js +78 -71
- package/esm/lib/query.js.map +1 -1
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -7,8 +7,6 @@
|
|
|
7
7
|
|
|
8
8
|
## Based on
|
|
9
9
|
|
|
10
|
-
Based on [Fastify](https://www.fastify.io) ([GitHub](https://github.com/fastify/fastify)).
|
|
11
|
-
|
|
12
10
|
Based on [TypeORM](https://www.typeorm.io) ([GitHub](https://github.com/typeorm/typeorm)).
|
|
13
11
|
|
|
14
12
|
And, what you see in [package.json](package.json).
|
package/dist/index.d.ts
CHANGED
|
@@ -2,6 +2,6 @@ import 'reflect-metadata';
|
|
|
2
2
|
import { DataSource } from 'typeorm';
|
|
3
3
|
import * as userManager from './lib/loader/userManager';
|
|
4
4
|
import { User } from './lib/entities/user.e';
|
|
5
|
-
import { applyQuery, executeCountQuery, executeFindQuery } from './lib/query';
|
|
5
|
+
import { applyQuery, executeCountQuery, executeFindQuery, useOrder, useWhere } from './lib/query';
|
|
6
6
|
export { Database } from './types/global';
|
|
7
|
-
export { User, userManager, DataSource, applyQuery, executeCountQuery, executeFindQuery };
|
|
7
|
+
export { User, userManager, DataSource, applyQuery, executeCountQuery, executeFindQuery, useOrder, useWhere };
|
package/dist/index.js
CHANGED
|
@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.executeFindQuery = exports.executeCountQuery = exports.applyQuery = exports.DataSource = exports.userManager = exports.User = void 0;
|
|
35
|
+
exports.useWhere = exports.useOrder = exports.executeFindQuery = exports.executeCountQuery = exports.applyQuery = exports.DataSource = exports.userManager = exports.User = void 0;
|
|
36
36
|
require("reflect-metadata");
|
|
37
37
|
const typeorm_1 = require("typeorm");
|
|
38
38
|
Object.defineProperty(exports, "DataSource", { enumerable: true, get: function () { return typeorm_1.DataSource; } });
|
|
@@ -45,6 +45,8 @@ const query_1 = require("./lib/query");
|
|
|
45
45
|
Object.defineProperty(exports, "applyQuery", { enumerable: true, get: function () { return query_1.applyQuery; } });
|
|
46
46
|
Object.defineProperty(exports, "executeCountQuery", { enumerable: true, get: function () { return query_1.executeCountQuery; } });
|
|
47
47
|
Object.defineProperty(exports, "executeFindQuery", { enumerable: true, get: function () { return query_1.executeFindQuery; } });
|
|
48
|
+
Object.defineProperty(exports, "useOrder", { enumerable: true, get: function () { return query_1.useOrder; } });
|
|
49
|
+
Object.defineProperty(exports, "useWhere", { enumerable: true, get: function () { return query_1.useWhere; } });
|
|
48
50
|
function start(options) {
|
|
49
51
|
return __awaiter(this, void 0, void 0, function* () {
|
|
50
52
|
return new Promise((resolve, reject) => {
|
|
@@ -95,5 +97,5 @@ function start(options) {
|
|
|
95
97
|
});
|
|
96
98
|
});
|
|
97
99
|
}
|
|
98
|
-
module.exports = { start, User: user_e_1.User, userManager, applyQuery: query_1.applyQuery, executeCountQuery: query_1.executeCountQuery, executeFindQuery: query_1.executeFindQuery };
|
|
100
|
+
module.exports = { start, User: user_e_1.User, userManager, applyQuery: query_1.applyQuery, executeCountQuery: query_1.executeCountQuery, executeFindQuery: query_1.executeFindQuery, useOrder: query_1.useOrder, useWhere: query_1.useWhere };
|
|
99
101
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEZ,4BAAyB;AACzB,qCAAoC;AAsER,2FAtEnB,oBAAU,OAsEmB;AArEtC,sEAAuD;AACvD,sEAAuD;AAoExC,kCAAW;AAnE1B,kDAA4C;AAmEnC,qFAnEA,aAAI,OAmEA;AAlEb,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,8 @@ declare const User: any;
|
|
|
2
2
|
export declare function demo(): Promise<never[]>;
|
|
3
3
|
export declare function register(data: typeof User): Promise<any>;
|
|
4
4
|
export declare function login(data: typeof User): Promise<any>;
|
|
5
|
+
export declare function logout(data: typeof User): Promise<void>;
|
|
6
|
+
export declare function forgotPassword(data: typeof User): Promise<void>;
|
|
7
|
+
export declare function resetPassword(data: typeof User): Promise<void>;
|
|
8
|
+
export declare function unregister(data: typeof User): Promise<void>;
|
|
5
9
|
export {};
|
|
@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.login = exports.register = exports.demo = void 0;
|
|
35
|
+
exports.unregister = exports.resetPassword = exports.forgotPassword = exports.logout = exports.login = exports.register = exports.demo = void 0;
|
|
36
36
|
const bcrypt = __importStar(require("bcrypt"));
|
|
37
37
|
const { User } = require('../entities/user.e');
|
|
38
38
|
function demo() {
|
|
@@ -44,7 +44,7 @@ exports.demo = demo;
|
|
|
44
44
|
function register(data) {
|
|
45
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
46
|
const { name, email, password } = data;
|
|
47
|
-
const salt = yield bcrypt.genSalt();
|
|
47
|
+
const salt = yield bcrypt.genSalt(12);
|
|
48
48
|
const hashedPassword = yield bcrypt.hash(password, salt);
|
|
49
49
|
try {
|
|
50
50
|
let user = Object.assign(Object.assign({}, data), { name: name || email, password: hashedPassword });
|
|
@@ -61,10 +61,11 @@ function register(data) {
|
|
|
61
61
|
exports.register = register;
|
|
62
62
|
function login(data) {
|
|
63
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
64
|
-
const {
|
|
64
|
+
const { email, password } = data;
|
|
65
65
|
try {
|
|
66
66
|
const user = yield global.repository.users.findOneBy({ email: email });
|
|
67
|
-
|
|
67
|
+
const match = yield bcrypt.compare(password, user.password);
|
|
68
|
+
return match ? user : null;
|
|
68
69
|
}
|
|
69
70
|
catch (error) {
|
|
70
71
|
throw error;
|
|
@@ -72,4 +73,20 @@ function login(data) {
|
|
|
72
73
|
});
|
|
73
74
|
}
|
|
74
75
|
exports.login = login;
|
|
76
|
+
function logout(data) {
|
|
77
|
+
return __awaiter(this, void 0, void 0, function* () { });
|
|
78
|
+
}
|
|
79
|
+
exports.logout = logout;
|
|
80
|
+
function forgotPassword(data) {
|
|
81
|
+
return __awaiter(this, void 0, void 0, function* () { });
|
|
82
|
+
}
|
|
83
|
+
exports.forgotPassword = forgotPassword;
|
|
84
|
+
function resetPassword(data) {
|
|
85
|
+
return __awaiter(this, void 0, void 0, function* () { });
|
|
86
|
+
}
|
|
87
|
+
exports.resetPassword = resetPassword;
|
|
88
|
+
function unregister(data) {
|
|
89
|
+
return __awaiter(this, void 0, void 0, function* () { });
|
|
90
|
+
}
|
|
91
|
+
exports.unregister = unregister;
|
|
75
92
|
//# sourceMappingURL=userManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE9C,SAAsB,IAAI;;QAGxB,OAAO,EAAE,CAAA;IACX,CAAC;CAAA;AAJD,oBAIC;AAED,SAAsB,QAAQ,CAAC,IAAiB;;QAC9C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QACtC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE9C,SAAsB,IAAI;;QAGxB,OAAO,EAAE,CAAA;IACX,CAAC;CAAA;AAJD,oBAIC;AAED,SAAsB,QAAQ,CAAC,IAAiB;;QAC9C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QACtC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACrC,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAExD,IAAI;YACF,IAAI,IAAI,GAAG,gCAAK,IAAI,KAAE,IAAI,EAAE,IAAI,IAAI,KAAK,EAAE,QAAQ,EAAE,cAAc,GAAiB,CAAA;YACpF,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC7B;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,KAAI,KAAK,EAAE;gBACxB,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAA;aACxC;YACD,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CAAA;AAdD,4BAcC;AAED,SAAsB,KAAK,CAAC,IAAiB;;QAC3C,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QAEhC,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;YACtE,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC3D,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;SAC3B;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CAAA;AAVD,sBAUC;AAED,SAAsB,MAAM,CAAC,IAAiB;0DAAG,CAAC;CAAA;AAAlD,wBAAkD;AAElD,SAAsB,cAAc,CAAC,IAAiB;0DAAG,CAAC;CAAA;AAA1D,wCAA0D;AAE1D,SAAsB,aAAa,CAAC,IAAiB;0DAAG,CAAC;CAAA;AAAzD,sCAAyD;AAEzD,SAAsB,UAAU,CAAC,IAAiB;0DAAG,CAAC;CAAA;AAAtD,gCAAsD"}
|
package/dist/lib/query.d.ts
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
export declare
|
|
1
|
+
export declare const useOrder: (order?: string[]) => {};
|
|
2
|
+
export declare const useWhere: (where: any) => {};
|
|
3
|
+
export declare function applyQuery(data: any, extraWhere: any): {
|
|
2
4
|
skip?: number | undefined;
|
|
3
5
|
take?: number | undefined;
|
|
4
6
|
order?: object | undefined;
|
|
5
7
|
where?: object | undefined;
|
|
6
8
|
};
|
|
7
|
-
export declare function executeFindQuery(repo: any, relations?: {}, data?: {}): Promise<{
|
|
9
|
+
export declare function executeFindQuery(repo: any, relations?: {}, data?: {}, extraWhere?: any): Promise<{
|
|
8
10
|
records: any;
|
|
9
11
|
headers: {
|
|
10
12
|
'v-total': any;
|
|
@@ -13,4 +15,4 @@ export declare function executeFindQuery(repo: any, relations?: {}, data?: {}):
|
|
|
13
15
|
'v-page': number;
|
|
14
16
|
};
|
|
15
17
|
}>;
|
|
16
|
-
export declare function executeCountQuery(repo: any, data?: {}): Promise<any>;
|
|
18
|
+
export declare function executeCountQuery(repo: any, data?: {}, extraWhere?: any): Promise<any>;
|
package/dist/lib/query.js
CHANGED
|
@@ -43,93 +43,100 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
43
43
|
return t;
|
|
44
44
|
};
|
|
45
45
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
|
-
exports.executeCountQuery = exports.executeFindQuery = exports.applyQuery = void 0;
|
|
46
|
+
exports.executeCountQuery = exports.executeFindQuery = exports.applyQuery = exports.useWhere = exports.useOrder = void 0;
|
|
47
47
|
const typeorm_1 = require("typeorm");
|
|
48
48
|
const log = __importStar(require("./util/logger"));
|
|
49
|
-
|
|
49
|
+
const evalOrder = (val = '') => (['desc', 'd', 'false', '1'].includes(val.toLowerCase()) ? 'desc' : 'asc');
|
|
50
|
+
const useOrder = (order = []) => {
|
|
51
|
+
const orderBy = {};
|
|
52
|
+
order
|
|
53
|
+
.filter((o) => !!o)
|
|
54
|
+
.forEach((o) => {
|
|
55
|
+
const p = o.split(':');
|
|
56
|
+
orderBy[p[0]] = evalOrder(p[1]);
|
|
57
|
+
});
|
|
58
|
+
return orderBy;
|
|
59
|
+
};
|
|
60
|
+
exports.useOrder = useOrder;
|
|
61
|
+
const useWhere = (where) => {
|
|
62
|
+
const result = {};
|
|
63
|
+
const val = (v) => v || 'notFound';
|
|
64
|
+
const reservedOperators = {
|
|
65
|
+
':null': (v) => (v == 'false' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
66
|
+
':notNull': (v) => (v == 'true' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
67
|
+
':in': (v) => (0, typeorm_1.In)(val(v).split(',')),
|
|
68
|
+
':nin': (v) => (0, typeorm_1.Not)((0, typeorm_1.In)(val(v).split(','))),
|
|
69
|
+
':likei': (v) => (0, typeorm_1.ILike)(`${val(v)}`),
|
|
70
|
+
':containsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}%`),
|
|
71
|
+
':ncontainsi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
72
|
+
':startsi': (v) => (0, typeorm_1.ILike)(`${val(v)}%`),
|
|
73
|
+
':endsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}`),
|
|
74
|
+
':eqi': (v) => (0, typeorm_1.ILike)(v),
|
|
75
|
+
':neqi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(v)),
|
|
76
|
+
':like': (v) => (0, typeorm_1.Like)(`${val(v)}`),
|
|
77
|
+
':contains': (v) => (0, typeorm_1.Like)(`%${val(v)}%`),
|
|
78
|
+
':ncontains': (v) => (0, typeorm_1.Not)((0, typeorm_1.Like)(`%${val(v)}%`)),
|
|
79
|
+
':starts': (v) => (0, typeorm_1.Like)(`${val(v)}%`),
|
|
80
|
+
':ends': (v) => (0, typeorm_1.Like)(`%${val(v)}`),
|
|
81
|
+
':eq': (v) => (0, typeorm_1.Equal)(v),
|
|
82
|
+
':neq': (v) => (0, typeorm_1.Not)((0, typeorm_1.Equal)(v)),
|
|
83
|
+
':gt': (v) => (0, typeorm_1.MoreThan)(v),
|
|
84
|
+
':ge': (v) => (0, typeorm_1.MoreThanOrEqual)(v),
|
|
85
|
+
':lt': (v) => (0, typeorm_1.LessThan)(v),
|
|
86
|
+
':le': (v) => (0, typeorm_1.LessThanOrEqual)(v),
|
|
87
|
+
':between': (v) => {
|
|
88
|
+
const s = v === null || v === void 0 ? void 0 : v.split(':');
|
|
89
|
+
return (s === null || s === void 0 ? void 0 : s.length) == 2 ? (0, typeorm_1.Between)(s[0], s[1]) : v;
|
|
90
|
+
}
|
|
91
|
+
};
|
|
92
|
+
const reservedWords = Object.keys(reservedOperators).join('|');
|
|
93
|
+
for (const objectPath in where) {
|
|
94
|
+
const parts = objectPath.split('.');
|
|
95
|
+
let target = result;
|
|
96
|
+
while (parts.length > 1) {
|
|
97
|
+
const part = parts.shift() || '';
|
|
98
|
+
target = target[part] = target[part] || {};
|
|
99
|
+
}
|
|
100
|
+
const m = parts[0].match(new RegExp(`(${reservedWords})\\b`, 'ig'));
|
|
101
|
+
const operator = (m === null || m === void 0 ? void 0 : m.length) ? m[0] : null;
|
|
102
|
+
const fieldName = operator ? parts[0].replace(operator, '') : parts[0];
|
|
103
|
+
let value = where[objectPath];
|
|
104
|
+
log.debug('fieldName: ' + fieldName + ' with path: ' + objectPath);
|
|
105
|
+
log.debug('operator: ' + operator + ' on value: ' + value);
|
|
106
|
+
if (operator) {
|
|
107
|
+
value = reservedOperators[operator](value);
|
|
108
|
+
}
|
|
109
|
+
target[fieldName] = value;
|
|
110
|
+
}
|
|
111
|
+
return result;
|
|
112
|
+
};
|
|
113
|
+
exports.useWhere = useWhere;
|
|
114
|
+
function applyQuery(data, extraWhere) {
|
|
50
115
|
const { page = 0, pageSize = 0, skip: sk = 0, take: tk = 0, sort: s } = data, where = __rest(data, ["page", "pageSize", "skip", "take", "sort"]);
|
|
51
116
|
const take = tk || pageSize || 50;
|
|
52
117
|
const skip = sk || page * pageSize || 0;
|
|
53
118
|
const order = !Array.isArray(s) ? [s] : s;
|
|
54
|
-
const evalOrder = (val = '') => (['desc', 'd', 'false', '1'].includes(val.toLowerCase()) ? 'desc' : 'asc');
|
|
55
|
-
const useOrder = (order = []) => {
|
|
56
|
-
const orderBy = {};
|
|
57
|
-
order
|
|
58
|
-
.filter((o) => !!o)
|
|
59
|
-
.forEach((o) => {
|
|
60
|
-
const p = o.split(':');
|
|
61
|
-
orderBy[p[0]] = evalOrder(p[1]);
|
|
62
|
-
});
|
|
63
|
-
return orderBy;
|
|
64
|
-
};
|
|
65
|
-
const useWhere = (where) => {
|
|
66
|
-
const result = {};
|
|
67
|
-
const val = (v) => v || 'notFound';
|
|
68
|
-
const reservedOperators = {
|
|
69
|
-
':null': (v) => (v == 'false' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
70
|
-
':notNull': (v) => (v == 'true' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
71
|
-
':in': (v) => (0, typeorm_1.In)(val(v).split(',')),
|
|
72
|
-
':nin': (v) => (0, typeorm_1.Not)((0, typeorm_1.In)(val(v).split(','))),
|
|
73
|
-
':likei': (v) => (0, typeorm_1.ILike)(`${val(v)}`),
|
|
74
|
-
':containsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}%`),
|
|
75
|
-
':ncontainsi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
76
|
-
':startsi': (v) => (0, typeorm_1.ILike)(`${val(v)}%`),
|
|
77
|
-
':endsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}`),
|
|
78
|
-
':eqi': (v) => (0, typeorm_1.ILike)(v),
|
|
79
|
-
':neqi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(v)),
|
|
80
|
-
':like': (v) => (0, typeorm_1.Like)(`${val(v)}`),
|
|
81
|
-
':contains': (v) => (0, typeorm_1.Like)(`%${val(v)}%`),
|
|
82
|
-
':ncontains': (v) => (0, typeorm_1.Not)((0, typeorm_1.Like)(`%${val(v)}%`)),
|
|
83
|
-
':starts': (v) => (0, typeorm_1.Like)(`${val(v)}%`),
|
|
84
|
-
':ends': (v) => (0, typeorm_1.Like)(`%${val(v)}`),
|
|
85
|
-
':eq': (v) => (0, typeorm_1.Equal)(v),
|
|
86
|
-
':neq': (v) => (0, typeorm_1.Not)((0, typeorm_1.Equal)(v)),
|
|
87
|
-
':gt': (v) => (0, typeorm_1.MoreThan)(v),
|
|
88
|
-
':ge': (v) => (0, typeorm_1.MoreThanOrEqual)(v),
|
|
89
|
-
':lt': (v) => (0, typeorm_1.LessThan)(v),
|
|
90
|
-
':le': (v) => (0, typeorm_1.LessThanOrEqual)(v),
|
|
91
|
-
':between': (v) => {
|
|
92
|
-
const s = v === null || v === void 0 ? void 0 : v.split(':');
|
|
93
|
-
return (s === null || s === void 0 ? void 0 : s.length) == 2 ? (0, typeorm_1.Between)(s[0], s[1]) : v;
|
|
94
|
-
}
|
|
95
|
-
};
|
|
96
|
-
const reservedWords = Object.keys(reservedOperators).join('|');
|
|
97
|
-
for (const objectPath in where) {
|
|
98
|
-
const parts = objectPath.split('.');
|
|
99
|
-
let target = result;
|
|
100
|
-
while (parts.length > 1) {
|
|
101
|
-
const part = parts.shift() || '';
|
|
102
|
-
target = target[part] = target[part] || {};
|
|
103
|
-
}
|
|
104
|
-
const m = parts[0].match(new RegExp(`(${reservedWords})\\b`, 'ig'));
|
|
105
|
-
const operator = (m === null || m === void 0 ? void 0 : m.length) ? m[0] : null;
|
|
106
|
-
const fieldName = operator ? parts[0].replace(operator, '') : parts[0];
|
|
107
|
-
let value = where[objectPath];
|
|
108
|
-
log.debug('fieldName: ' + fieldName + ' with path: ' + objectPath);
|
|
109
|
-
log.debug('operator: ' + operator + ' on value: ' + value);
|
|
110
|
-
if (operator) {
|
|
111
|
-
value = reservedOperators[operator](value);
|
|
112
|
-
}
|
|
113
|
-
target[fieldName] = value;
|
|
114
|
-
}
|
|
115
|
-
return result;
|
|
116
|
-
};
|
|
117
119
|
const query = {};
|
|
118
120
|
if (skip)
|
|
119
121
|
query.skip = skip;
|
|
120
122
|
if (take)
|
|
121
123
|
query.take = take;
|
|
122
124
|
if (order)
|
|
123
|
-
query.order = useOrder(order);
|
|
125
|
+
query.order = (0, exports.useOrder)(order);
|
|
124
126
|
if (where)
|
|
125
|
-
query.where = useWhere(where);
|
|
127
|
+
query.where = (0, exports.useWhere)(where);
|
|
128
|
+
let extra;
|
|
129
|
+
if (extraWhere) {
|
|
130
|
+
extra = Array.isArray(extraWhere) ? extraWhere.map((w) => (0, exports.useWhere)(w)) : (0, exports.useWhere)(extraWhere);
|
|
131
|
+
}
|
|
132
|
+
query.where = Array.isArray(extra) ? extra.map((w) => (Object.assign(Object.assign({}, w), query.where))) : Object.assign(Object.assign({}, extra), query.where);
|
|
126
133
|
log.debug('FINAL WHERE: ' + JSON.stringify(query.where));
|
|
127
134
|
return query;
|
|
128
135
|
}
|
|
129
136
|
exports.applyQuery = applyQuery;
|
|
130
|
-
function executeFindQuery(repo, relations = {}, data = {}) {
|
|
137
|
+
function executeFindQuery(repo, relations = {}, data = {}, extraWhere = {}) {
|
|
131
138
|
return __awaiter(this, void 0, void 0, function* () {
|
|
132
|
-
const extra = applyQuery(data);
|
|
139
|
+
const extra = applyQuery(data, extraWhere);
|
|
133
140
|
const [records = [], totalCount] = yield repo.findAndCount(Object.assign({ relations: relations }, extra));
|
|
134
141
|
return {
|
|
135
142
|
records,
|
|
@@ -143,9 +150,9 @@ function executeFindQuery(repo, relations = {}, data = {}) {
|
|
|
143
150
|
});
|
|
144
151
|
}
|
|
145
152
|
exports.executeFindQuery = executeFindQuery;
|
|
146
|
-
function executeCountQuery(repo, data = {}) {
|
|
153
|
+
function executeCountQuery(repo, data = {}, extraWhere = {}) {
|
|
147
154
|
return __awaiter(this, void 0, void 0, function* () {
|
|
148
|
-
const { where = {} } = applyQuery(data);
|
|
155
|
+
const { where = {} } = applyQuery(data, extraWhere);
|
|
149
156
|
return yield repo.count({ where: where });
|
|
150
157
|
});
|
|
151
158
|
}
|
package/dist/lib/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAYgB;AAEhB,mDAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":"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"}
|
package/esm/index.d.ts
CHANGED
|
@@ -2,6 +2,6 @@ import 'reflect-metadata';
|
|
|
2
2
|
import { DataSource } from 'typeorm';
|
|
3
3
|
import * as userManager from './lib/loader/userManager';
|
|
4
4
|
import { User } from './lib/entities/user.e';
|
|
5
|
-
import { applyQuery, executeCountQuery, executeFindQuery } from './lib/query';
|
|
5
|
+
import { applyQuery, executeCountQuery, executeFindQuery, useOrder, useWhere } from './lib/query';
|
|
6
6
|
export { Database } from './types/global';
|
|
7
|
-
export { User, userManager, DataSource, applyQuery, executeCountQuery, executeFindQuery };
|
|
7
|
+
export { User, userManager, DataSource, applyQuery, executeCountQuery, executeFindQuery, useOrder, useWhere };
|
package/esm/index.js
CHANGED
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.executeFindQuery = exports.executeCountQuery = exports.applyQuery = exports.DataSource = exports.userManager = exports.User = void 0;
|
|
26
|
+
exports.useWhere = exports.useOrder = exports.executeFindQuery = exports.executeCountQuery = exports.applyQuery = exports.DataSource = exports.userManager = exports.User = void 0;
|
|
27
27
|
require("reflect-metadata");
|
|
28
28
|
const typeorm_1 = require("typeorm");
|
|
29
29
|
Object.defineProperty(exports, "DataSource", { enumerable: true, get: function () { return typeorm_1.DataSource; } });
|
|
@@ -36,6 +36,8 @@ const query_1 = require("./lib/query");
|
|
|
36
36
|
Object.defineProperty(exports, "applyQuery", { enumerable: true, get: function () { return query_1.applyQuery; } });
|
|
37
37
|
Object.defineProperty(exports, "executeCountQuery", { enumerable: true, get: function () { return query_1.executeCountQuery; } });
|
|
38
38
|
Object.defineProperty(exports, "executeFindQuery", { enumerable: true, get: function () { return query_1.executeFindQuery; } });
|
|
39
|
+
Object.defineProperty(exports, "useOrder", { enumerable: true, get: function () { return query_1.useOrder; } });
|
|
40
|
+
Object.defineProperty(exports, "useWhere", { enumerable: true, get: function () { return query_1.useWhere; } });
|
|
39
41
|
async function start(options) {
|
|
40
42
|
return new Promise((resolve, reject) => {
|
|
41
43
|
if (global.npmDebugServerStarted) {
|
|
@@ -84,5 +86,5 @@ async function start(options) {
|
|
|
84
86
|
.catch((error) => reject(error));
|
|
85
87
|
});
|
|
86
88
|
}
|
|
87
|
-
module.exports = { start, User: user_e_1.User, userManager, applyQuery: query_1.applyQuery, executeCountQuery: query_1.executeCountQuery, executeFindQuery: query_1.executeFindQuery };
|
|
89
|
+
module.exports = { start, User: user_e_1.User, userManager, applyQuery: query_1.applyQuery, executeCountQuery: query_1.executeCountQuery, executeFindQuery: query_1.executeFindQuery, useOrder: query_1.useOrder, useWhere: query_1.useWhere };
|
|
88
90
|
//# sourceMappingURL=index.js.map
|
package/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;AAEZ,4BAAyB;AACzB,qCAAoC;AAsER,2FAtEnB,oBAAU,OAsEmB;AArEtC,sEAAuD;AACvD,sEAAuD;AAoExC,kCAAW;AAnE1B,kDAA4C;AAmEnC,qFAnEA,aAAI,OAmEA;AAlEb,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,8 @@ declare const User: any;
|
|
|
2
2
|
export declare function demo(): Promise<never[]>;
|
|
3
3
|
export declare function register(data: typeof User): Promise<any>;
|
|
4
4
|
export declare function login(data: typeof User): Promise<any>;
|
|
5
|
+
export declare function logout(data: typeof User): Promise<void>;
|
|
6
|
+
export declare function forgotPassword(data: typeof User): Promise<void>;
|
|
7
|
+
export declare function resetPassword(data: typeof User): Promise<void>;
|
|
8
|
+
export declare function unregister(data: typeof User): Promise<void>;
|
|
5
9
|
export {};
|
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.login = exports.register = exports.demo = void 0;
|
|
26
|
+
exports.unregister = exports.resetPassword = exports.forgotPassword = exports.logout = exports.login = exports.register = exports.demo = void 0;
|
|
27
27
|
const bcrypt = __importStar(require("bcrypt"));
|
|
28
28
|
const { User } = require('../entities/user.e');
|
|
29
29
|
async function demo() {
|
|
@@ -32,7 +32,7 @@ async function demo() {
|
|
|
32
32
|
exports.demo = demo;
|
|
33
33
|
async function register(data) {
|
|
34
34
|
const { name, email, password } = data;
|
|
35
|
-
const salt = await bcrypt.genSalt();
|
|
35
|
+
const salt = await bcrypt.genSalt(12);
|
|
36
36
|
const hashedPassword = await bcrypt.hash(password, salt);
|
|
37
37
|
try {
|
|
38
38
|
let user = { ...data, name: name || email, password: hashedPassword };
|
|
@@ -47,14 +47,23 @@ async function register(data) {
|
|
|
47
47
|
}
|
|
48
48
|
exports.register = register;
|
|
49
49
|
async function login(data) {
|
|
50
|
-
const {
|
|
50
|
+
const { email, password } = data;
|
|
51
51
|
try {
|
|
52
52
|
const user = await global.repository.users.findOneBy({ email: email });
|
|
53
|
-
|
|
53
|
+
const match = await bcrypt.compare(password, user.password);
|
|
54
|
+
return match ? user : null;
|
|
54
55
|
}
|
|
55
56
|
catch (error) {
|
|
56
57
|
throw error;
|
|
57
58
|
}
|
|
58
59
|
}
|
|
59
60
|
exports.login = login;
|
|
61
|
+
async function logout(data) { }
|
|
62
|
+
exports.logout = logout;
|
|
63
|
+
async function forgotPassword(data) { }
|
|
64
|
+
exports.forgotPassword = forgotPassword;
|
|
65
|
+
async function resetPassword(data) { }
|
|
66
|
+
exports.resetPassword = resetPassword;
|
|
67
|
+
async function unregister(data) { }
|
|
68
|
+
exports.unregister = unregister;
|
|
60
69
|
//# sourceMappingURL=userManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEvC,KAAK,UAAU,IAAI;IAGxB,OAAO,EAAE,CAAA;AACX,CAAC;AAJD,oBAIC;AAEM,KAAK,UAAU,QAAQ,CAAC,IAAiB;IAC9C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACtC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEvC,KAAK,UAAU,IAAI;IAGxB,OAAO,EAAE,CAAA;AACX,CAAC;AAJD,oBAIC;AAEM,KAAK,UAAU,QAAQ,CAAC,IAAiB;IAC9C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACtC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACrC,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAExD,IAAI;QACF,IAAI,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAiB,CAAA;QACpF,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KAC7B;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,KAAI,KAAK,EAAE;YACxB,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAA;SACxC;QACD,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;AAdD,4BAcC;AAEM,KAAK,UAAU,KAAK,CAAC,IAAiB;IAC3C,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAEhC,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;QACtE,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC3D,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;KAC3B;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;AAVD,sBAUC;AAEM,KAAK,UAAU,MAAM,CAAC,IAAiB,IAAG,CAAC;AAAlD,wBAAkD;AAE3C,KAAK,UAAU,cAAc,CAAC,IAAiB,IAAG,CAAC;AAA1D,wCAA0D;AAEnD,KAAK,UAAU,aAAa,CAAC,IAAiB,IAAG,CAAC;AAAzD,sCAAyD;AAElD,KAAK,UAAU,UAAU,CAAC,IAAiB,IAAG,CAAC;AAAtD,gCAAsD"}
|
package/esm/lib/query.d.ts
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
export declare
|
|
1
|
+
export declare const useOrder: (order?: string[]) => {};
|
|
2
|
+
export declare const useWhere: (where: any) => {};
|
|
3
|
+
export declare function applyQuery(data: any, extraWhere: any): {
|
|
2
4
|
skip?: number | undefined;
|
|
3
5
|
take?: number | undefined;
|
|
4
6
|
order?: object | undefined;
|
|
5
7
|
where?: object | undefined;
|
|
6
8
|
};
|
|
7
|
-
export declare function executeFindQuery(repo: any, relations?: {}, data?: {}): Promise<{
|
|
9
|
+
export declare function executeFindQuery(repo: any, relations?: {}, data?: {}, extraWhere?: any): Promise<{
|
|
8
10
|
records: any;
|
|
9
11
|
headers: {
|
|
10
12
|
'v-total': any;
|
|
@@ -13,4 +15,4 @@ export declare function executeFindQuery(repo: any, relations?: {}, data?: {}):
|
|
|
13
15
|
'v-page': number;
|
|
14
16
|
};
|
|
15
17
|
}>;
|
|
16
|
-
export declare function executeCountQuery(repo: any, data?: {}): Promise<any>;
|
|
18
|
+
export declare function executeCountQuery(repo: any, data?: {}, extraWhere?: any): Promise<any>;
|
package/esm/lib/query.js
CHANGED
|
@@ -23,92 +23,99 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.executeCountQuery = exports.executeFindQuery = exports.applyQuery = void 0;
|
|
26
|
+
exports.executeCountQuery = exports.executeFindQuery = exports.applyQuery = exports.useWhere = exports.useOrder = void 0;
|
|
27
27
|
const typeorm_1 = require("typeorm");
|
|
28
28
|
const log = __importStar(require("./util/logger"));
|
|
29
|
-
|
|
29
|
+
const evalOrder = (val = '') => (['desc', 'd', 'false', '1'].includes(val.toLowerCase()) ? 'desc' : 'asc');
|
|
30
|
+
const useOrder = (order = []) => {
|
|
31
|
+
const orderBy = {};
|
|
32
|
+
order
|
|
33
|
+
.filter((o) => !!o)
|
|
34
|
+
.forEach((o) => {
|
|
35
|
+
const p = o.split(':');
|
|
36
|
+
orderBy[p[0]] = evalOrder(p[1]);
|
|
37
|
+
});
|
|
38
|
+
return orderBy;
|
|
39
|
+
};
|
|
40
|
+
exports.useOrder = useOrder;
|
|
41
|
+
const useWhere = (where) => {
|
|
42
|
+
const result = {};
|
|
43
|
+
const val = (v) => v || 'notFound';
|
|
44
|
+
const reservedOperators = {
|
|
45
|
+
':null': (v) => (v == 'false' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
46
|
+
':notNull': (v) => (v == 'true' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
47
|
+
':in': (v) => (0, typeorm_1.In)(val(v).split(',')),
|
|
48
|
+
':nin': (v) => (0, typeorm_1.Not)((0, typeorm_1.In)(val(v).split(','))),
|
|
49
|
+
':likei': (v) => (0, typeorm_1.ILike)(`${val(v)}`),
|
|
50
|
+
':containsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}%`),
|
|
51
|
+
':ncontainsi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
52
|
+
':startsi': (v) => (0, typeorm_1.ILike)(`${val(v)}%`),
|
|
53
|
+
':endsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}`),
|
|
54
|
+
':eqi': (v) => (0, typeorm_1.ILike)(v),
|
|
55
|
+
':neqi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(v)),
|
|
56
|
+
':like': (v) => (0, typeorm_1.Like)(`${val(v)}`),
|
|
57
|
+
':contains': (v) => (0, typeorm_1.Like)(`%${val(v)}%`),
|
|
58
|
+
':ncontains': (v) => (0, typeorm_1.Not)((0, typeorm_1.Like)(`%${val(v)}%`)),
|
|
59
|
+
':starts': (v) => (0, typeorm_1.Like)(`${val(v)}%`),
|
|
60
|
+
':ends': (v) => (0, typeorm_1.Like)(`%${val(v)}`),
|
|
61
|
+
':eq': (v) => (0, typeorm_1.Equal)(v),
|
|
62
|
+
':neq': (v) => (0, typeorm_1.Not)((0, typeorm_1.Equal)(v)),
|
|
63
|
+
':gt': (v) => (0, typeorm_1.MoreThan)(v),
|
|
64
|
+
':ge': (v) => (0, typeorm_1.MoreThanOrEqual)(v),
|
|
65
|
+
':lt': (v) => (0, typeorm_1.LessThan)(v),
|
|
66
|
+
':le': (v) => (0, typeorm_1.LessThanOrEqual)(v),
|
|
67
|
+
':between': (v) => {
|
|
68
|
+
const s = v === null || v === void 0 ? void 0 : v.split(':');
|
|
69
|
+
return (s === null || s === void 0 ? void 0 : s.length) == 2 ? (0, typeorm_1.Between)(s[0], s[1]) : v;
|
|
70
|
+
}
|
|
71
|
+
};
|
|
72
|
+
const reservedWords = Object.keys(reservedOperators).join('|');
|
|
73
|
+
for (const objectPath in where) {
|
|
74
|
+
const parts = objectPath.split('.');
|
|
75
|
+
let target = result;
|
|
76
|
+
while (parts.length > 1) {
|
|
77
|
+
const part = parts.shift() || '';
|
|
78
|
+
target = target[part] = target[part] || {};
|
|
79
|
+
}
|
|
80
|
+
const m = parts[0].match(new RegExp(`(${reservedWords})\\b`, 'ig'));
|
|
81
|
+
const operator = (m === null || m === void 0 ? void 0 : m.length) ? m[0] : null;
|
|
82
|
+
const fieldName = operator ? parts[0].replace(operator, '') : parts[0];
|
|
83
|
+
let value = where[objectPath];
|
|
84
|
+
log.debug('fieldName: ' + fieldName + ' with path: ' + objectPath);
|
|
85
|
+
log.debug('operator: ' + operator + ' on value: ' + value);
|
|
86
|
+
if (operator) {
|
|
87
|
+
value = reservedOperators[operator](value);
|
|
88
|
+
}
|
|
89
|
+
target[fieldName] = value;
|
|
90
|
+
}
|
|
91
|
+
return result;
|
|
92
|
+
};
|
|
93
|
+
exports.useWhere = useWhere;
|
|
94
|
+
function applyQuery(data, extraWhere) {
|
|
30
95
|
const { page = 0, pageSize = 0, skip: sk = 0, take: tk = 0, sort: s, ...where } = data;
|
|
31
96
|
const take = tk || pageSize || 50;
|
|
32
97
|
const skip = sk || page * pageSize || 0;
|
|
33
98
|
const order = !Array.isArray(s) ? [s] : s;
|
|
34
|
-
const evalOrder = (val = '') => (['desc', 'd', 'false', '1'].includes(val.toLowerCase()) ? 'desc' : 'asc');
|
|
35
|
-
const useOrder = (order = []) => {
|
|
36
|
-
const orderBy = {};
|
|
37
|
-
order
|
|
38
|
-
.filter((o) => !!o)
|
|
39
|
-
.forEach((o) => {
|
|
40
|
-
const p = o.split(':');
|
|
41
|
-
orderBy[p[0]] = evalOrder(p[1]);
|
|
42
|
-
});
|
|
43
|
-
return orderBy;
|
|
44
|
-
};
|
|
45
|
-
const useWhere = (where) => {
|
|
46
|
-
const result = {};
|
|
47
|
-
const val = (v) => v || 'notFound';
|
|
48
|
-
const reservedOperators = {
|
|
49
|
-
':null': (v) => (v == 'false' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
50
|
-
':notNull': (v) => (v == 'true' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
51
|
-
':in': (v) => (0, typeorm_1.In)(val(v).split(',')),
|
|
52
|
-
':nin': (v) => (0, typeorm_1.Not)((0, typeorm_1.In)(val(v).split(','))),
|
|
53
|
-
':likei': (v) => (0, typeorm_1.ILike)(`${val(v)}`),
|
|
54
|
-
':containsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}%`),
|
|
55
|
-
':ncontainsi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
56
|
-
':startsi': (v) => (0, typeorm_1.ILike)(`${val(v)}%`),
|
|
57
|
-
':endsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}`),
|
|
58
|
-
':eqi': (v) => (0, typeorm_1.ILike)(v),
|
|
59
|
-
':neqi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(v)),
|
|
60
|
-
':like': (v) => (0, typeorm_1.Like)(`${val(v)}`),
|
|
61
|
-
':contains': (v) => (0, typeorm_1.Like)(`%${val(v)}%`),
|
|
62
|
-
':ncontains': (v) => (0, typeorm_1.Not)((0, typeorm_1.Like)(`%${val(v)}%`)),
|
|
63
|
-
':starts': (v) => (0, typeorm_1.Like)(`${val(v)}%`),
|
|
64
|
-
':ends': (v) => (0, typeorm_1.Like)(`%${val(v)}`),
|
|
65
|
-
':eq': (v) => (0, typeorm_1.Equal)(v),
|
|
66
|
-
':neq': (v) => (0, typeorm_1.Not)((0, typeorm_1.Equal)(v)),
|
|
67
|
-
':gt': (v) => (0, typeorm_1.MoreThan)(v),
|
|
68
|
-
':ge': (v) => (0, typeorm_1.MoreThanOrEqual)(v),
|
|
69
|
-
':lt': (v) => (0, typeorm_1.LessThan)(v),
|
|
70
|
-
':le': (v) => (0, typeorm_1.LessThanOrEqual)(v),
|
|
71
|
-
':between': (v) => {
|
|
72
|
-
const s = v === null || v === void 0 ? void 0 : v.split(':');
|
|
73
|
-
return (s === null || s === void 0 ? void 0 : s.length) == 2 ? (0, typeorm_1.Between)(s[0], s[1]) : v;
|
|
74
|
-
}
|
|
75
|
-
};
|
|
76
|
-
const reservedWords = Object.keys(reservedOperators).join('|');
|
|
77
|
-
for (const objectPath in where) {
|
|
78
|
-
const parts = objectPath.split('.');
|
|
79
|
-
let target = result;
|
|
80
|
-
while (parts.length > 1) {
|
|
81
|
-
const part = parts.shift() || '';
|
|
82
|
-
target = target[part] = target[part] || {};
|
|
83
|
-
}
|
|
84
|
-
const m = parts[0].match(new RegExp(`(${reservedWords})\\b`, 'ig'));
|
|
85
|
-
const operator = (m === null || m === void 0 ? void 0 : m.length) ? m[0] : null;
|
|
86
|
-
const fieldName = operator ? parts[0].replace(operator, '') : parts[0];
|
|
87
|
-
let value = where[objectPath];
|
|
88
|
-
log.debug('fieldName: ' + fieldName + ' with path: ' + objectPath);
|
|
89
|
-
log.debug('operator: ' + operator + ' on value: ' + value);
|
|
90
|
-
if (operator) {
|
|
91
|
-
value = reservedOperators[operator](value);
|
|
92
|
-
}
|
|
93
|
-
target[fieldName] = value;
|
|
94
|
-
}
|
|
95
|
-
return result;
|
|
96
|
-
};
|
|
97
99
|
const query = {};
|
|
98
100
|
if (skip)
|
|
99
101
|
query.skip = skip;
|
|
100
102
|
if (take)
|
|
101
103
|
query.take = take;
|
|
102
104
|
if (order)
|
|
103
|
-
query.order = useOrder(order);
|
|
105
|
+
query.order = (0, exports.useOrder)(order);
|
|
104
106
|
if (where)
|
|
105
|
-
query.where = useWhere(where);
|
|
107
|
+
query.where = (0, exports.useWhere)(where);
|
|
108
|
+
let extra;
|
|
109
|
+
if (extraWhere) {
|
|
110
|
+
extra = Array.isArray(extraWhere) ? extraWhere.map((w) => (0, exports.useWhere)(w)) : (0, exports.useWhere)(extraWhere);
|
|
111
|
+
}
|
|
112
|
+
query.where = Array.isArray(extra) ? extra.map((w) => ({ ...w, ...query.where })) : { ...extra, ...query.where };
|
|
106
113
|
log.debug('FINAL WHERE: ' + JSON.stringify(query.where));
|
|
107
114
|
return query;
|
|
108
115
|
}
|
|
109
116
|
exports.applyQuery = applyQuery;
|
|
110
|
-
async function executeFindQuery(repo, relations = {}, data = {}) {
|
|
111
|
-
const extra = applyQuery(data);
|
|
117
|
+
async function executeFindQuery(repo, relations = {}, data = {}, extraWhere = {}) {
|
|
118
|
+
const extra = applyQuery(data, extraWhere);
|
|
112
119
|
const [records = [], totalCount] = await repo.findAndCount({
|
|
113
120
|
relations: relations,
|
|
114
121
|
...extra
|
|
@@ -124,8 +131,8 @@ async function executeFindQuery(repo, relations = {}, data = {}) {
|
|
|
124
131
|
};
|
|
125
132
|
}
|
|
126
133
|
exports.executeFindQuery = executeFindQuery;
|
|
127
|
-
async function executeCountQuery(repo, data = {}) {
|
|
128
|
-
const { where = {} } = applyQuery(data);
|
|
134
|
+
async function executeCountQuery(repo, data = {}, extraWhere = {}) {
|
|
135
|
+
const { where = {} } = applyQuery(data, extraWhere);
|
|
129
136
|
return await repo.count({ where: where });
|
|
130
137
|
}
|
|
131
138
|
exports.executeCountQuery = executeCountQuery;
|
package/esm/lib/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAYgB;AAEhB,mDAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@volcanicminds/typeorm",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.13",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "TypeORM for the volcanic (minds) backend",
|
|
6
6
|
"keywords": [
|
|
@@ -22,14 +22,15 @@
|
|
|
22
22
|
"node": ">=16"
|
|
23
23
|
},
|
|
24
24
|
"scripts": {
|
|
25
|
-
"upgrade-deps": "npm-upgrade",
|
|
26
25
|
"clean": "rm -rf dist esm",
|
|
27
26
|
"prebuild": "npm run clean",
|
|
28
27
|
"test": "jest test --config ./jest.config.js",
|
|
29
28
|
"build:esm": "tsc --target es2018 --outDir esm",
|
|
30
29
|
"build:cjs": "tsc --target es2015 --module commonjs --outDir dist",
|
|
31
30
|
"build": "npm run build:esm && npm run build:cjs",
|
|
32
|
-
"compile": "npm run build"
|
|
31
|
+
"compile": "npm run build",
|
|
32
|
+
"reset": "yarn && yarn upgrade && yarn compile",
|
|
33
|
+
"upgrade-deps": "yarn upgrade-interactive"
|
|
33
34
|
},
|
|
34
35
|
"dependencies": {
|
|
35
36
|
"bcrypt": "^5.1.0",
|
|
@@ -40,7 +41,6 @@
|
|
|
40
41
|
"devDependencies": {
|
|
41
42
|
"@types/node": "^18.11.10",
|
|
42
43
|
"jest": "^29.3.1",
|
|
43
|
-
"npm-upgrade": "^3.1.0",
|
|
44
44
|
"ts-node": "^10.9.1",
|
|
45
45
|
"typescript": "^4.9.3"
|
|
46
46
|
},
|