@nxtedition/lib 19.1.6 → 19.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.1.6",
+  "version": "19.1.7",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/serializers.js

@@ -90,6 +90,10 @@ export default {
   },
 }
 
+// TODO (fix): Merge with errros/serializeError.
+// Note that 'data' here should be string while in "serializeError" it should be object.
+// Maybe we should rename serializeError to makeErrorObject or somehting??
+
 // Based on: https://github.com/pinojs/pino-std-serializers
 
 const seen = Symbol('circular-ref-tag')
@@ -136,17 +140,13 @@ Object.defineProperty(pinoErrProto, rawSymbol, {
 
 function errSerializer(err) {
   if (Array.isArray(err)) {
-    if (err.length === 0) {
-      return null
-    } else if (err.length === 1) {
-      return errSerializer(err[0])
-    } else {
-      return new AggregateError(err.map(errSerializer))
-    }
-  }
-
-  if (!isErrorLike(err)) {
-    return null
+    return err.length === 0 ? undefined : errSerializer({ message: '', errors: err })
+  } else if (!isErrorLike(err)) {
+    return undefined
+  } else if (err.message === '' && Array.isArray(err.errors) && err.errors.length === 0) {
+    return undefined
+  } else if (err.message === '' && Array.isArray(err.errors) && err.errors.length === 1) {
+    return errSerializer(err.errors[0])
   }
 
   err[seen] = undefined // tag to prevent re-looking at this
@@ -171,20 +171,34 @@ function errSerializer(err) {
         if (!Object.prototype.hasOwnProperty.call(val, seen)) {
           _err[key] = errSerializer(val)
         }
-      } else if (val == null) {
-        // Do nothing...
-      } else if (key === 'data' && typeof val === 'object') {
-        _err[key] = JSON.stringify(val, undefined, 2)
-      } else if (key === 'code' && typeof val === 'number') {
-        _err[key] = String(val)
-      } else if (key === 'signal' && typeof val === 'number') {
-        _err[key] = SIGNALS[val] ?? String(val)
-      } else {
+      } else if (val != null) {
         _err[key] = val
       }
     }
   }
 
+  if (_err.data != null && typeof _err.data !== 'string') {
+    _err.data = JSON.stringify(_err.data, undefined, 2)
+  }
+
+  if (_err.code != null && typeof _err.code !== 'string') {
+    _err.code = String(_err.code)
+  }
+
+  if (_err.statusCode == null && _err.status != null) {
+    _err.statusCode = Number(_err.status) ?? undefined
+  }
+
+  if (_err.signalCode == null && _err.signal != null) {
+    _err.signalCode = SIGNALS[_err._signal] ?? _err._signal
+  } else if (_err.signalCode != null) {
+    _err.signalCode = SIGNALS[_err.signalCode] ?? _err.signalCode
+  }
+
+  if (_err.exitCode == null && _err.code != null && /^([A-Z]+|[a-z]+|[0-9]+)$/.test(_err.code)) {
+    _err.exitCode = String(_err.code)
+  }
+
   delete err[seen] // clean up tag in case err is serialized again later
   _err.raw = err
   return _err