@diia-inhouse/diia-logger 4.2.3 → 4.3.0

package/dist/index.js

@@ -43,7 +43,7 @@ var DiiaLogger = class DiiaLogger {
 			customLevels: { [LogLevel.IO]: 25 },
 			redact: [...redactPaths || []]
 		}, destinationStream || void 0);
-		this.trim = trimmer(internalOptions, this.logger.isLevelEnabled(LogLevel.DEBUG));
+		this.trim = trimmer(internalOptions);
 	}
 	child(bindings, destinationStream) {
 		const pinoLogger = this.logger.child(bindings);

package/dist/trimmer.d.ts

@@ -1,6 +1,6 @@
 import { LoggerOptions } from "@diia-inhouse/types";
 
 //#region src/trimmer.d.ts
-declare const createTrimmer: (options?: LoggerOptions, isRedactionDisabled?: boolean) => ((i: unknown) => any);
+declare const createTrimmer: (options?: LoggerOptions) => ((i: unknown) => any);
 //#endregion
 export { createTrimmer };

package/dist/trimmer.js

@@ -8,7 +8,7 @@ function trimString(str, { maxStringLength, endLengthToLog }) {
 	const length = str.length;
 	return length > maxStringLength ? `${str.slice(0, maxStringLength - endLengthToLog)}...${str.slice(0 - endLengthToLog)} (${length} chars)` : str;
 }
-function trimObject(opts, node, depth, isRedactionDisabled) {
+function trimObject(opts, node, depth) {
 	const propertiesCount = Object.keys(node).length;
 	if (propertiesCount > opts.maxObjectBreadth) {
 		const visibleObjectProperties = Object.entries(node).slice(0, opts.maxObjectBreadth);
@@ -18,8 +18,8 @@ function trimObject(opts, node, depth, isRedactionDisabled) {
 	if (Object.getOwnPropertyNames(node).length > 0) {
 		const output = Array.isArray(node) ? [] : {};
 		for (const [key, value] of Object.entries(node)) {
-			if (isRedactionDisabled) {
-				output[key] = trimWalker(opts, value, depth + 1, isRedactionDisabled);
+			if (opts.redactDisabled) {
+				output[key] = trimWalker(opts, value, depth + 1);
 				continue;
 			}
 			if (!value) {
@@ -30,10 +30,10 @@ function trimObject(opts, node, depth, isRedactionDisabled) {
 				output[key] = "[Redacted]";
 				continue;
 			}
-			output[key] = trimWalker(opts, value, depth + 1, isRedactionDisabled);
+			output[key] = trimWalker(opts, value, depth + 1);
 			if (typeof value === "string" || Array.isArray(value)) {
-				if (opts.redact.fieldsToRedactFullname?.has(key)) output[key] = redactionWalker(opts, key, output[key], isRedactionDisabled);
-				if (opts.redact.fieldsToRedactItn?.has(key)) output[key] = redactionWalker(opts, key, output[key], isRedactionDisabled);
+				if (opts.redact.fieldsToRedactFullname?.has(key)) output[key] = redactionWalker(opts, key, output[key]);
+				if (opts.redact.fieldsToRedactItn?.has(key)) output[key] = redactionWalker(opts, key, output[key]);
 				continue;
 			}
 		}
@@ -41,7 +41,7 @@ function trimObject(opts, node, depth, isRedactionDisabled) {
 	}
 	return node;
 }
-const trimWalker = (opts, node, depth, isRedactionDisabled) => {
+const trimWalker = (opts, node, depth) => {
 	if (node instanceof Error) return node;
 	if (typeof node === "string") return trimString(node, opts);
 	if (typeof node === "number" || typeof node === "boolean" || node === void 0 || node === null) return node;
@@ -54,20 +54,20 @@ const trimWalker = (opts, node, depth, isRedactionDisabled) => {
 	}
 	if (node?.["_bsontype"] === "ObjectId") return node.toString();
 	if (node instanceof Date) return node;
-	if (isObject(node)) return trimObject(opts, node, depth, isRedactionDisabled);
+	if (isObject(node)) return trimObject(opts, node, depth);
 	return node;
 };
-const redactionWalker = (opts, key, value, isRedactionDisabled) => {
-	if (Array.isArray(value)) return value.map((item) => redactionWalker(opts, key, item, isRedactionDisabled));
+const redactionWalker = (opts, key, value) => {
+	if (Array.isArray(value)) return value.map((item) => redactionWalker(opts, key, item));
 	if (typeof value !== "string") return value;
 	if (opts.redact.fieldsToRedactFullname?.has(key)) value = redactFullName(value);
 	if (opts.redact.fieldsToRedactItn?.has(key)) value = redactItn(value);
 	return value;
 };
-const trimmer = (opts, isRedactionDisabled) => {
+const trimmer = (opts) => {
 	return (input) => {
 		try {
-			return trimWalker(opts, input, 0, isRedactionDisabled);
+			return trimWalker(opts, input, 0);
 		} catch (err) {
 			return {
 				err,
@@ -76,6 +76,6 @@ const trimmer = (opts, isRedactionDisabled) => {
 		}
 	};
 };
-const createTrimmer = (options = {}, isRedactionDisabled = false) => trimmer(toInternalLoggerOptions(options), isRedactionDisabled);
+const createTrimmer = (options = {}) => trimmer(toInternalLoggerOptions(options));
 //#endregion
 export { createTrimmer, trimmer };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/diia-logger",
-    "version": "4.2.3",
+    "version": "4.3.0",
     "type": "module",
     "description": "Logger package",
     "main": "dist/index.js",
@@ -45,7 +45,7 @@
         "@diia-inhouse/eslint-plugin": "1.9.6",
         "@diia-inhouse/oxc-config": "1.10.0",
         "@diia-inhouse/types": "13.2.0",
-        "@diia-inhouse/utils": "6.0.10",
+        "@diia-inhouse/utils": "6.0.11",
         "@types/lodash": "4.17.24",
         "@vitest/coverage-v8": "4.1.5",
         "@vitest/ui": "4.1.5",

package/src/index.ts

@@ -70,7 +70,7 @@ export default class DiiaLogger implements Logger {
                 destinationStream || undefined,
             )
 
-        this.trim = trimmer(internalOptions, this.logger.isLevelEnabled(LogLevel.DEBUG))
+        this.trim = trimmer(internalOptions)
     }
 
     child(bindings: Record<string, unknown>, destinationStream?: DestinationStream): Logger {

package/src/trimmer.ts

@@ -21,7 +21,7 @@ function trimString(str: string, { maxStringLength, endLengthToLog }: InternalLo
     return truncatedString
 }
 
-function trimObject(opts: InternalLoggerOptions, node: object, depth: number, isRedactionDisabled: boolean): object {
+function trimObject(opts: InternalLoggerOptions, node: object, depth: number): object {
     const propertiesCount = Object.keys(node).length
     if (propertiesCount > opts.maxObjectBreadth) {
         const visibleObjectProperties = Object.entries(node).slice(0, opts.maxObjectBreadth)
@@ -36,8 +36,8 @@ function trimObject(opts: InternalLoggerOptions, node: object, depth: number, is
         const output: Record<string, any> = Array.isArray(node) ? [] : {}
 
         for (const [key, value] of Object.entries(node)) {
-            if (isRedactionDisabled) {
-                output[key] = trimWalker(opts, value, depth + 1, isRedactionDisabled)
+            if (opts.redactDisabled) {
+                output[key] = trimWalker(opts, value, depth + 1)
                 continue
             }
 
@@ -51,15 +51,15 @@ function trimObject(opts: InternalLoggerOptions, node: object, depth: number, is
                 continue
             }
 
-            output[key] = trimWalker(opts, value, depth + 1, isRedactionDisabled)
+            output[key] = trimWalker(opts, value, depth + 1)
 
             if (typeof value === 'string' || Array.isArray(value)) {
                 if (opts.redact.fieldsToRedactFullname?.has(key)) {
-                    output[key] = redactionWalker(opts, key, output[key], isRedactionDisabled)
+                    output[key] = redactionWalker(opts, key, output[key])
                 }
 
                 if (opts.redact.fieldsToRedactItn?.has(key)) {
-                    output[key] = redactionWalker(opts, key, output[key], isRedactionDisabled)
+                    output[key] = redactionWalker(opts, key, output[key])
                 }
 
                 continue
@@ -72,7 +72,7 @@ function trimObject(opts: InternalLoggerOptions, node: object, depth: number, is
     return node
 }
 
-const trimWalker = (opts: InternalLoggerOptions, node: any, depth: number, isRedactionDisabled: boolean): any => {
+const trimWalker = (opts: InternalLoggerOptions, node: any, depth: number): any => {
     if (node instanceof Error) {
         return node
     }
@@ -112,16 +112,15 @@ const trimWalker = (opts: InternalLoggerOptions, node: any, depth: number, isRed
     }
 
     if (isObject(node)) {
-        return trimObject(opts, node, depth, isRedactionDisabled)
+        return trimObject(opts, node, depth)
     }
 
     return node
 }
 
-// oxlint-disable-next-line oxc/only-used-in-recursion
-const redactionWalker = (opts: InternalLoggerOptions, key: string, value: string | any[], isRedactionDisabled: boolean): string | any[] => {
+const redactionWalker = (opts: InternalLoggerOptions, key: string, value: string | any[]): string | any[] => {
     if (Array.isArray(value)) {
-        return value.map((item) => redactionWalker(opts, key, item, isRedactionDisabled))
+        return value.map((item) => redactionWalker(opts, key, item))
     }
 
     if (typeof value !== 'string') {
@@ -139,15 +138,14 @@ const redactionWalker = (opts: InternalLoggerOptions, key: string, value: string
     return value
 }
 
-export const trimmer = (opts: InternalLoggerOptions, isRedactionDisabled: boolean): ((i: unknown) => any) => {
+export const trimmer = (opts: InternalLoggerOptions): ((i: unknown) => any) => {
     return (input: unknown): any => {
         try {
-            return trimWalker(opts, input, 0, isRedactionDisabled)
+            return trimWalker(opts, input, 0)
         } catch (err) {
             return { err, msg: 'Failed to trim logger input' }
         }
     }
 }
 
-export const createTrimmer = (options: LoggerOptions = {}, isRedactionDisabled = false): ((i: unknown) => any) =>
-    trimmer(toInternalLoggerOptions(options), isRedactionDisabled)
+export const createTrimmer = (options: LoggerOptions = {}): ((i: unknown) => any) => trimmer(toInternalLoggerOptions(options))