Move logger to common-universal

packages/common-nodejs/package.json

@@ -22,37 +22,11 @@
         "types": "./dist/types/env/index.d.ts",
         "default": "./dist/cjs/env/index.js"
       }
-    },
-    "./logger": {
-      "import": {
-        "@marsfoundation/local-spark-monorepo": "./src/logger/index.ts",
-        "types": "./dist/types/logger/index.d.ts",
-        "default": "./dist/esm/logger/index.js"
-      },
-      "require": {
-        "@marsfoundation/local-spark-monorepo": "./src/logger/index.ts",
-        "types": "./dist/types/logger/index.d.ts",
-        "default": "./dist/cjs/logger/index.js"
-      }
-    },
-    "./tracer": {
-      "import": {
-        "@marsfoundation/local-spark-monorepo": "./src/tracer/index.ts",
-        "types": "./dist/types/tracer/index.d.ts",
-        "default": "./dist/esm/tracer/index.js"
-      },
-      "require": {
-        "@marsfoundation/local-spark-monorepo": "./src/tracer/index.ts",
-        "types": "./dist/types/tracer/index.d.ts",
-        "default": "./dist/cjs/tracer/index.js"
-      }
     }
   },
   "typesVersions": {
     "*": {
-      "env": ["dist/types/env/index.d.ts"],
-      "logger": ["dist/types/logger/index.d.ts"],
-      "tracer": ["dist/types/tracer/index.d.ts"]
+      "env": ["dist/types/env/index.d.ts"]
     }
   },
   "files": ["dist"],
@@ -72,7 +46,6 @@
     "@sinonjs/fake-timers": "^13.0.5",
     "@types/express": "^5.0.0",
     "@types/mocha": "^10.0.10",
-    "@types/pretty-ms": "^5.0.1",
     "@types/sinonjs__fake-timers": "^8.1.5",
     "@types/uuid": "^10.0.0",
     "earl": "^1.3.0",
@@ -81,10 +54,7 @@
     "tinyspy": "^3.0.2"
   },
   "dependencies": {
-    "chalk": "^5.3.0",
     "dotenv": "^16.3.1",
-    "error-stack-parser": "^2.1.4",
-    "pretty-ms": "^9.2.0",
     "uuid": "^11.0.3"
   },
   "peerDependencies": {

packages/common-nodejs/src/http/HttpClient.test.ts

@@ -1,6 +1,6 @@
+import { Logger } from '@marsfoundation/common-universal/logger'
 import { MockObject, expect, mockFn, mockObject } from 'earl'
 import { ZodError, z } from 'zod'
-import { Logger } from '../logger/index.js'
 import { HttpClient, HttpError } from './HttpClient.js'
 import { HttpServerMock, PostBody, getResponseSchema, postBodySchema } from './HttpServer.mock.js'
 

packages/common-nodejs/src/http/HttpClient.ts

@@ -1,6 +1,6 @@
+import { Logger } from '@marsfoundation/common-universal/logger'
 import { mergeDeep } from 'remeda'
 import { z } from 'zod'
-import { Logger } from '../logger/index.js'
 import { RetryOptions, defaultRetryOptions, fetchRetry } from './fetchRetry.js'
 
 export class HttpClient {

packages/common-universal/package.json

@@ -25,6 +25,36 @@
         "types": "./dist/types/index.d.ts",
         "default": "./dist/cjs/index.js"
       }
+    },
+    "./logger": {
+      "import": {
+        "@marsfoundation/local-spark-monorepo": "./src/logger/index.ts",
+        "types": "./dist/types/logger/index.d.ts",
+        "default": "./dist/esm/logger/index.js"
+      },
+      "require": {
+        "@marsfoundation/local-spark-monorepo": "./src/logger/index.ts",
+        "types": "./dist/types/logger/index.d.ts",
+        "default": "./dist/cjs/logger/index.js"
+      }
+    },
+    "./tracer": {
+      "import": {
+        "@marsfoundation/local-spark-monorepo": "./src/tracer/index.ts",
+        "types": "./dist/types/tracer/index.d.ts",
+        "default": "./dist/esm/tracer/index.js"
+      },
+      "require": {
+        "@marsfoundation/local-spark-monorepo": "./src/tracer/index.ts",
+        "types": "./dist/types/tracer/index.d.ts",
+        "default": "./dist/cjs/tracer/index.js"
+      }
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "logger": ["dist/types/logger/index.d.ts"],
+      "tracer": ["dist/types/tracer/index.d.ts"]
     }
   },
   "files": ["dist"],
@@ -48,13 +78,17 @@
     "@sinonjs/fake-timers": "^13.0.5",
     "@types/mocha": "^10.0.10",
     "@types/ms": "^2.1.0",
+    "@types/pretty-ms": "^5.0.1",
     "@types/sinonjs__fake-timers": "^8.1.5",
     "earl": "^1.3.0",
     "mocha": "^10.8.2"
   },
   "dependencies": {
+    "chalk": "^5.3.0",
+    "error-stack-parser": "^2.1.4",
     "fetch-retry": "^5.0.6",
     "ms": "^2.1.3",
-    "p-limit": "^6.1.0"
+    "p-limit": "^6.1.0",
+    "pretty-ms": "^9.2.0"
   }
 }

packages/common-universal/src/logger/LogFormatterObject.ts

@@ -0,0 +1,15 @@
+import { LogEntry, LogFormatter } from './types.js'
+
+export class LogFormatterObject implements LogFormatter {
+  public format(entry: LogEntry): object {
+    const core = {
+      time: entry.time.toISOString(),
+      level: entry.level,
+      service: entry.service,
+      message: entry.message,
+      error: entry.resolvedError,
+    }
+
+    return { ...core, parameters: entry.parameters }
+  }
+}

packages/common-nodejs/src/logger/LogFormatterPretty.ts → packages/common-universal/src/logger/LogFormatterPretty.ts

@@ -1,27 +1,9 @@
-import { inspect } from 'node:util'
 import chalk from 'chalk'
-
 import { LogLevel } from './LogLevel.js'
 import { LogEntry, LogFormatter } from './types.js'
 import { toJSON } from './utils.js'
 
-const STYLES = {
-  bigint: 'white',
-  boolean: 'white',
-  date: 'white',
-  module: 'white',
-  name: 'blue',
-  null: 'white',
-  number: 'white',
-  regexp: 'white',
-  special: 'white',
-  string: 'white',
-  symbol: 'white',
-  undefined: 'white',
-}
-
 const INDENT_SIZE = 4
-const INDENT = ' '.repeat(INDENT_SIZE)
 
 interface Options {
   colors: boolean
@@ -45,7 +27,7 @@ export class LogFormatterPretty implements LogFormatter {
     const serviceOut = this.formatServicePretty(entry.service, this.options.colors)
     const messageOut = entry.message ? ` ${entry.message}` : ''
     const paramsOut = this.formatParametersPretty(
-      this.sanitize(entry.resolvedError ? { ...entry.resolvedError, ...entry.parameters } : (entry.parameters ?? {})),
+      entry.resolvedError ? { ...entry.resolvedError, ...entry.parameters } : (entry.parameters ?? {}),
       this.options.colors,
     )
 
@@ -86,30 +68,15 @@ export class LogFormatterPretty implements LogFormatter {
   }
 
   protected formatParametersPretty(parameters: object, colors: boolean): string {
-    const oldStyles = inspect.styles
-    inspect.styles = STYLES
-
-    const inspected = inspect(parameters, {
-      colors,
-      breakLength: 80 - INDENT_SIZE,
-      depth: 5,
-    })
-
-    inspect.styles = oldStyles
-
-    if (inspected === '{}') {
+    const jsonParameters = toJSON(parameters, INDENT_SIZE)
+    if (jsonParameters === '{}') {
       return ''
     }
 
-    const indented = inspected
-      .split('\n')
-      .map((x) => INDENT + x)
-      .join('\n')
-
     if (colors) {
-      return `\n${chalk.gray(indented)}`
+      return `\n${chalk.gray(jsonParameters)}`
     }
-    return `\n${indented}`
+    return `\n${jsonParameters}`
   }
 
   protected formatServicePretty(service: string | undefined, colors: boolean): string {
@@ -118,8 +85,4 @@ export class LogFormatterPretty implements LogFormatter {
     }
     return colors ? ` ${chalk.gray('[')} ${chalk.yellow(service)} ${chalk.gray(']')}` : ` [ ${service} ]`
   }
-
-  protected sanitize(parameters: object): object {
-    return JSON.parse(toJSON(parameters))
-  }
 }