@qqi/log 1.0.0 → 1.1.0

package/README.md

@@ -32,6 +32,16 @@ dog('你好'); // 该值是否打印还依赖于环境变量中有没有配置 `
 a_node_tools_dev=true npm run dev
 ```
 
+### 折叠同名方法打印消息
+
+使用 `fold` 参数 :
+
+```js
+import { Dog } from '@qqi/log';
+
+const dog = Dog();
+```
+
 ## 文档地址
 
 参看 [https://earthnut.dev/npm/qqi/log](https://earthnut.dev/npm/qqi/log)

package/cjs/index.js

@@ -1,92 +1,137 @@
 'use strict';
 
-var aJsTools = require('a-js-tools');
-var setType = require('./setType.js');
-var blankCall = require('./blankCall.js');
-var managePrint = require('./managePrint.js');
-var aTypeOfJs = require('a-type-of-js');
-var platform = require('./platform.js');
 var _static = require('@color-pen/static');
+var aJsTools = require('a-js-tools');
+var colorPen = require('color-pen');
+var util = require('./util.js');
 
 /**
  *
- * 创建 dev log 工厂函数
+ * @param options 配置项
+ * @returns 函数对象
  *
+ */
+var DogConstructor = aJsTools.createConstructor(Dog);
+/**
+ * ## 创建 dev log 工厂函数
  * @param options - 配置项
  * @returns - dev log 工厂函数
  */
 function Dog(options) {
-    if (aTypeOfJs.isUndefined(options))
-        options = {
-            name: aJsTools.getRandomString(10),
-            type: false,
-        };
-    if (aTypeOfJs.isBoolean(options))
-        options = {
-            name: aJsTools.getRandomString(10),
-            type: options,
-        };
-    if (aTypeOfJs.isString(options))
-        options = {
-            name: options,
-            type: false,
-        };
-    let { name = '', type = false } = options;
-    // 处理 name
-    name = name.trim().replace(/\s+/g, '_');
-    /**  当前获取环境值  */
-    const _env = (platform.platform === 'node' &&
-        (globalThis?.process.env[name.toUpperCase().concat('_DEV')] ??
-            globalThis?.process.env[name.toLowerCase().concat('_dev')])) ||
-        false;
-    const env = _env === 'false' ? false : _env === 'true' ? true : _env;
+    var _this = this;
+    var _p = util.parseOption(options);
+    this.name = _p.name || aJsTools.getRandomString(12);
+    this.fold = Boolean(_p.fold);
+    var env = util.getEnv(this.name);
+    var type = _p.type || false;
+    this.mark = '';
     /**  默认 node 环境以获取到的环境值为准，而非 node 环境默认开启，并通过自定义的 @qqi/babel-plugin-remove-dog-calls 来进行过滤正式环境（环境值需要自定义） */
-    type = platform.platform === 'node' ? setType.setType(env ?? type) : true;
-    /// 原始的调用方法，在 type 值变化时会触发该值的更替
-    // 私有方法 error
-    const _privateFunc = {
-        error: blankCall.blankCall,
-        warn: blankCall.blankCall,
-        info: blankCall.blankCall,
+    this.type = util.platform === 'node' ? util.setType(env !== null && env !== void 0 ? env : type) : true;
+    /**
+     * ## 解析 error
+     * @param type
+     */
+    var prefix = function (type) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        try {
+            throw new Error();
+        }
+        catch (error) {
+            var parseErrorResult = (((_a = error.stack) === null || _a === void 0 ? void 0 : _a.split('\n')) || []).map(function (item) {
+                var reg = /at\s(.*)\s\((.*):(\d*):(\d*)\)/;
+                var res = reg.exec(item);
+                if (res) {
+                    return {
+                        name: res[1],
+                        path: res[2],
+                        line: res[3],
+                        column: res[4],
+                    };
+                }
+                return {
+                    name: '',
+                };
+            });
+            var result = parseErrorResult.filter(function (e) { return e.name !== '' && e.path !== undefined; });
+            var res = (_d = (_c = (_b = result[3]) !== null && _b !== void 0 ? _b : result[2]) !== null && _c !== void 0 ? _c : result[1]) !== null && _d !== void 0 ? _d : result[0];
+            var startStr = " ".concat(type === 'info' ? '💡' : type === 'error' ? '❌' : '⚠️ ', " ").concat(new Date().toLocaleString(), " ");
+            var printStartPenStr = (type === 'info'
+                ? colorPen.bgCyanPen.brightWhite
+                : type === 'error'
+                    ? colorPen.bgBlackPen.red
+                    : colorPen.bgBrightYellowPen.brightGreen)(startStr);
+            var mark = (_e = res === null || res === void 0 ? void 0 : res.name) !== null && _e !== void 0 ? _e : '';
+            if (_this.fold && mark) {
+                if (mark === _this.mark) ;
+                else {
+                    if (_this.mark) {
+                        console.groupEnd();
+                    }
+                    console.groupCollapsed(mark);
+                }
+            }
+            _this.mark = mark;
+            return "".concat(printStartPenStr, " ").concat(mark, "  ").concat((_f = res === null || res === void 0 ? void 0 : res.line) === null || _f === void 0 ? void 0 : _f.concat(' 行'), " ").concat((_g = res === null || res === void 0 ? void 0 : res.column) === null || _g === void 0 ? void 0 : _g.concat(' 列'));
+        }
+    };
+    this.info = function () {
+        var msg = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            msg[_i] = arguments[_i];
+        }
+        if (_this.type === 'all' || _this.type === 'info' || _this.type === true) {
+            var _prefix = prefix('info');
+            msg.unshift(_prefix);
+            console.log.apply(console, msg);
+        }
+    };
+    /**
+     * @param msg
+     */
+    this.warn = function () {
+        var msg = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            msg[_i] = arguments[_i];
+        }
+        if (_this.type === 'all' || _this.type === 'warn' || _this.type === true) {
+            var _prefix = prefix('warn');
+            msg.unshift(_prefix);
+            console.warn.apply(console, msg);
+        }
     };
-    managePrint.managePrint(type, _privateFunc, name);
-    /**  本体方法  */
-    const dog = (...str) => {
-        Reflect.apply(_privateFunc.info, this, str);
+    /**
+     *
+     * @param msg
+     */
+    this.error = function () {
+        var msg = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            msg[_i] = arguments[_i];
+        }
+        if (_this.type === 'all' || _this.type === 'error' || _this.type === true) {
+            var _prefix = prefix('error');
+            msg.unshift(_prefix);
+            console.error.apply(console, msg);
+        }
+    };
+    /**
+     *  本体方法
+     * @param str
+     */
+    var dog = function () {
+        var str = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            str[_i] = arguments[_i];
+        }
+        _this.info(str);
     };
     // 设置 prototype
     Object.setPrototypeOf(dog, this);
-    // 设置属性和方法
-    Object.defineProperties(this, {
-        type: {
-            get() {
-                return type || false;
-            },
-            set(value) {
-                const new_type = setType.setType(value);
-                if (new_type !== type) {
-                    type = new_type;
-                    managePrint.managePrint(type, _privateFunc, name);
-                }
-            },
-        },
-        error: {
-            value: (...str) => Reflect.apply(_privateFunc.error, this, str),
-            configurable: false,
-            enumerable: false,
-            writable: false,
-        },
-        warn: {
-            value: (...str) => Reflect.apply(_privateFunc.warn, this, str),
-            configurable: false,
-            enumerable: false,
-            writable: false,
-        },
-    });
     return dog;
 }
-Dog.prototype.clear = () => {
-    if (platform.platform === 'browser') {
+/** 原型上添加 clear 方法 */
+Dog.prototype.clear = function () {
+    if (util.platform === 'browser') {
         console.clear();
     }
     else {
@@ -94,11 +139,47 @@ Dog.prototype.clear = () => {
     }
 };
 /**
- *
- * @param options 配置项
- * @returns 函数对象
  *
  */
-const DogConstructor = aJsTools.createConstructor(Dog);
+function DogVirtualImt() {
+    /**
+     *  模拟类的构建
+     * @param _arg
+     */
+    var _dev = function () {
+    };
+    Object.setPrototypeOf(_dev, this);
+    Object.defineProperties(this, {
+        info: {
+            value: function () {
+            },
+            configurable: false,
+            writable: false,
+        },
+        warn: {
+            value: function () {
+            },
+            configurable: false,
+            writable: false,
+        },
+        error: {
+            value: function () {
+            },
+            configurable: false,
+            writable: false,
+        },
+        type: {
+            get: function () {
+                return false;
+            },
+            set: function (_) { },
+        },
+    });
+    return _dev;
+}
+DogVirtualImt.prototype.clear = console.clear;
+/** 虚拟狗，没有实现不打印 */
+var DogVirtualConstructor = aJsTools.createConstructor(DogVirtualImt);
 
 exports.Dog = DogConstructor;
+exports.DogVirtual = DogVirtualConstructor;

package/cjs/util.js

@@ -0,0 +1,87 @@
+'use strict';
+
+var aJsTools = require('a-js-tools');
+var aTypeOfJs = require('a-type-of-js');
+
+/**
+ * @packageDocumentation
+ * @module @qqi/log/util
+ * @file util.ts
+ * @description 工具
+ * @author MrMudBean <Mr.MudBean@outlook.com>
+ * @license MIT
+ * @copyright 2026 ©️ MrMudBean
+ * @since 2026-01-28 03:11
+ * @version 1.0.1
+ * @lastModified 2026-01-28 04:34
+ */
+var typeList = [
+    false,
+    true,
+    'all',
+    'info',
+    'error',
+    'warn',
+];
+/**
+ * ## 解析参数
+ * @param options
+ */
+function parseOption(options) {
+    var result = {
+        name: aJsTools.getRandomString(10),
+        type: false,
+        fold: false,
+    };
+    if (aTypeOfJs.isUndefined(options))
+        return result;
+    if (aTypeOfJs.isBoolean(options)) {
+        result.type = options;
+        return result;
+    }
+    if (aTypeOfJs.isString(options)) {
+        // 处理 name
+        result.name = options.trim().replace(/\s+/g, '_');
+        return result;
+    }
+    if (aTypeOfJs.isString(options.name)) {
+        result.name = options.name.trim().replace(/\s+/g, '_');
+        return result;
+    }
+    return options;
+}
+/**
+ * 获取当前的环境变量
+ * @param name
+ */
+function getEnv(name) {
+    var _a;
+    if (name === void 0) { name = aJsTools.getRandomString(10); }
+    /**  当前获取环境值  */
+    var _env = false;
+    if (platform === 'node' && ((_a = globalThis === null || globalThis === void 0 ? void 0 : globalThis.process) === null || _a === void 0 ? void 0 : _a.env)) {
+        var processEnv = process.env;
+        _env =
+            processEnv[name.toUpperCase().concat('_DEV')] ||
+                processEnv[name.toLowerCase().concat('_dev')] ||
+                false;
+    }
+    var env = _env === 'false' ? false : _env === 'true' ? true : _env;
+    return env;
+}
+var platform = aJsTools.isNode() ? 'node' : 'browser';
+/**
+ * 设置 type 的类型
+ * @param type 新的类型
+ */
+function setType(type) {
+    if (typeList.includes(type))
+        return type;
+    return false;
+}
+
+exports.getEnv = getEnv;
+exports.parseOption = parseOption;
+exports.platform = platform;
+exports.setType = setType;
+exports.typeList = typeList;