@anjianshi/utils 1.2.0 → 1.2.2

package/logging/adapt.d.ts

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

package/logging/adapt.js

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

package/logging/index.d.ts

@@ -7,6 +7,7 @@ export declare enum LogLevel {
     Warning = 3,
     Error = 4
 }
+export declare const logLevelMap: Record<string, LogLevel>;
 export interface LogInfo {
     logger: string;
     level: LogLevel;
@@ -22,13 +23,14 @@ export declare class Logger {
     level: LogLevel;
     handlers: Set<LogHandler>;
     constructor(name?: string, base?: Logger | null);
-    setLevel(level: LogLevel): void;
+    static getRealLevel(raw: LogLevel | string): LogLevel;
+    setLevel(level: LogLevel | string): void;
     addHandler(handler: LogHandler): void;
     /**
      * 创建一个以当前 logger 为 base 的 child logger
      */
     getChild(name: string): this;
-    log(level: LogLevel, args: unknown[]): void;
+    log(level: LogLevel | string, args: unknown[]): void;
     protected logByInfo(info: LogInfo): void;
     debug(...args: any[]): void;
     info(...args: any[]): void;

package/logging/index.js

@@ -11,6 +11,14 @@ export var LogLevel;
     LogLevel[LogLevel["Warning"] = 3] = "Warning";
     LogLevel[LogLevel["Error"] = 4] = "Error";
 })(LogLevel || (LogLevel = {}));
+export const logLevelMap = {
+    debug: LogLevel.Debug,
+    info: LogLevel.Info,
+    warn: LogLevel.Warning,
+    warning: LogLevel.Warning,
+    err: LogLevel.Error,
+    error: LogLevel.Error,
+};
 export class LogHandler {
     log(info) { } // eslint-disable-line @typescript-eslint/no-unused-vars
 }
@@ -19,12 +27,22 @@ export class Logger {
     base;
     level = LogLevel.Info;
     handlers = new Set();
-    constructor(name = '', base = null) {
+    constructor(name = '', base = null // 指定上级 logger，当前 logger 记录的日志也会传递给上级
+    ) {
         this.name = name;
         this.base = base;
     }
+    static getRealLevel(raw) {
+        if (typeof raw === 'string') {
+            raw = raw.toLocaleLowerCase();
+            if (logLevelMap[raw] === undefined)
+                throw new Error('Not supported log level: ' + raw);
+            return logLevelMap[raw];
+        }
+        return raw;
+    }
     setLevel(level) {
-        this.level = level;
+        this.level = Logger.getRealLevel(level);
     }
     addHandler(handler) {
         this.handlers.add(handler);
@@ -38,6 +56,7 @@ export class Logger {
         return new this.constructor(fullname, this);
     }
     log(level, args) {
+        level = Logger.getRealLevel(level);
         this.logByInfo({ logger: this.name, level, time: dayjs(), args });
     }
     logByInfo(info) {

package/package.json

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

package/src/logging/adapt.ts

@@ -1,10 +1,10 @@
 import type { Debug } from 'debug'
-import { getLogger } from './index.js'
+import { getLogger, type Logger } from './index.js'
 
 /**
  * 适配 debug package
  */
-export function adaptDebugLib(debugLib: Debug, enable = '') {
+export function adaptDebugLib(debugLib: Debug, enable = '', logger?: Logger) {
   // 不在 localStorage 里记录 debugLib enable 状态，
   // 以解决 web worker 里读不到 localStorage 而无法启用 debugLib 日志的问题
   const emulate = {
@@ -31,7 +31,7 @@ export function adaptDebugLib(debugLib: Debug, enable = '') {
   Object.assign(debugLib, emulate)
 
   // 将 debugLib 日志转发给 logger
-  const logger = getLogger('3rd-library')
+  if (!logger) logger = getLogger('3rd-library')
   debugLib.log = logger.debug.bind(logger)
 
   if (enable) {

package/src/logging/index.ts

@@ -13,6 +13,15 @@ export enum LogLevel {
   Error = 4,
 }
 
+export const logLevelMap: Record<string, LogLevel> = {
+  debug: LogLevel.Debug,
+  info: LogLevel.Info,
+  warn: LogLevel.Warning,
+  warning: LogLevel.Warning,
+  err: LogLevel.Error,
+  error: LogLevel.Error,
+}
+
 export interface LogInfo {
   logger: string // logger name；有多级 logger 的情况下，这是最初的 logger 名称
   level: LogLevel
@@ -30,11 +39,20 @@ export class Logger {
 
   constructor(
     public name: string = '',
-    public base: Logger | null = null, // 指定上级 logger，当前 logger 记录的日志也会传递给上级
+    public base: Logger | null = null // 指定上级 logger，当前 logger 记录的日志也会传递给上级
   ) {}
 
-  setLevel(level: LogLevel) {
-    this.level = level
+  static getRealLevel(raw: LogLevel | string) {
+    if (typeof raw === 'string') {
+      raw = raw.toLocaleLowerCase()
+      if (logLevelMap[raw] === undefined) throw new Error('Not supported log level: ' + raw)
+      return logLevelMap[raw]!
+    }
+    return raw
+  }
+
+  setLevel(level: LogLevel | string) {
+    this.level = Logger.getRealLevel(level)
   }
 
   addHandler(handler: LogHandler) {
@@ -51,7 +69,8 @@ export class Logger {
     return new (this.constructor as Constructor)(fullname, this) as this
   }
 
-  log(level: LogLevel, args: unknown[]) {
+  log(level: LogLevel | string, args: unknown[]) {
+    level = Logger.getRealLevel(level)
     this.logByInfo({ logger: this.name, level, time: dayjs(), args })
   }
   protected logByInfo(info: LogInfo) {