@anjianshi/utils 1.0.6 → 1.0.7

package/env-node/logging.d.ts

@@ -47,7 +47,7 @@ export declare class FileHandler extends LogHandler {
     readonly options: FileHandlerOptions;
     constructor(options?: Partial<FileHandlerOptions>);
     log(info: LogInfo): void;
-    protected stringifyDataItem(item: unknown): string;
+    protected formatDataItem(item: unknown): string;
     private buffer;
     private bufferSize;
     protected pushBuffer(...strings: string[]): void;

package/env-node/logging.js

@@ -7,6 +7,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import chalk from 'chalk';
 import dayjs from 'dayjs';
+import { removeANSIColor } from '../lang/index.js';
 import { logger as defaultLogger, LogLevel, LogHandler, formatters, } from '../logging/index.js';
 export * from '../logging/index.js';
 /**
@@ -87,7 +88,7 @@ export class FileHandler extends LogHandler {
         const itemStrings = [];
         let totalLength = prefix.length;
         for (const item of args) {
-            const itemString = this.stringifyDataItem(item);
+            const itemString = this.formatDataItem(item);
             // 截断过长的日志内容 Truncate overly long log messages
             if (totalLength + itemString.length < this.options.maxLength) {
                 itemStrings.push((totalLength === prefix.length ? '' : ' ') + itemString);
@@ -100,9 +101,9 @@ export class FileHandler extends LogHandler {
         }
         this.pushBuffer(prefix, ...itemStrings, '\n');
     }
-    stringifyDataItem(item) {
+    formatDataItem(item) {
         if (typeof item === 'string')
-            return item;
+            return removeANSIColor(item);
         if (item instanceof Error)
             return item.stack ?? String(item);
         try {

package/lang/string.d.ts

@@ -23,3 +23,8 @@ export declare function safeParseFloat(value: string | number, fallback: number)
  * dp: how many decimal places to keep（保留几位小数）
  */
 export declare function readableSize(bytes: number, si?: boolean, dp?: number): string;
+/**
+ * 移除字符串中的 ASNI Color 修饰符
+ * https://stackoverflow.com/a/7150870/2815178
+ */
+export declare function removeANSIColor(string: string): string;

package/lang/string.js

@@ -79,3 +79,12 @@ export function readableSize(bytes, si = false, dp = 1) {
     } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
     return `${bytes.toFixed(dp)} ${units[u]}`;
 }
+/**
+ * 移除字符串中的 ASNI Color 修饰符
+ * https://stackoverflow.com/a/7150870/2815178
+ */
+export function removeANSIColor(string) {
+    return string.replace(
+    // eslint-disable-next-line no-control-regex
+    /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-utils",
   "bugs": {

package/src/env-node/logging.ts

@@ -7,6 +7,7 @@ import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import chalk from 'chalk'
 import dayjs from 'dayjs'
+import { removeANSIColor } from '../lang/index.js'
 import {
   logger as defaultLogger,
   type Logger,
@@ -120,7 +121,7 @@ export class FileHandler extends LogHandler {
     const itemStrings: string[] = []
     let totalLength = prefix.length
     for (const item of args) {
-      const itemString = this.stringifyDataItem(item)
+      const itemString = this.formatDataItem(item)
 
       // 截断过长的日志内容 Truncate overly long log messages
       if (totalLength + itemString.length < this.options.maxLength) {
@@ -137,8 +138,8 @@ export class FileHandler extends LogHandler {
     this.pushBuffer(prefix, ...itemStrings, '\n')
   }
 
-  protected stringifyDataItem(item: unknown) {
-    if (typeof item === 'string') return item
+  protected formatDataItem(item: unknown) {
+    if (typeof item === 'string') return removeANSIColor(item)
     if (item instanceof Error) return item.stack ?? String(item)
     try {
       const json = JSON.stringify(item) as string | undefined

package/src/lang/string.ts

@@ -82,3 +82,15 @@ export function readableSize(bytes: number, si = false, dp = 1) {
   } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1)
   return `${bytes.toFixed(dp)} ${units[u]!}`
 }
+
+/**
+ * 移除字符串中的 ASNI Color 修饰符
+ * https://stackoverflow.com/a/7150870/2815178
+ */
+export function removeANSIColor(string: string) {
+  return string.replace(
+    // eslint-disable-next-line no-control-regex
+    /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
+    '',
+  )
+}