@volcanicminds/typeorm 0.0.18 → 0.1.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/entities/user.d.ts +5 -2
- package/dist/lib/entities/user.js.map +1 -1
- package/dist/lib/loader/userManager.d.ts +2 -2
- package/dist/lib/loader/userManager.js +8 -8
- package/dist/lib/loader/userManager.js.map +1 -1
- package/dist/lib/query.js +12 -30
- package/dist/lib/query.js.map +1 -1
- package/esm/lib/entities/user.d.ts +5 -2
- package/esm/lib/entities/user.js.map +1 -1
- package/esm/lib/loader/userManager.d.ts +2 -2
- package/esm/lib/loader/userManager.js +11 -9
- package/esm/lib/loader/userManager.js.map +1 -1
- package/esm/lib/query.js +12 -30
- package/esm/lib/query.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,8 +5,11 @@ export declare abstract class User extends BaseEntity {
|
|
|
5
5
|
abstract username: string;
|
|
6
6
|
abstract email: string;
|
|
7
7
|
abstract password: string;
|
|
8
|
-
abstract
|
|
9
|
-
abstract
|
|
8
|
+
abstract confirmed: boolean;
|
|
9
|
+
abstract confirmedAt: Date;
|
|
10
|
+
abstract blocked: boolean;
|
|
11
|
+
abstract blockedReason: string;
|
|
12
|
+
abstract blockedAt: Date;
|
|
10
13
|
abstract roles: string[];
|
|
11
14
|
abstract version: number;
|
|
12
15
|
abstract createdAt: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;CAgB5C;AAhBD,oBAgBC"}
|
|
@@ -8,5 +8,5 @@ export declare function retrieveUserByEmail(email: string): Promise<any>;
|
|
|
8
8
|
export declare function retrieveUserByExternalId(externalId: string): Promise<any>;
|
|
9
9
|
export declare function retrieveUserByPassword(email: string, password: string): Promise<any>;
|
|
10
10
|
export declare function changePassword(email: string, password: string, oldPassword: string): Promise<any>;
|
|
11
|
-
export declare function
|
|
12
|
-
export declare function
|
|
11
|
+
export declare function blockUserById(id: string, reason: string): Promise<any>;
|
|
12
|
+
export declare function unblockUserById(id: string): Promise<any>;
|
|
@@ -43,7 +43,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
43
43
|
return t;
|
|
44
44
|
};
|
|
45
45
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
|
-
exports.
|
|
46
|
+
exports.unblockUserById = exports.blockUserById = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = exports.demo = void 0;
|
|
47
47
|
const bcrypt = __importStar(require("bcrypt"));
|
|
48
48
|
const Crypto = require('crypto');
|
|
49
49
|
function demo() {
|
|
@@ -72,7 +72,7 @@ function createUser(data) {
|
|
|
72
72
|
externalId = Crypto.randomUUID({ disableEntropyCache: true });
|
|
73
73
|
user = yield global.repository.users.findOneBy({ externalId: externalId });
|
|
74
74
|
} while (user != null);
|
|
75
|
-
user = yield global.entity.User.create(Object.assign(Object.assign({}, data), {
|
|
75
|
+
user = yield global.entity.User.create(Object.assign(Object.assign({}, data), { confirmed: true, confirmedAt: new Date(), blocked: false, blockedReason: null, externalId: externalId, email: email, username: username || email, password: hashedPassword }));
|
|
76
76
|
return yield global.entity.User.save(user);
|
|
77
77
|
}
|
|
78
78
|
catch (error) {
|
|
@@ -208,16 +208,16 @@ function changePassword(email, password, oldPassword) {
|
|
|
208
208
|
});
|
|
209
209
|
}
|
|
210
210
|
exports.changePassword = changePassword;
|
|
211
|
-
function
|
|
211
|
+
function blockUserById(id, reason) {
|
|
212
212
|
return __awaiter(this, void 0, void 0, function* () {
|
|
213
|
-
return updateUserById(id, {
|
|
213
|
+
return updateUserById(id, { blocked: true, blockedAt: new Date(), blockedReason: reason });
|
|
214
214
|
});
|
|
215
215
|
}
|
|
216
|
-
exports.
|
|
217
|
-
function
|
|
216
|
+
exports.blockUserById = blockUserById;
|
|
217
|
+
function unblockUserById(id) {
|
|
218
218
|
return __awaiter(this, void 0, void 0, function* () {
|
|
219
|
-
return updateUserById(id, {
|
|
219
|
+
return updateUserById(id, { blocked: false, blockedAt: new Date(), blockedReason: null });
|
|
220
220
|
});
|
|
221
221
|
}
|
|
222
|
-
exports.
|
|
222
|
+
exports.unblockUserById = unblockUserById;
|
|
223
223
|
//# sourceMappingURL=userManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEhC,SAAsB,IAAI;;QAGxB,OAAO,EAAE,CAAA;IACX,CAAC;CAAA;AAJD,oBAIC;AAED,SAAsB,WAAW,CAAC,IAA+B;;QAE/D,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAA;IACpF,CAAC;CAAA;AAHD,kCAGC;AAED,SAAsB,UAAU,CAAC,IAA+B;;QAC9D,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QAE1C,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE;YACvB,OAAO,IAAI,CAAA;SACZ;QAED,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,UAAU,EAAE,IAAI,CAAA;YACpB,GAAG;gBACD,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAA;gBAE7D,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAA;aAC3E,QAAQ,IAAI,IAAI,IAAI,EAAC;YAEtB,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,gCAClC,IAAI,KACP,
|
|
1
|
+
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/query.js
CHANGED
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -45,17 +22,24 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
45
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
23
|
exports.executeCountQuery = exports.executeFindQuery = exports.applyQuery = exports.useWhere = exports.useOrder = void 0;
|
|
47
24
|
const typeorm_1 = require("typeorm");
|
|
48
|
-
const log = __importStar(require("./util/logger"));
|
|
49
25
|
const evalOrder = (val = '') => (['desc', 'd', 'false', '1'].includes(val.toLowerCase()) ? 'desc' : 'asc');
|
|
50
26
|
const useOrder = (order = []) => {
|
|
51
|
-
const
|
|
27
|
+
const result = {};
|
|
52
28
|
order
|
|
53
29
|
.filter((o) => !!o)
|
|
54
30
|
.forEach((o) => {
|
|
55
|
-
const
|
|
56
|
-
|
|
31
|
+
const parts = o.split(':');
|
|
32
|
+
const fieldFullPath = parts[0].split('.');
|
|
33
|
+
const sortType = evalOrder(parts[1]);
|
|
34
|
+
let target = result;
|
|
35
|
+
while (fieldFullPath.length > 1) {
|
|
36
|
+
const fieldPath = fieldFullPath.shift() || '';
|
|
37
|
+
target = target[fieldPath] = target[fieldPath] || {};
|
|
38
|
+
}
|
|
39
|
+
const fieldName = fieldFullPath[0];
|
|
40
|
+
target[fieldName] = sortType;
|
|
57
41
|
});
|
|
58
|
-
return
|
|
42
|
+
return result;
|
|
59
43
|
};
|
|
60
44
|
exports.useOrder = useOrder;
|
|
61
45
|
const useWhere = (where) => {
|
|
@@ -101,8 +85,6 @@ const useWhere = (where) => {
|
|
|
101
85
|
const operator = (m === null || m === void 0 ? void 0 : m.length) ? m[0] : null;
|
|
102
86
|
const fieldName = operator ? parts[0].replace(operator, '') : parts[0];
|
|
103
87
|
let value = where[objectPath];
|
|
104
|
-
log.debug('fieldName: ' + fieldName + ' with path: ' + objectPath);
|
|
105
|
-
log.debug('operator: ' + operator + ' on value: ' + value);
|
|
106
88
|
if (operator) {
|
|
107
89
|
value = reservedOperators[operator](value);
|
|
108
90
|
}
|
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":"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"}
|
|
@@ -5,8 +5,11 @@ export declare abstract class User extends BaseEntity {
|
|
|
5
5
|
abstract username: string;
|
|
6
6
|
abstract email: string;
|
|
7
7
|
abstract password: string;
|
|
8
|
-
abstract
|
|
9
|
-
abstract
|
|
8
|
+
abstract confirmed: boolean;
|
|
9
|
+
abstract confirmedAt: Date;
|
|
10
|
+
abstract blocked: boolean;
|
|
11
|
+
abstract blockedReason: string;
|
|
12
|
+
abstract blockedAt: Date;
|
|
10
13
|
abstract roles: string[];
|
|
11
14
|
abstract version: number;
|
|
12
15
|
abstract createdAt: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;CAgB5C;AAhBD,oBAgBC"}
|
|
@@ -8,5 +8,5 @@ export declare function retrieveUserByEmail(email: string): Promise<any>;
|
|
|
8
8
|
export declare function retrieveUserByExternalId(externalId: string): Promise<any>;
|
|
9
9
|
export declare function retrieveUserByPassword(email: string, password: string): Promise<any>;
|
|
10
10
|
export declare function changePassword(email: string, password: string, oldPassword: string): Promise<any>;
|
|
11
|
-
export declare function
|
|
12
|
-
export declare function
|
|
11
|
+
export declare function blockUserById(id: string, reason: string): Promise<any>;
|
|
12
|
+
export declare function unblockUserById(id: string): Promise<any>;
|
|
@@ -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.
|
|
26
|
+
exports.unblockUserById = exports.blockUserById = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = exports.demo = void 0;
|
|
27
27
|
const bcrypt = __importStar(require("bcrypt"));
|
|
28
28
|
const Crypto = require('crypto');
|
|
29
29
|
async function demo() {
|
|
@@ -49,8 +49,10 @@ async function createUser(data) {
|
|
|
49
49
|
} while (user != null);
|
|
50
50
|
user = await global.entity.User.create({
|
|
51
51
|
...data,
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
confirmed: true,
|
|
53
|
+
confirmedAt: new Date(),
|
|
54
|
+
blocked: false,
|
|
55
|
+
blockedReason: null,
|
|
54
56
|
externalId: externalId,
|
|
55
57
|
email: email,
|
|
56
58
|
username: username || email,
|
|
@@ -176,12 +178,12 @@ async function changePassword(email, password, oldPassword) {
|
|
|
176
178
|
}
|
|
177
179
|
}
|
|
178
180
|
exports.changePassword = changePassword;
|
|
179
|
-
async function
|
|
180
|
-
return updateUserById(id, {
|
|
181
|
+
async function blockUserById(id, reason) {
|
|
182
|
+
return updateUserById(id, { blocked: true, blockedAt: new Date(), blockedReason: reason });
|
|
181
183
|
}
|
|
182
|
-
exports.
|
|
183
|
-
async function
|
|
184
|
-
return updateUserById(id, {
|
|
184
|
+
exports.blockUserById = blockUserById;
|
|
185
|
+
async function unblockUserById(id) {
|
|
186
|
+
return updateUserById(id, { blocked: false, blockedAt: new Date(), blockedReason: null });
|
|
185
187
|
}
|
|
186
|
-
exports.
|
|
188
|
+
exports.unblockUserById = unblockUserById;
|
|
187
189
|
//# sourceMappingURL=userManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEzB,KAAK,UAAU,IAAI;IAGxB,OAAO,EAAE,CAAA;AACX,CAAC;AAJD,oBAIC;AAEM,KAAK,UAAU,WAAW,CAAC,IAA+B;IAE/D,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAA;AACpF,CAAC;AAHD,kCAGC;AAEM,KAAK,UAAU,UAAU,CAAC,IAA+B;IAC9D,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAE1C,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE;QACvB,OAAO,IAAI,CAAA;KACZ;IAED,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,UAAU,EAAE,IAAI,CAAA;QACpB,GAAG;YACD,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAA;YAE7D,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAA;SAC3E,QAAQ,IAAI,IAAI,IAAI,EAAC;QAEtB,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;YACrC,GAAG,IAAI;YACP,
|
|
1
|
+
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":"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"}
|
package/esm/lib/query.js
CHANGED
|
@@ -1,41 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
3
|
exports.executeCountQuery = exports.executeFindQuery = exports.applyQuery = exports.useWhere = exports.useOrder = void 0;
|
|
27
4
|
const typeorm_1 = require("typeorm");
|
|
28
|
-
const log = __importStar(require("./util/logger"));
|
|
29
5
|
const evalOrder = (val = '') => (['desc', 'd', 'false', '1'].includes(val.toLowerCase()) ? 'desc' : 'asc');
|
|
30
6
|
const useOrder = (order = []) => {
|
|
31
|
-
const
|
|
7
|
+
const result = {};
|
|
32
8
|
order
|
|
33
9
|
.filter((o) => !!o)
|
|
34
10
|
.forEach((o) => {
|
|
35
|
-
const
|
|
36
|
-
|
|
11
|
+
const parts = o.split(':');
|
|
12
|
+
const fieldFullPath = parts[0].split('.');
|
|
13
|
+
const sortType = evalOrder(parts[1]);
|
|
14
|
+
let target = result;
|
|
15
|
+
while (fieldFullPath.length > 1) {
|
|
16
|
+
const fieldPath = fieldFullPath.shift() || '';
|
|
17
|
+
target = target[fieldPath] = target[fieldPath] || {};
|
|
18
|
+
}
|
|
19
|
+
const fieldName = fieldFullPath[0];
|
|
20
|
+
target[fieldName] = sortType;
|
|
37
21
|
});
|
|
38
|
-
return
|
|
22
|
+
return result;
|
|
39
23
|
};
|
|
40
24
|
exports.useOrder = useOrder;
|
|
41
25
|
const useWhere = (where) => {
|
|
@@ -81,8 +65,6 @@ const useWhere = (where) => {
|
|
|
81
65
|
const operator = (m === null || m === void 0 ? void 0 : m.length) ? m[0] : null;
|
|
82
66
|
const fieldName = operator ? parts[0].replace(operator, '') : parts[0];
|
|
83
67
|
let value = where[objectPath];
|
|
84
|
-
log.debug('fieldName: ' + fieldName + ' with path: ' + objectPath);
|
|
85
|
-
log.debug('operator: ' + operator + ' on value: ' + value);
|
|
86
68
|
if (operator) {
|
|
87
69
|
value = reservedOperators[operator](value);
|
|
88
70
|
}
|
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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"}
|