@likec4/log 1.18.0 → 1.19.1

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@likec4/log",
   "license": "MIT",
-  "version": "1.18.0",
+  "version": "1.19.1",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
   "files": [
     "dist",
-    "lib"
+    "src"
   ],
   "repository": {
     "type": "git",
@@ -15,12 +15,9 @@
     "directory": "packages/log"
   },
   "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "browser": "./dist/browser.mjs",
-  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
+      "sources": "./src/index.ts",
       "node": {
         "types": "./dist/index.d.ts",
         "import": "./dist/index.mjs",
@@ -44,16 +41,18 @@
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
-    "prepack": "unbuild",
-    "generate": "unbuild"
+    "build": "unbuild"
   },
   "devDependencies": {
-    "@likec4/tsconfig": "1.18.0",
+    "@likec4/tsconfig": "1.19.1",
     "@types/node": "^20.17.7",
-    "consola": "^3.2.3",
+    "consola": "^3.3.3",
+    "merge-error-cause": "^5.0.0",
+    "safe-stringify": "^1.1.1",
     "std-env": "^3.8.0",
     "typescript": "^5.7.2",
-    "unbuild": "^3.0.0-rc.11"
+    "unbuild": "^3.1.0",
+    "wrap-error-message": "^3.0.0"
   },
   "packageManager": "yarn@4.5.3"
 }

package/src/browser.ts

@@ -0,0 +1,16 @@
+import { createConsola } from 'consola/browser'
+import { type LogObject, LogLevels } from 'consola/core'
+import { type FormattedLogObject, formattedLogObj } from './format'
+
+export type * from 'consola/core'
+export type { FormattedLogObject }
+
+const consola = createConsola({
+  level: LogLevels.debug,
+})
+
+export function formatLogObj(logObj: LogObject): FormattedLogObject {
+  return formattedLogObj(logObj)
+}
+
+export { consola, consola as logger, consola as rootLogger, LogLevels }

package/src/format.ts

@@ -0,0 +1,60 @@
+import type { LogObject } from 'consola/core'
+import mergeErrorCause from 'merge-error-cause'
+import safeStringify from 'safe-stringify'
+import wrapErrorMessage from 'wrap-error-message'
+
+export type FormattedLogObject = {
+  message: string
+  error?: {
+    message: string
+    name: string
+    stack?: string
+  }
+}
+
+const defaultParseStack = (stack: string): string[] => {
+  const lines = stack.split('\n').map((l) => l.trim().replace('file://', ''))
+  return lines
+}
+
+export function formattedLogObj(
+  logObj: LogObject,
+  parseStack = defaultParseStack,
+): FormattedLogObject {
+  const result: FormattedLogObject = {
+    message: '',
+  }
+  const error = logObj.args.find(a => a instanceof Error)
+  if (!error) {
+    result.message = logObj.args.map(arg => typeof arg === 'string' ? arg : safeStringify(arg)).join('; ')
+    if (typeof logObj.tag === 'string' && logObj.tag.length > 0) {
+      result.message = `[${logObj.tag}] ${result.message}`
+    }
+    return result
+  }
+
+  const mergedErr = logObj.args.reduce(
+    (acc: Error, arg) => {
+      if (arg === error) {
+        return acc
+      }
+      const msg = typeof arg === 'string' ? arg : safeStringify(arg)
+      return wrapErrorMessage(acc, msg)
+    },
+    mergeErrorCause(error),
+  )
+  result.message = mergedErr.message
+  result.error = {
+    message: mergedErr.message,
+    name: mergedErr.name,
+  }
+  if (mergedErr.stack) {
+    const stack = parseStack(mergedErr.stack)
+    result.error.stack = stack.join('\n')
+    result.message += '\n' + stack.slice(1).map(l => '  ' + l).join('\n')
+  }
+  if (typeof logObj.tag === 'string' && logObj.tag.length > 0) {
+    result.message = `[${logObj.tag}] ${result.message}`
+  }
+  return result
+}

package/src/index.ts

@@ -0,0 +1,36 @@
+import { createConsola } from 'consola'
+import { type LogObject, LogLevels } from 'consola/core'
+import { sep } from 'node:path'
+import { cwd } from 'node:process'
+import { type FormattedLogObject, formattedLogObj } from './format'
+
+export type * from 'consola/core'
+export type { FormattedLogObject }
+
+function parseStack(stack: string): string[] {
+  const currentDir = cwd() + sep
+  const lines = stack.split('\n').map((l) => l.trim().replace('file://', '').replace(currentDir, ''))
+  return lines
+}
+
+export function formatLogObj(logObj: LogObject): FormattedLogObject {
+  return formattedLogObj(logObj, parseStack)
+}
+
+const level = LogLevels.debug
+
+const consola = createConsola({
+  level,
+  defaults: {
+    level,
+  },
+  throttle: 2,
+  throttleMin: 500,
+  formatOptions: {
+    colors: true,
+    compact: false,
+    date: false,
+  },
+})
+
+export { consola, consola as logger, consola as rootLogger, LogLevels }