@wiajs/log 4.3.9 → 4.3.11

package/dist/log.cjs

@@ -0,0 +1,160 @@
+/*!
+  * wia log v4.3.11
+  * (c) 2024-2024 Sibyl Yu and contributors
+  * Released under the MIT License.
+  */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const path = require('node:path');
+const node_url = require('node:url');
+const debug = require('debug');
+
+/**
+ * debug日志封装,
+ * 使用方法：
+ * import {log as Log, filename} from './log.js'
+ * const log = Log({env: `wia:${filename(__filename)}`})
+ * log('hello')
+ * log({a: 1, b: 2}, 'fun')
+ * log.error/err/info/warn
+ * $env:DEBUG=* 全开
+ * $env:DEBUG=*:log 全开
+ * $env:DEBUG=*:info log 不开，其他全开
+ * warn 和 err 一直打开！
+ */
+class Log {
+  /**
+   * 构造函数
+   * @param {*} opts {
+   *  pre: 前缀，一般是模块名称,
+   *  env: NODE_DEBUG 环境变量
+   * }
+   */
+  constructor(opts) {
+    let {env} = opts;
+    env = env ?? '';
+    const ds = {}; // debugs
+    ds.debug = debug(`${env}`);
+    ds.info = debug(`${env}:info`);
+    ds.err = debug(`${env}:err`);
+    ds.warn = debug(`${env}:warn`);
+
+    // 仅最后调用生效，覆盖环境变量
+    if (ds.debug.enabled) debug.enable('*');
+    else if (ds.info.enabled) debug.enable(`${env}:info,${env}:err,${env}:warn`);
+    else debug.enable(`${env}:err,${env}:warn`);
+
+    this.ds = ds;
+  }
+
+  /**
+   *
+   * @param  {...any} args
+   */
+  debug(...args) {
+    const first = args?.at(0);
+    const last = args?.at(-1);
+    if (typeof first === 'string') {
+      args[0] = `${first}`;
+      this.ds.debug(...args);
+    } else if (typeof first === 'object' && typeof last === 'string') this.ds.debug(`${last}:%O`, first);
+    // args[0] = `${this.pre}:${args[0]}`
+    // console.debug(...args)
+    // console.debug(this.pre, ...args)
+  }
+
+  /**
+   *
+   * @param  {...any} args
+   */
+  error(...args) {
+    const first = args?.at(0);
+    const last = args?.at(-1);
+    if (typeof first === 'string') {
+      args[0] = ` ${first}`;
+      this.ds.err(...args);
+    } else if (typeof first === 'object' && typeof last === 'string') this.ds.err(` ${last}:%O`, first);
+  }
+
+  /**
+   *
+   * @param  {...any} args
+   */
+  err(...args) {
+    const first = args?.[0];
+    if (first?.message || first?.msg) {
+      args[0] = {exp: first.message || first.msg};
+      if (first?.code) args[0].exp += ` code:${first.code}`;
+    }
+    this.error(...args);
+  }
+
+  /**
+   *
+   * @param  {...any} args
+   */
+  warn(...args) {
+    const first = args?.at(0);
+    const last = args?.at(-1);
+    if (typeof first === 'string') this.ds.warn(...args);
+    else if (typeof first === 'object' && typeof last === 'string') this.ds.warn(`${last}:%O`, first);
+  }
+
+  /**
+   *
+   * @param  {...any} args
+   */
+  info(...args) {
+    const first = args?.at(0);
+    const last = args?.at(-1);
+    if (typeof first === 'string') this.ds.info(...args);
+    else if (typeof first === 'object' && typeof last === 'string') this.ds.info(`${last}:%O`, first);
+  }
+}
+
+/**
+ * 标准日志输出或构建模块日志类实例，用于模块中带[m:xxx]标记日志输出
+ * 启用 {f:fn} 标记时，需在函数尾部清除f（log({f:''})），否则会溢出到其他函数
+ * @param {...any} args - params
+ * returns {pino & (...args) => void}
+ */
+function log(...args) {
+  const last = args.at(-1);
+
+  // 全局日志
+  if (args.length !== 1 || !last?.env) return
+
+  const {env} = last;
+  // 唯一 env 属性，则构造新的 log 实例，这种写法，能被jsDoc识别子属性
+  const lg = new Log({env});
+
+  /** @param {*} args2 */
+  const R = (...args2) => lg.debug(...args2);
+  R.debug = lg.debug.bind(lg);
+  R.info = lg.info.bind(lg);
+  R.warn = lg.warn.bind(lg);
+  R.info = lg.info.bind(lg);
+  R.error = lg.error.bind(lg);
+  R.err = lg.err.bind(lg);
+
+  return R
+}
+
+/**
+ * 获取模块文件名称
+ * esm: import.meta.url or cjs: __filename
+ * @param {string} file
+ * @returns
+ */
+function name(file) {
+  // import.meta.url: 'file:///D:/prj/wiajs/req/test/log.t.js'
+  file = node_url.fileURLToPath(file); // fileUrl 转成路径
+  const baseName = path.basename(file);
+  return baseName.replace(path.extname(baseName), '')
+}
+
+exports.default = Log;
+exports.log = log;
+exports.name = name;

package/dist/log.js

@@ -0,0 +1,177 @@
+/*!
+  * wia log v4.3.11
+  * (c) 2024-2024 Sibyl Yu and contributors
+  * Released under the MIT License.
+  */
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Log = factory());
+})(this, (function () { 'use strict';
+
+	/**
+	 * 前端日志输出，封装 console日志，简化代码，支持模块或直接输出
+	 * 调用时，描述字符串后置，便于可选缺省，输出时，自带前置，类似 后端pino，保持前后端一致性
+	 * m 为模块，fn 为函数名称
+	 */ let Log = class Log {
+	    /**
+		 * @param {string} m 模块
+		 */ constructor(m){
+	        /** @type {string} 模块 */ this.m = "";
+	        /** @type {string} 函数 */ this.fn = "";
+	        this.m = m;
+	    }
+	    /**
+		 * get log desc
+		 * 描述字符串后置调用，前置显示
+		 * @param {*[]} args
+		 * @returns {string}
+		 */ getDesc(args) {
+	        let R = "";
+	        try {
+	            const _ = this;
+	            const { m } = _;
+	            let fn = "", desc = "";
+	            if (args.length > 1) {
+	                const last = args.at(-1);
+	                if (typeof last === "object") {
+	                    ({ desc, fn } = last);
+	                } else if (typeof last === "string") desc = last;
+	                if (desc || fn) {
+	                    fn = fn || _.fn;
+	                    _.fn = fn;
+	                    args.pop();
+	                }
+	            }
+	            fn = fn || _.fn;
+	            if (m) desc = `${desc}[${m}${fn ? ":" + fn : ""}]`; // eslint-disable-line
+	            R = desc;
+	        } catch (e) {
+	            console.error(`getDesc exp:${e.message}`);
+	        }
+	        return R;
+	    }
+	    /** @param {...any} args - params */ log(...args) {
+	        const _ = this;
+	        const last = args.at(-1);
+	        // clear fn
+	        if (args.length === 1 && typeof last === "object" && last.fn) _.fn = "";
+	        else {
+	            const desc = _.getDesc(args);
+	            console.log(desc, ...args);
+	        }
+	    }
+	    /** @param {...any} args - params */ debug(...args) {
+	        const _ = this;
+	        const desc = _.getDesc(args);
+	        if (desc) console.log(desc, ...args);
+	        else console.log(...args);
+	    }
+	    /** @param {...any} args - params */ info(...args) {
+	        const _ = this;
+	        const desc = _.getDesc(args);
+	        if (desc) console.info(desc, ...args);
+	        else console.log(...args);
+	    }
+	    /** @param {...any} args - params */ warn(...args) {
+	        const _ = this;
+	        const { desc, arg } = _.getDesc(args);
+	        if (desc) console.warn(desc, ...arg);
+	        else console.log(...args);
+	    }
+	    /** @param {...any} args - params */ trace(...args) {
+	        const _ = this;
+	        const { desc, arg } = _.getDesc(args);
+	        if (desc) console.trace(desc, ...arg);
+	        else console.trace(...args);
+	    }
+	    /** @param {...any} args - params */ error(...args) {
+	        const _ = this;
+	        const desc = _.getDesc(args);
+	        if (desc) console.error(desc, ...args);
+	        else console.log(...args);
+	    }
+	    /**
+		 * 用于 catch(e) log.err(e)
+		 * @param {...any} args - params */ err(...args) {
+	        const _ = this;
+	        const first = args?.[0];
+	        if (first instanceof Error || first && first.message && first.cause && first.stack) args[0] = {
+	            exp: args[0].message
+	        };
+	        _.error(...args);
+	    }
+	};
+	function getDesc(args) {
+	    let desc = "";
+	    const last = args.at(-1);
+	    if (typeof last === "string") {
+	        desc = last;
+	        args.pop();
+	    }
+	    return desc;
+	}
+	/**
+	 * 标准日志输出或构建模块日志类实例，用于模块中带[m:xxx]标记日志输出
+	 * 启用 {f:fn} 标记时，需在函数尾部清除f（log({f:''})），否则会溢出到其他函数
+	 * @param {...any} args - params
+	 * returns {*}
+	 */ function log(...args) {
+	    const last = args.at(-1);
+	    // 全局日志
+	    if (args.length !== 1 || !last?.m) {
+	        const desc = getDesc(args);
+	        desc ? console.log(desc, ...args) : console.log(...args);
+	        return;
+	    }
+	    // 唯一 m 属性，则构造新的 log 实例，这种写法，能被jsDoc识别子属性
+	    const lg = new Log(last?.m);
+	    /** @param {*} args2 */ const R = (...args2)=>lg.log(...args2);
+	    R.debug = lg.debug.bind(lg);
+	    R.info = lg.info.bind(lg);
+	    R.warn = lg.warn.bind(lg);
+	    R.info = lg.info.bind(lg);
+	    R.trace = lg.trace.bind(lg);
+	    R.error = lg.error.bind(lg);
+	    R.err = lg.err.bind(lg);
+	    return R;
+	}
+	/**
+	 * 用于 catch(e) log.err(e)
+	 * @param {...any} args - params */ log.err = (...args)=>{
+	    const desc = getDesc(args);
+	    const first = args?.[0];
+	    if (first instanceof Error || first && first.message && first.cause && first.stack) args[0] = {
+	        exp: args[0].message
+	    };
+	    desc ? console.error(desc, ...args) : console.error(...args);
+	};
+	/**
+	 * @param {...any} args - params */ log.error = (...args)=>{
+	    const desc = getDesc(args);
+	    desc ? console.error(desc, ...args) : console.error(...args);
+	};
+	/**
+	 * @param {...any} args - params */ log.warn = (...args)=>{
+	    const desc = getDesc(args);
+	    desc ? console.warn(desc, ...args) : console.warn(...args);
+	};
+	/**
+	 * @param {...any} args - params */ log.info = (...args)=>{
+	    const desc = getDesc(args);
+	    desc ? console.info(desc, ...args) : console.info(...args);
+	};
+	/**
+	 * @param {...any} args - params */ log.debug = (...args)=>{
+	    const desc = getDesc(args);
+	    desc ? console.log(desc, ...args) : console.log(...args);
+	};
+	/**
+	 * @param {...any} args - params */ log.trace = (...args)=>{
+	    const desc = getDesc(args);
+	    desc ? console.trace(desc, ...args) : console.trace(...args);
+	};
+
+	return log;
+
+}));

package/dist/log.min.js

@@ -0,0 +1,6 @@
+/*!
+  * wia log v4.3.11
+  * (c) 2024-2024 Sibyl Yu and contributors
+  * Released under the MIT License.
+  */
+var o,e;o=this,e=function(){"use strict";let o=class{constructor(o){this.m="",this.fn="",this.m=o}getDesc(o){let e="";try{const n=this,{m:s}=n;let t="",c="";if(o.length>1){const e=o.at(-1);"object"==typeof e?({desc:c,fn:t}=e):"string"==typeof e&&(c=e),(c||t)&&(t=t||n.fn,n.fn=t,o.pop())}t=t||n.fn,s&&(c=`${c}[${s}${t?":"+t:""}]`),e=c}catch(o){console.error(`getDesc exp:${o.message}`)}return e}log(...o){const e=this,n=o.at(-1);if(1===o.length&&"object"==typeof n&&n.fn)e.fn="";else{const n=e.getDesc(o);console.log(n,...o)}}debug(...o){const e=this.getDesc(o);e?console.log(e,...o):console.log(...o)}info(...o){const e=this.getDesc(o);e?console.info(e,...o):console.log(...o)}warn(...o){const{desc:e,arg:n}=this.getDesc(o);e?console.warn(e,...n):console.log(...o)}trace(...o){const{desc:e,arg:n}=this.getDesc(o);e?console.trace(e,...n):console.trace(...o)}error(...o){const e=this.getDesc(o);e?console.error(e,...o):console.log(...o)}err(...o){const e=o?.[0];(e instanceof Error||e&&e.message&&e.cause&&e.stack)&&(o[0]={exp:o[0].message}),this.error(...o)}};function e(o){let e="";const n=o.at(-1);return"string"==typeof n&&(e=n,o.pop()),e}function n(...n){const s=n.at(-1);if(1!==n.length||!s?.m){const o=e(n);return void(o?console.log(o,...n):console.log(...n))}const t=new o(s?.m),c=(...o)=>t.log(...o);return c.debug=t.debug.bind(t),c.info=t.info.bind(t),c.warn=t.warn.bind(t),c.info=t.info.bind(t),c.trace=t.trace.bind(t),c.error=t.error.bind(t),c.err=t.err.bind(t),c}return n.err=(...o)=>{const n=e(o),s=o?.[0];(s instanceof Error||s&&s.message&&s.cause&&s.stack)&&(o[0]={exp:o[0].message}),n?console.error(n,...o):console.error(...o)},n.error=(...o)=>{const n=e(o);n?console.error(n,...o):console.error(...o)},n.warn=(...o)=>{const n=e(o);n?console.warn(n,...o):console.warn(...o)},n.info=(...o)=>{const n=e(o);n?console.info(n,...o):console.info(...o)},n.debug=(...o)=>{const n=e(o);n?console.log(n,...o):console.log(...o)},n.trace=(...o)=>{const n=e(o);n?console.trace(n,...o):console.trace(...o)},n},"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(o="undefined"!=typeof globalThis?globalThis:o||self).Log=e();

package/dist/log.mjs

@@ -0,0 +1,154 @@
+/*!
+  * wia log v4.3.11
+  * (c) 2024-2024 Sibyl Yu and contributors
+  * Released under the MIT License.
+  */
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import debug from 'debug';
+
+/**
+ * debug日志封装,
+ * 使用方法：
+ * import {log as Log, filename} from './log.js'
+ * const log = Log({env: `wia:${filename(__filename)}`})
+ * log('hello')
+ * log({a: 1, b: 2}, 'fun')
+ * log.error/err/info/warn
+ * $env:DEBUG=* 全开
+ * $env:DEBUG=*:log 全开
+ * $env:DEBUG=*:info log 不开，其他全开
+ * warn 和 err 一直打开！
+ */
+class Log {
+  /**
+   * 构造函数
+   * @param {*} opts {
+   *  pre: 前缀，一般是模块名称,
+   *  env: NODE_DEBUG 环境变量
+   * }
+   */
+  constructor(opts) {
+    let {env} = opts;
+    env = env ?? '';
+    const ds = {}; // debugs
+    ds.debug = debug(`${env}`);
+    ds.info = debug(`${env}:info`);
+    ds.err = debug(`${env}:err`);
+    ds.warn = debug(`${env}:warn`);
+
+    // 仅最后调用生效，覆盖环境变量
+    if (ds.debug.enabled) debug.enable('*');
+    else if (ds.info.enabled) debug.enable(`${env}:info,${env}:err,${env}:warn`);
+    else debug.enable(`${env}:err,${env}:warn`);
+
+    this.ds = ds;
+  }
+
+  /**
+   *
+   * @param  {...any} args
+   */
+  debug(...args) {
+    const first = args?.at(0);
+    const last = args?.at(-1);
+    if (typeof first === 'string') {
+      args[0] = `${first}`;
+      this.ds.debug(...args);
+    } else if (typeof first === 'object' && typeof last === 'string') this.ds.debug(`${last}:%O`, first);
+    // args[0] = `${this.pre}:${args[0]}`
+    // console.debug(...args)
+    // console.debug(this.pre, ...args)
+  }
+
+  /**
+   *
+   * @param  {...any} args
+   */
+  error(...args) {
+    const first = args?.at(0);
+    const last = args?.at(-1);
+    if (typeof first === 'string') {
+      args[0] = ` ${first}`;
+      this.ds.err(...args);
+    } else if (typeof first === 'object' && typeof last === 'string') this.ds.err(` ${last}:%O`, first);
+  }
+
+  /**
+   *
+   * @param  {...any} args
+   */
+  err(...args) {
+    const first = args?.[0];
+    if (first?.message || first?.msg) {
+      args[0] = {exp: first.message || first.msg};
+      if (first?.code) args[0].exp += ` code:${first.code}`;
+    }
+    this.error(...args);
+  }
+
+  /**
+   *
+   * @param  {...any} args
+   */
+  warn(...args) {
+    const first = args?.at(0);
+    const last = args?.at(-1);
+    if (typeof first === 'string') this.ds.warn(...args);
+    else if (typeof first === 'object' && typeof last === 'string') this.ds.warn(`${last}:%O`, first);
+  }
+
+  /**
+   *
+   * @param  {...any} args
+   */
+  info(...args) {
+    const first = args?.at(0);
+    const last = args?.at(-1);
+    if (typeof first === 'string') this.ds.info(...args);
+    else if (typeof first === 'object' && typeof last === 'string') this.ds.info(`${last}:%O`, first);
+  }
+}
+
+/**
+ * 标准日志输出或构建模块日志类实例，用于模块中带[m:xxx]标记日志输出
+ * 启用 {f:fn} 标记时，需在函数尾部清除f（log({f:''})），否则会溢出到其他函数
+ * @param {...any} args - params
+ * returns {pino & (...args) => void}
+ */
+function log(...args) {
+  const last = args.at(-1);
+
+  // 全局日志
+  if (args.length !== 1 || !last?.env) return
+
+  const {env} = last;
+  // 唯一 env 属性，则构造新的 log 实例，这种写法，能被jsDoc识别子属性
+  const lg = new Log({env});
+
+  /** @param {*} args2 */
+  const R = (...args2) => lg.debug(...args2);
+  R.debug = lg.debug.bind(lg);
+  R.info = lg.info.bind(lg);
+  R.warn = lg.warn.bind(lg);
+  R.info = lg.info.bind(lg);
+  R.error = lg.error.bind(lg);
+  R.err = lg.err.bind(lg);
+
+  return R
+}
+
+/**
+ * 获取模块文件名称
+ * esm: import.meta.url or cjs: __filename
+ * @param {string} file
+ * @returns
+ */
+function name(file) {
+  // import.meta.url: 'file:///D:/prj/wiajs/req/test/log.t.js'
+  file = fileURLToPath(file); // fileUrl 转成路径
+  const baseName = path.basename(file);
+  return baseName.replace(path.extname(baseName), '')
+}
+
+export { Log as default, log, name };

package/index.js

@@ -1 +1 @@
-export { default, name, log } from "./lib/node";
+export {default, name, log} from './lib/node.js'

package/lib/browser.js

@@ -0,0 +1,163 @@
+/**
+ * 前端日志输出，封装 console日志，简化代码，支持模块或直接输出
+ * 调用时，描述字符串后置，便于可选缺省，输出时，自带前置，类似 后端pino，保持前后端一致性
+ * m 为模块，fn 为函数名称
+ */ let Log = class Log {
+    /**
+	 * @param {string} m 模块
+	 */ constructor(m){
+        /** @type {string} 模块 */ this.m = "";
+        /** @type {string} 函数 */ this.fn = "";
+        this.m = m;
+    }
+    /**
+	 * get log desc
+	 * 描述字符串后置调用，前置显示
+	 * @param {*[]} args
+	 * @returns {string}
+	 */ getDesc(args) {
+        let R = "";
+        try {
+            const _ = this;
+            const { m } = _;
+            let fn = "", desc = "";
+            if (args.length > 1) {
+                const last = args.at(-1);
+                if (typeof last === "object") {
+                    ({ desc, fn } = last);
+                } else if (typeof last === "string") desc = last;
+                if (desc || fn) {
+                    fn = fn || _.fn;
+                    _.fn = fn;
+                    args.pop();
+                }
+            }
+            fn = fn || _.fn;
+            if (m) desc = `${desc}[${m}${fn ? ":" + fn : ""}]`; // eslint-disable-line
+            R = desc;
+        } catch (e) {
+            console.error(`getDesc exp:${e.message}`);
+        }
+        return R;
+    }
+    /** @param {...any} args - params */ log(...args) {
+        const _ = this;
+        const last = args.at(-1);
+        // clear fn
+        if (args.length === 1 && typeof last === "object" && last.fn) _.fn = "";
+        else {
+            const desc = _.getDesc(args);
+            console.log(desc, ...args);
+        }
+    }
+    /** @param {...any} args - params */ debug(...args) {
+        const _ = this;
+        const desc = _.getDesc(args);
+        if (desc) console.log(desc, ...args);
+        else console.log(...args);
+    }
+    /** @param {...any} args - params */ info(...args) {
+        const _ = this;
+        const desc = _.getDesc(args);
+        if (desc) console.info(desc, ...args);
+        else console.log(...args);
+    }
+    /** @param {...any} args - params */ warn(...args) {
+        const _ = this;
+        const { desc, arg } = _.getDesc(args);
+        if (desc) console.warn(desc, ...arg);
+        else console.log(...args);
+    }
+    /** @param {...any} args - params */ trace(...args) {
+        const _ = this;
+        const { desc, arg } = _.getDesc(args);
+        if (desc) console.trace(desc, ...arg);
+        else console.trace(...args);
+    }
+    /** @param {...any} args - params */ error(...args) {
+        const _ = this;
+        const desc = _.getDesc(args);
+        if (desc) console.error(desc, ...args);
+        else console.log(...args);
+    }
+    /**
+	 * 用于 catch(e) log.err(e)
+	 * @param {...any} args - params */ err(...args) {
+        const _ = this;
+        const first = args?.[0];
+        if (first instanceof Error || first && first.message && first.cause && first.stack) args[0] = {
+            exp: args[0].message
+        };
+        _.error(...args);
+    }
+};
+function getDesc(args) {
+    let desc = "";
+    const last = args.at(-1);
+    if (typeof last === "string") {
+        desc = last;
+        args.pop();
+    }
+    return desc;
+}
+/**
+ * 标准日志输出或构建模块日志类实例，用于模块中带[m:xxx]标记日志输出
+ * 启用 {f:fn} 标记时，需在函数尾部清除f（log({f:''})），否则会溢出到其他函数
+ * @param {...any} args - params
+ * returns {*}
+ */ function log(...args) {
+    const last = args.at(-1);
+    // 全局日志
+    if (args.length !== 1 || !last?.m) {
+        const desc = getDesc(args);
+        desc ? console.log(desc, ...args) : console.log(...args);
+        return;
+    }
+    // 唯一 m 属性，则构造新的 log 实例，这种写法，能被jsDoc识别子属性
+    const lg = new Log(last?.m);
+    /** @param {*} args2 */ const R = (...args2)=>lg.log(...args2);
+    R.debug = lg.debug.bind(lg);
+    R.info = lg.info.bind(lg);
+    R.warn = lg.warn.bind(lg);
+    R.info = lg.info.bind(lg);
+    R.trace = lg.trace.bind(lg);
+    R.error = lg.error.bind(lg);
+    R.err = lg.err.bind(lg);
+    return R;
+}
+/**
+ * 用于 catch(e) log.err(e)
+ * @param {...any} args - params */ log.err = (...args)=>{
+    const desc = getDesc(args);
+    const first = args?.[0];
+    if (first instanceof Error || first && first.message && first.cause && first.stack) args[0] = {
+        exp: args[0].message
+    };
+    desc ? console.error(desc, ...args) : console.error(...args);
+};
+/**
+ * @param {...any} args - params */ log.error = (...args)=>{
+    const desc = getDesc(args);
+    desc ? console.error(desc, ...args) : console.error(...args);
+};
+/**
+ * @param {...any} args - params */ log.warn = (...args)=>{
+    const desc = getDesc(args);
+    desc ? console.warn(desc, ...args) : console.warn(...args);
+};
+/**
+ * @param {...any} args - params */ log.info = (...args)=>{
+    const desc = getDesc(args);
+    desc ? console.info(desc, ...args) : console.info(...args);
+};
+/**
+ * @param {...any} args - params */ log.debug = (...args)=>{
+    const desc = getDesc(args);
+    desc ? console.log(desc, ...args) : console.log(...args);
+};
+/**
+ * @param {...any} args - params */ log.trace = (...args)=>{
+    const desc = getDesc(args);
+    desc ? console.trace(desc, ...args) : console.trace(...args);
+};
+export default log; // export { log, Log };

package/lib/node.js

@@ -0,0 +1,130 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import debug from 'debug';
+/**
+ * debug日志封装,
+ * 使用方法：
+ * import {log as Log, filename} from './log.js'
+ * const log = Log({env: `wia:${filename(__filename)}`})
+ * log('hello')
+ * log({a: 1, b: 2}, 'fun')
+ * log.error/err/info/warn
+ * $env:DEBUG=* 全开
+ * $env:DEBUG=*:log 全开
+ * $env:DEBUG=*:info log 不开，其他全开
+ * warn 和 err 一直打开！
+ */ export default class Log {
+    /**
+   * 构造函数
+   * @param {*} opts {
+   *  pre: 前缀，一般是模块名称,
+   *  env: NODE_DEBUG 环境变量
+   * }
+   */ constructor(opts){
+        let { env } = opts;
+        env = env ?? '';
+        const ds = {} // debugs
+        ;
+        ds.debug = debug(`${env}`);
+        ds.info = debug(`${env}:info`);
+        ds.err = debug(`${env}:err`);
+        ds.warn = debug(`${env}:warn`);
+        // 仅最后调用生效，覆盖环境变量
+        if (ds.debug.enabled) debug.enable('*');
+        else if (ds.info.enabled) debug.enable(`${env}:info,${env}:err,${env}:warn`);
+        else debug.enable(`${env}:err,${env}:warn`);
+        this.ds = ds;
+    }
+    /**
+   *
+   * @param  {...any} args
+   */ debug(...args) {
+        const first = args?.at(0);
+        const last = args?.at(-1);
+        if (typeof first === 'string') {
+            args[0] = `${first}`;
+            this.ds.debug(...args);
+        } else if (typeof first === 'object' && typeof last === 'string') this.ds.debug(`${last}:%O`, first);
+    // args[0] = `${this.pre}:${args[0]}`
+    // console.debug(...args)
+    // console.debug(this.pre, ...args)
+    }
+    /**
+   *
+   * @param  {...any} args
+   */ error(...args) {
+        const first = args?.at(0);
+        const last = args?.at(-1);
+        if (typeof first === 'string') {
+            args[0] = ` ${first}`;
+            this.ds.err(...args);
+        } else if (typeof first === 'object' && typeof last === 'string') this.ds.err(` ${last}:%O`, first);
+    }
+    /**
+   *
+   * @param  {...any} args
+   */ err(...args) {
+        const first = args?.[0];
+        if (first?.message || first?.msg) {
+            args[0] = {
+                exp: first.message || first.msg
+            };
+            if (first?.code) args[0].exp += ` code:${first.code}`;
+        }
+        this.error(...args);
+    }
+    /**
+   *
+   * @param  {...any} args
+   */ warn(...args) {
+        const first = args?.at(0);
+        const last = args?.at(-1);
+        if (typeof first === 'string') this.ds.warn(...args);
+        else if (typeof first === 'object' && typeof last === 'string') this.ds.warn(`${last}:%O`, first);
+    }
+    /**
+   *
+   * @param  {...any} args
+   */ info(...args) {
+        const first = args?.at(0);
+        const last = args?.at(-1);
+        if (typeof first === 'string') this.ds.info(...args);
+        else if (typeof first === 'object' && typeof last === 'string') this.ds.info(`${last}:%O`, first);
+    }
+}
+/**
+ * 标准日志输出或构建模块日志类实例，用于模块中带[m:xxx]标记日志输出
+ * 启用 {f:fn} 标记时，需在函数尾部清除f（log({f:''})），否则会溢出到其他函数
+ * @param {...any} args - params
+ * returns {pino & (...args) => void}
+ */ function log(...args) {
+    const last = args.at(-1);
+    // 全局日志
+    if (args.length !== 1 || !last?.env) return;
+    const { env } = last;
+    // 唯一 env 属性，则构造新的 log 实例，这种写法，能被jsDoc识别子属性
+    const lg = new Log({
+        env
+    });
+    /** @param {*} args2 */ const R = (...args2)=>lg.debug(...args2);
+    R.debug = lg.debug.bind(lg);
+    R.info = lg.info.bind(lg);
+    R.warn = lg.warn.bind(lg);
+    R.info = lg.info.bind(lg);
+    R.error = lg.error.bind(lg);
+    R.err = lg.err.bind(lg);
+    return R;
+}
+/**
+ * 获取模块文件名称
+ * esm: import.meta.url or cjs: __filename
+ * @param {string} file
+ * @returns
+ */ function name(file) {
+    // import.meta.url: 'file:///D:/prj/wiajs/req/test/log.t.js'
+    file = fileURLToPath(file) // fileUrl 转成路径
+    ;
+    const baseName = path.basename(file);
+    return baseName.replace(path.extname(baseName), '');
+}
+export { name, log };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wiajs/log",
   "description": "Lightweight debugging utility for Node.js and the browser",
-  "version": "4.3.9",
+  "version": "4.3.11",
   "type": "module",
   "main": "index.js",
   "browser": "./lib/browser.js",
@@ -36,7 +36,6 @@
     "test:coverage": "cat ./coverage/lcov.info | coveralls"
   },
   "keywords": ["debug", "log", "debugger"],
-  "files": ["src", "LICENSE", "README.md"],
   "repository": {
     "type": "git",
     "url": "https://github.com/wiajs/log"

package/src/browser.js

@@ -1,213 +0,0 @@
-/**
- * 前端日志输出，封装 console日志，简化代码，支持模块或直接输出
- * 调用时，描述字符串后置，便于可选缺省，输出时，自带前置，类似 后端pino，保持前后端一致性
- * m 为模块，fn 为函数名称
- */
-class Log {
-	/** @type {string} 模块 */
-	m = "";
-
-	/** @type {string} 函数 */
-	fn = "";
-
-	/**
-	 * @param {string} m 模块
-	 */
-	constructor(m) {
-		this.m = m;
-	}
-
-	/**
-	 * get log desc
-	 * 描述字符串后置调用，前置显示
-	 * @param {*[]} args
-	 * @returns {string}
-	 */
-	getDesc(args) {
-		let R = "";
-		try {
-			const _ = this;
-			const { m } = _;
-			let fn = "",
-				desc = "";
-
-			if (args.length > 1) {
-				const last = args.at(-1);
-				if (typeof last === "object") {
-					({ desc, fn } = last);
-				} else if (typeof last === "string") desc = last;
-				if (desc || fn) {
-					fn = fn || _.fn;
-					_.fn = fn;
-					args.pop();
-				}
-			}
-			fn = fn || _.fn;
-			if (m) desc = `${desc}[${m}${fn ? ":" + fn : ""}]`; // eslint-disable-line
-			R = desc;
-		} catch (e) {
-			console.error(`getDesc exp:${e.message}`);
-		}
-
-		return R;
-	}
-
-	/** @param {...any} args - params */
-	log(...args) {
-		const _ = this;
-		const last = args.at(-1);
-		// clear fn
-		if (args.length === 1 && typeof last === "object" && last.fn) _.fn = "";
-		else {
-			const desc = _.getDesc(args);
-			console.log(desc, ...args);
-		}
-	}
-
-	/** @param {...any} args - params */
-	debug(...args) {
-		const _ = this;
-		const desc = _.getDesc(args);
-		if (desc) console.log(desc, ...args);
-		else console.log(...args);
-	}
-
-	/** @param {...any} args - params */
-	info(...args) {
-		const _ = this;
-		const desc = _.getDesc(args);
-		if (desc) console.info(desc, ...args);
-		else console.log(...args);
-	}
-
-	/** @param {...any} args - params */
-	warn(...args) {
-		const _ = this;
-		const { desc, arg } = _.getDesc(args);
-		if (desc) console.warn(desc, ...arg);
-		else console.log(...args);
-	}
-
-	/** @param {...any} args - params */
-	trace(...args) {
-		const _ = this;
-		const { desc, arg } = _.getDesc(args);
-		if (desc) console.trace(desc, ...arg);
-		else console.trace(...args);
-	}
-
-	/** @param {...any} args - params */
-	error(...args) {
-		const _ = this;
-		const desc = _.getDesc(args);
-		if (desc) console.error(desc, ...args);
-		else console.log(...args);
-	}
-
-	/**
-	 * 用于 catch(e) log.err(e)
-	 * @param {...any} args - params */
-	err(...args) {
-		const _ = this;
-		const first = args?.[0];
-		if (
-			first instanceof Error ||
-			(first && first.message && first.cause && first.stack)
-		)
-			args[0] = { exp: args[0].message };
-		_.error(...args);
-	}
-}
-
-function getDesc(args) {
-	let desc = "";
-	const last = args.at(-1);
-	if (typeof last === "string") {
-		desc = last;
-		args.pop();
-	}
-	return desc;
-}
-
-/**
- * 标准日志输出或构建模块日志类实例，用于模块中带[m:xxx]标记日志输出
- * 启用 {f:fn} 标记时，需在函数尾部清除f（log({f:''})），否则会溢出到其他函数
- * @param {...any} args - params
- * returns {*}
- */
-function log(...args) {
-	const last = args.at(-1);
-
-	// 全局日志
-	if (args.length !== 1 || !last?.m) {
-		const desc = getDesc(args);
-		desc ? console.log(desc, ...args) : console.log(...args);
-		return;
-	}
-
-	// 唯一 m 属性，则构造新的 log 实例，这种写法，能被jsDoc识别子属性
-	const lg = new Log(last?.m);
-	/** @param {*} args2 */
-	const R = (...args2) => lg.log(...args2);
-	R.debug = lg.debug.bind(lg);
-	R.info = lg.info.bind(lg);
-	R.warn = lg.warn.bind(lg);
-	R.info = lg.info.bind(lg);
-	R.trace = lg.trace.bind(lg);
-	R.error = lg.error.bind(lg);
-	R.err = lg.err.bind(lg);
-
-	return R;
-}
-
-/**
- * 用于 catch(e) log.err(e)
- * @param {...any} args - params */
-log.err = (...args) => {
-	const desc = getDesc(args);
-	const first = args?.[0];
-	if (
-		first instanceof Error ||
-		(first && first.message && first.cause && first.stack)
-	)
-		args[0] = { exp: args[0].message };
-	desc ? console.error(desc, ...args) : console.error(...args);
-};
-
-/**
- * @param {...any} args - params */
-log.error = (...args) => {
-	const desc = getDesc(args);
-	desc ? console.error(desc, ...args) : console.error(...args);
-};
-
-/**
- * @param {...any} args - params */
-log.warn = (...args) => {
-	const desc = getDesc(args);
-	desc ? console.warn(desc, ...args) : console.warn(...args);
-};
-
-/**
- * @param {...any} args - params */
-log.info = (...args) => {
-	const desc = getDesc(args);
-	desc ? console.info(desc, ...args) : console.info(...args);
-};
-
-/**
- * @param {...any} args - params */
-log.debug = (...args) => {
-	const desc = getDesc(args);
-	desc ? console.log(desc, ...args) : console.log(...args);
-};
-
-/**
- * @param {...any} args - params */
-log.trace = (...args) => {
-	const desc = getDesc(args);
-	desc ? console.trace(desc, ...args) : console.trace(...args);
-};
-
-export default log;
-// export { log, Log };

package/src/node.js

@@ -1,150 +0,0 @@
-import path from "node:path";
-import debug from "debug";
-
-/**
- * debug日志封装,
- * 使用方法：
- * import {log as Log, filename} from './log.js'
- * const log = Log({env: `wia:${filename(__filename)}`})
- * log('hello')
- * log({a: 1, b: 2}, 'fun')
- * log.error/err/info/warn
- * $env:DEBUG=* 全开
- * $env:DEBUG=*:log 全开
- * $env:DEBUG=*:info log 不开，其他全开
- * warn 和 err 一直打开！
- */
-export default class Log {
-	/**
-	 * 构造函数
-	 * @param {*} opts {
-	 *  pre: 前缀，一般是模块名称,
-	 *  env: NODE_DEBUG 环境变量
-	 * }
-	 */
-	constructor(opts) {
-		let { env } = opts;
-		env = env ?? "";
-		const ds = {}; // debugs
-		ds.debug = debug(`${env}`);
-		ds.info = debug(`${env}:info`);
-		ds.err = debug(`${env}:err`);
-		ds.warn = debug(`${env}:warn`);
-
-		// 仅最后调用生效，覆盖环境变量
-		if (ds.debug.enabled) debug.enable("*");
-		else if (ds.info.enabled)
-			debug.enable(`${env}:info,${env}:err,${env}:warn`);
-		else debug.enable(`${env}:err,${env}:warn`);
-
-		this.ds = ds;
-	}
-
-	/**
-	 *
-	 * @param  {...any} args
-	 */
-	debug(...args) {
-		const first = args?.at(0);
-		const last = args?.at(-1);
-		if (typeof first === "string") {
-			args[0] = `${first}`;
-			this.ds.debug(...args);
-		} else if (typeof first === "object" && typeof last === "string")
-			this.ds.debug(`${last}:%O`, first);
-		// args[0] = `${this.pre}:${args[0]}`
-		// console.debug(...args)
-		// console.debug(this.pre, ...args)
-	}
-
-	/**
-	 *
-	 * @param  {...any} args
-	 */
-	error(...args) {
-		const first = args?.at(0);
-		const last = args?.at(-1);
-		if (typeof first === "string") {
-			args[0] = ` ${first}`;
-			this.ds.err(...args);
-		} else if (typeof first === "object" && typeof last === "string")
-			this.ds.err(` ${last}:%O`, first);
-	}
-
-	/**
-	 *
-	 * @param  {...any} args
-	 */
-	err(...args) {
-		const first = args?.[0];
-		if (first?.message || first?.msg) {
-			args[0] = { exp: first.message || first.msg };
-			if (first?.code) args[0].exp += ` code:${first.code}`;
-		}
-		this.error(...args);
-	}
-
-	/**
-	 *
-	 * @param  {...any} args
-	 */
-	warn(...args) {
-		const first = args?.at(0);
-		const last = args?.at(-1);
-		if (typeof first === "string") this.ds.warn(...args);
-		else if (typeof first === "object" && typeof last === "string")
-			this.ds.warn(`${last}:%O`, first);
-	}
-
-	/**
-	 *
-	 * @param  {...any} args
-	 */
-	info(...args) {
-		const first = args?.at(0);
-		const last = args?.at(-1);
-		if (typeof first === "string") this.ds.info(...args);
-		else if (typeof first === "object" && typeof last === "string")
-			this.ds.info(`${last}:%O`, first);
-	}
-}
-
-/**
- * 标准日志输出或构建模块日志类实例，用于模块中带[m:xxx]标记日志输出
- * 启用 {f:fn} 标记时，需在函数尾部清除f（log({f:''})），否则会溢出到其他函数
- * @param {...any} args - params
- * returns {pino & (...args) => void}
- */
-function log(...args) {
-	const last = args.at(-1);
-
-	// 全局日志
-	if (args.length !== 1 || !last?.env) return;
-
-	const { env } = last;
-	// 唯一 env 属性，则构造新的 log 实例，这种写法，能被jsDoc识别子属性
-	const lg = new Log({ env });
-
-	/** @param {*} args2 */
-	const R = (...args2) => lg.debug(...args2);
-	R.debug = lg.debug.bind(lg);
-	R.info = lg.info.bind(lg);
-	R.warn = lg.warn.bind(lg);
-	R.info = lg.info.bind(lg);
-	R.error = lg.error.bind(lg);
-	R.err = lg.err.bind(lg);
-
-	return R;
-}
-
-/**
- * 获取模块文件名称
- * @param {string} file
- * @returns
- */
-function name(file) {
-	const baseName = path.basename(file);
-	return baseName.replace(path.extname(baseName), "");
-}
-
-export { name, log };