@spinajs/orm 1.2.44 → 1.2.50
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/lib/orm.d.ts +1 -0
- package/lib/orm.js +22 -20
- package/lib/orm.js.map +1 -1
- package/package.json +5 -5
- package/lib/helpers.d.ts +0 -1
- package/lib/helpers.js +0 -14
- package/lib/helpers.js.map +0 -1
- package/lib/log-common/src/index.d.ts +0 -180
- package/lib/log-common/src/index.js +0 -49
- package/lib/log-common/src/index.js.map +0 -1
- package/lib/orm/src/builders.d.ts +0 -429
- package/lib/orm/src/builders.js +0 -1082
- package/lib/orm/src/builders.js.map +0 -1
- package/lib/orm/src/cli.d.ts +0 -1
- package/lib/orm/src/cli.js +0 -2
- package/lib/orm/src/cli.js.map +0 -1
- package/lib/orm/src/converters.d.ts +0 -9
- package/lib/orm/src/converters.js +0 -22
- package/lib/orm/src/converters.js.map +0 -1
- package/lib/orm/src/decorators.d.ts +0 -122
- package/lib/orm/src/decorators.js +0 -380
- package/lib/orm/src/decorators.js.map +0 -1
- package/lib/orm/src/driver.d.ts +0 -77
- package/lib/orm/src/driver.js +0 -84
- package/lib/orm/src/driver.js.map +0 -1
- package/lib/orm/src/enums.d.ts +0 -111
- package/lib/orm/src/enums.js +0 -122
- package/lib/orm/src/enums.js.map +0 -1
- package/lib/orm/src/exceptions.d.ts +0 -6
- package/lib/orm/src/exceptions.js +0 -11
- package/lib/orm/src/exceptions.js.map +0 -1
- package/lib/orm/src/hydrators.d.ts +0 -16
- package/lib/orm/src/hydrators.js +0 -70
- package/lib/orm/src/hydrators.js.map +0 -1
- package/lib/orm/src/index.d.ts +0 -12
- package/lib/orm/src/index.js +0 -25
- package/lib/orm/src/index.js.map +0 -1
- package/lib/orm/src/interfaces.d.ts +0 -615
- package/lib/orm/src/interfaces.js +0 -186
- package/lib/orm/src/interfaces.js.map +0 -1
- package/lib/orm/src/model.d.ts +0 -135
- package/lib/orm/src/model.js +0 -449
- package/lib/orm/src/model.js.map +0 -1
- package/lib/orm/src/orm.d.ts +0 -59
- package/lib/orm/src/orm.js +0 -278
- package/lib/orm/src/orm.js.map +0 -1
- package/lib/orm/src/relations.d.ts +0 -96
- package/lib/orm/src/relations.js +0 -503
- package/lib/orm/src/relations.js.map +0 -1
- package/lib/orm/src/statements.d.ts +0 -132
- package/lib/orm/src/statements.js +0 -257
- package/lib/orm/src/statements.js.map +0 -1
- package/lib/orm/src/types.d.ts +0 -2
- package/lib/orm/src/types.js +0 -3
- package/lib/orm/src/types.js.map +0 -1
- package/lib/orm/src/wrappers.d.ts +0 -5
- package/lib/orm/src/wrappers.js +0 -13
- package/lib/orm/src/wrappers.js.map +0 -1
package/lib/orm.d.ts
CHANGED
|
@@ -54,6 +54,7 @@ export declare class Orm extends AsyncModule {
|
|
|
54
54
|
protected registerMigration<T extends OrmMigration>(migration: Class<T>): void;
|
|
55
55
|
private createConnections;
|
|
56
56
|
private applyModelMixins;
|
|
57
|
+
private getMigrationDate;
|
|
57
58
|
private executeAvaibleMigrations;
|
|
58
59
|
private prepareMigrations;
|
|
59
60
|
}
|
package/lib/orm.js
CHANGED
|
@@ -27,15 +27,7 @@ const exceptions_2 = require("./exceptions");
|
|
|
27
27
|
*/
|
|
28
28
|
const CFG_PROPS = ['Database', 'User', 'Host', 'Port', 'Filename', 'Driver', 'Name'];
|
|
29
29
|
const MIGRATION_TABLE_NAME = 'spinajs_migration';
|
|
30
|
-
const MIGRATION_FILE_REGEXP = /(.*)_([0-9]{4}_[0-9]{2}_[0-9]{2}_[0-9]{2}_[0-9]{2}_[0-9]{2})
|
|
31
|
-
const MIGRATION_TYPE_REGEXP = /(.*)_([0-9]{4}_[0-9]{2}_[0-9]{2}_[0-9]{2}_[0-9]{2}_[0-9]{2})/;
|
|
32
|
-
function migrationFileTypeMatcher(name) {
|
|
33
|
-
const match = name.match(MIGRATION_TYPE_REGEXP);
|
|
34
|
-
if (match === null || match.length !== 3) {
|
|
35
|
-
throw new exceptions_2.OrmException(`Invalid migration file name ${name}, expected: ${name}_YYYY_MM_DD_HH_mm_ss`);
|
|
36
|
-
}
|
|
37
|
-
return match[1];
|
|
38
|
-
}
|
|
30
|
+
const MIGRATION_FILE_REGEXP = /(.*)_([0-9]{4}_[0-9]{2}_[0-9]{2}_[0-9]{2}_[0-9]{2}_[0-9]{2})/;
|
|
39
31
|
class Orm extends di_1.AsyncModule {
|
|
40
32
|
constructor() {
|
|
41
33
|
super(...arguments);
|
|
@@ -172,10 +164,13 @@ class Orm extends di_1.AsyncModule {
|
|
|
172
164
|
* @param model - model to register
|
|
173
165
|
*/
|
|
174
166
|
registerMigration(migration) {
|
|
175
|
-
const
|
|
167
|
+
const created = this.getMigrationDate(migration);
|
|
168
|
+
if (created === null) {
|
|
169
|
+
throw new exceptions_2.OrmException(`Migration file ${migration.name} have invalid name format ( invalid migration name, expected: some_name_yyyy_MM_dd_HH_mm_ss got ${migration.name})`);
|
|
170
|
+
}
|
|
176
171
|
this.Migrations.push({
|
|
177
|
-
file: `${migration.name}
|
|
178
|
-
name: `${migration.name}
|
|
172
|
+
file: `${migration.name}.registered`,
|
|
173
|
+
name: `${migration.name}`,
|
|
179
174
|
type: migration,
|
|
180
175
|
});
|
|
181
176
|
}
|
|
@@ -215,18 +210,25 @@ class Orm extends di_1.AsyncModule {
|
|
|
215
210
|
}
|
|
216
211
|
});
|
|
217
212
|
}
|
|
213
|
+
getMigrationDate(migration) {
|
|
214
|
+
const match = migration.name.match(MIGRATION_FILE_REGEXP);
|
|
215
|
+
if (match === null || match.length !== 3) {
|
|
216
|
+
return null;
|
|
217
|
+
}
|
|
218
|
+
const created = luxon_1.DateTime.fromFormat(match[2], 'yyyy_MM_dd_HH_mm_ss');
|
|
219
|
+
if (!created.isValid) {
|
|
220
|
+
return null;
|
|
221
|
+
}
|
|
222
|
+
return created;
|
|
223
|
+
}
|
|
218
224
|
async executeAvaibleMigrations(name, callback, down) {
|
|
219
225
|
var _a, _b;
|
|
220
226
|
const toMigrate = name ? this.Migrations.filter((m) => m.name === name) : this.Migrations;
|
|
221
227
|
let migrations = toMigrate
|
|
222
228
|
.map((x) => {
|
|
223
|
-
const
|
|
224
|
-
if (
|
|
225
|
-
throw new exceptions_2.OrmException(`Migration file name have invalid format ( expected: some_name_yyyy_MM_dd_HH_mm_ss got ${x.
|
|
226
|
-
}
|
|
227
|
-
const created = luxon_1.DateTime.fromFormat(match[2], 'yyyy_MM_dd_HH_mm_ss');
|
|
228
|
-
if (!created.isValid) {
|
|
229
|
-
throw new exceptions_2.OrmException(`Migration file ${x.file} have invalid name format ( invalid migration date )`);
|
|
229
|
+
const created = this.getMigrationDate(x.type);
|
|
230
|
+
if (created === null) {
|
|
231
|
+
throw new exceptions_2.OrmException(`Migration file ${x.name} have invalid name format ( invalid migration name, expected: some_name_yyyy_MM_dd_HH_mm_ss got ${x.name})`);
|
|
230
232
|
}
|
|
231
233
|
return Object.assign({ created }, x);
|
|
232
234
|
})
|
|
@@ -274,7 +276,7 @@ __decorate([
|
|
|
274
276
|
__metadata("design:type", Array)
|
|
275
277
|
], Orm.prototype, "Models", void 0);
|
|
276
278
|
__decorate([
|
|
277
|
-
(0, reflection_1.ListFromFiles)('/**/!(*.d).{ts,js}', 'system.dirs.migrations'
|
|
279
|
+
(0, reflection_1.ListFromFiles)('/**/!(*.d).{ts,js}', 'system.dirs.migrations'),
|
|
278
280
|
__metadata("design:type", Array)
|
|
279
281
|
], Orm.prototype, "Migrations", void 0);
|
|
280
282
|
__decorate([
|
package/lib/orm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAsC;AACtC,0DAAuD;AACvD,oCAA4E;AAC5E,sCAA2C;AAC3C,oDAA+D;AAC/D,4BAA4B;AAC5B,6CAA+H;AAC/H,mCAAiF;AACjF,6CAAuF;AAEvF,oDAAuD;AACvD,iCAAiC;AACjC,6CAA4C;AAE5C;;GAEG;AACH,MAAM,SAAS,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AACrF,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AACjD,MAAM,qBAAqB,GAAG,
|
|
1
|
+
{"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinajs/orm",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.50",
|
|
4
4
|
"description": "framework orm module",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"private": false,
|
|
@@ -40,16 +40,16 @@
|
|
|
40
40
|
},
|
|
41
41
|
"homepage": "https://github.com/spinajs/main#readme",
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@spinajs/configuration": "^1.2.
|
|
43
|
+
"@spinajs/configuration": "^1.2.50",
|
|
44
44
|
"@spinajs/di": "^1.2.32",
|
|
45
45
|
"@spinajs/exceptions": "^1.2.7",
|
|
46
46
|
"@spinajs/internal-logger": "^1.2.32",
|
|
47
|
-
"@spinajs/log": "^1.2.
|
|
48
|
-
"@spinajs/reflection": "^1.2.
|
|
47
|
+
"@spinajs/log": "^1.2.50",
|
|
48
|
+
"@spinajs/reflection": "^1.2.50",
|
|
49
49
|
"lodash": "^4.17.14",
|
|
50
50
|
"luxon": "^2.3.0",
|
|
51
51
|
"typescript-mix": "^3.1.3",
|
|
52
52
|
"uuid": "^8.3.2"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "b3b0f8f2e54312b752a57b3582c992aa06c74fca"
|
|
55
55
|
}
|
package/lib/helpers.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function applyMixins(derivedCtor: any, baseCtors: any[]): void;
|
package/lib/helpers.js
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.applyMixins = void 0;
|
|
4
|
-
function applyMixins(derivedCtor, baseCtors) {
|
|
5
|
-
baseCtors.forEach((baseCtor) => {
|
|
6
|
-
Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
|
|
7
|
-
if (name !== 'constructor') {
|
|
8
|
-
derivedCtor.prototype[name] = baseCtor.prototype[name];
|
|
9
|
-
}
|
|
10
|
-
});
|
|
11
|
-
});
|
|
12
|
-
}
|
|
13
|
-
exports.applyMixins = applyMixins;
|
|
14
|
-
//# sourceMappingURL=helpers.js.map
|
package/lib/helpers.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW,CAAC,WAAgB,EAAE,SAAgB;IAC5D,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC7B,MAAM,CAAC,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9D,IAAI,IAAI,KAAK,aAAa,EAAE;gBAC1B,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aACxD;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AARD,kCAQC"}
|
|
@@ -1,180 +0,0 @@
|
|
|
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;
|
|
@@ -1,49 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
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;AAmLD,SAAgB,sBAAsB,CAAC,GAAmB,EAAE,OAAuB,EAAE,KAAe,EAAE,MAAc,EAAE,SAAc,EAAE,GAAG,IAAW;IAClJ,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;AAfD,wDAeC"}
|