@likec4/log 1.22.0 → 1.22.1

package/dist/index.cjs

@@ -1332,7 +1332,7 @@ function loggable(error) {
   return safeStringify(error);
 }
 
-function errorFromLogRecord(record) {
+function gerErrorFromLogRecord(record) {
   const errors = Object.values(record.properties).filter((v) => v instanceof Error).map((err) => {
     const mergedErr = mergeErrorCause(err);
     if (mergedErr.stack) {
@@ -1345,15 +1345,22 @@ function errorFromLogRecord(record) {
   }
   return errors.length === 1 ? errors[0] : new AggregateError(errors);
 }
-function appendErrorToMessage(values, color = false) {
-  const error = errorFromLogRecord(values.record);
+function errorFromLogRecord(record) {
+  const error = gerErrorFromLogRecord(record);
+  if (error && typeof record.rawMessage === "string") {
+    return wrapErrorMessage(error, record.rawMessage + "\n");
+  }
+  return error;
+}
+function appendErrorToMessage(values, color) {
+  const error = gerErrorFromLogRecord(values.record);
   if (error) {
     let errorMessge = error.message;
     if (error.stack) {
       errorMessge = errorMessge + "\n" + ident(error.stack.split("\n").slice(1));
     }
     if (color) {
-      errorMessge = `RED: ${ansiColors.red}${errorMessge}${RESET}`;
+      errorMessge = `${ansiColors.red}${errorMessge}${RESET}`;
     }
     return {
       ...values,
@@ -1378,7 +1385,7 @@ function getMessageOnlyFormatter() {
 }
 const level = (l) => levelAbbreviations[l];
 function getTextFormatter(options) {
-  const format = options?.format ?? (({ timestamp, level: level2, category, message }) => {
+  const _format = options?.format ?? (({ timestamp, level: level2, category, message }) => {
     return `${timestamp} ${level2} ${category} ${message}`;
   });
   return logtape.getTextFormatter({
@@ -1386,7 +1393,9 @@ function getTextFormatter(options) {
     level,
     category: ".",
     ...options,
-    format: (values) => format(appendErrorToMessage(values))
+    format: (values) => {
+      return _format(appendErrorToMessage(values));
+    }
   });
 }
 const RESET = "\x1B[0m";
@@ -1401,7 +1410,7 @@ const ansiColors = {
   // white: "\x1b[37m",
 };
 function getAnsiColorFormatter(options) {
-  const format = options?.format ?? (({ timestamp, level: level2, category, message }) => {
+  const _format = options?.format ?? (({ timestamp, level: level2, category, message }) => {
     return `${timestamp} ${level2} ${category} ${message}`;
   });
   return logtape.getAnsiColorFormatter({
@@ -1412,7 +1421,7 @@ function getAnsiColorFormatter(options) {
     category: ".",
     ...options,
     format: (values) => {
-      return format(appendErrorToMessage(values, true));
+      return _format(appendErrorToMessage(values, true));
     }
   });
 }
@@ -1461,6 +1470,7 @@ function ensureLoggerIsConfigured() {
   }
 }
 
+exports.withFilter = logtape.withFilter;
 exports.configureLogger = configureLogger;
 exports.consola = logger;
 exports.createLogger = createLogger;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import * as _logtape_logtape from '@logtape/logtape';
 import { LogRecord, AnsiColorFormatterOptions, TextFormatter, ConsoleSinkOptions, Sink, TextFormatterOptions, Config } from '@logtape/logtape';
-export { Filter, LogLevel, LogRecord, Logger, Sink, TextFormatter } from '@logtape/logtape';
+export { Filter, LogLevel, LogRecord, Logger, Sink, TextFormatter, withFilter } from '@logtape/logtape';
 
 declare function errorFromLogRecord(record: LogRecord): Error | null;
 declare function getMessageOnlyFormatter(): TextFormatter;

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import * as _logtape_logtape from '@logtape/logtape';
 import { LogRecord, AnsiColorFormatterOptions, TextFormatter, ConsoleSinkOptions, Sink, TextFormatterOptions, Config } from '@logtape/logtape';
-export { Filter, LogLevel, LogRecord, Logger, Sink, TextFormatter } from '@logtape/logtape';
+export { Filter, LogLevel, LogRecord, Logger, Sink, TextFormatter, withFilter } from '@logtape/logtape';
 
 declare function errorFromLogRecord(record: LogRecord): Error | null;
 declare function getMessageOnlyFormatter(): TextFormatter;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as _logtape_logtape from '@logtape/logtape';
 import { LogRecord, AnsiColorFormatterOptions, TextFormatter, ConsoleSinkOptions, Sink, TextFormatterOptions, Config } from '@logtape/logtape';
-export { Filter, LogLevel, LogRecord, Logger, Sink, TextFormatter } from '@logtape/logtape';
+export { Filter, LogLevel, LogRecord, Logger, Sink, TextFormatter, withFilter } from '@logtape/logtape';
 
 declare function errorFromLogRecord(record: LogRecord): Error | null;
 declare function getMessageOnlyFormatter(): TextFormatter;

package/dist/index.mjs

@@ -1,4 +1,5 @@
 import { getAnsiColorFormatter as getAnsiColorFormatter$1, getConsoleSink as getConsoleSink$1, getTextFormatter as getTextFormatter$1, getLogger, configure } from '@logtape/logtape';
+export { withFilter } from '@logtape/logtape';
 
 const normalizeDescriptors=(error)=>{
 CORE_ERROR_PROPS.forEach((propName)=>{
@@ -1330,7 +1331,7 @@ function loggable(error) {
   return safeStringify(error);
 }
 
-function errorFromLogRecord(record) {
+function gerErrorFromLogRecord(record) {
   const errors = Object.values(record.properties).filter((v) => v instanceof Error).map((err) => {
     const mergedErr = mergeErrorCause(err);
     if (mergedErr.stack) {
@@ -1343,15 +1344,22 @@ function errorFromLogRecord(record) {
   }
   return errors.length === 1 ? errors[0] : new AggregateError(errors);
 }
-function appendErrorToMessage(values, color = false) {
-  const error = errorFromLogRecord(values.record);
+function errorFromLogRecord(record) {
+  const error = gerErrorFromLogRecord(record);
+  if (error && typeof record.rawMessage === "string") {
+    return wrapErrorMessage(error, record.rawMessage + "\n");
+  }
+  return error;
+}
+function appendErrorToMessage(values, color) {
+  const error = gerErrorFromLogRecord(values.record);
   if (error) {
     let errorMessge = error.message;
     if (error.stack) {
       errorMessge = errorMessge + "\n" + ident(error.stack.split("\n").slice(1));
     }
     if (color) {
-      errorMessge = `RED: ${ansiColors.red}${errorMessge}${RESET}`;
+      errorMessge = `${ansiColors.red}${errorMessge}${RESET}`;
     }
     return {
       ...values,
@@ -1376,7 +1384,7 @@ function getMessageOnlyFormatter() {
 }
 const level = (l) => levelAbbreviations[l];
 function getTextFormatter(options) {
-  const format = options?.format ?? (({ timestamp, level: level2, category, message }) => {
+  const _format = options?.format ?? (({ timestamp, level: level2, category, message }) => {
     return `${timestamp} ${level2} ${category} ${message}`;
   });
   return getTextFormatter$1({
@@ -1384,7 +1392,9 @@ function getTextFormatter(options) {
     level,
     category: ".",
     ...options,
-    format: (values) => format(appendErrorToMessage(values))
+    format: (values) => {
+      return _format(appendErrorToMessage(values));
+    }
   });
 }
 const RESET = "\x1B[0m";
@@ -1399,7 +1409,7 @@ const ansiColors = {
   // white: "\x1b[37m",
 };
 function getAnsiColorFormatter(options) {
-  const format = options?.format ?? (({ timestamp, level: level2, category, message }) => {
+  const _format = options?.format ?? (({ timestamp, level: level2, category, message }) => {
     return `${timestamp} ${level2} ${category} ${message}`;
   });
   return getAnsiColorFormatter$1({
@@ -1410,7 +1420,7 @@ function getAnsiColorFormatter(options) {
     category: ".",
     ...options,
     format: (values) => {
-      return format(appendErrorToMessage(values, true));
+      return _format(appendErrorToMessage(values, true));
     }
   });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/log",
   "license": "MIT",
-  "version": "1.22.0",
+  "version": "1.22.1",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -37,7 +37,7 @@
     "@logtape/logtape": "^0.8.2"
   },
   "devDependencies": {
-    "@likec4/tsconfig": "1.22.0",
+    "@likec4/tsconfig": "1.22.1",
     "@types/node": "^20.17.17",
     "consola": "^3.4.0",
     "merge-error-cause": "^5.0.0",

package/src/formatters.ts

@@ -12,6 +12,7 @@ import {
   getTextFormatter as getLogtapeTextFormatter,
 } from '@logtape/logtape'
 import mergeErrorCause from 'merge-error-cause'
+import wrapErrorMessage from 'wrap-error-message'
 import { ident, parseStack } from './utils'
 
 // export function formatProperties(properties: Record<string, unknown>): {
@@ -69,7 +70,7 @@ import { ident, parseStack } from './utils'
 //   }
 // }
 
-export function errorFromLogRecord(record: LogRecord): Error | null {
+function gerErrorFromLogRecord(record: LogRecord): Error | null {
   const errors = Object
     .values(record.properties)
     .filter((v) => v instanceof Error)
@@ -84,21 +85,25 @@ export function errorFromLogRecord(record: LogRecord): Error | null {
     return null
   }
   return errors.length === 1 ? errors[0]! : new AggregateError(errors)
-  // if (typeof record.rawMessage === 'string') {
-  //   return wrapErrorMessage(error, record.rawMessage + Z'\n')
-  // }
-  // return error
 }
 
-export function appendErrorToMessage(values: FormattedValues, color = false): FormattedValues {
-  const error = errorFromLogRecord(values.record)
+export function errorFromLogRecord(record: LogRecord): Error | null {
+  const error = gerErrorFromLogRecord(record)
+  if (error && typeof record.rawMessage === 'string') {
+    return wrapErrorMessage(error, record.rawMessage + '\n')
+  }
+  return error
+}
+
+export function appendErrorToMessage(values: FormattedValues, color?: boolean): FormattedValues {
+  const error = gerErrorFromLogRecord(values.record)
   if (error) {
     let errorMessge = error.message
     if (error.stack) {
       errorMessge = errorMessge + '\n' + ident(error.stack.split('\n').slice(1))
     }
     if (color) {
-      errorMessge = `RED: ${ansiColors.red}${errorMessge}${RESET}`
+      errorMessge = `${ansiColors.red}${errorMessge}${RESET}`
     }
     return {
       ...values,
@@ -143,7 +148,7 @@ export function getMessageOnlyFormatter(): TextFormatter {
 const level = (l: LogLevel): string => levelAbbreviations[l]
 
 export function getTextFormatter(options?: TextFormatterOptions): TextFormatter {
-  const format = options?.format ?? (({ timestamp, level, category, message }: FormattedValues): string => {
+  const _format = options?.format ?? (({ timestamp, level, category, message }: FormattedValues): string => {
     return `${timestamp} ${level} ${category} ${message}`
   })
   // const format = options?.format
@@ -152,7 +157,9 @@ export function getTextFormatter(options?: TextFormatterOptions): TextFormatter
     level,
     category: '.',
     ...options,
-    format: (values) => format(appendErrorToMessage(values)),
+    format: (values) => {
+      return _format(appendErrorToMessage(values))
+    },
   })
 }
 
@@ -170,7 +177,7 @@ const ansiColors = {
 } as const
 
 export function getAnsiColorFormatter(options?: AnsiColorFormatterOptions): TextFormatter {
-  const format = options?.format ?? (({ timestamp, level, category, message }: FormattedValues): string => {
+  const _format = options?.format ?? (({ timestamp, level, category, message }: FormattedValues): string => {
     return `${timestamp} ${level} ${category} ${message}`
   })
   return getLogtapeAnsiColorFormatter({
@@ -181,7 +188,7 @@ export function getAnsiColorFormatter(options?: AnsiColorFormatterOptions): Text
     category: '.',
     ...options,
     format: (values) => {
-      return format(appendErrorToMessage(values, true))
+      return _format(appendErrorToMessage(values, true))
     },
   })
 }

package/src/index.ts

@@ -24,6 +24,10 @@ export {
   getTextFormatter,
 } from './formatters'
 
+export {
+  withFilter,
+} from '@logtape/logtape'
+
 export {
   logger as consola,
   logger as rootLogger,