@diia-inhouse/diia-logger 3.17.3 → 3.18.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/config.js +16 -1
- package/dist/config.js.map +1 -1
- package/dist/index.js +4 -15
- package/dist/index.js.map +1 -1
- package/dist/trimmer.js +4 -1
- package/dist/trimmer.js.map +1 -1
- package/dist/types/config.d.ts +3 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/trimmer.d.ts +2 -0
- package/package.json +4 -4
- package/src/config.ts +19 -0
- package/src/index.ts +5 -19
- package/src/trimmer.ts +6 -0
package/dist/config.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.defaultOptions = void 0;
|
|
3
|
+
exports.toInternalLoggerOptions = exports.defaultOptions = void 0;
|
|
4
|
+
const lodash_1 = require("lodash");
|
|
4
5
|
const types_1 = require("@diia-inhouse/types");
|
|
5
6
|
exports.defaultOptions = {
|
|
6
7
|
logLevel: types_1.LogLevel.INFO,
|
|
@@ -133,4 +134,18 @@ exports.defaultOptions = {
|
|
|
133
134
|
fieldsToRedactItn: ['label', 'paymentPurpose', 'subject', 'value'],
|
|
134
135
|
},
|
|
135
136
|
};
|
|
137
|
+
const toInternalLoggerOptions = (options = {}) => {
|
|
138
|
+
const merged = (0, lodash_1.merge)({}, exports.defaultOptions, options);
|
|
139
|
+
const { redact } = merged;
|
|
140
|
+
return {
|
|
141
|
+
...merged,
|
|
142
|
+
redact: {
|
|
143
|
+
fields: new Set(redact.fields),
|
|
144
|
+
paths: new Set(redact.paths),
|
|
145
|
+
fieldsToRedactFullname: new Set(redact.fieldsToRedactFullname),
|
|
146
|
+
fieldsToRedactItn: new Set(redact.fieldsToRedactItn),
|
|
147
|
+
},
|
|
148
|
+
};
|
|
149
|
+
};
|
|
150
|
+
exports.toInternalLoggerOptions = toInternalLoggerOptions;
|
|
136
151
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;AAAA,+CAA6D;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.defaultOptions = exports.DiiaLogger = void 0;
|
|
36
|
+
exports.createTrimmer = exports.defaultOptions = exports.DiiaLogger = void 0;
|
|
37
37
|
const lodash_1 = require("lodash");
|
|
38
38
|
const pino_1 = __importStar(require("pino"));
|
|
39
39
|
const types_1 = require("@diia-inhouse/types");
|
|
@@ -47,7 +47,7 @@ class DiiaLogger {
|
|
|
47
47
|
constructor(options = {}, asyncLocalStorage, destinationStream = null, existedLogger = null) {
|
|
48
48
|
this.options = options;
|
|
49
49
|
this.asyncLocalStorage = asyncLocalStorage;
|
|
50
|
-
const internalOptions = this.
|
|
50
|
+
const internalOptions = (0, config_1.toInternalLoggerOptions)(this.options);
|
|
51
51
|
const { redact: { paths: redactPaths }, } = internalOptions;
|
|
52
52
|
this.logger =
|
|
53
53
|
existedLogger ||
|
|
@@ -130,19 +130,6 @@ class DiiaLogger {
|
|
|
130
130
|
}
|
|
131
131
|
return data;
|
|
132
132
|
}
|
|
133
|
-
getOptions() {
|
|
134
|
-
const options = (0, lodash_1.merge)({}, config_1.defaultOptions, this.options);
|
|
135
|
-
const { redact } = options;
|
|
136
|
-
return {
|
|
137
|
-
...options,
|
|
138
|
-
redact: {
|
|
139
|
-
fields: new Set(redact.fields),
|
|
140
|
-
paths: new Set(redact.paths),
|
|
141
|
-
fieldsToRedactFullname: new Set(redact.fieldsToRedactFullname),
|
|
142
|
-
fieldsToRedactItn: new Set(redact.fieldsToRedactItn),
|
|
143
|
-
},
|
|
144
|
-
};
|
|
145
|
-
}
|
|
146
133
|
getServiceVersion() {
|
|
147
134
|
try {
|
|
148
135
|
const { utils } = require('@diia-inhouse/utils');
|
|
@@ -157,4 +144,6 @@ exports.default = DiiaLogger;
|
|
|
157
144
|
exports.DiiaLogger = DiiaLogger;
|
|
158
145
|
var config_2 = require("./config");
|
|
159
146
|
Object.defineProperty(exports, "defaultOptions", { enumerable: true, get: function () { return config_2.defaultOptions; } });
|
|
147
|
+
var trimmer_2 = require("./trimmer");
|
|
148
|
+
Object.defineProperty(exports, "createTrimmer", { enumerable: true, get: function () { return trimmer_2.createTrimmer; } });
|
|
160
149
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/trimmer.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.trimmer = void 0;
|
|
3
|
+
exports.createTrimmer = exports.trimmer = void 0;
|
|
4
4
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
5
5
|
const bson_1 = require("bson");
|
|
6
6
|
const lodash_1 = require("lodash");
|
|
7
|
+
const config_1 = require("./config");
|
|
7
8
|
const fullName_1 = require("./redactors/fullName");
|
|
8
9
|
const itn_1 = require("./redactors/itn");
|
|
9
10
|
function trimString(str, { maxStringLength, endLengthToLog }) {
|
|
@@ -111,4 +112,6 @@ const trimmer = (opts, isRedactionDisabled) => {
|
|
|
111
112
|
};
|
|
112
113
|
};
|
|
113
114
|
exports.trimmer = trimmer;
|
|
115
|
+
const createTrimmer = (options = {}, isRedactionDisabled = false) => (0, exports.trimmer)((0, config_1.toInternalLoggerOptions)(options), isRedactionDisabled);
|
|
116
|
+
exports.createTrimmer = createTrimmer;
|
|
114
117
|
//# sourceMappingURL=trimmer.js.map
|
package/dist/trimmer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trimmer.js","sourceRoot":"","sources":["../src/trimmer.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD,+BAA+B;AAC/B,mCAAiC;
|
|
1
|
+
{"version":3,"file":"trimmer.js","sourceRoot":"","sources":["../src/trimmer.ts"],"names":[],"mappings":"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"}
|
package/dist/types/config.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { LogLevel } from '@diia-inhouse/types';
|
|
1
|
+
import { LogLevel, LoggerOptions } from '@diia-inhouse/types';
|
|
2
|
+
import { InternalLoggerOptions } from './interfaces';
|
|
2
3
|
export declare const defaultOptions: {
|
|
3
4
|
logLevel: LogLevel.INFO;
|
|
4
5
|
maxArrayLength: number;
|
|
@@ -13,3 +14,4 @@ export declare const defaultOptions: {
|
|
|
13
14
|
fieldsToRedactItn: string[];
|
|
14
15
|
};
|
|
15
16
|
};
|
|
17
|
+
export declare const toInternalLoggerOptions: (options?: LoggerOptions) => InternalLoggerOptions;
|
package/dist/types/index.d.ts
CHANGED
|
@@ -19,8 +19,8 @@ export default class DiiaLogger implements Logger {
|
|
|
19
19
|
prepareContext(context: LogData): LogData;
|
|
20
20
|
private printMessage;
|
|
21
21
|
private extractPredefinedProperties;
|
|
22
|
-
private getOptions;
|
|
23
22
|
private getServiceVersion;
|
|
24
23
|
}
|
|
25
24
|
export { DiiaLogger };
|
|
26
25
|
export { defaultOptions } from './config';
|
|
26
|
+
export { createTrimmer } from './trimmer';
|
package/dist/types/trimmer.d.ts
CHANGED
|
@@ -1,2 +1,4 @@
|
|
|
1
|
+
import { LoggerOptions } from '@diia-inhouse/types';
|
|
1
2
|
import { InternalLoggerOptions } from './interfaces';
|
|
2
3
|
export declare const trimmer: (opts: InternalLoggerOptions, isRedactionDisabled: boolean) => ((i: unknown) => any);
|
|
4
|
+
export declare const createTrimmer: (options?: LoggerOptions, isRedactionDisabled?: boolean) => ((i: unknown) => any);
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@diia-inhouse/diia-logger",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.18.0",
|
|
4
4
|
"description": "Logger package",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/types/index.d.ts",
|
|
7
|
-
"repository": "https://github.com/diia-open-source/be-diia-logger
|
|
7
|
+
"repository": "https://github.com/diia-open-source/be-diia-logger",
|
|
8
8
|
"author": "Diia",
|
|
9
9
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
10
10
|
"engines": {
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"@diia-inhouse/configs": "6.1.1",
|
|
37
37
|
"@diia-inhouse/eslint-config": "8.8.0",
|
|
38
38
|
"@diia-inhouse/eslint-plugin": "1.9.5",
|
|
39
|
-
"@diia-inhouse/types": "11.
|
|
40
|
-
"@diia-inhouse/utils": "5.3.
|
|
39
|
+
"@diia-inhouse/types": "11.7.0",
|
|
40
|
+
"@diia-inhouse/utils": "5.3.6",
|
|
41
41
|
"@types/lodash": "4.17.24",
|
|
42
42
|
"@vitest/coverage-v8": "4.0.18",
|
|
43
43
|
"@vitest/ui": "4.0.18",
|
package/src/config.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
|
+
import { merge } from 'lodash'
|
|
2
|
+
|
|
1
3
|
import { LogLevel, LoggerOptions } from '@diia-inhouse/types'
|
|
2
4
|
|
|
5
|
+
import { InternalLoggerOptions } from './interfaces'
|
|
6
|
+
|
|
3
7
|
export const defaultOptions = {
|
|
4
8
|
logLevel: LogLevel.INFO,
|
|
5
9
|
maxArrayLength: 100,
|
|
@@ -131,3 +135,18 @@ export const defaultOptions = {
|
|
|
131
135
|
fieldsToRedactItn: ['label', 'paymentPurpose', 'subject', 'value'],
|
|
132
136
|
},
|
|
133
137
|
} satisfies LoggerOptions
|
|
138
|
+
|
|
139
|
+
export const toInternalLoggerOptions = (options: LoggerOptions = {}): InternalLoggerOptions => {
|
|
140
|
+
const merged = merge({}, defaultOptions, options)
|
|
141
|
+
const { redact } = merged
|
|
142
|
+
|
|
143
|
+
return {
|
|
144
|
+
...merged,
|
|
145
|
+
redact: {
|
|
146
|
+
fields: new Set(redact.fields),
|
|
147
|
+
paths: new Set(redact.paths),
|
|
148
|
+
fieldsToRedactFullname: new Set(redact.fieldsToRedactFullname),
|
|
149
|
+
fieldsToRedactItn: new Set(redact.fieldsToRedactItn),
|
|
150
|
+
},
|
|
151
|
+
}
|
|
152
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { AsyncLocalStorage } from 'node:async_hooks'
|
|
3
3
|
|
|
4
|
-
import { isObject
|
|
4
|
+
import { isObject } from 'lodash'
|
|
5
5
|
import pino, { DestinationStream, Logger as PinoLogger, stdSerializers } from 'pino'
|
|
6
6
|
|
|
7
7
|
import { AlsData, LogData, LogLevel, Logger, LoggerOptions } from '@diia-inhouse/types'
|
|
8
8
|
import type * as Utils from '@diia-inhouse/utils'
|
|
9
9
|
|
|
10
|
-
import {
|
|
11
|
-
import { InternalLoggerOptions } from './interfaces'
|
|
10
|
+
import { toInternalLoggerOptions } from './config'
|
|
12
11
|
import { trimmer } from './trimmer'
|
|
13
12
|
|
|
14
13
|
export default class DiiaLogger implements Logger {
|
|
@@ -22,7 +21,7 @@ export default class DiiaLogger implements Logger {
|
|
|
22
21
|
destinationStream: DestinationStream | null = null,
|
|
23
22
|
existedLogger: PinoLogger<'io'> | null = null,
|
|
24
23
|
) {
|
|
25
|
-
const internalOptions = this.
|
|
24
|
+
const internalOptions = toInternalLoggerOptions(this.options)
|
|
26
25
|
const {
|
|
27
26
|
redact: { paths: redactPaths },
|
|
28
27
|
} = internalOptions
|
|
@@ -134,21 +133,6 @@ export default class DiiaLogger implements Logger {
|
|
|
134
133
|
return data
|
|
135
134
|
}
|
|
136
135
|
|
|
137
|
-
private getOptions(): InternalLoggerOptions {
|
|
138
|
-
const options = merge({}, defaultOptions, this.options)
|
|
139
|
-
const { redact } = options
|
|
140
|
-
|
|
141
|
-
return {
|
|
142
|
-
...options,
|
|
143
|
-
redact: {
|
|
144
|
-
fields: new Set(redact.fields),
|
|
145
|
-
paths: new Set(redact.paths),
|
|
146
|
-
fieldsToRedactFullname: new Set(redact.fieldsToRedactFullname),
|
|
147
|
-
fieldsToRedactItn: new Set(redact.fieldsToRedactItn),
|
|
148
|
-
},
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
|
|
152
136
|
private getServiceVersion(): string | undefined {
|
|
153
137
|
try {
|
|
154
138
|
const { utils } = require('@diia-inhouse/utils') as typeof Utils
|
|
@@ -163,3 +147,5 @@ export default class DiiaLogger implements Logger {
|
|
|
163
147
|
export { DiiaLogger }
|
|
164
148
|
|
|
165
149
|
export { defaultOptions } from './config'
|
|
150
|
+
|
|
151
|
+
export { createTrimmer } from './trimmer'
|
package/src/trimmer.ts
CHANGED
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
import { ObjectId } from 'bson'
|
|
3
3
|
import { isObject } from 'lodash'
|
|
4
4
|
|
|
5
|
+
import { LoggerOptions } from '@diia-inhouse/types'
|
|
6
|
+
|
|
7
|
+
import { toInternalLoggerOptions } from './config'
|
|
5
8
|
import { InternalLoggerOptions } from './interfaces'
|
|
6
9
|
import { redactFullName } from './redactors/fullName'
|
|
7
10
|
import { redactItn } from './redactors/itn'
|
|
@@ -142,3 +145,6 @@ export const trimmer = (opts: InternalLoggerOptions, isRedactionDisabled: boolea
|
|
|
142
145
|
}
|
|
143
146
|
}
|
|
144
147
|
}
|
|
148
|
+
|
|
149
|
+
export const createTrimmer = (options: LoggerOptions = {}, isRedactionDisabled = false): ((i: unknown) => any) =>
|
|
150
|
+
trimmer(toInternalLoggerOptions(options), isRedactionDisabled)
|