@diia-inhouse/diia-logger 3.0.0 → 3.2.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/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/trimmer.js +8 -5
- package/dist/trimmer.js.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/trimmer.d.ts +1 -1
- package/package.json +1 -1
- package/src/index.ts +4 -2
- package/src/trimmer.ts +9 -5
package/dist/index.js
CHANGED
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.DiiaLogger = void 0;
|
|
26
|
+
exports.defaultOptions = exports.DiiaLogger = void 0;
|
|
27
27
|
const lodash_1 = require("lodash");
|
|
28
28
|
const pino_1 = __importStar(require("pino"));
|
|
29
29
|
const types_1 = require("@diia-inhouse/types");
|
|
@@ -39,7 +39,6 @@ class DiiaLogger {
|
|
|
39
39
|
this.asyncLocalStorage = asyncLocalStorage;
|
|
40
40
|
const trimmerOptions = { ...config_1.defaultOptions, ...options };
|
|
41
41
|
const { redact: { paths: redactPaths }, } = trimmerOptions;
|
|
42
|
-
this.trim = (0, trimmer_1.trimmer)(trimmerOptions);
|
|
43
42
|
this.logger =
|
|
44
43
|
existedLogger ||
|
|
45
44
|
(0, pino_1.default)({
|
|
@@ -68,6 +67,7 @@ class DiiaLogger {
|
|
|
68
67
|
},
|
|
69
68
|
redact: redactPaths,
|
|
70
69
|
}, destinationStream || undefined);
|
|
70
|
+
this.trim = (0, trimmer_1.trimmer)(trimmerOptions, this.logger.isLevelEnabled(types_1.LogLevel.DEBUG));
|
|
71
71
|
}
|
|
72
72
|
child(bindings, destinationStream) {
|
|
73
73
|
const pinoLogger = this.logger.child(bindings);
|
|
@@ -122,4 +122,6 @@ class DiiaLogger {
|
|
|
122
122
|
}
|
|
123
123
|
exports.default = DiiaLogger;
|
|
124
124
|
exports.DiiaLogger = DiiaLogger;
|
|
125
|
+
var config_2 = require("./config");
|
|
126
|
+
Object.defineProperty(exports, "defaultOptions", { enumerable: true, get: function () { return config_2.defaultOptions; } });
|
|
125
127
|
//# 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,mCAAiC;AACjC,6CAAoF;AAEpF,+CAAsG;AAEtG,qCAAyC;AACzC,uCAAmC;AAEnC,MAAqB,UAAU;IAMN;IACA;IANb,MAAM,CAAkB;IAExB,IAAI,CAA4B;IAExC,YACqB,UAAwB,EAAE,EAC1B,iBAA8C,EAC/D,oBAA8C,IAAI,EAClD,gBAAyC,IAAI;QAH5B,YAAO,GAAP,OAAO,CAAmB;QAC1B,sBAAiB,GAAjB,iBAAiB,CAA6B;QAI/D,MAAM,cAAc,GAAmB,EAAE,GAAG,uBAAc,EAAE,GAAG,OAAO,EAAE,CAAA;QACxE,MAAM,EACF,MAAM,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,GACjC,GAAG,cAAc,CAAA;QAElB,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/trimmer.js
CHANGED
|
@@ -25,7 +25,7 @@ function formatString(str, { maxStringLength, endLengthToLog }) {
|
|
|
25
25
|
: str;
|
|
26
26
|
return truncatedString;
|
|
27
27
|
}
|
|
28
|
-
const walker = (opts, node, depth) => {
|
|
28
|
+
const walker = (opts, node, depth, isRedactionDisabled) => {
|
|
29
29
|
if (node instanceof Error) {
|
|
30
30
|
return node;
|
|
31
31
|
}
|
|
@@ -62,6 +62,10 @@ const walker = (opts, node, depth) => {
|
|
|
62
62
|
if (keys.length > 0) {
|
|
63
63
|
const output = Array.isArray(node) ? [] : {};
|
|
64
64
|
for (const [key, value] of Object.entries(node)) {
|
|
65
|
+
if (isRedactionDisabled) {
|
|
66
|
+
output[key] = walker(opts, value, depth + 1, isRedactionDisabled);
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
65
69
|
if (!value) {
|
|
66
70
|
output[key] = value;
|
|
67
71
|
continue;
|
|
@@ -74,8 +78,7 @@ const walker = (opts, node, depth) => {
|
|
|
74
78
|
output[key] = redactFullName(value);
|
|
75
79
|
continue;
|
|
76
80
|
}
|
|
77
|
-
output[key] = walker(opts, value, depth + 1);
|
|
78
|
-
continue;
|
|
81
|
+
output[key] = walker(opts, value, depth + 1, isRedactionDisabled);
|
|
79
82
|
}
|
|
80
83
|
return output;
|
|
81
84
|
}
|
|
@@ -83,9 +86,9 @@ const walker = (opts, node, depth) => {
|
|
|
83
86
|
}
|
|
84
87
|
return node;
|
|
85
88
|
};
|
|
86
|
-
const trimmer = (opts) => {
|
|
89
|
+
const trimmer = (opts, isRedactionDisabled) => {
|
|
87
90
|
return (input) => {
|
|
88
|
-
return walker(opts, input, 0);
|
|
91
|
+
return walker(opts, input, 0, isRedactionDisabled);
|
|
89
92
|
};
|
|
90
93
|
};
|
|
91
94
|
exports.trimmer = trimmer;
|
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;AAIjC,SAAS,cAAc,CAAC,IAAY;IAChC,gDAAgD;IAChD,MAAM,aAAa,GAAG,8FAA8F,CAAA;IAEpH,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAW,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAA;QAE9C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,KAAK,CAAA;QAChB,CAAC;QAED,OAAO,wBAAwB,QAAQ;aAClC,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACtB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAA;IACvB,CAAC,CAAC,CAAA;AACN,CAAC;AAED,SAAS,YAAY,CAAC,GAAW,EAAE,EAAE,eAAe,EAAE,cAAc,EAAkB;IAClF,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;IACzB,MAAM,eAAe,GACjB,MAAM,GAAG,eAAe;QACpB,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,cAAc,CAAC,KAAK,MAAM,SAAS;QAC1G,CAAC,CAAC,GAAG,CAAA;IAEb,OAAO,eAAe,CAAA;AAC1B,CAAC;AAED,MAAM,MAAM,GAAG,CAAC,IAAoB,EAAE,IAAS,EAAE,KAAa,EAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"trimmer.js","sourceRoot":"","sources":["../src/trimmer.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD,+BAA+B;AAC/B,mCAAiC;AAIjC,SAAS,cAAc,CAAC,IAAY;IAChC,gDAAgD;IAChD,MAAM,aAAa,GAAG,8FAA8F,CAAA;IAEpH,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAW,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAA;QAE9C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,KAAK,CAAA;QAChB,CAAC;QAED,OAAO,wBAAwB,QAAQ;aAClC,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACtB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAA;IACvB,CAAC,CAAC,CAAA;AACN,CAAC;AAED,SAAS,YAAY,CAAC,GAAW,EAAE,EAAE,eAAe,EAAE,cAAc,EAAkB;IAClF,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;IACzB,MAAM,eAAe,GACjB,MAAM,GAAG,eAAe;QACpB,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,cAAc,CAAC,KAAK,MAAM,SAAS;QAC1G,CAAC,CAAC,GAAG,CAAA;IAEb,OAAO,eAAe,CAAA;AAC1B,CAAC;AAED,MAAM,MAAM,GAAG,CAAC,IAAoB,EAAE,IAAS,EAAE,KAAa,EAAE,mBAA4B,EAAO,EAAE;IACjG,IAAI,IAAI,YAAY,KAAK,EAAE,CAAC;QACxB,OAAO,IAAI,CAAA;IACf,CAAC;IAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,OAAO,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACnC,CAAC;IAED,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAC/F,OAAO,IAAI,CAAA;IACf,CAAC;IAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO,YAAY,CAAA;IACvB,CAAC;IAED,IAAI,KAAK,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QAC/B,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,UAAU,IAAI,CAAC,MAAM,GAAG,CAAA;IACnC,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC3D,MAAM,eAAe,GAAW,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,cAAc,CAAA;QAEjE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,WAAW,eAAe,aAAa,CAAC,CAAA;IAC7F,CAAC;IAED,IAAI,eAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAA;IAC1B,CAAC;IAED,IAAI,IAAA,iBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;QACjB,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAA;QAChD,IAAI,eAAe,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1C,MAAM,uBAAuB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAEpF,uBAAuB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,GAAG,eAAe,GAAG,IAAI,CAAC,gBAAgB,kBAAkB,CAAC,CAAC,CAAA;YAEnG,OAAO,MAAM,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAA;QACtD,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC7C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClB,MAAM,MAAM,GAAwB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YAEjE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9C,IAAI,mBAAmB,EAAE,CAAC;oBACtB,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,mBAAmB,CAAC,CAAA;oBACjE,SAAQ;gBACZ,CAAC;gBAED,IAAI,CAAC,KAAK,EAAE,CAAC;oBACT,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;oBACnB,SAAQ;gBACZ,CAAC;gBAED,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACpC,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAA;oBAC1B,SAAQ;gBACZ,CAAC;gBAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjF,MAAM,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA;oBACnC,SAAQ;gBACZ,CAAC;gBAED,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,mBAAmB,CAAC,CAAA;YACrE,CAAC;YAED,OAAO,MAAM,CAAA;QACjB,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAED,OAAO,IAAI,CAAA;AACf,CAAC,CAAA;AAEM,MAAM,OAAO,GAAG,CAAC,IAAoB,EAAE,mBAA4B,EAAyB,EAAE;IACjG,OAAO,CAAC,KAAc,EAAO,EAAE;QAC3B,OAAO,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAA;IACtD,CAAC,CAAA;AACL,CAAC,CAAA;AAJY,QAAA,OAAO,WAInB"}
|
package/dist/types/index.d.ts
CHANGED
package/dist/types/trimmer.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { TrimmerOptions } from '@diia-inhouse/types';
|
|
2
|
-
export declare const trimmer: (opts: TrimmerOptions) => ((i: unknown) => any);
|
|
2
|
+
export declare const trimmer: (opts: TrimmerOptions, isRedactionDisabled: boolean) => ((i: unknown) => any);
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -25,8 +25,6 @@ export default class DiiaLogger implements Logger {
|
|
|
25
25
|
redact: { paths: redactPaths },
|
|
26
26
|
} = trimmerOptions
|
|
27
27
|
|
|
28
|
-
this.trim = trimmer(trimmerOptions)
|
|
29
|
-
|
|
30
28
|
this.logger =
|
|
31
29
|
existedLogger ||
|
|
32
30
|
pino(
|
|
@@ -60,6 +58,8 @@ export default class DiiaLogger implements Logger {
|
|
|
60
58
|
},
|
|
61
59
|
destinationStream || undefined,
|
|
62
60
|
)
|
|
61
|
+
|
|
62
|
+
this.trim = trimmer(trimmerOptions, this.logger.isLevelEnabled(LogLevel.DEBUG))
|
|
63
63
|
}
|
|
64
64
|
|
|
65
65
|
child(bindings: Record<string, unknown>, destinationStream?: DestinationStream): Logger {
|
|
@@ -133,3 +133,5 @@ export default class DiiaLogger implements Logger {
|
|
|
133
133
|
}
|
|
134
134
|
|
|
135
135
|
export { DiiaLogger }
|
|
136
|
+
|
|
137
|
+
export { defaultOptions } from './config'
|
package/src/trimmer.ts
CHANGED
|
@@ -32,7 +32,7 @@ function formatString(str: string, { maxStringLength, endLengthToLog }: TrimmerO
|
|
|
32
32
|
return truncatedString
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
const walker = (opts: TrimmerOptions, node: any, depth: number): any => {
|
|
35
|
+
const walker = (opts: TrimmerOptions, node: any, depth: number, isRedactionDisabled: boolean): any => {
|
|
36
36
|
if (node instanceof Error) {
|
|
37
37
|
return node
|
|
38
38
|
}
|
|
@@ -82,6 +82,11 @@ const walker = (opts: TrimmerOptions, node: any, depth: number): any => {
|
|
|
82
82
|
const output: Record<string, any> = Array.isArray(node) ? [] : {}
|
|
83
83
|
|
|
84
84
|
for (const [key, value] of Object.entries(node)) {
|
|
85
|
+
if (isRedactionDisabled) {
|
|
86
|
+
output[key] = walker(opts, value, depth + 1, isRedactionDisabled)
|
|
87
|
+
continue
|
|
88
|
+
}
|
|
89
|
+
|
|
85
90
|
if (!value) {
|
|
86
91
|
output[key] = value
|
|
87
92
|
continue
|
|
@@ -97,8 +102,7 @@ const walker = (opts: TrimmerOptions, node: any, depth: number): any => {
|
|
|
97
102
|
continue
|
|
98
103
|
}
|
|
99
104
|
|
|
100
|
-
output[key] = walker(opts, value, depth + 1)
|
|
101
|
-
continue
|
|
105
|
+
output[key] = walker(opts, value, depth + 1, isRedactionDisabled)
|
|
102
106
|
}
|
|
103
107
|
|
|
104
108
|
return output
|
|
@@ -110,8 +114,8 @@ const walker = (opts: TrimmerOptions, node: any, depth: number): any => {
|
|
|
110
114
|
return node
|
|
111
115
|
}
|
|
112
116
|
|
|
113
|
-
export const trimmer = (opts: TrimmerOptions): ((i: unknown) => any) => {
|
|
117
|
+
export const trimmer = (opts: TrimmerOptions, isRedactionDisabled: boolean): ((i: unknown) => any) => {
|
|
114
118
|
return (input: unknown): any => {
|
|
115
|
-
return walker(opts, input, 0)
|
|
119
|
+
return walker(opts, input, 0, isRedactionDisabled)
|
|
116
120
|
}
|
|
117
121
|
}
|