@qqi/log 0.0.0 → 0.0.2

package/package.json

@@ -3,13 +3,13 @@
   "module": "index.mjs",
   "types": "index.d.ts",
   "type": "module",
-  "version": "0.0.0",
+  "version": "0.0.2",
   "name": "@qqi/log",
   "description": "原 @qqi/dev-log 中的 log 部分",
   "license": "MIT",
   "dependencies": {
     "@color-pen/static": "^1.0.0",
-    "a-js-tools": "^1.0.1",
+    "a-js-tools": "^1.0.5",
     "a-type-of-js": "^1.0.2",
     "color-pen": "^2.0.11"
   },

package/src/index.cjs

@@ -18,22 +18,32 @@ var _static = require('@color-pen/static');
  *
  */
 function Dog(options) {
-    let { name = '', type = false } = 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 = aTypeOfJs.isString(name)
-        ? name.trim().replace(/\s+/g, '_')
-        : aJsTools.getRandomString(10);
+    name = name.trim().replace(/\s+/g, '_');
+    /**  当前获取环境值  */
     const _env = (platform.platform === 'node' &&
         (process.env[name.toUpperCase().concat('_DEV')] ??
             process.env[name.toLowerCase().concat('_dev')])) ||
         false;
-    const env = aTypeOfJs.isUndefined(_env) || _env === 'false'
-        ? false
-        : _env === 'true'
-            ? true
-            : _env;
-    /**  私有属性  */
-    type = setType.setType(env ?? type);
+    const env = _env === 'false' ? false : _env === 'true' ? true : _env;
+    /**  默认 node 环境以获取到的环境值为准，而非 node 环境默认开启，并通过自定义的 @qqi/babel-plugin-remove-dog-calls 来进行过滤正式环境（环境值需要自定义） */
+    type = platform.platform === 'node' ? setType.setType(env ?? type) : true;
     /// 原始的调用方法，在 type 值变化时会触发该值的更替
     // 私有方法 error
     const _privateFunc = {
@@ -54,11 +64,11 @@ function Dog(options) {
             get() {
                 return type || false;
             },
-            set(type) {
-                const new_type = setType.setType(type);
+            set(value) {
+                const new_type = setType.setType(value);
                 if (new_type !== type) {
                     type = new_type;
-                    managePrint.managePrint(new_type, _privateFunc, name);
+                    managePrint.managePrint(type, _privateFunc, name);
                 }
             },
         },

package/src/index.d.ts

@@ -1,9 +1,8 @@
-import { DevLog, DogOptions } from './type';
 /**
  *
  * @param options 配置项
  * @returns 函数对象
  *
  */
-declare const DogConstructor: import("a-js-tools").CreateConstructor<DevLog, [options?: DogOptions | undefined]>;
+declare const DogConstructor: any;
 export { DogConstructor as Dog };

package/src/index.mjs

@@ -2,7 +2,7 @@ import { createConstructor, getRandomString } from 'a-js-tools';
 import { setType } from './setType.mjs';
 import { blankCall } from './blankCall.mjs';
 import { managePrint } from './managePrint.mjs';
-import { isString, isUndefined } from 'a-type-of-js';
+import { isUndefined, isBoolean, isString } from 'a-type-of-js';
 import { platform } from './platform.mjs';
 import { esc } from '@color-pen/static';
 
@@ -16,22 +16,32 @@ import { esc } from '@color-pen/static';
  *
  */
 function Dog(options) {
-    let { name = '', type = false } = options || {};
+    if (isUndefined(options))
+        options = {
+            name: getRandomString(10),
+            type: false,
+        };
+    if (isBoolean(options))
+        options = {
+            name: getRandomString(10),
+            type: options,
+        };
+    if (isString(options))
+        options = {
+            name: options,
+            type: false,
+        };
+    let { name = '', type = false } = options;
     // 处理 name
-    name = isString(name)
-        ? name.trim().replace(/\s+/g, '_')
-        : getRandomString(10);
+    name = name.trim().replace(/\s+/g, '_');
+    /**  当前获取环境值  */
     const _env = (platform === 'node' &&
         (process.env[name.toUpperCase().concat('_DEV')] ??
             process.env[name.toLowerCase().concat('_dev')])) ||
         false;
-    const env = isUndefined(_env) || _env === 'false'
-        ? false
-        : _env === 'true'
-            ? true
-            : _env;
-    /**  私有属性  */
-    type = setType(env ?? type);
+    const env = _env === 'false' ? false : _env === 'true' ? true : _env;
+    /**  默认 node 环境以获取到的环境值为准，而非 node 环境默认开启，并通过自定义的 @qqi/babel-plugin-remove-dog-calls 来进行过滤正式环境（环境值需要自定义） */
+    type = platform === 'node' ? setType(env ?? type) : true;
     /// 原始的调用方法，在 type 值变化时会触发该值的更替
     // 私有方法 error
     const _privateFunc = {
@@ -52,11 +62,11 @@ function Dog(options) {
             get() {
                 return type || false;
             },
-            set(type) {
-                const new_type = setType(type);
+            set(value) {
+                const new_type = setType(value);
                 if (new_type !== type) {
                     type = new_type;
-                    managePrint(new_type, _privateFunc, name);
+                    managePrint(type, _privateFunc, name);
                 }
             },
         },

package/src/managePrint.cjs

@@ -36,9 +36,17 @@ function managePrint(type, privateFunc, name) {
     }
     // 在 非 node 环境始终执行，搭配 @qqi/babel-plugin-remove-dog-calls 使用
     else {
-        privateFunc.info = printInfo.printInfo;
-        privateFunc.warn = printWarn.printWarn;
-        privateFunc.error = printError.printError;
+        if (type === false)
+            return Reflect.apply(notSupport.notSupport, privateFunc, []);
+        privateFunc.info = ['all', 'info', true].includes(type)
+            ? printInfo.printInfo
+            : blankCall.blankCall;
+        privateFunc.error = ['all', 'error', true].includes(type)
+            ? printError.printError
+            : blankCall.blankCall;
+        privateFunc.warn = ['all', 'warn', true].includes(type)
+            ? printWarn.printWarn
+            : blankCall.blankCall;
     }
 }
 

package/src/managePrint.mjs

@@ -34,9 +34,17 @@ function managePrint(type, privateFunc, name) {
     }
     // 在 非 node 环境始终执行，搭配 @qqi/babel-plugin-remove-dog-calls 使用
     else {
-        privateFunc.info = printInfo;
-        privateFunc.warn = printWarn;
-        privateFunc.error = printError;
+        if (type === false)
+            return Reflect.apply(notSupport, privateFunc, []);
+        privateFunc.info = ['all', 'info', true].includes(type)
+            ? printInfo
+            : blankCall;
+        privateFunc.error = ['all', 'error', true].includes(type)
+            ? printError
+            : blankCall;
+        privateFunc.warn = ['all', 'warn', true].includes(type)
+            ? printWarn
+            : blankCall;
     }
 }
 

package/src/type.d.ts

@@ -33,4 +33,4 @@ export type DogOptions = {
      *
      */
     name?: string;
-};
+} | string | boolean;