@spinajs/orm-sqlite 1.0.22 → 1.2.31
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 +11 -0
- package/lib/compilers.d.ts +1 -0
- package/lib/compilers.js +32 -14
- package/lib/compilers.js.map +1 -1
- package/lib/converters.d.ts +4 -7
- package/lib/converters.js +13 -17
- package/lib/converters.js.map +1 -1
- package/lib/index.js +23 -15
- package/lib/index.js.map +1 -1
- package/lib/log-common/src/index.d.ts +180 -0
- package/lib/log-common/src/index.js +49 -0
- package/lib/log-common/src/index.js.map +1 -0
- package/lib/orm-sqlite/src/compilers.d.ts +32 -0
- package/lib/orm-sqlite/src/compilers.js +215 -0
- package/lib/orm-sqlite/src/compilers.js.map +1 -0
- package/lib/orm-sqlite/src/converters.d.ts +6 -0
- package/lib/orm-sqlite/src/converters.js +25 -0
- package/lib/orm-sqlite/src/converters.js.map +1 -0
- package/lib/orm-sqlite/src/index.d.ts +22 -0
- package/lib/orm-sqlite/src/index.js +221 -0
- package/lib/orm-sqlite/src/index.js.map +1 -0
- package/lib/orm-sqlite/src/statements.d.ts +6 -0
- package/lib/orm-sqlite/src/statements.js +31 -0
- package/lib/orm-sqlite/src/statements.js.map +1 -0
- package/lib/orm-sqlite/src/types.d.ts +13 -0
- package/lib/orm-sqlite/src/types.js +3 -0
- package/lib/orm-sqlite/src/types.js.map +1 -0
- package/lib/orm-sqlite.js +7 -0
- package/lib/statements.js +3 -6
- package/lib/statements.js.map +1 -1
- package/package.json +23 -37
- package/lib/decorators.d.ts +0 -1
- package/lib/decorators.js +0 -32
- package/lib/decorators.js.map +0 -1
package/README.md
ADDED
package/lib/compilers.d.ts
CHANGED
package/lib/compilers.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/* eslint-disable prettier/prettier */
|
|
2
3
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
4
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
5
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -27,7 +28,7 @@ let SqliteOrderByCompiler = class SqliteOrderByCompiler extends orm_1.OrderByQue
|
|
|
27
28
|
let stmt = '';
|
|
28
29
|
const bindings = [];
|
|
29
30
|
if (sort) {
|
|
30
|
-
stmt = ` ORDER BY
|
|
31
|
+
stmt = ` ORDER BY \`${sort.column}\` ${sort.order.toLowerCase() === 'asc' ? 'ASC' : 'DESC'}`;
|
|
31
32
|
}
|
|
32
33
|
return {
|
|
33
34
|
bindings,
|
|
@@ -36,7 +37,7 @@ let SqliteOrderByCompiler = class SqliteOrderByCompiler extends orm_1.OrderByQue
|
|
|
36
37
|
}
|
|
37
38
|
};
|
|
38
39
|
SqliteOrderByCompiler = __decorate([
|
|
39
|
-
di_1.NewInstance(),
|
|
40
|
+
(0, di_1.NewInstance)(),
|
|
40
41
|
__metadata("design:paramtypes", [orm_1.OrderByBuilder])
|
|
41
42
|
], SqliteOrderByCompiler);
|
|
42
43
|
exports.SqliteOrderByCompiler = SqliteOrderByCompiler;
|
|
@@ -59,7 +60,7 @@ let SqliteOnDuplicateQueryCompiler = class SqliteOnDuplicateQueryCompiler extend
|
|
|
59
60
|
.getParent()
|
|
60
61
|
.getColumns()
|
|
61
62
|
.findIndex((col) => (_.isString(col.Column) ? col.Column === c : null));
|
|
62
|
-
return this._builder.getParent().Values[0][cIndex];
|
|
63
|
+
return this._builder.getParent().Values[0][`${cIndex}`];
|
|
63
64
|
}
|
|
64
65
|
else {
|
|
65
66
|
return c.Bindings;
|
|
@@ -67,12 +68,12 @@ let SqliteOnDuplicateQueryCompiler = class SqliteOnDuplicateQueryCompiler extend
|
|
|
67
68
|
});
|
|
68
69
|
return {
|
|
69
70
|
bindings,
|
|
70
|
-
expression: `ON CONFLICT(${this._builder.getColumn().join(',')}) DO UPDATE SET ${columns}`,
|
|
71
|
+
expression: `ON CONFLICT(${this._builder.getColumn().join(',')}) DO UPDATE SET ${columns.join(',')}`,
|
|
71
72
|
};
|
|
72
73
|
}
|
|
73
74
|
};
|
|
74
75
|
SqliteOnDuplicateQueryCompiler = __decorate([
|
|
75
|
-
di_1.NewInstance(),
|
|
76
|
+
(0, di_1.NewInstance)(),
|
|
76
77
|
__metadata("design:paramtypes", [orm_1.OnDuplicateQueryBuilder])
|
|
77
78
|
], SqliteOnDuplicateQueryCompiler);
|
|
78
79
|
exports.SqliteOnDuplicateQueryCompiler = SqliteOnDuplicateQueryCompiler;
|
|
@@ -80,15 +81,16 @@ let SqliteTableQueryCompiler = class SqliteTableQueryCompiler extends orm_sql_1.
|
|
|
80
81
|
compile() {
|
|
81
82
|
const _table = this._table();
|
|
82
83
|
const _columns = this._columns();
|
|
84
|
+
const _foreignKeys = this._foreignKeys();
|
|
83
85
|
return {
|
|
84
86
|
bindings: [],
|
|
85
|
-
expression: `${_table} (${_columns})`,
|
|
87
|
+
expression: `${_table} (${_columns} ${_foreignKeys ? ',' + _foreignKeys : ''})`,
|
|
86
88
|
};
|
|
87
89
|
}
|
|
88
90
|
};
|
|
89
91
|
SqliteTableQueryCompiler = __decorate([
|
|
90
|
-
di_1.NewInstance(),
|
|
91
|
-
di_1.Inject(di_1.Container)
|
|
92
|
+
(0, di_1.NewInstance)(),
|
|
93
|
+
(0, di_1.Inject)(di_1.Container)
|
|
92
94
|
], SqliteTableQueryCompiler);
|
|
93
95
|
exports.SqliteTableQueryCompiler = SqliteTableQueryCompiler;
|
|
94
96
|
let SqliteInsertQueryCompiler = class SqliteInsertQueryCompiler extends orm_sql_1.SqlInsertQueryCompiler {
|
|
@@ -106,15 +108,15 @@ let SqliteInsertQueryCompiler = class SqliteInsertQueryCompiler extends orm_sql_
|
|
|
106
108
|
};
|
|
107
109
|
}
|
|
108
110
|
into() {
|
|
109
|
-
return `INSERT${this._builder.Ignore ?
|
|
111
|
+
return `INSERT${this._builder.Ignore ? ' OR IGNORE' : ''} INTO \`${this._builder.Table}\``;
|
|
110
112
|
}
|
|
111
113
|
};
|
|
112
114
|
__decorate([
|
|
113
|
-
di_1.Autoinject(),
|
|
115
|
+
(0, di_1.Autoinject)(),
|
|
114
116
|
__metadata("design:type", di_1.Container)
|
|
115
117
|
], SqliteInsertQueryCompiler.prototype, "_container", void 0);
|
|
116
118
|
SqliteInsertQueryCompiler = __decorate([
|
|
117
|
-
di_1.NewInstance(),
|
|
119
|
+
(0, di_1.NewInstance)(),
|
|
118
120
|
__metadata("design:paramtypes", [orm_1.InsertQueryBuilder])
|
|
119
121
|
], SqliteInsertQueryCompiler);
|
|
120
122
|
exports.SqliteInsertQueryCompiler = SqliteInsertQueryCompiler;
|
|
@@ -127,7 +129,7 @@ let SqliteColumnCompiler = class SqliteColumnCompiler extends orm_sql_1.SqlColum
|
|
|
127
129
|
case 'tinyblob':
|
|
128
130
|
case 'mediumblob':
|
|
129
131
|
case 'longblob':
|
|
130
|
-
_stmt.push(
|
|
132
|
+
_stmt.push('BLOB');
|
|
131
133
|
break;
|
|
132
134
|
case 'string':
|
|
133
135
|
case 'text':
|
|
@@ -185,12 +187,28 @@ let SqliteColumnCompiler = class SqliteColumnCompiler extends orm_sql_1.SqlColum
|
|
|
185
187
|
}
|
|
186
188
|
return {
|
|
187
189
|
bindings: [],
|
|
188
|
-
expression: _stmt.filter(x => !_.isEmpty(x)).join(' '),
|
|
190
|
+
expression: _stmt.filter((x) => !_.isEmpty(x)).join(' '),
|
|
189
191
|
};
|
|
190
192
|
}
|
|
193
|
+
_defaultCompiler() {
|
|
194
|
+
let _stmt = '';
|
|
195
|
+
if (_.isNil(this.builder.Default) || (_.isString(this.builder.Default) && _.isEmpty(this.builder.Default.trim()))) {
|
|
196
|
+
return _stmt;
|
|
197
|
+
}
|
|
198
|
+
if (_.isString(this.builder.Default)) {
|
|
199
|
+
_stmt = `DEFAULT '${this.builder.Default.trim()}'`;
|
|
200
|
+
}
|
|
201
|
+
else if (_.isNumber(this.builder.Default)) {
|
|
202
|
+
_stmt = `DEFAULT ${this.builder.Default}`;
|
|
203
|
+
}
|
|
204
|
+
else if (this.builder.Default instanceof orm_1.RawQuery) {
|
|
205
|
+
_stmt = `DEFAULT ${(this.builder.Default).Query}`;
|
|
206
|
+
}
|
|
207
|
+
return _stmt;
|
|
208
|
+
}
|
|
191
209
|
};
|
|
192
210
|
SqliteColumnCompiler = __decorate([
|
|
193
|
-
di_1.NewInstance()
|
|
211
|
+
(0, di_1.NewInstance)()
|
|
194
212
|
], SqliteColumnCompiler);
|
|
195
213
|
exports.SqliteColumnCompiler = SqliteColumnCompiler;
|
|
196
214
|
//# sourceMappingURL=compilers.js.map
|
package/lib/compilers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compilers.js","sourceRoot":"","sources":["../src/compilers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compilers.js","sourceRoot":"","sources":["../src/compilers.ts"],"names":[],"mappings":"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"}
|
package/lib/converters.d.ts
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
import { DatetimeValueConverter
|
|
1
|
+
import { DatetimeValueConverter } from '@spinajs/orm';
|
|
2
|
+
import { DateTime } from 'luxon';
|
|
2
3
|
export declare class SqliteDatetimeValueConverter extends DatetimeValueConverter {
|
|
3
|
-
toDB(value: Date): string;
|
|
4
|
-
fromDB(value: string):
|
|
5
|
-
}
|
|
6
|
-
export declare class SqliteSetValueConverter extends SetValueConverter {
|
|
7
|
-
toDB(value: any[]): string;
|
|
8
|
-
fromDB(value: string): string[];
|
|
4
|
+
toDB(value: Date | DateTime): string;
|
|
5
|
+
fromDB(value: string): DateTime;
|
|
9
6
|
}
|
package/lib/converters.js
CHANGED
|
@@ -1,29 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.SqliteDatetimeValueConverter = void 0;
|
|
4
|
+
/* eslint-disable prettier/prettier */
|
|
4
5
|
const orm_1 = require("@spinajs/orm");
|
|
6
|
+
const luxon_1 = require("luxon");
|
|
5
7
|
class SqliteDatetimeValueConverter extends orm_1.DatetimeValueConverter {
|
|
6
8
|
toDB(value) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
fromDB(value) {
|
|
10
|
-
return new Date(value);
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
exports.SqliteDatetimeValueConverter = SqliteDatetimeValueConverter;
|
|
14
|
-
class SqliteSetValueConverter extends orm_1.SetValueConverter {
|
|
15
|
-
toDB(value) {
|
|
16
|
-
if (value) {
|
|
17
|
-
return value.join(",");
|
|
9
|
+
if (value instanceof Date) {
|
|
10
|
+
return value.toISOString();
|
|
18
11
|
}
|
|
19
|
-
|
|
12
|
+
if (value instanceof luxon_1.DateTime) {
|
|
13
|
+
value.toISO();
|
|
14
|
+
}
|
|
15
|
+
return null;
|
|
20
16
|
}
|
|
21
17
|
fromDB(value) {
|
|
22
|
-
if (value) {
|
|
23
|
-
return
|
|
18
|
+
if (!value) {
|
|
19
|
+
return null;
|
|
24
20
|
}
|
|
25
|
-
return
|
|
21
|
+
return luxon_1.DateTime.fromISO(value);
|
|
26
22
|
}
|
|
27
23
|
}
|
|
28
|
-
exports.
|
|
24
|
+
exports.SqliteDatetimeValueConverter = SqliteDatetimeValueConverter;
|
|
29
25
|
//# sourceMappingURL=converters.js.map
|
package/lib/converters.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converters.js","sourceRoot":"","sources":["../src/converters.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"converters.js","sourceRoot":"","sources":["../src/converters.ts"],"names":[],"mappings":";;;AAAA,sCAAsC;AACtC,sCAAsD;AACtD,iCAAiC;AAEjC,MAAa,4BAA6B,SAAQ,4BAAsB;IAC/D,IAAI,CAAC,KAAsB;QAChC,IAAI,KAAK,YAAY,IAAI,EAAE;YACzB,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;SAC5B;QAED,IAAI,KAAK,YAAY,gBAAQ,EAAE;YAC7B,KAAK,CAAC,KAAK,EAAE,CAAC;SACf;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,MAAM,CAAC,KAAa;QACzB,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QAED,OAAO,gBAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;CACF;AApBD,oEAoBC"}
|
package/lib/index.js
CHANGED
|
@@ -13,10 +13,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
13
13
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
14
14
|
};
|
|
15
15
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
16
|
-
for (var p in m) if (p !== "default" && !
|
|
16
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
17
17
|
};
|
|
18
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
19
|
exports.SqliteOrmDriver = void 0;
|
|
20
|
+
/* eslint-disable prettier/prettier */
|
|
20
21
|
__exportStar(require("./compilers"), exports);
|
|
21
22
|
const orm_1 = require("@spinajs/orm");
|
|
22
23
|
const sqlite3_1 = require("sqlite3");
|
|
@@ -25,6 +26,7 @@ const di_1 = require("@spinajs/di");
|
|
|
25
26
|
const compilers_1 = require("./compilers");
|
|
26
27
|
const statements_1 = require("./statements");
|
|
27
28
|
const converters_1 = require("./converters");
|
|
29
|
+
const exceptions_1 = require("@spinajs/exceptions");
|
|
28
30
|
let SqliteOrmDriver = class SqliteOrmDriver extends orm_sql_1.SqlDriver {
|
|
29
31
|
execute(stmt, params, queryContext) {
|
|
30
32
|
const queryParams = params !== null && params !== void 0 ? params : [];
|
|
@@ -32,7 +34,7 @@ let SqliteOrmDriver = class SqliteOrmDriver extends orm_sql_1.SqlDriver {
|
|
|
32
34
|
throw new Error('cannot execute sqlite statement, no db connection avaible');
|
|
33
35
|
}
|
|
34
36
|
super.execute(stmt, queryParams, queryContext);
|
|
35
|
-
return new Promise((
|
|
37
|
+
return new Promise((resolve, reject) => {
|
|
36
38
|
switch (queryContext) {
|
|
37
39
|
case orm_1.QueryContext.Update:
|
|
38
40
|
case orm_1.QueryContext.Delete:
|
|
@@ -40,28 +42,33 @@ let SqliteOrmDriver = class SqliteOrmDriver extends orm_sql_1.SqlDriver {
|
|
|
40
42
|
case orm_1.QueryContext.Transaction:
|
|
41
43
|
this.Db.run(stmt, ...queryParams, (err, data) => {
|
|
42
44
|
if (err) {
|
|
43
|
-
|
|
45
|
+
reject(err);
|
|
44
46
|
return;
|
|
45
47
|
}
|
|
46
|
-
|
|
48
|
+
resolve(data);
|
|
47
49
|
});
|
|
48
50
|
break;
|
|
49
51
|
case orm_1.QueryContext.Select:
|
|
50
52
|
this.Db.all(stmt, ...queryParams, (err, rows) => {
|
|
51
53
|
if (err) {
|
|
52
|
-
|
|
54
|
+
reject(err);
|
|
53
55
|
return;
|
|
54
56
|
}
|
|
55
|
-
|
|
57
|
+
resolve(rows);
|
|
56
58
|
});
|
|
57
59
|
break;
|
|
58
60
|
case orm_1.QueryContext.Insert:
|
|
59
61
|
this.Db.run(stmt, ...queryParams, function (err) {
|
|
60
62
|
if (err) {
|
|
61
|
-
|
|
63
|
+
if (err.code === 'SQLITE_CONSTRAINT') {
|
|
64
|
+
reject(new exceptions_1.ResourceDuplicated(err));
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
reject(err);
|
|
68
|
+
}
|
|
62
69
|
return;
|
|
63
70
|
}
|
|
64
|
-
|
|
71
|
+
resolve(this.lastID);
|
|
65
72
|
});
|
|
66
73
|
break;
|
|
67
74
|
}
|
|
@@ -72,7 +79,7 @@ let SqliteOrmDriver = class SqliteOrmDriver extends orm_sql_1.SqlDriver {
|
|
|
72
79
|
}
|
|
73
80
|
async connect() {
|
|
74
81
|
return new Promise((resolve, reject) => {
|
|
75
|
-
this.Db = new sqlite3_1.Database(this.Options.Filename, err => {
|
|
82
|
+
this.Db = new sqlite3_1.Database(this.Options.Filename, (err) => {
|
|
76
83
|
if (err) {
|
|
77
84
|
reject(err);
|
|
78
85
|
return;
|
|
@@ -83,7 +90,7 @@ let SqliteOrmDriver = class SqliteOrmDriver extends orm_sql_1.SqlDriver {
|
|
|
83
90
|
}
|
|
84
91
|
async disconnect() {
|
|
85
92
|
return new Promise((res, rej) => {
|
|
86
|
-
this.Db.close(err => {
|
|
93
|
+
this.Db.close((err) => {
|
|
87
94
|
if (err) {
|
|
88
95
|
rej(err);
|
|
89
96
|
return;
|
|
@@ -102,7 +109,6 @@ let SqliteOrmDriver = class SqliteOrmDriver extends orm_sql_1.SqlDriver {
|
|
|
102
109
|
this.Container.register(compilers_1.SqliteOnDuplicateQueryCompiler).as(orm_1.OnDuplicateQueryCompiler);
|
|
103
110
|
this.Container.register(compilers_1.SqliteInsertQueryCompiler).as(orm_1.InsertQueryCompiler);
|
|
104
111
|
this.Container.register(converters_1.SqliteDatetimeValueConverter).as(orm_1.DatetimeValueConverter);
|
|
105
|
-
this.Container.register(converters_1.SqliteSetValueConverter).as(orm_1.SetValueConverter);
|
|
106
112
|
}
|
|
107
113
|
async transaction(qrOrCallback) {
|
|
108
114
|
if (!qrOrCallback) {
|
|
@@ -135,7 +141,7 @@ let SqliteOrmDriver = class SqliteOrmDriver extends orm_sql_1.SqlDriver {
|
|
|
135
141
|
*/
|
|
136
142
|
async tableInfo(name, _schema) {
|
|
137
143
|
const tblInfo = (await this.execute(`PRAGMA table_info(${name});`, null, orm_1.QueryContext.Select));
|
|
138
|
-
const indexInfo = (await this.execute(
|
|
144
|
+
const indexInfo = (await this.execute(`select type, name, tbl_name, sql FROM sqlite_master WHERE type='index' AND tbl_name='${name}'`, null, orm_1.QueryContext.Select));
|
|
139
145
|
const re = /\((.*?)\)/;
|
|
140
146
|
const indices = indexInfo.map((i) => {
|
|
141
147
|
var _a;
|
|
@@ -157,18 +163,20 @@ let SqliteOrmDriver = class SqliteOrmDriver extends orm_sql_1.SqlDriver {
|
|
|
157
163
|
Unsigned: false,
|
|
158
164
|
Nullable: r.notnull === 0,
|
|
159
165
|
PrimaryKey: r.pk === 1,
|
|
166
|
+
Uuid: false,
|
|
167
|
+
Ignore: false,
|
|
160
168
|
// simply assumpt that integer pkeys are autoincement / auto fill by default
|
|
161
|
-
AutoIncrement: r.pk === 1 && r.type ===
|
|
169
|
+
AutoIncrement: r.pk === 1 && r.type === 'INTEGER',
|
|
162
170
|
Name: r.name,
|
|
163
171
|
Converter: null,
|
|
164
172
|
Schema: _schema ? _schema : this.Options.Database,
|
|
165
|
-
Unique: indices.find(i => i.column_name && i.column_name.includes(r.name) && i.table === name) !== undefined,
|
|
173
|
+
Unique: indices.find((i) => i.column_name && i.column_name.includes(r.name) && i.table === name) !== undefined,
|
|
166
174
|
};
|
|
167
175
|
});
|
|
168
176
|
}
|
|
169
177
|
};
|
|
170
178
|
SqliteOrmDriver = __decorate([
|
|
171
|
-
di_1.Injectable('orm-driver-sqlite')
|
|
179
|
+
(0, di_1.Injectable)('orm-driver-sqlite')
|
|
172
180
|
], SqliteOrmDriver);
|
|
173
181
|
exports.SqliteOrmDriver = SqliteOrmDriver;
|
|
174
182
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,8CAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
export declare enum LogLevel {
|
|
2
|
+
Security = 999,
|
|
3
|
+
Fatal = 6,
|
|
4
|
+
Error = 5,
|
|
5
|
+
Warn = 4,
|
|
6
|
+
Success = 3,
|
|
7
|
+
Info = 2,
|
|
8
|
+
Debug = 1,
|
|
9
|
+
Trace = 0
|
|
10
|
+
}
|
|
11
|
+
export declare const StrToLogLevel: {
|
|
12
|
+
trace: LogLevel;
|
|
13
|
+
debug: LogLevel;
|
|
14
|
+
info: LogLevel;
|
|
15
|
+
success: LogLevel;
|
|
16
|
+
warn: LogLevel;
|
|
17
|
+
error: LogLevel;
|
|
18
|
+
fatal: LogLevel;
|
|
19
|
+
security: LogLevel;
|
|
20
|
+
};
|
|
21
|
+
export declare const LogLevelStrings: {
|
|
22
|
+
1: string;
|
|
23
|
+
5: string;
|
|
24
|
+
6: string;
|
|
25
|
+
2: string;
|
|
26
|
+
999: string;
|
|
27
|
+
3: string;
|
|
28
|
+
0: string;
|
|
29
|
+
4: string;
|
|
30
|
+
};
|
|
31
|
+
export declare abstract class LogVariable {
|
|
32
|
+
abstract get Name(): string;
|
|
33
|
+
abstract Value(option?: string): string;
|
|
34
|
+
}
|
|
35
|
+
export interface ILogRule {
|
|
36
|
+
name: string;
|
|
37
|
+
level: "trace" | "debug" | "info" | "warn" | "error" | "fatal" | "security" | "success";
|
|
38
|
+
target: string | string[];
|
|
39
|
+
}
|
|
40
|
+
export interface ITargetsOption {
|
|
41
|
+
name: string;
|
|
42
|
+
type: string;
|
|
43
|
+
options: ICommonTargetOptions;
|
|
44
|
+
}
|
|
45
|
+
export interface ILogOptions {
|
|
46
|
+
targets: ITargetsOption[];
|
|
47
|
+
rules: ILogRule[];
|
|
48
|
+
variables: Record<string, unknown>;
|
|
49
|
+
}
|
|
50
|
+
export interface ICommonTargetOptions {
|
|
51
|
+
/**
|
|
52
|
+
* Message layout. You can use variables
|
|
53
|
+
*
|
|
54
|
+
* Default message layout is: datetime level message (logger)
|
|
55
|
+
*/
|
|
56
|
+
layout: string;
|
|
57
|
+
/**
|
|
58
|
+
* Target name
|
|
59
|
+
*/
|
|
60
|
+
name: string;
|
|
61
|
+
/**
|
|
62
|
+
* Target type
|
|
63
|
+
*/
|
|
64
|
+
type: string;
|
|
65
|
+
/**
|
|
66
|
+
* Is logger enabled
|
|
67
|
+
*/
|
|
68
|
+
enabled: boolean;
|
|
69
|
+
}
|
|
70
|
+
export interface IColoredConsoleTargetOptions extends ICommonTargetOptions {
|
|
71
|
+
/**
|
|
72
|
+
* Color theme for console message. Best leave it for default.
|
|
73
|
+
*/
|
|
74
|
+
theme: {
|
|
75
|
+
security: string | string[];
|
|
76
|
+
fatal: string | string[];
|
|
77
|
+
error: string | string[];
|
|
78
|
+
warn: string | string[];
|
|
79
|
+
success: string | string[];
|
|
80
|
+
info: string | string[];
|
|
81
|
+
debug: string | string[];
|
|
82
|
+
trace: string | string[];
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
export interface IFileTargetOptions extends ICommonTargetOptions {
|
|
86
|
+
options: {
|
|
87
|
+
/**
|
|
88
|
+
* path whre log is stored. It is allowed to use variables to create path eg. date / time etc.
|
|
89
|
+
*/
|
|
90
|
+
path: string;
|
|
91
|
+
/**
|
|
92
|
+
* Archive path for logs eg. when size is exceeded. Is is allowed to use variables eg. date / time etc.
|
|
93
|
+
*
|
|
94
|
+
* Default is none. When not set archive files are stored in same folder as logs.
|
|
95
|
+
*/
|
|
96
|
+
archivePath: string;
|
|
97
|
+
/**
|
|
98
|
+
* Maximum log file size, if exceeded it is moved to archive, and new log file is created
|
|
99
|
+
*
|
|
100
|
+
* Default is 1mb
|
|
101
|
+
*/
|
|
102
|
+
maxSize: number;
|
|
103
|
+
/**
|
|
104
|
+
* Should compress log file when moved to archive
|
|
105
|
+
*
|
|
106
|
+
* Default is false
|
|
107
|
+
*/
|
|
108
|
+
compress: boolean;
|
|
109
|
+
/**
|
|
110
|
+
* Should rotate log file eg. new file every new day.
|
|
111
|
+
* You should use cron like definition eg. at 1am every day: 0 1 * * *
|
|
112
|
+
* When rotate event occurs, old file is moved to archive, and new one is created
|
|
113
|
+
*
|
|
114
|
+
* Default is not set
|
|
115
|
+
*/
|
|
116
|
+
rotate: string;
|
|
117
|
+
/**
|
|
118
|
+
* How mutch archive files should be preserved before deletion. Default is 0
|
|
119
|
+
* Eg. to store max 5 archive files, set it to 5. Oldest by modification time are deleted.
|
|
120
|
+
*/
|
|
121
|
+
maxArchiveFiles: number;
|
|
122
|
+
/**
|
|
123
|
+
* Buffer size for incoming log messages. Messages are stored in buffer before write to file.
|
|
124
|
+
*
|
|
125
|
+
* Default is 8kb
|
|
126
|
+
*/
|
|
127
|
+
bufferSize: number;
|
|
128
|
+
/**
|
|
129
|
+
* Time in ms after whitch flush will be forced. If set to 0 feature is disabled ( any data hangin in temp buffer will not be saved before it reaches bufferSize)
|
|
130
|
+
* Default time is 10s.
|
|
131
|
+
*/
|
|
132
|
+
flushTimeout: number;
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
export interface ILogStaticVariables {
|
|
136
|
+
error: Error | undefined;
|
|
137
|
+
level: string;
|
|
138
|
+
logger: string;
|
|
139
|
+
message: string;
|
|
140
|
+
}
|
|
141
|
+
export interface ILogVariable {
|
|
142
|
+
[key: string]: unknown | (() => unknown);
|
|
143
|
+
}
|
|
144
|
+
export interface ILogEntry {
|
|
145
|
+
Level: LogLevel;
|
|
146
|
+
Variables: LogVariables;
|
|
147
|
+
}
|
|
148
|
+
export interface ILog {
|
|
149
|
+
trace(message: string, ...args: any[]): void;
|
|
150
|
+
trace(err: Error, message: string, ...args: any[]): void;
|
|
151
|
+
trace(err: Error | string, message: string | any[], ...args: any[]): void;
|
|
152
|
+
debug(message: string, ...args: any[]): void;
|
|
153
|
+
debug(err: Error, message: string, ...args: any[]): void;
|
|
154
|
+
debug(err: Error | string, message: string | any[], ...args: any[]): void;
|
|
155
|
+
info(message: string, ...args: any[]): void;
|
|
156
|
+
info(err: Error, message: string, ...args: any[]): void;
|
|
157
|
+
info(err: Error | string, message: string | any[], ...args: any[]): void;
|
|
158
|
+
warn(message: string, ...args: any[]): void;
|
|
159
|
+
warn(err: Error, message: string, ...args: any[]): void;
|
|
160
|
+
warn(err: Error | string, message: string | any[], ...args: any[]): void;
|
|
161
|
+
error(message: string, ...args: any[]): void;
|
|
162
|
+
error(err: Error, message: string, ...args: any[]): void;
|
|
163
|
+
error(err: Error | string, message: string | any[], ...args: any[]): void;
|
|
164
|
+
fatal(message: string, ...args: any[]): void;
|
|
165
|
+
fatal(err: Error, message: string, ...args: any[]): void;
|
|
166
|
+
fatal(err: Error | string, message: string | any[], ...args: any[]): void;
|
|
167
|
+
security(message: string, ...args: any[]): void;
|
|
168
|
+
security(err: Error, message: string, ...args: any[]): void;
|
|
169
|
+
security(err: Error | string, message: string | any[], ...args: any[]): void;
|
|
170
|
+
success(message: string, ...args: any[]): void;
|
|
171
|
+
success(err: Error, message: string, ...args: any[]): void;
|
|
172
|
+
success(err: Error | string, message: string | any[], ...args: any[]): void;
|
|
173
|
+
child(name: string, variables?: LogVariables): ILog;
|
|
174
|
+
write(entry: ILogEntry): Promise<PromiseSettledResult<void>[]>;
|
|
175
|
+
addVariable(name: string, value: unknown): void;
|
|
176
|
+
timeStart(name: string): void;
|
|
177
|
+
timeEnd(name: string): number;
|
|
178
|
+
}
|
|
179
|
+
export declare type LogVariables = ILogStaticVariables & ILogVariable;
|
|
180
|
+
export declare function createLogMessageObject(err: Error | string, message: string | any[], level: LogLevel, logger: string, variables: any, ...args: any[]): ILogEntry;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createLogMessageObject = exports.LogVariable = exports.LogLevelStrings = exports.StrToLogLevel = exports.LogLevel = void 0;
|
|
4
|
+
const util = require("util");
|
|
5
|
+
var LogLevel;
|
|
6
|
+
(function (LogLevel) {
|
|
7
|
+
LogLevel[LogLevel["Security"] = 999] = "Security";
|
|
8
|
+
LogLevel[LogLevel["Fatal"] = 6] = "Fatal";
|
|
9
|
+
LogLevel[LogLevel["Error"] = 5] = "Error";
|
|
10
|
+
LogLevel[LogLevel["Warn"] = 4] = "Warn";
|
|
11
|
+
LogLevel[LogLevel["Success"] = 3] = "Success";
|
|
12
|
+
LogLevel[LogLevel["Info"] = 2] = "Info";
|
|
13
|
+
LogLevel[LogLevel["Debug"] = 1] = "Debug";
|
|
14
|
+
LogLevel[LogLevel["Trace"] = 0] = "Trace";
|
|
15
|
+
})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
|
|
16
|
+
exports.StrToLogLevel = {
|
|
17
|
+
trace: LogLevel.Trace,
|
|
18
|
+
debug: LogLevel.Debug,
|
|
19
|
+
info: LogLevel.Info,
|
|
20
|
+
success: LogLevel.Success,
|
|
21
|
+
warn: LogLevel.Warn,
|
|
22
|
+
error: LogLevel.Error,
|
|
23
|
+
fatal: LogLevel.Fatal,
|
|
24
|
+
security: LogLevel.Security,
|
|
25
|
+
};
|
|
26
|
+
exports.LogLevelStrings = {
|
|
27
|
+
[LogLevel.Debug]: "debug",
|
|
28
|
+
[LogLevel.Error]: "error",
|
|
29
|
+
[LogLevel.Fatal]: "fatal",
|
|
30
|
+
[LogLevel.Info]: "info",
|
|
31
|
+
[LogLevel.Security]: "security",
|
|
32
|
+
[LogLevel.Success]: "success",
|
|
33
|
+
[LogLevel.Trace]: "trace",
|
|
34
|
+
[LogLevel.Warn]: "warn",
|
|
35
|
+
};
|
|
36
|
+
class LogVariable {
|
|
37
|
+
}
|
|
38
|
+
exports.LogVariable = LogVariable;
|
|
39
|
+
function createLogMessageObject(err, message, level, logger, variables, ...args) {
|
|
40
|
+
const sMsg = err instanceof Error ? message : err;
|
|
41
|
+
const tMsg = args.length !== 0 ? util.format(sMsg, ...args) : sMsg;
|
|
42
|
+
const lName = logger !== null && logger !== void 0 ? logger : message;
|
|
43
|
+
return {
|
|
44
|
+
Level: level,
|
|
45
|
+
Variables: Object.assign({ error: err instanceof Error ? err : undefined, level: exports.LogLevelStrings[`${level}`].toUpperCase(), logger: lName, message: tMsg }, variables),
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
exports.createLogMessageObject = createLogMessageObject;
|
|
49
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../log-common/src/index.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B,IAAY,QAgBX;AAhBD,WAAY,QAAQ;IAClB,iDAAc,CAAA;IAEd,yCAAS,CAAA;IAET,yCAAS,CAAA;IAET,uCAAQ,CAAA;IAER,6CAAW,CAAA;IAEX,uCAAQ,CAAA;IAER,yCAAS,CAAA;IAET,yCAAS,CAAA;AACX,CAAC,EAhBW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAgBnB;AAEY,QAAA,aAAa,GAAG;IAC3B,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;IACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;IACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;IACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;CAC5B,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;IACvB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,UAAU;IAC/B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS;IAC7B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;CACxB,CAAC;AAEF,MAAsB,WAAW;CAGhC;AAHD,kCAGC;AA2LD,SAAgB,sBAAsB,CACpC,GAAmB,EACnB,OAAuB,EACvB,KAAe,EACf,MAAc,EACd,SAAc,EACd,GAAG,IAAW;IAEd,MAAM,IAAI,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAE,OAAkB,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,MAAM,KAAK,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,OAAO,CAAC;IAEhC,OAAO;QACL,KAAK,EAAE,KAAK;QACZ,SAAS,kBACP,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAC7C,KAAK,EAAE,uBAAe,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,WAAW,EAAE,EAChD,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,IAAI,IACV,SAAS,CACb;KACF,CAAC;AACJ,CAAC;AAtBD,wDAsBC"}
|