@mhmdhammoud/meritt-utils 1.5.7 → 1.5.9

package/dist/__tests__/logger.test.js

@@ -94,7 +94,7 @@ describe('route and format logs', () => {
         key0: 'val0',
         key1: 'val1',
     };
-    test('log info with structured context (single object flattened)', () => {
+    test('log info with structured context (single object in context field)', () => {
         //@ts-ignore
         jest.spyOn(pino_1.pino, 'destination').mockReturnValue(PINO_DESTINATION);
         //@ts-ignore
@@ -105,11 +105,10 @@ describe('route and format logs', () => {
             component: LOGGER_NAME,
             code: LOG_EVENT.code,
             msg: LOG_EVENT.msg,
-            key0: 'val0',
-            key1: 'val1',
+            context: { key0: 'val0', key1: 'val1' },
         }));
     });
-    test('remap reserved elastic field names dynamically', () => {
+    test('remap reserved elastic field names in context', () => {
         //@ts-ignore
         jest.spyOn(pino_1.pino, 'destination').mockReturnValue(PINO_DESTINATION);
         //@ts-ignore
@@ -122,11 +121,11 @@ describe('route and format logs', () => {
                 _index: 'bad-index',
             },
         });
+        // Context holds sanitized structure; reserved names remapped recursively
         expect(PINO.info).toHaveBeenCalledWith(expect.objectContaining({
-            mongo_id: 'abc123',
-            nested: expect.objectContaining({
-                mongo_id: 'nested-1',
-                es_index: 'bad-index',
+            context: expect.objectContaining({
+                mongo_id: 'abc123',
+                nested: { mongo_id: 'nested-1', es_index: 'bad-index' },
             }),
         }));
         expect(PINO.info).not.toHaveBeenCalledWith(expect.objectContaining({

package/dist/lib/logger.js

@@ -381,20 +381,18 @@ class Logger {
         if (trace) {
             ecs.trace_id = trace.traceId;
         }
-        // Structured context: flatten single plain object as top-level fields
-        // Sanitize values to avoid ES mapping conflicts (e.g. Error objects → serializable shape)
+        // Structured context: put in single 'context' field to avoid ES mapping conflicts.
+        // Flattening to top-level caused document_parsing_exception (object vs scalar type mismatches).
+        // Nesting in context keeps structure consistent and avoids per-field mapping conflicts.
+        let context;
         let detail;
         if (args.length === 1 &&
             isPlainObject(args[0]) &&
             Object.keys(args[0]).length > 0) {
-            const obj = args[0];
-            for (const [k, v] of Object.entries(obj)) {
-                const key = toSafeElasticFieldName(k);
-                ecs[key] = sanitizeForElastic(v);
-            }
+            context = sanitizeForElastic(args[0]);
         }
         else {
-            detail = isLocal ? args : JSON.stringify(args);
+            detail = isLocal ? args : JSON.stringify(sanitizeForElastic(args));
         }
         // Legacy fields for backward compatibility (component, code, msg)
         const base = {
@@ -403,6 +401,9 @@ class Logger {
             code: event.code,
             msg: event.msg,
         };
+        if (context !== undefined) {
+            base.context = context;
+        }
         if (detail !== undefined) {
             base.detail = detail;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@mhmdhammoud/meritt-utils",
-	"version": "1.5.7",
+	"version": "1.5.9",
 	"description": "",
 	"main": "./dist/index.js",
 	"private": false,

package/src/__tests__/logger.test.ts

@@ -70,7 +70,7 @@ describe('route and format logs', () => {
 		key0: 'val0',
 		key1: 'val1',
 	}
-	test('log info with structured context (single object flattened)', () => {
+	test('log info with structured context (single object in context field)', () => {
 		//@ts-ignore
 		jest.spyOn(pino, 'destination').mockReturnValue(PINO_DESTINATION)
 		//@ts-ignore
@@ -84,13 +84,12 @@ describe('route and format logs', () => {
 				component: LOGGER_NAME,
 				code: LOG_EVENT.code,
 				msg: LOG_EVENT.msg,
-				key0: 'val0',
-				key1: 'val1',
+				context: { key0: 'val0', key1: 'val1' },
 			})
 		)
 	})
 
-	test('remap reserved elastic field names dynamically', () => {
+	test('remap reserved elastic field names in context', () => {
 		//@ts-ignore
 		jest.spyOn(pino, 'destination').mockReturnValue(PINO_DESTINATION)
 		//@ts-ignore
@@ -105,12 +104,12 @@ describe('route and format logs', () => {
 			},
 		})
 
+		// Context holds sanitized structure; reserved names remapped recursively
 		expect(PINO.info).toHaveBeenCalledWith(
 			expect.objectContaining({
-				mongo_id: 'abc123',
-				nested: expect.objectContaining({
-					mongo_id: 'nested-1',
-					es_index: 'bad-index',
+				context: expect.objectContaining({
+					mongo_id: 'abc123',
+					nested: { mongo_id: 'nested-1', es_index: 'bad-index' },
 				}),
 			})
 		)

package/src/lib/logger.ts

@@ -461,21 +461,19 @@ class Logger {
 			ecs.trace_id = trace.traceId
 		}
 
-		// Structured context: flatten single plain object as top-level fields
-		// Sanitize values to avoid ES mapping conflicts (e.g. Error objects → serializable shape)
+		// Structured context: put in single 'context' field to avoid ES mapping conflicts.
+		// Flattening to top-level caused document_parsing_exception (object vs scalar type mismatches).
+		// Nesting in context keeps structure consistent and avoids per-field mapping conflicts.
+		let context: Record<string, unknown> | undefined
 		let detail: unknown
 		if (
 			args.length === 1 &&
 			isPlainObject(args[0]) &&
 			Object.keys(args[0]).length > 0
 		) {
-			const obj = args[0]
-			for (const [k, v] of Object.entries(obj)) {
-				const key = toSafeElasticFieldName(k)
-				ecs[key] = sanitizeForElastic(v)
-			}
+			context = sanitizeForElastic(args[0]) as Record<string, unknown>
 		} else {
-			detail = isLocal ? args : JSON.stringify(args)
+			detail = isLocal ? args : JSON.stringify(sanitizeForElastic(args))
 		}
 
 		// Legacy fields for backward compatibility (component, code, msg)
@@ -485,6 +483,9 @@ class Logger {
 			code: event.code,
 			msg: event.msg,
 		}
+		if (context !== undefined) {
+			base.context = context
+		}
 		if (detail !== undefined) {
 			base.detail = detail
 		}