@anjianshi/utils 1.0.8 → 1.1.0

package/.eslintrc.cjs

@@ -1,6 +1,6 @@
 /* eslint-env node */
 module.exports = {
   root: true,
-  extends: ['./node_modules/@anjianshi/presets/eslint-base.js'],
+  extends: ['./node_modules/@anjianshi/presets-eslint-base/index.js'],
   rules: {},
 }

package/env-node/logging.d.ts

@@ -1,3 +1,4 @@
+import chalk from 'chalk';
 import { type Logger, type LogInfo, LogHandler } from '../logging/index.js';
 export * from '../logging/index.js';
 /**
@@ -24,14 +25,14 @@ export declare class ConsoleHandler extends LogHandler {
         };
     };
     static readonly levelColors: {
-        1: import("chalk").ChalkInstance;
-        2: import("chalk").ChalkInstance;
-        3: import("chalk").ChalkInstance;
-        4: import("chalk").ChalkInstance;
+        1: chalk.Chalk;
+        2: chalk.Chalk;
+        3: chalk.Chalk;
+        4: chalk.Chalk;
     };
     private static readonly loggerColors;
     private static readonly loggerColorMap;
-    static getLoggerColor(logger: string): "green" | "yellow" | "blue" | "cyan" | "magenta" | "greenBright" | "yellowBright" | "blueBright" | "cyanBright" | "magentaBright";
+    static getLoggerColor(logger: string): "green" | "yellow" | "blue" | "magenta" | "cyan" | "greenBright" | "yellowBright" | "blueBright" | "magentaBright" | "cyanBright";
 }
 /**
  * 写入文件日志
@@ -47,7 +48,7 @@ export declare class FileHandler extends LogHandler {
     readonly options: FileHandlerOptions;
     constructor(options?: Partial<FileHandlerOptions>);
     log(info: LogInfo): void;
-    protected formatDataItem(item: unknown): string;
+    protected stringifyDataItem(item: unknown): string;
     private buffer;
     private bufferSize;
     protected pushBuffer(...strings: string[]): void;

package/env-node/logging.js

@@ -7,7 +7,6 @@ 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';
 /**
@@ -21,9 +20,9 @@ export class ConsoleHandler extends LogHandler {
         const levelName = formatters.level(info);
         const loggerColor = chalk[ConsoleHandler.getLoggerColor(logger)];
         const prefix = [
-            chalk.white(`[${formatters.datetime(info)}]`),
+            chalk.white(`[${formatters.time(info)}]`),
             levelColor(`[${levelName}]`),
-            logger ? loggerColor(`[${logger}]`) : '',
+            loggerColor(`[${logger}]`),
         ].join('');
         method(prefix, ...args);
     }
@@ -88,7 +87,7 @@ export class FileHandler extends LogHandler {
         const itemStrings = [];
         let totalLength = prefix.length;
         for (const item of args) {
-            const itemString = this.formatDataItem(item);
+            const itemString = this.stringifyDataItem(item);
             // 截断过长的日志内容 Truncate overly long log messages
             if (totalLength + itemString.length < this.options.maxLength) {
                 itemStrings.push((totalLength === prefix.length ? '' : ' ') + itemString);
@@ -101,9 +100,9 @@ export class FileHandler extends LogHandler {
         }
         this.pushBuffer(prefix, ...itemStrings, '\n');
     }
-    formatDataItem(item) {
+    stringifyDataItem(item) {
         if (typeof item === 'string')
-            return removeANSIColor(item);
+            return item;
         if (item instanceof Error)
             return item.stack ?? String(item);
         try {

package/init-dayjs.js

@@ -1,8 +1,7 @@
-import dayjs from 'dayjs';
+import { extend, locale } from 'dayjs';
 import objectSupport from 'dayjs/plugin/objectSupport.js';
 import 'dayjs/locale/zh-cn.js';
 export function initDayJs() {
-    // dayjs 的类型标记错误，这两个方法只能通过 dayjs 对象访问，并不能直接引入
-    dayjs.extend(objectSupport); // eslint-disable-line import/no-named-as-default-member
-    dayjs.locale('zh-cn'); // eslint-disable-line import/no-named-as-default-member
+    extend(objectSupport);
+    locale('zh-cn');
 }

package/lang/string.d.ts

@@ -23,8 +23,3 @@ 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,12 +79,3 @@ 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/logging/adapt.d.ts

@@ -2,4 +2,4 @@ import type { Debug } from 'debug';
 /**
  * 适配 debug package
  */
-export declare function adaptDebugLib(debugLib: Debug, enable?: string, logger?: import("./index.js").Logger): void;
+export declare function adaptDebugLib(debugLib: Debug, enable?: string): void;

package/logging/adapt.js

@@ -2,7 +2,7 @@ import { getLogger } from './index.js';
 /**
  * 适配 debug package
  */
-export function adaptDebugLib(debugLib, enable = '', logger = getLogger('3rd-library')) {
+export function adaptDebugLib(debugLib, enable = '') {
     // 不在 localStorage 里记录 debugLib enable 状态，
     // 以解决 web worker 里读不到 localStorage 而无法启用 debugLib 日志的问题
     const emulate = {
@@ -30,12 +30,8 @@ export function adaptDebugLib(debugLib, enable = '', logger = getLogger('3rd-lib
     };
     Object.assign(debugLib, emulate);
     // 将 debugLib 日志转发给 logger
-    debugLib.log = (initial, ...rest) => {
-        // 移除开头的额外空格
-        if (typeof initial === 'string')
-            initial = initial.trimStart();
-        logger.debug(initial, ...rest);
-    };
+    const logger = getLogger('3rd-library');
+    debugLib.log = logger.debug.bind(logger);
     if (enable) {
         debugLib.enable(enable);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-utils",
   "bugs": {
@@ -25,20 +25,19 @@
   },
   "main": "index.js",
   "dependencies": {
-    "chalk": "^5.3.0",
     "dayjs": "^1.11.10",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@anjianshi/presets": "1.3.0",
+    "@anjianshi/presets-eslint-node": "^1.0.3",
+    "@anjianshi/presets-eslint-typescript": "^1.0.3",
+    "@anjianshi/presets-prettier": "^1.0.0",
+    "@anjianshi/presets-typescript": "^1.0.1",
     "@types/debug": "^4.1.9",
     "@types/lodash": "^4.14.199",
     "@types/node": "^20.8.6",
-    "eslint": "^8.51.0",
-    "prettier-not-stubborn": "^3.0.3",
-    "typescript": "^5.2.2",
     "vconsole": "^3.15.1"
   },
   "eslintIgnore": [],
-  "prettier": "@anjianshi/presets/prettierrc"
+  "prettier": "@anjianshi/presets-prettier/prettierrc"
 }

package/src/.eslintrc.cjs

@@ -1,8 +1,5 @@
 /* eslint-env node */
 module.exports = {
   root: true,
-  extends: [
-    '../node_modules/@anjianshi/presets/eslint-base.js',
-    '../node_modules/@anjianshi/presets/eslint-typescript.js',
-  ],
+  extends: ['../node_modules/@anjianshi/presets-eslint-typescript/exclusive.js'],
 }

package/src/env-node/.eslintrc.cjs

@@ -1,4 +1,4 @@
 /* eslint-env node */
 module.exports = {
-  extends: ['../../node_modules/@anjianshi/presets/eslint-node.js'],
+  extends: ['../../node_modules/@anjianshi/presets-eslint-node/exclusive.js'],
 }

package/src/env-node/logging.ts

@@ -7,7 +7,6 @@ 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,
@@ -30,9 +29,9 @@ export class ConsoleHandler extends LogHandler {
     const levelName = formatters.level(info)
     const loggerColor = chalk[ConsoleHandler.getLoggerColor(logger)]
     const prefix = [
-      chalk.white(`[${formatters.datetime(info)}]`),
+      chalk.white(`[${formatters.time(info)}]`),
       levelColor(`[${levelName}]`),
-      logger ? loggerColor(`[${logger}]`) : '',
+      loggerColor(`[${logger}]`),
     ].join('')
     method(prefix, ...args)
   }
@@ -121,7 +120,7 @@ export class FileHandler extends LogHandler {
     const itemStrings: string[] = []
     let totalLength = prefix.length
     for (const item of args) {
-      const itemString = this.formatDataItem(item)
+      const itemString = this.stringifyDataItem(item)
 
       // 截断过长的日志内容 Truncate overly long log messages
       if (totalLength + itemString.length < this.options.maxLength) {
@@ -138,8 +137,8 @@ export class FileHandler extends LogHandler {
     this.pushBuffer(prefix, ...itemStrings, '\n')
   }
 
-  protected formatDataItem(item: unknown) {
-    if (typeof item === 'string') return removeANSIColor(item)
+  protected stringifyDataItem(item: unknown) {
+    if (typeof item === 'string') return item
     if (item instanceof Error) return item.stack ?? String(item)
     try {
       const json = JSON.stringify(item) as string | undefined

package/src/init-dayjs.ts

@@ -1,9 +1,8 @@
-import dayjs from 'dayjs'
+import { extend, locale } from 'dayjs'
 import objectSupport from 'dayjs/plugin/objectSupport.js'
 import 'dayjs/locale/zh-cn.js'
 
 export function initDayJs() {
-  // dayjs 的类型标记错误，这两个方法只能通过 dayjs 对象访问，并不能直接引入
-  dayjs.extend(objectSupport) // eslint-disable-line import/no-named-as-default-member
-  dayjs.locale('zh-cn') // eslint-disable-line import/no-named-as-default-member
+  extend(objectSupport)
+  locale('zh-cn')
 }

package/src/lang/string.ts

@@ -82,15 +82,3 @@ 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,
-    '',
-  )
-}

package/src/logging/adapt.ts

@@ -4,7 +4,7 @@ import { getLogger } from './index.js'
 /**
  * 适配 debug package
  */
-export function adaptDebugLib(debugLib: Debug, enable = '', logger = getLogger('3rd-library')) {
+export function adaptDebugLib(debugLib: Debug, enable = '') {
   // 不在 localStorage 里记录 debugLib enable 状态，
   // 以解决 web worker 里读不到 localStorage 而无法启用 debugLib 日志的问题
   const emulate = {
@@ -31,11 +31,8 @@ export function adaptDebugLib(debugLib: Debug, enable = '', logger = getLogger('
   Object.assign(debugLib, emulate)
 
   // 将 debugLib 日志转发给 logger
-  debugLib.log = (initial?: unknown, ...rest: unknown[]) => {
-    // 移除开头的额外空格
-    if (typeof initial === 'string') initial = initial.trimStart()
-    logger.debug(initial, ...rest)
-  }
+  const logger = getLogger('3rd-library')
+  debugLib.log = logger.debug.bind(logger)
 
   if (enable) {
     debugLib.enable(enable)

package/src/logging/index.ts

@@ -14,7 +14,7 @@ export enum LogLevel {
 }
 
 export interface LogInfo {
-  logger: string // 生成此条日志的 logger 的 name；有多级 logger 的情况下，这是最初的 logger 名称
+  logger: string // logger name；有多级 logger 的情况下，这是最初的 logger 名称
   level: LogLevel
   time: Dayjs
   args: unknown[] // log content

package/src/url.ts

@@ -31,7 +31,7 @@ function parseQuery(url: string, options?: { array?: false, strict?: boolean }):
 function parseQuery(url: string, options: { array: true, strict?: boolean }): Record<string, string | string[]> // prettier-ignore
 function parseQuery(
   url: string,
-  options?: { array?: boolean; strict?: boolean },
+  options?: { array?: boolean; strict?: boolean }
 ): Record<string, string | string[]> {
   if (!url) return {}
   const { array = false, strict = false } = options ?? {}
@@ -116,7 +116,7 @@ hash    string     不带 # 号；若 url 已有 hash，会用此值代替
 export function combineUrl(
   origUrl: string,
   search?: Record<string, string | string[]>,
-  hash?: string,
+  hash?: string
 ) {
   search = search ?? {}
   hash = hash ?? ''