@likec4/log 1.17.1 → 1.19.0

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@likec4/log",
   "license": "MIT",
-  "version": "1.17.1",
+  "version": "1.19.0",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
   "files": [
-    "dist"
+    "dist",
+    "src"
   ],
   "repository": {
     "type": "git",
@@ -14,19 +15,24 @@
     "directory": "packages/log"
   },
   "type": "module",
-  "sideEffects": false,
   "exports": {
     ".": {
+      "development": "./src/index.ts",
       "node": {
-        "types": "./dist/node.d.ts",
-        "import": "./dist/node.mjs",
-        "require": "./dist/node.cjs"
-      },
-      "default": {
         "types": "./dist/index.d.ts",
         "import": "./dist/index.mjs",
         "require": "./dist/index.cjs"
+      },
+      "default": {
+        "types": "./dist/index.d.ts",
+        "import": "./dist/browser.mjs",
+        "require": "./dist/browser.cjs"
       }
+    },
+    "./browser": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/browser.mjs",
+      "require": "./dist/browser.cjs"
     }
   },
   "publishConfig": {
@@ -35,16 +41,18 @@
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
-    "prepack": "unbuild",
-    "generate": "unbuild"
+    "build": "unbuild"
   },
   "devDependencies": {
-    "@likec4/tsconfig": "1.17.1",
+    "@likec4/tsconfig": "1.19.0",
     "@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,34 @@
+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,
+  },
+  formatOptions: {
+    colors: true,
+    compact: false,
+    date: false,
+  },
+})
+
+export { consola, consola as logger, consola as rootLogger, LogLevels }

package/dist/node.cjs

@@ -1,14 +0,0 @@
-'use strict';
-
-const node = require('./shared/log.CIkEHqaW.cjs');
-require('node:util');
-require('node:path');
-require('node:process');
-require('node:tty');
-
-
-
-exports.LogLevels = node.LogLevels;
-exports.consola = node.consola;
-exports.logger = node.consola;
-exports.rootLogger = node.consola;

package/dist/node.d.cts

@@ -1,126 +0,0 @@
-type SelectOption = {
-    label: string;
-    value: string;
-    hint?: string;
-};
-type TextOptions = {
-    type?: "text";
-    default?: string;
-    placeholder?: string;
-    initial?: string;
-};
-type ConfirmOptions = {
-    type: "confirm";
-    initial?: boolean;
-};
-type SelectOptions = {
-    type: "select";
-    initial?: string;
-    options: (string | SelectOption)[];
-};
-type MultiSelectOptions = {
-    type: "multiselect";
-    initial?: string;
-    options: string[] | SelectOption[];
-    required?: boolean;
-};
-type PromptOptions = TextOptions | ConfirmOptions | SelectOptions | MultiSelectOptions;
-type inferPromptReturnType<T extends PromptOptions> = T extends TextOptions ? string : T extends ConfirmOptions ? boolean : T extends SelectOptions ? T["options"][number] : T extends MultiSelectOptions ? T["options"] : unknown;
-declare function prompt<_ = any, __ = any, T extends PromptOptions = TextOptions>(message: string, opts?: PromptOptions): Promise<inferPromptReturnType<T>>;
-
-type LogLevel = 0 | 1 | 2 | 3 | 4 | 5 | (number & {});
-declare const LogLevels: Record<LogType, number>;
-type LogType = "silent" | "fatal" | "error" | "warn" | "log" | "info" | "success" | "fail" | "ready" | "start" | "box" | "debug" | "trace" | "verbose";
-declare const LogTypes: Record<LogType, Partial<LogObject>>;
-
-interface ConsolaOptions {
-    reporters: ConsolaReporter[];
-    types: Record<LogType, InputLogObject>;
-    level: LogLevel;
-    defaults: InputLogObject;
-    throttle: number;
-    throttleMin: number;
-    stdout?: NodeJS.WriteStream;
-    stderr?: NodeJS.WriteStream;
-    mockFn?: (type: LogType, defaults: InputLogObject) => (...args: any) => void;
-    prompt?: typeof prompt | undefined;
-    formatOptions: FormatOptions;
-}
-/**
- * @see https://nodejs.org/api/util.html#util_util_inspect_object_showhidden_depth_colors
- */
-interface FormatOptions {
-    columns?: number;
-    date?: boolean;
-    colors?: boolean;
-    compact?: boolean | number;
-    [key: string]: unknown;
-}
-interface InputLogObject {
-    level?: LogLevel;
-    tag?: string;
-    type?: LogType;
-    message?: string;
-    additional?: string | string[];
-    args?: any[];
-    date?: Date;
-}
-interface LogObject extends InputLogObject {
-    level: LogLevel;
-    type: LogType;
-    tag: string;
-    args: any[];
-    date: Date;
-    [key: string]: unknown;
-}
-interface ConsolaReporter {
-    log: (logObj: LogObject, ctx: {
-        options: ConsolaOptions;
-    }) => void;
-}
-
-declare class Consola {
-    options: ConsolaOptions;
-    _lastLog: {
-        serialized?: string;
-        object?: LogObject;
-        count?: number;
-        time?: Date;
-        timeout?: ReturnType<typeof setTimeout>;
-    };
-    _mockFn?: ConsolaOptions["mockFn"];
-    constructor(options?: Partial<ConsolaOptions>);
-    get level(): LogLevel;
-    set level(level: LogLevel);
-    prompt<T extends PromptOptions>(message: string, opts?: T): Promise<T extends TextOptions ? string : T extends ConfirmOptions ? boolean : T extends SelectOptions ? T["options"][number] : T extends MultiSelectOptions ? T["options"] : unknown>;
-    create(options: Partial<ConsolaOptions>): ConsolaInstance;
-    withDefaults(defaults: InputLogObject): ConsolaInstance;
-    withTag(tag: string): ConsolaInstance;
-    addReporter(reporter: ConsolaReporter): this;
-    removeReporter(reporter: ConsolaReporter): ConsolaReporter[] | this;
-    setReporters(reporters: ConsolaReporter[]): this;
-    wrapAll(): void;
-    restoreAll(): void;
-    wrapConsole(): void;
-    restoreConsole(): void;
-    wrapStd(): void;
-    _wrapStream(stream: NodeJS.WriteStream | undefined, type: LogType): void;
-    restoreStd(): void;
-    _restoreStream(stream?: NodeJS.WriteStream): void;
-    pauseLogs(): void;
-    resumeLogs(): void;
-    mockTypes(mockFn?: ConsolaOptions["mockFn"]): void;
-    _wrapLogFn(defaults: InputLogObject, isRaw?: boolean): (...args: any[]) => false | undefined;
-    _logFn(defaults: InputLogObject, args: any[], isRaw?: boolean): false | undefined;
-    _log(logObj: LogObject): void;
-}
-interface LogFn {
-    (message: InputLogObject | any, ...args: any[]): void;
-    raw: (...args: any[]) => void;
-}
-type ConsolaInstance = Consola & Record<LogType, LogFn>;
-declare function createConsola(options?: Partial<ConsolaOptions>): ConsolaInstance;
-
-declare const consola: ConsolaInstance;
-
-export { Consola, type ConsolaInstance, type ConsolaOptions, type ConsolaReporter, type FormatOptions, type InputLogObject, type LogLevel, LogLevels, type LogObject, type LogType, LogTypes, consola, createConsola, consola as logger, consola as rootLogger };

package/dist/node.d.mts

@@ -1,126 +0,0 @@
-type SelectOption = {
-    label: string;
-    value: string;
-    hint?: string;
-};
-type TextOptions = {
-    type?: "text";
-    default?: string;
-    placeholder?: string;
-    initial?: string;
-};
-type ConfirmOptions = {
-    type: "confirm";
-    initial?: boolean;
-};
-type SelectOptions = {
-    type: "select";
-    initial?: string;
-    options: (string | SelectOption)[];
-};
-type MultiSelectOptions = {
-    type: "multiselect";
-    initial?: string;
-    options: string[] | SelectOption[];
-    required?: boolean;
-};
-type PromptOptions = TextOptions | ConfirmOptions | SelectOptions | MultiSelectOptions;
-type inferPromptReturnType<T extends PromptOptions> = T extends TextOptions ? string : T extends ConfirmOptions ? boolean : T extends SelectOptions ? T["options"][number] : T extends MultiSelectOptions ? T["options"] : unknown;
-declare function prompt<_ = any, __ = any, T extends PromptOptions = TextOptions>(message: string, opts?: PromptOptions): Promise<inferPromptReturnType<T>>;
-
-type LogLevel = 0 | 1 | 2 | 3 | 4 | 5 | (number & {});
-declare const LogLevels: Record<LogType, number>;
-type LogType = "silent" | "fatal" | "error" | "warn" | "log" | "info" | "success" | "fail" | "ready" | "start" | "box" | "debug" | "trace" | "verbose";
-declare const LogTypes: Record<LogType, Partial<LogObject>>;
-
-interface ConsolaOptions {
-    reporters: ConsolaReporter[];
-    types: Record<LogType, InputLogObject>;
-    level: LogLevel;
-    defaults: InputLogObject;
-    throttle: number;
-    throttleMin: number;
-    stdout?: NodeJS.WriteStream;
-    stderr?: NodeJS.WriteStream;
-    mockFn?: (type: LogType, defaults: InputLogObject) => (...args: any) => void;
-    prompt?: typeof prompt | undefined;
-    formatOptions: FormatOptions;
-}
-/**
- * @see https://nodejs.org/api/util.html#util_util_inspect_object_showhidden_depth_colors
- */
-interface FormatOptions {
-    columns?: number;
-    date?: boolean;
-    colors?: boolean;
-    compact?: boolean | number;
-    [key: string]: unknown;
-}
-interface InputLogObject {
-    level?: LogLevel;
-    tag?: string;
-    type?: LogType;
-    message?: string;
-    additional?: string | string[];
-    args?: any[];
-    date?: Date;
-}
-interface LogObject extends InputLogObject {
-    level: LogLevel;
-    type: LogType;
-    tag: string;
-    args: any[];
-    date: Date;
-    [key: string]: unknown;
-}
-interface ConsolaReporter {
-    log: (logObj: LogObject, ctx: {
-        options: ConsolaOptions;
-    }) => void;
-}
-
-declare class Consola {
-    options: ConsolaOptions;
-    _lastLog: {
-        serialized?: string;
-        object?: LogObject;
-        count?: number;
-        time?: Date;
-        timeout?: ReturnType<typeof setTimeout>;
-    };
-    _mockFn?: ConsolaOptions["mockFn"];
-    constructor(options?: Partial<ConsolaOptions>);
-    get level(): LogLevel;
-    set level(level: LogLevel);
-    prompt<T extends PromptOptions>(message: string, opts?: T): Promise<T extends TextOptions ? string : T extends ConfirmOptions ? boolean : T extends SelectOptions ? T["options"][number] : T extends MultiSelectOptions ? T["options"] : unknown>;
-    create(options: Partial<ConsolaOptions>): ConsolaInstance;
-    withDefaults(defaults: InputLogObject): ConsolaInstance;
-    withTag(tag: string): ConsolaInstance;
-    addReporter(reporter: ConsolaReporter): this;
-    removeReporter(reporter: ConsolaReporter): ConsolaReporter[] | this;
-    setReporters(reporters: ConsolaReporter[]): this;
-    wrapAll(): void;
-    restoreAll(): void;
-    wrapConsole(): void;
-    restoreConsole(): void;
-    wrapStd(): void;
-    _wrapStream(stream: NodeJS.WriteStream | undefined, type: LogType): void;
-    restoreStd(): void;
-    _restoreStream(stream?: NodeJS.WriteStream): void;
-    pauseLogs(): void;
-    resumeLogs(): void;
-    mockTypes(mockFn?: ConsolaOptions["mockFn"]): void;
-    _wrapLogFn(defaults: InputLogObject, isRaw?: boolean): (...args: any[]) => false | undefined;
-    _logFn(defaults: InputLogObject, args: any[], isRaw?: boolean): false | undefined;
-    _log(logObj: LogObject): void;
-}
-interface LogFn {
-    (message: InputLogObject | any, ...args: any[]): void;
-    raw: (...args: any[]) => void;
-}
-type ConsolaInstance = Consola & Record<LogType, LogFn>;
-declare function createConsola(options?: Partial<ConsolaOptions>): ConsolaInstance;
-
-declare const consola: ConsolaInstance;
-
-export { Consola, type ConsolaInstance, type ConsolaOptions, type ConsolaReporter, type FormatOptions, type InputLogObject, type LogLevel, LogLevels, type LogObject, type LogType, LogTypes, consola, createConsola, consola as logger, consola as rootLogger };

package/dist/node.d.ts

@@ -1,126 +0,0 @@
-type SelectOption = {
-    label: string;
-    value: string;
-    hint?: string;
-};
-type TextOptions = {
-    type?: "text";
-    default?: string;
-    placeholder?: string;
-    initial?: string;
-};
-type ConfirmOptions = {
-    type: "confirm";
-    initial?: boolean;
-};
-type SelectOptions = {
-    type: "select";
-    initial?: string;
-    options: (string | SelectOption)[];
-};
-type MultiSelectOptions = {
-    type: "multiselect";
-    initial?: string;
-    options: string[] | SelectOption[];
-    required?: boolean;
-};
-type PromptOptions = TextOptions | ConfirmOptions | SelectOptions | MultiSelectOptions;
-type inferPromptReturnType<T extends PromptOptions> = T extends TextOptions ? string : T extends ConfirmOptions ? boolean : T extends SelectOptions ? T["options"][number] : T extends MultiSelectOptions ? T["options"] : unknown;
-declare function prompt<_ = any, __ = any, T extends PromptOptions = TextOptions>(message: string, opts?: PromptOptions): Promise<inferPromptReturnType<T>>;
-
-type LogLevel = 0 | 1 | 2 | 3 | 4 | 5 | (number & {});
-declare const LogLevels: Record<LogType, number>;
-type LogType = "silent" | "fatal" | "error" | "warn" | "log" | "info" | "success" | "fail" | "ready" | "start" | "box" | "debug" | "trace" | "verbose";
-declare const LogTypes: Record<LogType, Partial<LogObject>>;
-
-interface ConsolaOptions {
-    reporters: ConsolaReporter[];
-    types: Record<LogType, InputLogObject>;
-    level: LogLevel;
-    defaults: InputLogObject;
-    throttle: number;
-    throttleMin: number;
-    stdout?: NodeJS.WriteStream;
-    stderr?: NodeJS.WriteStream;
-    mockFn?: (type: LogType, defaults: InputLogObject) => (...args: any) => void;
-    prompt?: typeof prompt | undefined;
-    formatOptions: FormatOptions;
-}
-/**
- * @see https://nodejs.org/api/util.html#util_util_inspect_object_showhidden_depth_colors
- */
-interface FormatOptions {
-    columns?: number;
-    date?: boolean;
-    colors?: boolean;
-    compact?: boolean | number;
-    [key: string]: unknown;
-}
-interface InputLogObject {
-    level?: LogLevel;
-    tag?: string;
-    type?: LogType;
-    message?: string;
-    additional?: string | string[];
-    args?: any[];
-    date?: Date;
-}
-interface LogObject extends InputLogObject {
-    level: LogLevel;
-    type: LogType;
-    tag: string;
-    args: any[];
-    date: Date;
-    [key: string]: unknown;
-}
-interface ConsolaReporter {
-    log: (logObj: LogObject, ctx: {
-        options: ConsolaOptions;
-    }) => void;
-}
-
-declare class Consola {
-    options: ConsolaOptions;
-    _lastLog: {
-        serialized?: string;
-        object?: LogObject;
-        count?: number;
-        time?: Date;
-        timeout?: ReturnType<typeof setTimeout>;
-    };
-    _mockFn?: ConsolaOptions["mockFn"];
-    constructor(options?: Partial<ConsolaOptions>);
-    get level(): LogLevel;
-    set level(level: LogLevel);
-    prompt<T extends PromptOptions>(message: string, opts?: T): Promise<T extends TextOptions ? string : T extends ConfirmOptions ? boolean : T extends SelectOptions ? T["options"][number] : T extends MultiSelectOptions ? T["options"] : unknown>;
-    create(options: Partial<ConsolaOptions>): ConsolaInstance;
-    withDefaults(defaults: InputLogObject): ConsolaInstance;
-    withTag(tag: string): ConsolaInstance;
-    addReporter(reporter: ConsolaReporter): this;
-    removeReporter(reporter: ConsolaReporter): ConsolaReporter[] | this;
-    setReporters(reporters: ConsolaReporter[]): this;
-    wrapAll(): void;
-    restoreAll(): void;
-    wrapConsole(): void;
-    restoreConsole(): void;
-    wrapStd(): void;
-    _wrapStream(stream: NodeJS.WriteStream | undefined, type: LogType): void;
-    restoreStd(): void;
-    _restoreStream(stream?: NodeJS.WriteStream): void;
-    pauseLogs(): void;
-    resumeLogs(): void;
-    mockTypes(mockFn?: ConsolaOptions["mockFn"]): void;
-    _wrapLogFn(defaults: InputLogObject, isRaw?: boolean): (...args: any[]) => false | undefined;
-    _logFn(defaults: InputLogObject, args: any[], isRaw?: boolean): false | undefined;
-    _log(logObj: LogObject): void;
-}
-interface LogFn {
-    (message: InputLogObject | any, ...args: any[]): void;
-    raw: (...args: any[]) => void;
-}
-type ConsolaInstance = Consola & Record<LogType, LogFn>;
-declare function createConsola(options?: Partial<ConsolaOptions>): ConsolaInstance;
-
-declare const consola: ConsolaInstance;
-
-export { Consola, type ConsolaInstance, type ConsolaOptions, type ConsolaReporter, type FormatOptions, type InputLogObject, type LogLevel, LogLevels, type LogObject, type LogType, LogTypes, consola, createConsola, consola as logger, consola as rootLogger };

package/dist/node.mjs

@@ -1,5 +0,0 @@
-export { L as LogLevels, a as consola, a as logger, a as rootLogger } from './shared/log.C5OT49Cy.mjs';
-import 'node:util';
-import 'node:path';
-import 'node:process';
-import 'node:tty';