@wiajs/log 4.3.13 → 4.3.16

package/dist/log.js

@@ -1,191 +1,194 @@
 /*!
-  * wia log v4.3.13
+  * wia log v4.3.15
   * (c) 2024-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
-	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Log = {}));
-})(this, (function (exports) { 'use strict';
+  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);
-	};
-	/**
-	 * 获取模块文件名称
-	 * 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), '')
-	    return '';
-	}
-	 // export { log, Log };
+  /**
+   * 前端日志输出，封装 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 {{desc: string, arg: *[]}}
+     */ getDesc(args) {
+          let R = {
+              desc: '',
+              arg: args
+          };
+          try {
+              const _ = this;
+              const { m } = _;
+              let fn = '';
+              let 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,
+                  arg: args
+              };
+          } 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, arg } = _.getDesc(args);
+          if (desc) console.error(desc, ...arg);
+          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?.message && first?.cause && first?.stack) args[0] = {
+              exp: args[0].message
+          };
+          _.error(...args);
+      }
+  };
+  /**
+   * get log desc
+   * 描述字符串作为最后参数调用，显示时，前置
+   * @param {*[]} args
+   * @returns {{desc: string, arg: *[]}}
+   */ function getDesc(args) {
+      let desc = '';
+      const last = args.at(-1);
+      if (typeof last === 'string') {
+          desc = last;
+          args.pop();
+      }
+      return {
+          desc,
+          arg: args
+      };
+  }
+  /**
+   * 标准日志输出或构建模块日志类实例，用于模块中带[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, arg } = getDesc(args);
+      const first = args?.[0];
+      if (first instanceof Error || first?.message && first?.cause && first?.stack) args[0] = {
+          exp: args[0].message
+      };
+      desc ? console.error(desc, ...arg) : console.error(...args);
+  };
+  /**
+   * @param {...any} args - params */ log.error = (...args)=>{
+      const { desc, arg } = getDesc(args);
+      desc ? console.error(desc, ...arg) : console.error(...args);
+  };
+  /**
+   * @param {...any} args - params */ log.warn = (...args)=>{
+      const { desc, arg } = getDesc(args);
+      desc ? console.warn(desc, ...arg) : console.warn(...args);
+  };
+  /**
+   * @param {...any} args - params */ log.info = (...args)=>{
+      const { desc, arg } = getDesc(args);
+      desc ? console.info(desc, ...arg) : console.info(...args);
+  };
+  /**
+   * @param {...any} args - params */ log.debug = (...args)=>{
+      const { desc, arg } = getDesc(args);
+      desc ? console.log(desc, ...arg) : console.log(...args);
+  };
+  /**
+   * @param {...any} args - params */ log.trace = (...args)=>{
+      const { desc, arg } = getDesc(args);
+      desc ? console.trace(desc, ...arg) : console.trace(...args);
+  };
 
-	exports.log = log;
-	exports.name = name;
+  return log;
 
 }));

package/dist/log.min.js

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