@volcanicminds/typeorm 0.8.0 → 0.9.0
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/dist/lib/query.d.ts +2 -2
- package/dist/lib/query.js +16 -15
- package/dist/lib/query.js.map +1 -1
- package/esm/lib/query.d.ts +2 -2
- package/esm/lib/query.js +16 -15
- package/esm/lib/query.js.map +1 -1
- package/package.json +4 -3
package/dist/lib/query.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare const useOrder: (order?: string[]) => {};
|
|
2
|
-
export declare const useWhere: (where: any) => {};
|
|
3
|
-
export declare function applyQuery(data: any, extraWhere: any): {
|
|
2
|
+
export declare const useWhere: (where: any, repo?: any) => {};
|
|
3
|
+
export declare function applyQuery(data: any, extraWhere: any, repo: any): {
|
|
4
4
|
skip?: number;
|
|
5
5
|
take?: number;
|
|
6
6
|
order?: object;
|
package/dist/lib/query.js
CHANGED
|
@@ -45,8 +45,9 @@ const useOrder = (order = []) => {
|
|
|
45
45
|
return result;
|
|
46
46
|
};
|
|
47
47
|
exports.useOrder = useOrder;
|
|
48
|
-
const useWhere = (where) => {
|
|
48
|
+
const useWhere = (where, repo) => {
|
|
49
49
|
const result = {};
|
|
50
|
+
const isTargetMongo = isMongo(repo);
|
|
50
51
|
const val = (v) => v || 'notFound';
|
|
51
52
|
const reservedOperators = {
|
|
52
53
|
':null': (v) => (v == 'false' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
@@ -54,19 +55,19 @@ const useWhere = (where) => {
|
|
|
54
55
|
':raw': (v) => (0, typeorm_1.Raw)((alias) => `${alias} ${v}`),
|
|
55
56
|
':in': (v) => (0, typeorm_1.In)(val(v).split(',')),
|
|
56
57
|
':nin': (v) => (0, typeorm_1.Not)((0, typeorm_1.In)(val(v).split(','))),
|
|
57
|
-
':likei': (v) => (0, typeorm_1.ILike)(
|
|
58
|
-
':containsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}%`),
|
|
59
|
-
':ncontainsi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
60
|
-
':startsi': (v) => (0, typeorm_1.ILike)(`${val(v)}%`),
|
|
61
|
-
':endsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}`),
|
|
62
|
-
':eqi': (v) => (0, typeorm_1.ILike)(v),
|
|
63
|
-
':neqi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(v)),
|
|
58
|
+
':likei': (v) => (isTargetMongo ? new RegExp(val(v), 'i') : (0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
59
|
+
':containsi': (v) => (isTargetMongo ? new RegExp(val(v), 'i') : (0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
60
|
+
':ncontainsi': (v) => (isTargetMongo ? (0, typeorm_1.Not)(new RegExp(val(v), 'i')) : (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`))),
|
|
61
|
+
':startsi': (v) => (isTargetMongo ? new RegExp(`^${val(v)}`, 'i') : (0, typeorm_1.ILike)(`${val(v)}%`)),
|
|
62
|
+
':endsi': (v) => (isTargetMongo ? new RegExp(`${val(v)}$`, 'i') : (0, typeorm_1.ILike)(`%${val(v)}`)),
|
|
63
|
+
':eqi': (v) => (isTargetMongo ? new RegExp(`^${val(v)}$`, 'i') : (0, typeorm_1.ILike)(v)),
|
|
64
|
+
':neqi': (v) => (isTargetMongo ? (0, typeorm_1.Not)(new RegExp(`^${val(v)}$`, 'i')) : (0, typeorm_1.Not)((0, typeorm_1.ILike)(v))),
|
|
64
65
|
':like': (v) => (0, typeorm_1.Like)(`${val(v)}`),
|
|
65
66
|
':contains': (v) => (0, typeorm_1.Like)(`%${val(v)}%`),
|
|
66
67
|
':ncontains': (v) => (0, typeorm_1.Not)((0, typeorm_1.Like)(`%${val(v)}%`)),
|
|
67
68
|
':starts': (v) => (0, typeorm_1.Like)(`${val(v)}%`),
|
|
68
69
|
':ends': (v) => (0, typeorm_1.Like)(`%${val(v)}`),
|
|
69
|
-
':eq': (v) => (0, typeorm_1.Equal)(v),
|
|
70
|
+
':eq': (v) => (isTargetMongo ? v : (0, typeorm_1.Equal)(v)),
|
|
70
71
|
':neq': (v) => (0, typeorm_1.Not)((0, typeorm_1.Equal)(v)),
|
|
71
72
|
':gt': (v) => (0, typeorm_1.MoreThan)(v),
|
|
72
73
|
':ge': (v) => (0, typeorm_1.MoreThanOrEqual)(v),
|
|
@@ -97,7 +98,7 @@ const useWhere = (where) => {
|
|
|
97
98
|
return result;
|
|
98
99
|
};
|
|
99
100
|
exports.useWhere = useWhere;
|
|
100
|
-
function applyQuery(data, extraWhere) {
|
|
101
|
+
function applyQuery(data, extraWhere, repo) {
|
|
101
102
|
const { page: p = 1, pageSize = 25, skip: sk = 0, take: tk = 0, sort: s } = data, where = __rest(data, ["page", "pageSize", "skip", "take", "sort"]);
|
|
102
103
|
const page = (p < 1 ? 1 : p) - 1;
|
|
103
104
|
const take = tk || pageSize;
|
|
@@ -111,17 +112,17 @@ function applyQuery(data, extraWhere) {
|
|
|
111
112
|
if (order)
|
|
112
113
|
query.order = (0, exports.useOrder)(order);
|
|
113
114
|
if (where)
|
|
114
|
-
query.where = (0, exports.useWhere)(where);
|
|
115
|
+
query.where = (0, exports.useWhere)(where, repo);
|
|
115
116
|
let extra;
|
|
116
117
|
if (extraWhere) {
|
|
117
|
-
extra = Array.isArray(extraWhere) ? extraWhere.map((w) => (0, exports.useWhere)(w)) : (0, exports.useWhere)(extraWhere);
|
|
118
|
+
extra = Array.isArray(extraWhere) ? extraWhere.map((w) => (0, exports.useWhere)(w, repo)) : (0, exports.useWhere)(extraWhere, repo);
|
|
118
119
|
}
|
|
119
120
|
query.where = Array.isArray(extra) ? extra.map((w) => (Object.assign(Object.assign({}, w), query.where))) : Object.assign(Object.assign({}, extra), query.where);
|
|
120
121
|
return query;
|
|
121
122
|
}
|
|
122
123
|
function executeFindQuery(repo_1) {
|
|
123
124
|
return __awaiter(this, arguments, void 0, function* (repo, relations = {}, data = {}, extraWhere = {}, extraOptions = {}) {
|
|
124
|
-
const extra = applyQuery(data, extraWhere);
|
|
125
|
+
const extra = applyQuery(data, extraWhere, repo);
|
|
125
126
|
const [records = [], totalCount] = yield repo.findAndCount(Object.assign(Object.assign({ relations: relations }, extra), extraOptions));
|
|
126
127
|
return {
|
|
127
128
|
records,
|
|
@@ -137,13 +138,13 @@ function executeFindQuery(repo_1) {
|
|
|
137
138
|
}
|
|
138
139
|
function executeCountQuery(repo_1) {
|
|
139
140
|
return __awaiter(this, arguments, void 0, function* (repo, data = {}, extraWhere = {}) {
|
|
140
|
-
const { where = {} } = applyQuery(data, extraWhere);
|
|
141
|
+
const { where = {} } = applyQuery(data, extraWhere, repo);
|
|
141
142
|
return yield repo.count(isMongo(repo) ? where : { where: where });
|
|
142
143
|
});
|
|
143
144
|
}
|
|
144
145
|
function getType(repo) {
|
|
145
146
|
var _a, _b, _c;
|
|
146
|
-
return ((_c = (_b = (_a = repo === null || repo === void 0 ? void 0 : repo.
|
|
147
|
+
return ((_c = (_b = (_a = repo === null || repo === void 0 ? void 0 : repo.manager) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.type) || 'pg';
|
|
147
148
|
}
|
|
148
149
|
function isMongo(repo) {
|
|
149
150
|
return getType(repo) === 'mongodb';
|
package/dist/lib/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAqGA,gCA0BC;AAED,4CAyBC;AAED,8CAGC;AA/JD,qCAagB;AAEhB,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;AAE3G,MAAM,QAAQ,GAAG,CAAC,QAAkB,EAAE,EAAE,EAAE;IAC/C,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,KAAK;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAClB,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;QACrB,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC1B,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACzC,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAEpC,IAAI,MAAM,GAAG,MAAM,CAAA;QACnB,OAAO,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,SAAS,GAAW,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,CAAA;YACrD,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;QACtD,CAAC;QAED,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;QAElC,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAA;IAC9B,CAAC,CAAC,CAAA;IAEJ,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AArBY,QAAA,QAAQ,YAqBpB;AAEM,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAE,IAAU,EAAE,EAAE;IACjD,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnC,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,UAAU,CAAA;IAElC,MAAM,iBAAiB,GAAG;QACxB,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAM,GAAE,CAAC;QACzD,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAM,GAAE,CAAC;QAC3D,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,aAAG,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC;QAC9C,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,YAAE,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,aAAG,EAAC,IAAA,YAAE,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,eAAK,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACjF,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,eAAK,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACrF,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAA,aAAG,EAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,aAAG,EAAC,IAAA,eAAK,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChG,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,eAAK,EAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACxF,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,eAAK,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACtF,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,eAAK,EAAC,CAAC,CAAC,CAAC;QAC1E,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAA,aAAG,EAAC,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,aAAG,EAAC,IAAA,eAAK,EAAC,CAAC,CAAC,CAAC,CAAC;QACrF,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,cAAI,EAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,cAAI,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACvC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,aAAG,EAAC,IAAA,cAAI,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC7C,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,cAAI,EAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACpC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,cAAI,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,eAAK,EAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,aAAG,EAAC,IAAA,eAAK,EAAC,CAAC,CAAC,CAAC;QAC5B,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kBAAQ,EAAC,CAAC,CAAC;QACzB,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAe,EAAC,CAAC,CAAC;QAChC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kBAAQ,EAAC,CAAC,CAAC;QACzB,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAe,EAAC,CAAC,CAAC;QAChC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE;YAChB,MAAM,CAAC,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,CAAC,GAAG,CAAC,CAAA;YACvB,OAAO,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,MAAM,KAAI,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACjD,CAAC;KACF,CAAA;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE9D,KAAK,MAAM,UAAU,IAAI,KAAK,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEnC,IAAI,MAAM,GAAG,MAAM,CAAA;QACnB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,GAAW,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAA;YACxC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;QAC5C,CAAC;QAED,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,aAAa,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;QACnE,MAAM,QAAQ,GAAG,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,MAAM,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACxC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACtE,IAAI,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,CAAA;QAE7B,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAA;QAC5C,CAAC;QAED,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAA;IAC3B,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AA3DY,QAAA,QAAQ,YA2DpB;AAED,SAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI;IAC/C,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,QAAQ,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,KAAe,IAAI,EAAd,KAAK,UAAK,IAAI,EAApF,4CAA6E,CAAO,CAAA;IAC1F,MAAM,IAAI,GAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACxC,MAAM,IAAI,GAAW,EAAE,IAAI,QAAQ,CAAA;IACnC,MAAM,IAAI,GAAW,EAAE,IAAI,IAAI,GAAG,QAAQ,CAAA;IAC1C,MAAM,KAAK,GAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEnD,MAAM,KAAK,GAAG,EAKb,CAAA;IAED,IAAI,IAAI;QAAE,KAAK,CAAC,IAAI,GAAG,IAAI,CAAA;IAC3B,IAAI,IAAI;QAAE,KAAK,CAAC,IAAI,GAAG,IAAI,CAAA;IAC3B,IAAI,KAAK;QAAE,KAAK,CAAC,KAAK,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IACxC,IAAI,KAAK;QAAE,KAAK,CAAC,KAAK,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAE9C,IAAI,KAAU,CAAA;IACd,IAAI,UAAU,EAAE,CAAC;QACf,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAC3G,CAAC;IAED,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAAM,CAAC,GAAK,KAAK,CAAC,KAAK,EAAG,CAAC,CAAC,CAAC,iCAAM,KAAK,GAAK,KAAK,CAAC,KAAK,CAAE,CAAA;IAChH,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAsB,gBAAgB;yDACpC,IAAS,EACT,YAAiB,EAAE,EACnB,OAAY,EAAE,EACd,aAAkB,EAAE,EACpB,eAAoB,EAAE;QAEtB,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,CAAC,OAAO,GAAG,EAAE,EAAE,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,+BACxD,SAAS,EAAE,SAAS,IACjB,KAAK,GACL,YAAY,EACf,CAAA;QAEF,OAAO;YACL,OAAO;YACP,OAAO,EAAE;gBACP,SAAS,EAAE,OAAO,CAAC,MAAM;gBACzB,SAAS,EAAE,UAAU;gBACrB,QAAQ,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC;gBACxB,YAAY,EAAE,KAAK,CAAC,IAAI;gBACxB,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aACnE;SACF,CAAA;IACH,CAAC;CAAA;AAED,SAAsB,iBAAiB;yDAAC,IAAS,EAAE,IAAI,GAAG,EAAE,EAAE,aAAkB,EAAE;QAChF,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;QACzD,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;IACnE,CAAC;CAAA;AAED,SAAS,OAAO,CAAC,IAAI;;IACnB,OAAO,CAAA,MAAA,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,UAAU,0CAAE,OAAO,0CAAE,IAAI,KAAI,IAAI,CAAA;AACzD,CAAC;AAED,SAAS,OAAO,CAAC,IAAI;IACnB,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,SAAS,CAAA;AACpC,CAAC"}
|
package/esm/lib/query.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare const useOrder: (order?: string[]) => {};
|
|
2
|
-
export declare const useWhere: (where: any) => {};
|
|
3
|
-
export declare function applyQuery(data: any, extraWhere: any): {
|
|
2
|
+
export declare const useWhere: (where: any, repo?: any) => {};
|
|
3
|
+
export declare function applyQuery(data: any, extraWhere: any, repo: any): {
|
|
4
4
|
skip?: number;
|
|
5
5
|
take?: number;
|
|
6
6
|
order?: object;
|
package/esm/lib/query.js
CHANGED
|
@@ -25,8 +25,9 @@ const useOrder = (order = []) => {
|
|
|
25
25
|
return result;
|
|
26
26
|
};
|
|
27
27
|
exports.useOrder = useOrder;
|
|
28
|
-
const useWhere = (where) => {
|
|
28
|
+
const useWhere = (where, repo) => {
|
|
29
29
|
const result = {};
|
|
30
|
+
const isTargetMongo = isMongo(repo);
|
|
30
31
|
const val = (v) => v || 'notFound';
|
|
31
32
|
const reservedOperators = {
|
|
32
33
|
':null': (v) => (v == 'false' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
@@ -34,19 +35,19 @@ const useWhere = (where) => {
|
|
|
34
35
|
':raw': (v) => (0, typeorm_1.Raw)((alias) => `${alias} ${v}`),
|
|
35
36
|
':in': (v) => (0, typeorm_1.In)(val(v).split(',')),
|
|
36
37
|
':nin': (v) => (0, typeorm_1.Not)((0, typeorm_1.In)(val(v).split(','))),
|
|
37
|
-
':likei': (v) => (0, typeorm_1.ILike)(
|
|
38
|
-
':containsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}%`),
|
|
39
|
-
':ncontainsi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
40
|
-
':startsi': (v) => (0, typeorm_1.ILike)(`${val(v)}%`),
|
|
41
|
-
':endsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}`),
|
|
42
|
-
':eqi': (v) => (0, typeorm_1.ILike)(v),
|
|
43
|
-
':neqi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(v)),
|
|
38
|
+
':likei': (v) => (isTargetMongo ? new RegExp(val(v), 'i') : (0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
39
|
+
':containsi': (v) => (isTargetMongo ? new RegExp(val(v), 'i') : (0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
40
|
+
':ncontainsi': (v) => (isTargetMongo ? (0, typeorm_1.Not)(new RegExp(val(v), 'i')) : (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`))),
|
|
41
|
+
':startsi': (v) => (isTargetMongo ? new RegExp(`^${val(v)}`, 'i') : (0, typeorm_1.ILike)(`${val(v)}%`)),
|
|
42
|
+
':endsi': (v) => (isTargetMongo ? new RegExp(`${val(v)}$`, 'i') : (0, typeorm_1.ILike)(`%${val(v)}`)),
|
|
43
|
+
':eqi': (v) => (isTargetMongo ? new RegExp(`^${val(v)}$`, 'i') : (0, typeorm_1.ILike)(v)),
|
|
44
|
+
':neqi': (v) => (isTargetMongo ? (0, typeorm_1.Not)(new RegExp(`^${val(v)}$`, 'i')) : (0, typeorm_1.Not)((0, typeorm_1.ILike)(v))),
|
|
44
45
|
':like': (v) => (0, typeorm_1.Like)(`${val(v)}`),
|
|
45
46
|
':contains': (v) => (0, typeorm_1.Like)(`%${val(v)}%`),
|
|
46
47
|
':ncontains': (v) => (0, typeorm_1.Not)((0, typeorm_1.Like)(`%${val(v)}%`)),
|
|
47
48
|
':starts': (v) => (0, typeorm_1.Like)(`${val(v)}%`),
|
|
48
49
|
':ends': (v) => (0, typeorm_1.Like)(`%${val(v)}`),
|
|
49
|
-
':eq': (v) => (0, typeorm_1.Equal)(v),
|
|
50
|
+
':eq': (v) => (isTargetMongo ? v : (0, typeorm_1.Equal)(v)),
|
|
50
51
|
':neq': (v) => (0, typeorm_1.Not)((0, typeorm_1.Equal)(v)),
|
|
51
52
|
':gt': (v) => (0, typeorm_1.MoreThan)(v),
|
|
52
53
|
':ge': (v) => (0, typeorm_1.MoreThanOrEqual)(v),
|
|
@@ -77,7 +78,7 @@ const useWhere = (where) => {
|
|
|
77
78
|
return result;
|
|
78
79
|
};
|
|
79
80
|
exports.useWhere = useWhere;
|
|
80
|
-
function applyQuery(data, extraWhere) {
|
|
81
|
+
function applyQuery(data, extraWhere, repo) {
|
|
81
82
|
const { page: p = 1, pageSize = 25, skip: sk = 0, take: tk = 0, sort: s, ...where } = data;
|
|
82
83
|
const page = (p < 1 ? 1 : p) - 1;
|
|
83
84
|
const take = tk || pageSize;
|
|
@@ -91,16 +92,16 @@ function applyQuery(data, extraWhere) {
|
|
|
91
92
|
if (order)
|
|
92
93
|
query.order = (0, exports.useOrder)(order);
|
|
93
94
|
if (where)
|
|
94
|
-
query.where = (0, exports.useWhere)(where);
|
|
95
|
+
query.where = (0, exports.useWhere)(where, repo);
|
|
95
96
|
let extra;
|
|
96
97
|
if (extraWhere) {
|
|
97
|
-
extra = Array.isArray(extraWhere) ? extraWhere.map((w) => (0, exports.useWhere)(w)) : (0, exports.useWhere)(extraWhere);
|
|
98
|
+
extra = Array.isArray(extraWhere) ? extraWhere.map((w) => (0, exports.useWhere)(w, repo)) : (0, exports.useWhere)(extraWhere, repo);
|
|
98
99
|
}
|
|
99
100
|
query.where = Array.isArray(extra) ? extra.map((w) => ({ ...w, ...query.where })) : { ...extra, ...query.where };
|
|
100
101
|
return query;
|
|
101
102
|
}
|
|
102
103
|
async function executeFindQuery(repo, relations = {}, data = {}, extraWhere = {}, extraOptions = {}) {
|
|
103
|
-
const extra = applyQuery(data, extraWhere);
|
|
104
|
+
const extra = applyQuery(data, extraWhere, repo);
|
|
104
105
|
const [records = [], totalCount] = await repo.findAndCount({
|
|
105
106
|
relations: relations,
|
|
106
107
|
...extra,
|
|
@@ -118,12 +119,12 @@ async function executeFindQuery(repo, relations = {}, data = {}, extraWhere = {}
|
|
|
118
119
|
};
|
|
119
120
|
}
|
|
120
121
|
async function executeCountQuery(repo, data = {}, extraWhere = {}) {
|
|
121
|
-
const { where = {} } = applyQuery(data, extraWhere);
|
|
122
|
+
const { where = {} } = applyQuery(data, extraWhere, repo);
|
|
122
123
|
return await repo.count(isMongo(repo) ? where : { where: where });
|
|
123
124
|
}
|
|
124
125
|
function getType(repo) {
|
|
125
126
|
var _a, _b, _c;
|
|
126
|
-
return ((_c = (_b = (_a = repo === null || repo === void 0 ? void 0 : repo.
|
|
127
|
+
return ((_c = (_b = (_a = repo === null || repo === void 0 ? void 0 : repo.manager) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.type) || 'pg';
|
|
127
128
|
}
|
|
128
129
|
function isMongo(repo) {
|
|
129
130
|
return getType(repo) === 'mongodb';
|
package/esm/lib/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":";;;
|
|
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.
|
|
3
|
+
"version": "0.9.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "TypeORM for the volcanic (minds) backend",
|
|
6
6
|
"keywords": [
|
|
@@ -29,14 +29,15 @@
|
|
|
29
29
|
"build": "npm run build:esm && npm run build:cjs",
|
|
30
30
|
"compile": "npm run build",
|
|
31
31
|
"reset": "yarn && yarn up && yarn compile",
|
|
32
|
-
"upgrade-deps": "yarn upgrade-interactive"
|
|
32
|
+
"upgrade-deps": "yarn upgrade-interactive",
|
|
33
|
+
"combine": "node combine.js"
|
|
33
34
|
},
|
|
34
35
|
"dependencies": {
|
|
35
36
|
"bcrypt": "^5.1.1",
|
|
36
37
|
"dotenv": "^16.4.5",
|
|
37
38
|
"pluralize": "^8.0.0",
|
|
38
39
|
"reflect-metadata": "^0.1.14",
|
|
39
|
-
"typeorm": "^0.3.
|
|
40
|
+
"typeorm": "^0.3.27"
|
|
40
41
|
},
|
|
41
42
|
"devDependencies": {
|
|
42
43
|
"@types/node": "^18.19.59",
|