@volcanicminds/typeorm 0.0.10 → 0.0.12
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 +42 -6
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/query.d.ts +3 -3
- package/dist/lib/query.js +99 -29
- package/dist/lib/query.js.map +1 -1
- package/dist/lib/util/logger.d.ts +6 -0
- package/dist/lib/util/logger.js +34 -0
- package/dist/lib/util/logger.js.map +1 -0
- package/esm/index.js +1 -0
- package/esm/index.js.map +1 -1
- package/esm/lib/query.d.ts +3 -3
- package/esm/lib/query.js +99 -29
- package/esm/lib/query.js.map +1 -1
- package/esm/lib/util/logger.d.ts +6 -0
- package/esm/lib/util/logger.js +34 -0
- package/esm/lib/util/logger.js.map +1 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
[](https://opensource.org/licenses/MIT)
|
|
2
2
|
[](https://en.wikipedia.org/wiki/Open_source)
|
|
3
|
-
[](https://github.com/volcanicminds/volcanic-typeorm)
|
|
4
4
|
[](https://www.npmjs.com/package/@volcanicminds/typeorm)
|
|
5
5
|
|
|
6
6
|
# volcanic-database-typeorm
|
|
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).
|
|
@@ -19,6 +17,8 @@ And, what you see in [package.json](package.json).
|
|
|
19
17
|
yarn add @volcanicminds/typeorm
|
|
20
18
|
```
|
|
21
19
|
|
|
20
|
+
It's possible use this module with module [`@volcanicminds/backend`](https://github.com/volcanicminds/volcanic-backend)
|
|
21
|
+
|
|
22
22
|
## How to upgrade packages
|
|
23
23
|
|
|
24
24
|
```js
|
|
@@ -42,7 +42,7 @@ For example, under `/src/entities` create the following:
|
|
|
42
42
|
import { Entity, Column, Index, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm'
|
|
43
43
|
|
|
44
44
|
@Entity()
|
|
45
|
-
class Player {
|
|
45
|
+
export class Player {
|
|
46
46
|
@PrimaryGeneratedColumn('uuid')
|
|
47
47
|
id: number
|
|
48
48
|
|
|
@@ -59,8 +59,6 @@ class Player {
|
|
|
59
59
|
@UpdateDateColumn()
|
|
60
60
|
updatedAt: Date
|
|
61
61
|
}
|
|
62
|
-
|
|
63
|
-
module.exports = Player
|
|
64
62
|
```
|
|
65
63
|
|
|
66
64
|
For more info and possibilities see [typeorm decorators](https://typeorm.io/decorator-reference)
|
|
@@ -81,3 +79,41 @@ Log levels:
|
|
|
81
79
|
- **warn**: useful warnings if the environment is controlled
|
|
82
80
|
- **error**: print out errors even if not blocking/fatal errors
|
|
83
81
|
- **fatal**: ok you are dead now, but you want to know
|
|
82
|
+
|
|
83
|
+
## Query: Operators
|
|
84
|
+
|
|
85
|
+
It's possible use some operators:
|
|
86
|
+
|
|
87
|
+
| Operator | Description | Datatypes | Example |
|
|
88
|
+
| ---------- | ---------------------------------- | ------------- | -------------------- |
|
|
89
|
+
| null | Is null | all | field:null=true |
|
|
90
|
+
| notNull | Not is null | all | field:notNull=true |
|
|
91
|
+
| in | Included in an array | all | field:in=A,B,C |
|
|
92
|
+
| nin | Not included in an array | all | field:nin=A,B,C |
|
|
93
|
+
| gt | Greater than | numeric, date | field:gt=10 |
|
|
94
|
+
| ge | Greater than or equals to | numeric, date | field:ge=10 |
|
|
95
|
+
| lt | Less than | numeric, date | field:lt=10 |
|
|
96
|
+
| le | Less than or equals to | numeric, date | field:le=10 |
|
|
97
|
+
| between | Is between A and B | numeric, date | field:between=A,B |
|
|
98
|
+
| like | Like with wildcard % | text | field:like=va%ue |
|
|
99
|
+
| contains | Contains | text | field:contains=alu |
|
|
100
|
+
| ncontains | Not contains | text | field:ncontains=xyz |
|
|
101
|
+
| starts | Starts with | text | field:starts=val |
|
|
102
|
+
| ends | Ends with | text | field:ends=lue |
|
|
103
|
+
| eq | Equals to | all | field:eq=value |
|
|
104
|
+
| neq | Not equals to | all | field:neq=xyz |
|
|
105
|
+
| likei | Like with wildcard % (ignore-case) | text | field:likei=va%ue |
|
|
106
|
+
| containsi | Contains (ignore-case) | text | field:containsi=alu |
|
|
107
|
+
| ncontainsi | Not contains (ignore-case) | text | field:ncontainsi=xyz |
|
|
108
|
+
| startsi | Starts with (ignore-case) | text | field:startsi=val |
|
|
109
|
+
| endsi | Ends with (ignore-case) | text | field:endsi=lue |
|
|
110
|
+
| eqi | Equals to (ignore-case) | text | field:eqi=value |
|
|
111
|
+
| neqi | Not equals to (ignore-case) | text | field:neqi=xyz |
|
|
112
|
+
|
|
113
|
+
The expression `field=value` is equals to `field:eq=value`
|
|
114
|
+
|
|
115
|
+
**Pay attention**: Some datatypes, like UUID, are special types and have possibility to use only specific operator (for example: eq, null, notNull, ..)
|
|
116
|
+
|
|
117
|
+
## Logging
|
|
118
|
+
|
|
119
|
+
Use Pino logger if in your project you have a `global.log` with a valid instance.
|
package/dist/index.js
CHANGED
|
@@ -76,6 +76,7 @@ function start(options) {
|
|
|
76
76
|
: LOG_DB_LEVEL === 'error'
|
|
77
77
|
? 'error'
|
|
78
78
|
: false;
|
|
79
|
+
global.isLoggingEnabled = (options === null || options === void 0 ? void 0 : options.logging) || true;
|
|
79
80
|
const { classes, repositories, entities } = loaderEntities.load();
|
|
80
81
|
options.entities = [...(options.entities || []), ...(entities || [])];
|
|
81
82
|
options.logger = LOG_COLORIZE ? 'advanced-console' : 'simple-console';
|
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;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/query.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export declare function applyQuery(data: any): {
|
|
1
|
+
export declare function applyQuery(data: any, extraWhere: any): {
|
|
2
2
|
skip?: number | undefined;
|
|
3
3
|
take?: number | undefined;
|
|
4
4
|
order?: object | undefined;
|
|
5
5
|
where?: object | undefined;
|
|
6
6
|
};
|
|
7
|
-
export declare function executeFindQuery(repo: any, relations?: {}, data?: {}): Promise<{
|
|
7
|
+
export declare function executeFindQuery(repo: any, relations?: {}, data?: {}, extraWhere?: any): Promise<{
|
|
8
8
|
records: any;
|
|
9
9
|
headers: {
|
|
10
10
|
'v-total': any;
|
|
@@ -13,4 +13,4 @@ export declare function executeFindQuery(repo: any, relations?: {}, data?: {}):
|
|
|
13
13
|
'v-page': number;
|
|
14
14
|
};
|
|
15
15
|
}>;
|
|
16
|
-
export declare function executeCountQuery(repo: any, data?: {}): Promise<any>;
|
|
16
|
+
export declare function executeCountQuery(repo: any, data?: {}, extraWhere?: any): Promise<any>;
|
package/dist/lib/query.js
CHANGED
|
@@ -1,4 +1,27 @@
|
|
|
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
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -21,35 +44,76 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
21
44
|
};
|
|
22
45
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
46
|
exports.executeCountQuery = exports.executeFindQuery = exports.applyQuery = void 0;
|
|
24
|
-
|
|
47
|
+
const typeorm_1 = require("typeorm");
|
|
48
|
+
const log = __importStar(require("./util/logger"));
|
|
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
|
+
const useWhere = (where) => {
|
|
61
|
+
const result = {};
|
|
62
|
+
const val = (v) => v || 'notFound';
|
|
63
|
+
const reservedOperators = {
|
|
64
|
+
':null': (v) => (v == 'false' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
65
|
+
':notNull': (v) => (v == 'true' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
66
|
+
':in': (v) => (0, typeorm_1.In)(val(v).split(',')),
|
|
67
|
+
':nin': (v) => (0, typeorm_1.Not)((0, typeorm_1.In)(val(v).split(','))),
|
|
68
|
+
':likei': (v) => (0, typeorm_1.ILike)(`${val(v)}`),
|
|
69
|
+
':containsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}%`),
|
|
70
|
+
':ncontainsi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
71
|
+
':startsi': (v) => (0, typeorm_1.ILike)(`${val(v)}%`),
|
|
72
|
+
':endsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}`),
|
|
73
|
+
':eqi': (v) => (0, typeorm_1.ILike)(v),
|
|
74
|
+
':neqi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(v)),
|
|
75
|
+
':like': (v) => (0, typeorm_1.Like)(`${val(v)}`),
|
|
76
|
+
':contains': (v) => (0, typeorm_1.Like)(`%${val(v)}%`),
|
|
77
|
+
':ncontains': (v) => (0, typeorm_1.Not)((0, typeorm_1.Like)(`%${val(v)}%`)),
|
|
78
|
+
':starts': (v) => (0, typeorm_1.Like)(`${val(v)}%`),
|
|
79
|
+
':ends': (v) => (0, typeorm_1.Like)(`%${val(v)}`),
|
|
80
|
+
':eq': (v) => (0, typeorm_1.Equal)(v),
|
|
81
|
+
':neq': (v) => (0, typeorm_1.Not)((0, typeorm_1.Equal)(v)),
|
|
82
|
+
':gt': (v) => (0, typeorm_1.MoreThan)(v),
|
|
83
|
+
':ge': (v) => (0, typeorm_1.MoreThanOrEqual)(v),
|
|
84
|
+
':lt': (v) => (0, typeorm_1.LessThan)(v),
|
|
85
|
+
':le': (v) => (0, typeorm_1.LessThanOrEqual)(v),
|
|
86
|
+
':between': (v) => {
|
|
87
|
+
const s = v === null || v === void 0 ? void 0 : v.split(':');
|
|
88
|
+
return (s === null || s === void 0 ? void 0 : s.length) == 2 ? (0, typeorm_1.Between)(s[0], s[1]) : v;
|
|
89
|
+
}
|
|
90
|
+
};
|
|
91
|
+
const reservedWords = Object.keys(reservedOperators).join('|');
|
|
92
|
+
for (const objectPath in where) {
|
|
93
|
+
const parts = objectPath.split('.');
|
|
94
|
+
let target = result;
|
|
95
|
+
while (parts.length > 1) {
|
|
96
|
+
const part = parts.shift() || '';
|
|
97
|
+
target = target[part] = target[part] || {};
|
|
98
|
+
}
|
|
99
|
+
const m = parts[0].match(new RegExp(`(${reservedWords})\\b`, 'ig'));
|
|
100
|
+
const operator = (m === null || m === void 0 ? void 0 : m.length) ? m[0] : null;
|
|
101
|
+
const fieldName = operator ? parts[0].replace(operator, '') : parts[0];
|
|
102
|
+
let value = where[objectPath];
|
|
103
|
+
log.debug('fieldName: ' + fieldName + ' with path: ' + objectPath);
|
|
104
|
+
log.debug('operator: ' + operator + ' on value: ' + value);
|
|
105
|
+
if (operator) {
|
|
106
|
+
value = reservedOperators[operator](value);
|
|
107
|
+
}
|
|
108
|
+
target[fieldName] = value;
|
|
109
|
+
}
|
|
110
|
+
return result;
|
|
111
|
+
};
|
|
112
|
+
function applyQuery(data, extraWhere) {
|
|
25
113
|
const { page = 0, pageSize = 0, skip: sk = 0, take: tk = 0, sort: s } = data, where = __rest(data, ["page", "pageSize", "skip", "take", "sort"]);
|
|
26
114
|
const take = tk || pageSize || 50;
|
|
27
115
|
const skip = sk || page * pageSize || 0;
|
|
28
116
|
const order = !Array.isArray(s) ? [s] : s;
|
|
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
|
-
const useWhere = (where) => {
|
|
41
|
-
const result = {};
|
|
42
|
-
for (const objectPath in where) {
|
|
43
|
-
const parts = objectPath.split('.');
|
|
44
|
-
let target = result;
|
|
45
|
-
while (parts.length > 1) {
|
|
46
|
-
const part = parts.shift() || '';
|
|
47
|
-
target = target[part] = target[part] || {};
|
|
48
|
-
}
|
|
49
|
-
target[parts[0]] = where[objectPath];
|
|
50
|
-
}
|
|
51
|
-
return result;
|
|
52
|
-
};
|
|
53
117
|
const query = {};
|
|
54
118
|
if (skip)
|
|
55
119
|
query.skip = skip;
|
|
@@ -59,12 +123,18 @@ function applyQuery(data) {
|
|
|
59
123
|
query.order = useOrder(order);
|
|
60
124
|
if (where)
|
|
61
125
|
query.where = useWhere(where);
|
|
126
|
+
let extra;
|
|
127
|
+
if (extraWhere) {
|
|
128
|
+
extra = Array.isArray(extraWhere) ? extraWhere.map((w) => useWhere(w)) : useWhere(extraWhere);
|
|
129
|
+
}
|
|
130
|
+
query.where = Array.isArray(extra) ? extra.map((w) => (Object.assign(Object.assign({}, w), query.where))) : Object.assign(Object.assign({}, extra), query.where);
|
|
131
|
+
log.debug('FINAL WHERE: ' + JSON.stringify(query.where));
|
|
62
132
|
return query;
|
|
63
133
|
}
|
|
64
134
|
exports.applyQuery = applyQuery;
|
|
65
|
-
function executeFindQuery(repo, relations = {}, data = {}) {
|
|
135
|
+
function executeFindQuery(repo, relations = {}, data = {}, extraWhere = {}) {
|
|
66
136
|
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
-
const extra = applyQuery(data);
|
|
137
|
+
const extra = applyQuery(data, extraWhere);
|
|
68
138
|
const [records = [], totalCount] = yield repo.findAndCount(Object.assign({ relations: relations }, extra));
|
|
69
139
|
return {
|
|
70
140
|
records,
|
|
@@ -78,9 +148,9 @@ function executeFindQuery(repo, relations = {}, data = {}) {
|
|
|
78
148
|
});
|
|
79
149
|
}
|
|
80
150
|
exports.executeFindQuery = executeFindQuery;
|
|
81
|
-
function executeCountQuery(repo, data = {}) {
|
|
151
|
+
function executeCountQuery(repo, data = {}, extraWhere = {}) {
|
|
82
152
|
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
-
const { where = {} } = applyQuery(data);
|
|
153
|
+
const { where = {} } = applyQuery(data, extraWhere);
|
|
84
154
|
return yield repo.count({ where: where });
|
|
85
155
|
});
|
|
86
156
|
}
|
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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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare function trace(data: any): void;
|
|
2
|
+
export declare function debug(data: any): void;
|
|
3
|
+
export declare function info(data: any): void;
|
|
4
|
+
export declare function warn(data: any): void;
|
|
5
|
+
export declare function error(data: any): void;
|
|
6
|
+
export declare function fatal(data: any): void;
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.fatal = exports.error = exports.warn = exports.info = exports.debug = exports.trace = void 0;
|
|
4
|
+
function trace(data) {
|
|
5
|
+
var _a;
|
|
6
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.trace) && global.log.trace(data);
|
|
7
|
+
}
|
|
8
|
+
exports.trace = trace;
|
|
9
|
+
function debug(data) {
|
|
10
|
+
var _a;
|
|
11
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.debug) && global.log.debug(data);
|
|
12
|
+
}
|
|
13
|
+
exports.debug = debug;
|
|
14
|
+
function info(data) {
|
|
15
|
+
var _a;
|
|
16
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.info) && global.log.info(data);
|
|
17
|
+
}
|
|
18
|
+
exports.info = info;
|
|
19
|
+
function warn(data) {
|
|
20
|
+
var _a;
|
|
21
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.warn) && global.log.warn(data);
|
|
22
|
+
}
|
|
23
|
+
exports.warn = warn;
|
|
24
|
+
function error(data) {
|
|
25
|
+
var _a;
|
|
26
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.error) && global.log.error(data);
|
|
27
|
+
}
|
|
28
|
+
exports.error = error;
|
|
29
|
+
function fatal(data) {
|
|
30
|
+
var _a;
|
|
31
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.fatal) && global.log.fatal(data);
|
|
32
|
+
}
|
|
33
|
+
exports.fatal = fatal;
|
|
34
|
+
//# sourceMappingURL=logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../lib/util/logger.ts"],"names":[],"mappings":";;;AAAA,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,IAAI,CAAC,IAAI;;IACvB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,IAAI,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtE,CAAC;AAFD,oBAEC;AAED,SAAgB,IAAI,CAAC,IAAI;;IACvB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,IAAI,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtE,CAAC;AAFD,oBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC"}
|
package/esm/index.js
CHANGED
|
@@ -66,6 +66,7 @@ async function start(options) {
|
|
|
66
66
|
: LOG_DB_LEVEL === 'error'
|
|
67
67
|
? 'error'
|
|
68
68
|
: false;
|
|
69
|
+
global.isLoggingEnabled = (options === null || options === void 0 ? void 0 : options.logging) || true;
|
|
69
70
|
const { classes, repositories, entities } = loaderEntities.load();
|
|
70
71
|
options.entities = [...(options.entities || []), ...(entities || [])];
|
|
71
72
|
options.logger = LOG_COLORIZE ? 'advanced-console' : 'simple-console';
|
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;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
package/esm/lib/query.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export declare function applyQuery(data: any): {
|
|
1
|
+
export declare function applyQuery(data: any, extraWhere: any): {
|
|
2
2
|
skip?: number | undefined;
|
|
3
3
|
take?: number | undefined;
|
|
4
4
|
order?: object | undefined;
|
|
5
5
|
where?: object | undefined;
|
|
6
6
|
};
|
|
7
|
-
export declare function executeFindQuery(repo: any, relations?: {}, data?: {}): Promise<{
|
|
7
|
+
export declare function executeFindQuery(repo: any, relations?: {}, data?: {}, extraWhere?: any): Promise<{
|
|
8
8
|
records: any;
|
|
9
9
|
headers: {
|
|
10
10
|
'v-total': any;
|
|
@@ -13,4 +13,4 @@ export declare function executeFindQuery(repo: any, relations?: {}, data?: {}):
|
|
|
13
13
|
'v-page': number;
|
|
14
14
|
};
|
|
15
15
|
}>;
|
|
16
|
-
export declare function executeCountQuery(repo: any, data?: {}): Promise<any>;
|
|
16
|
+
export declare function executeCountQuery(repo: any, data?: {}, extraWhere?: any): Promise<any>;
|
package/esm/lib/query.js
CHANGED
|
@@ -1,35 +1,99 @@
|
|
|
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
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
26
|
exports.executeCountQuery = exports.executeFindQuery = exports.applyQuery = void 0;
|
|
4
|
-
|
|
27
|
+
const typeorm_1 = require("typeorm");
|
|
28
|
+
const log = __importStar(require("./util/logger"));
|
|
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
|
+
const useWhere = (where) => {
|
|
41
|
+
const result = {};
|
|
42
|
+
const val = (v) => v || 'notFound';
|
|
43
|
+
const reservedOperators = {
|
|
44
|
+
':null': (v) => (v == 'false' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
45
|
+
':notNull': (v) => (v == 'true' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
|
|
46
|
+
':in': (v) => (0, typeorm_1.In)(val(v).split(',')),
|
|
47
|
+
':nin': (v) => (0, typeorm_1.Not)((0, typeorm_1.In)(val(v).split(','))),
|
|
48
|
+
':likei': (v) => (0, typeorm_1.ILike)(`${val(v)}`),
|
|
49
|
+
':containsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}%`),
|
|
50
|
+
':ncontainsi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`)),
|
|
51
|
+
':startsi': (v) => (0, typeorm_1.ILike)(`${val(v)}%`),
|
|
52
|
+
':endsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}`),
|
|
53
|
+
':eqi': (v) => (0, typeorm_1.ILike)(v),
|
|
54
|
+
':neqi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(v)),
|
|
55
|
+
':like': (v) => (0, typeorm_1.Like)(`${val(v)}`),
|
|
56
|
+
':contains': (v) => (0, typeorm_1.Like)(`%${val(v)}%`),
|
|
57
|
+
':ncontains': (v) => (0, typeorm_1.Not)((0, typeorm_1.Like)(`%${val(v)}%`)),
|
|
58
|
+
':starts': (v) => (0, typeorm_1.Like)(`${val(v)}%`),
|
|
59
|
+
':ends': (v) => (0, typeorm_1.Like)(`%${val(v)}`),
|
|
60
|
+
':eq': (v) => (0, typeorm_1.Equal)(v),
|
|
61
|
+
':neq': (v) => (0, typeorm_1.Not)((0, typeorm_1.Equal)(v)),
|
|
62
|
+
':gt': (v) => (0, typeorm_1.MoreThan)(v),
|
|
63
|
+
':ge': (v) => (0, typeorm_1.MoreThanOrEqual)(v),
|
|
64
|
+
':lt': (v) => (0, typeorm_1.LessThan)(v),
|
|
65
|
+
':le': (v) => (0, typeorm_1.LessThanOrEqual)(v),
|
|
66
|
+
':between': (v) => {
|
|
67
|
+
const s = v === null || v === void 0 ? void 0 : v.split(':');
|
|
68
|
+
return (s === null || s === void 0 ? void 0 : s.length) == 2 ? (0, typeorm_1.Between)(s[0], s[1]) : v;
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
const reservedWords = Object.keys(reservedOperators).join('|');
|
|
72
|
+
for (const objectPath in where) {
|
|
73
|
+
const parts = objectPath.split('.');
|
|
74
|
+
let target = result;
|
|
75
|
+
while (parts.length > 1) {
|
|
76
|
+
const part = parts.shift() || '';
|
|
77
|
+
target = target[part] = target[part] || {};
|
|
78
|
+
}
|
|
79
|
+
const m = parts[0].match(new RegExp(`(${reservedWords})\\b`, 'ig'));
|
|
80
|
+
const operator = (m === null || m === void 0 ? void 0 : m.length) ? m[0] : null;
|
|
81
|
+
const fieldName = operator ? parts[0].replace(operator, '') : parts[0];
|
|
82
|
+
let value = where[objectPath];
|
|
83
|
+
log.debug('fieldName: ' + fieldName + ' with path: ' + objectPath);
|
|
84
|
+
log.debug('operator: ' + operator + ' on value: ' + value);
|
|
85
|
+
if (operator) {
|
|
86
|
+
value = reservedOperators[operator](value);
|
|
87
|
+
}
|
|
88
|
+
target[fieldName] = value;
|
|
89
|
+
}
|
|
90
|
+
return result;
|
|
91
|
+
};
|
|
92
|
+
function applyQuery(data, extraWhere) {
|
|
5
93
|
const { page = 0, pageSize = 0, skip: sk = 0, take: tk = 0, sort: s, ...where } = data;
|
|
6
94
|
const take = tk || pageSize || 50;
|
|
7
95
|
const skip = sk || page * pageSize || 0;
|
|
8
96
|
const order = !Array.isArray(s) ? [s] : s;
|
|
9
|
-
const evalOrder = (val = '') => (['desc', 'd', 'false', '1'].includes(val.toLowerCase()) ? 'desc' : 'asc');
|
|
10
|
-
const useOrder = (order = []) => {
|
|
11
|
-
const orderBy = {};
|
|
12
|
-
order
|
|
13
|
-
.filter((o) => !!o)
|
|
14
|
-
.forEach((o) => {
|
|
15
|
-
const p = o.split(':');
|
|
16
|
-
orderBy[p[0]] = evalOrder(p[1]);
|
|
17
|
-
});
|
|
18
|
-
return orderBy;
|
|
19
|
-
};
|
|
20
|
-
const useWhere = (where) => {
|
|
21
|
-
const result = {};
|
|
22
|
-
for (const objectPath in where) {
|
|
23
|
-
const parts = objectPath.split('.');
|
|
24
|
-
let target = result;
|
|
25
|
-
while (parts.length > 1) {
|
|
26
|
-
const part = parts.shift() || '';
|
|
27
|
-
target = target[part] = target[part] || {};
|
|
28
|
-
}
|
|
29
|
-
target[parts[0]] = where[objectPath];
|
|
30
|
-
}
|
|
31
|
-
return result;
|
|
32
|
-
};
|
|
33
97
|
const query = {};
|
|
34
98
|
if (skip)
|
|
35
99
|
query.skip = skip;
|
|
@@ -39,11 +103,17 @@ function applyQuery(data) {
|
|
|
39
103
|
query.order = useOrder(order);
|
|
40
104
|
if (where)
|
|
41
105
|
query.where = useWhere(where);
|
|
106
|
+
let extra;
|
|
107
|
+
if (extraWhere) {
|
|
108
|
+
extra = Array.isArray(extraWhere) ? extraWhere.map((w) => useWhere(w)) : useWhere(extraWhere);
|
|
109
|
+
}
|
|
110
|
+
query.where = Array.isArray(extra) ? extra.map((w) => ({ ...w, ...query.where })) : { ...extra, ...query.where };
|
|
111
|
+
log.debug('FINAL WHERE: ' + JSON.stringify(query.where));
|
|
42
112
|
return query;
|
|
43
113
|
}
|
|
44
114
|
exports.applyQuery = applyQuery;
|
|
45
|
-
async function executeFindQuery(repo, relations = {}, data = {}) {
|
|
46
|
-
const extra = applyQuery(data);
|
|
115
|
+
async function executeFindQuery(repo, relations = {}, data = {}, extraWhere = {}) {
|
|
116
|
+
const extra = applyQuery(data, extraWhere);
|
|
47
117
|
const [records = [], totalCount] = await repo.findAndCount({
|
|
48
118
|
relations: relations,
|
|
49
119
|
...extra
|
|
@@ -59,8 +129,8 @@ async function executeFindQuery(repo, relations = {}, data = {}) {
|
|
|
59
129
|
};
|
|
60
130
|
}
|
|
61
131
|
exports.executeFindQuery = executeFindQuery;
|
|
62
|
-
async function executeCountQuery(repo, data = {}) {
|
|
63
|
-
const { where = {} } = applyQuery(data);
|
|
132
|
+
async function executeCountQuery(repo, data = {}, extraWhere = {}) {
|
|
133
|
+
const { where = {} } = applyQuery(data, extraWhere);
|
|
64
134
|
return await repo.count({ where: where });
|
|
65
135
|
}
|
|
66
136
|
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":"
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAYgB;AAEhB,mDAAoC;AAEpC,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;AAElH,MAAM,QAAQ,GAAG,CAAC,QAAkB,EAAE,EAAE,EAAE;IACxC,MAAM,OAAO,GAAG,EAAE,CAAA;IAClB,KAAK;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAClB,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;QACrB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACtB,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjC,CAAC,CAAC,CAAA;IAEJ,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAE,EAAE;IAC9B,MAAM,MAAM,GAAG,EAAE,CAAA;IAEjB,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,UAAU,CAAA;IAClC,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;QAE3D,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;QAEzC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAK,EAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAK,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACzC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,aAAG,EAAC,IAAA,eAAK,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC/C,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAK,EAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACtC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAK,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACpC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAK,EAAC,CAAC,CAAC;QACvB,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,aAAG,EAAC,IAAA,eAAK,EAAC,CAAC,CAAC,CAAC;QAE7B,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,IAAA,eAAK,EAAC,CAAC,CAAC;QACtB,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,aAAG,EAAC,IAAA,eAAK,EAAC,CAAC,CAAC,CAAC;QAE5B,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;IAG9D,KAAK,MAAM,UAAU,IAAI,KAAK,EAAE;QAE9B,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAGnC,IAAI,MAAM,GAAG,MAAM,CAAA;QACnB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,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;SAC3C;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;QAM7B,GAAG,CAAC,KAAK,CAAC,aAAa,GAAG,SAAS,GAAG,cAAc,GAAG,UAAU,CAAC,CAAA;QAClE,GAAG,CAAC,KAAK,CAAC,YAAY,GAAG,QAAQ,GAAG,aAAa,GAAG,KAAK,CAAC,CAAA;QAG1D,IAAI,QAAQ,EAAE;YACZ,KAAK,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAA;SAC3C;QAED,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAA;KAE1B;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,SAAgB,UAAU,CAAC,IAAI,EAAE,UAAU;IACzC,MAAM,EAAE,IAAI,GAAG,CAAC,EAAE,QAAQ,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,IAAI,CAAA;IACtF,MAAM,IAAI,GAAW,EAAE,IAAI,QAAQ,IAAI,EAAE,CAAA;IACzC,MAAM,IAAI,GAAW,EAAE,IAAI,IAAI,GAAG,QAAQ,IAAI,CAAC,CAAA;IAC/C,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,QAAQ,CAAC,KAAK,CAAC,CAAA;IACxC,IAAI,KAAK;QAAE,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAExC,IAAI,KAAU,CAAA;IACd,IAAI,UAAU,EAAE;QACd,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;KAC9F;IAGD,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;IAEhH,GAAG,CAAC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IACxD,OAAO,KAAK,CAAA;AACd,CAAC;AA5BD,gCA4BC;AAEM,KAAK,UAAU,gBAAgB,CAAC,IAAS,EAAE,SAAS,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,aAAkB,EAAE;IAC/F,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IAE1C,MAAM,CAAC,OAAO,GAAG,EAAE,EAAE,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;QACzD,SAAS,EAAE,SAAS;QACpB,GAAG,KAAK;KACT,CAAC,CAAA;IAEF,OAAO;QACL,OAAO;QACP,OAAO,EAAE;YACP,SAAS,EAAE,UAAU;YACrB,SAAS,EAAE,OAAO,CAAC,MAAM;YACzB,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,QAAQ,EAAE,CAAC;SACZ;KACF,CAAA;AACH,CAAC;AAjBD,4CAiBC;AAEM,KAAK,UAAU,iBAAiB,CAAC,IAAS,EAAE,IAAI,GAAG,EAAE,EAAE,aAAkB,EAAE;IAChF,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IACnD,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;AAC3C,CAAC;AAHD,8CAGC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare function trace(data: any): void;
|
|
2
|
+
export declare function debug(data: any): void;
|
|
3
|
+
export declare function info(data: any): void;
|
|
4
|
+
export declare function warn(data: any): void;
|
|
5
|
+
export declare function error(data: any): void;
|
|
6
|
+
export declare function fatal(data: any): void;
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.fatal = exports.error = exports.warn = exports.info = exports.debug = exports.trace = void 0;
|
|
4
|
+
function trace(data) {
|
|
5
|
+
var _a;
|
|
6
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.trace) && global.log.trace(data);
|
|
7
|
+
}
|
|
8
|
+
exports.trace = trace;
|
|
9
|
+
function debug(data) {
|
|
10
|
+
var _a;
|
|
11
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.debug) && global.log.debug(data);
|
|
12
|
+
}
|
|
13
|
+
exports.debug = debug;
|
|
14
|
+
function info(data) {
|
|
15
|
+
var _a;
|
|
16
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.info) && global.log.info(data);
|
|
17
|
+
}
|
|
18
|
+
exports.info = info;
|
|
19
|
+
function warn(data) {
|
|
20
|
+
var _a;
|
|
21
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.warn) && global.log.warn(data);
|
|
22
|
+
}
|
|
23
|
+
exports.warn = warn;
|
|
24
|
+
function error(data) {
|
|
25
|
+
var _a;
|
|
26
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.error) && global.log.error(data);
|
|
27
|
+
}
|
|
28
|
+
exports.error = error;
|
|
29
|
+
function fatal(data) {
|
|
30
|
+
var _a;
|
|
31
|
+
global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.fatal) && global.log.fatal(data);
|
|
32
|
+
}
|
|
33
|
+
exports.fatal = fatal;
|
|
34
|
+
//# sourceMappingURL=logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../lib/util/logger.ts"],"names":[],"mappings":";;;AAAA,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,IAAI,CAAC,IAAI;;IACvB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,IAAI,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtE,CAAC;AAFD,oBAEC;AAED,SAAgB,IAAI,CAAC,IAAI;;IACvB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,IAAI,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtE,CAAC;AAFD,oBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC"}
|