@idlebox/logger 0.0.24 → 0.0.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/lib/common/helpers.d.ts.map +1 -1
  2. package/lib/common/helpers.js +10 -5
  3. package/lib/common/helpers.js.map +1 -1
  4. package/lib/common/logger.create.d.ts +3 -1
  5. package/lib/common/logger.create.d.ts.map +1 -1
  6. package/lib/common/logger.create.js +9 -6
  7. package/lib/common/logger.create.js.map +1 -1
  8. package/lib/common/logger.global.js +1 -1
  9. package/lib/common/logger.global.js.map +1 -1
  10. package/package.json +14 -10
  11. package/src/common/helpers.ts +11 -5
  12. package/src/common/logger.create.ts +9 -6
  13. package/src/common/logger.global.ts +1 -1
  14. package/src/tsconfig.json +10 -7
package/lib/common/helpers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,WAYzD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,UAEvC;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,MAAM,CAavE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAA0B,GAAG,MAAM,CAKhF;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAA0B,GAAG,MAAM,CAKjF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,WAGxC;AAED;;GAEG;AACH,eAAO,IAAI,eAAe,gBA6CtB,CAAC;AAEL;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,QAE1D;AAED,KAAK,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,GAAG,aAAa,CAAC;AAYpF,eAAO,IAAI,oBAAoB,MAVrB,KAAK,UAAU,OAAO,WAUe,CAAC;AAChD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,QAcnD"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,WAYzD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,UAEvC;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,MAAM,CAavE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAA0B,GAAG,MAAM,CAKhF;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAA0B,GAAG,MAAM,CAKjF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,WAGxC;AAED;;GAEG;AACH,eAAO,IAAI,eAAe,EAAE,cAAkE,CAAC;AAqD/F;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,QAE1D;AAED,KAAK,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,GAAG,aAAa,CAAC;AAYpF,eAAO,IAAI,oBAAoB,MAVrB,KAAK,UAAU,OAAO,WAUe,CAAC;AAChD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,QAcnD"}
package/lib/common/helpers.js CHANGED
@@ -1,4 +1,4 @@
1
- import { prettyFormatError } from '@idlebox/common';
1
+ import { globalObject, isNodeJs, prettyFormatError } from '@idlebox/common';
2
2
  import debug from 'debug';
3
3
  import { debug_commands } from '../functions/builtin-commands.js';
4
4
  import { EnableLogLevel } from '../loglevels/loglevel.js';
@@ -85,7 +85,9 @@ export function debug_enabled(tag) {
85
85
  /**
86
86
  * [当指定tag开启时] 应该输出它的什么级别
87
87
  */
88
- export let defaultLogLevel = (() => {
88
+ export let defaultLogLevel = isNodeJs ? detectNode() : detectEnv(localStorage);
89
+ function detectNode() {
90
+ const process = globalObject['process'];
89
91
  if (process.argv.includes('--verbose')) {
90
92
  // 参数中含有 --verbose 时，设置默认日志级别
91
93
  return EnableLogLevel.verbose;
@@ -101,10 +103,13 @@ export let defaultLogLevel = (() => {
101
103
  return EnableLogLevel.debug;
102
104
  }
103
105
  }
106
+ return detectEnv(process.env);
107
+ }
108
+ function detectEnv(env) {
104
109
  // DEBUG=xxx,verbose,xxx
105
110
  // biome-ignore lint/performance/useTopLevelRegex: a
106
111
  const has_debug_verbose = /(?<=^| |,)(verbose|debug)(?=$| |,)/;
107
- const setted = has_debug_verbose.exec(process.env.DEBUG || '');
112
+ const setted = has_debug_verbose.exec(env.DEBUG || '');
108
113
  if (setted) {
109
114
  if (setted[0] === 'verbose') {
110
115
  return EnableLogLevel.verbose;
@@ -115,7 +120,7 @@ export let defaultLogLevel = (() => {
115
120
  }
116
121
  else {
117
122
  // 直接通过 DEBUG_LEVEL 设置
118
- switch (process.env.DEBUG_LEVEL || '') {
123
+ switch (env.DEBUG_LEVEL || '') {
119
124
  case '':
120
125
  return EnableLogLevel.log;
121
126
  case 'verbose':
@@ -133,7 +138,7 @@ export let defaultLogLevel = (() => {
133
138
  return EnableLogLevel.verbose;
134
139
  }
135
140
  }
136
- })();
141
+ }
137
142
  /**
138
143
  * 手动设置默认日志级别
139
144
  * root-logger 和 已经创建的 不受此影响
package/lib/common/helpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"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"}
package/lib/common/logger.create.d.ts CHANGED
@@ -1,7 +1,9 @@
1
+ import { EnableLogLevel } from '../loglevels/loglevel.js';
1
2
  import type { IInstrestedConsole, IMyLogger } from './types.js';
2
3
  export interface ILoggerOptionsReq {
3
4
  readonly colors?: boolean;
4
5
  readonly console: IInstrestedConsole;
6
+ readonly level?: EnableLogLevel;
5
7
  }
6
8
  /**
7
9
  * 创建一个新的logger实例
@@ -9,5 +11,5 @@ export interface ILoggerOptionsReq {
9
11
  * @param colors 是否启用颜色，默认启用
10
12
  * @returns
11
13
  */
12
- export declare function createLoggerObject(tag: string, { colors, console }: ILoggerOptionsReq): IMyLogger;
14
+ export declare function createLoggerObject(tag: string, { colors, console, level }: ILoggerOptionsReq): IMyLogger;
13
15
  //# sourceMappingURL=logger.create.d.ts.map
package/lib/common/logger.create.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logger.create.d.ts","sourceRoot":"","sources":["../../src/common/logger.create.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;CACrC;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,MAAa,EAAE,OAAO,EAAE,EAAE,iBAAiB,GAAG,SAAS,CAWxG"}
1
+ {"version":3,"file":"logger.create.d.ts","sourceRoot":"","sources":["../../src/common/logger.create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IACrC,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;CAChC;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,MAAa,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,iBAAiB,GAAG,SAAS,CAa/G"}
package/lib/common/logger.create.js CHANGED
@@ -8,13 +8,16 @@ import { globalLogger } from './logger.global.js';
8
8
  * @param colors 是否启用颜色，默认启用
9
9
  * @returns
10
10
  */
11
- export function createLoggerObject(tag, { colors = true, console }) {
12
- let level = EnableLogLevel.error;
13
- if (debug_enabled(tag)) {
14
- level = defaultLogLevel;
11
+ export function createLoggerObject(tag, { colors = true, console, level }) {
12
+ let logLevel = EnableLogLevel.error;
13
+ if (level !== undefined) {
14
+ logLevel = level;
15
15
  }
16
- const logger = create(console, tag, level, colors);
17
- (globalLogger || logger).verbose `logger "${tag}" created, level = ${EnableLogLevel[level]}`;
16
+ else if (debug_enabled(tag)) {
17
+ logLevel = defaultLogLevel;
18
+ }
19
+ const logger = create(console, tag, logLevel, colors);
20
+ (globalLogger || logger).verbose `logger "${tag}" created, level = ${EnableLogLevel[logLevel]}`;
18
21
  return logger;
19
22
  }
20
23
  //# sourceMappingURL=logger.create.js.map
package/lib/common/logger.create.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logger.create.js","sourceRoot":"","sources":["../../src/common/logger.create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAQlD;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAW,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAqB;IAC5F,IAAI,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;IACjC,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,KAAK,GAAG,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAEnD,CAAC,YAAY,IAAI,MAAM,CAAC,CAAC,OAAO,CAAA,WAAW,GAAG,sBAAsB,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;IAE5F,OAAO,MAAM,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"logger.create.js","sourceRoot":"","sources":["../../src/common/logger.create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AASlD;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAW,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,EAAqB;IACnG,IAAI,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC;IACpC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACzB,QAAQ,GAAG,KAAK,CAAC;IAClB,CAAC;SAAM,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/B,QAAQ,GAAG,eAAe,CAAC;IAC5B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEtD,CAAC,YAAY,IAAI,MAAM,CAAC,CAAC,OAAO,CAAA,WAAW,GAAG,sBAAsB,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;IAE/F,OAAO,MAAM,CAAC;AACf,CAAC"}
package/lib/common/logger.global.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { globalObject } from '@idlebox/common';
2
2
  import { create } from './create.logger.js';
3
- const symbol = Symbol.for('@idlebox/logger/global/terminal');
3
+ const symbol = Symbol('@idlebox/logger');
4
4
  /**
5
5
  * 作为logger导出，必须在程序入口调用过 createGlobalLogger() 才能使用
6
6
  */
package/lib/common/logger.global.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logger.global.js","sourceRoot":"","sources":["../../src/common/logger.global.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;AAE7D;;GAEG;AACH,MAAM,CAAC,IAAI,YAAuB,CAAC;AAEnC;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAA2B,EAAE,GAAW,EAAE,YAA4B;IACxG,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,YAAY,EAAE,CAAC;QAClB,YAAY,CAAC,KAAK,CAAA,+BAA+B,CAAC;QAClD,OAAO;IACR,CAAC;IAED,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACpC,YAAY,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC;IAEpC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAElC,IAAI,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QACpC,YAAY,CAAC,OAAO,CAAA,oBAAoB,CAAC;IAC1C,CAAC;SAAM,CAAC;QACP,YAAY,CAAC,KAAK,CAAA,kBAAkB,CAAC;IACtC,CAAC;IACD,OAAO;AACR,CAAC"}
1
+ {"version":3,"file":"logger.global.js","sourceRoot":"","sources":["../../src/common/logger.global.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,MAAM,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAEzC;;GAEG;AACH,MAAM,CAAC,IAAI,YAAuB,CAAC;AAEnC;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAA2B,EAAE,GAAW,EAAE,YAA4B;IACxG,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,YAAY,EAAE,CAAC;QAClB,YAAY,CAAC,KAAK,CAAA,+BAA+B,CAAC;QAClD,OAAO;IACR,CAAC;IAED,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACpC,YAAY,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC;IAEpC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAElC,IAAI,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QACpC,YAAY,CAAC,OAAO,CAAA,oBAAoB,CAAC;IAC1C,CAAC;SAAM,CAAC;QACP,YAAY,CAAC,KAAK,CAAA,kBAAkB,CAAC;IACtC,CAAC;IACD,OAAO;AACR,CAAC"}
package/package.json CHANGED
@@ -1,8 +1,11 @@
1
1
  {
2
2
  "name": "@idlebox/logger",
3
3
  "type": "module",
4
- "version": "0.0.24",
4
+ "version": "0.0.26",
5
5
  "description": "A simple logger module for my self use (nodejs).",
6
+ "license": "MIT",
7
+ "author": "GongT <admin@gongt.me>",
8
+ "main": "./lib/environments/browser.js",
6
9
  "exports": {
7
10
  ".": {
8
11
  "source": "./src/environments/node.ts",
@@ -10,31 +13,32 @@
10
13
  "node": "./lib/environments/node.js",
11
14
  "default": "./lib/environments/browser.js"
12
15
  },
13
- "./node": "./lib/environments/node.js",
14
- "./browser": "./lib/environments/browser.js",
16
+ "./node": {
17
+ "source": "./src/environments/node.ts",
18
+ "default": "./lib/environments/node.js"
19
+ },
20
+ "./browser": {
21
+ "default": "./lib/environments/browser.js"
22
+ },
15
23
  "./package.json": "./package.json"
16
24
  },
17
- "sideEffects": false,
18
25
  "dependencies": {
19
26
  "debug": "^4.4.3",
20
- "@idlebox/common": "^1.5.22",
21
- "@idlebox/terminal-control": "^0.0.4"
27
+ "@idlebox/common": "^1.5.25",
28
+ "@idlebox/terminal-control": "^0.0.6"
22
29
  },
23
30
  "devDependencies": {
24
31
  "@types/debug": "^4.1.13",
25
32
  "@types/node": "^25.5.0",
26
33
  "mocha": "^11.7.5",
27
- "@mpis/run": "^0.0.26",
28
34
  "@build-script/baseline-rig": "latest"
29
35
  },
30
- "license": "MIT",
31
- "author": "GongT <admin@gongt.me>",
32
36
  "repository": {
33
37
  "type": "git",
34
38
  "url": "git+https://github.com/GongT/baobao.git",
35
39
  "directory": "@idlebox/logger"
36
40
  },
37
- "main": "./lib/environments/browser.js",
41
+ "sideEffects": false,
38
42
  "scripts": {
39
43
  "build": "mpis-run build",
40
44
  "watch": "mpis-run watch",
package/src/common/helpers.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { prettyFormatError } from '@idlebox/common';
1
+ import { globalObject, isNodeJs, prettyFormatError } from '@idlebox/common';
2
2
  import debug from 'debug';
3
3
  import { debug_commands } from '../functions/builtin-commands.js';
4
4
  import { EnableLogLevel } from '../loglevels/loglevel.js';
@@ -90,7 +90,10 @@ export function debug_enabled(tag: string) {
90
90
  /**
91
91
  * [当指定tag开启时] 应该输出它的什么级别
92
92
  */
93
- export let defaultLogLevel = (() => {
93
+ export let defaultLogLevel: EnableLogLevel = isNodeJs ? detectNode() : detectEnv(localStorage);
94
+
95
+ function detectNode(): EnableLogLevel {
96
+ const process: typeof import('node:process') = globalObject['process'];
94
97
  if (process.argv.includes('--verbose')) {
95
98
  // 参数中含有 --verbose 时，设置默认日志级别
96
99
  return EnableLogLevel.verbose;
@@ -104,11 +107,14 @@ export let defaultLogLevel = (() => {
104
107
  return EnableLogLevel.debug;
105
108
  }
106
109
  }
110
+ return detectEnv(process.env);
111
+ }
107
112
 
113
+ function detectEnv(env: Record<string, string | undefined>): EnableLogLevel {
108
114
  // DEBUG=xxx,verbose,xxx
109
115
  // biome-ignore lint/performance/useTopLevelRegex: a
110
116
  const has_debug_verbose = /(?<=^| |,)(verbose|debug)(?=$| |,)/;
111
- const setted = has_debug_verbose.exec(process.env.DEBUG || '');
117
+ const setted = has_debug_verbose.exec(env.DEBUG || '');
112
118
  if (setted) {
113
119
  if (setted[0] === 'verbose') {
114
120
  return EnableLogLevel.verbose;
@@ -117,7 +123,7 @@ export let defaultLogLevel = (() => {
117
123
  }
118
124
  } else {
119
125
  // 直接通过 DEBUG_LEVEL 设置
120
- switch (process.env.DEBUG_LEVEL || '') {
126
+ switch (env.DEBUG_LEVEL || '') {
121
127
  case '':
122
128
  return EnableLogLevel.log;
123
129
  case 'verbose':
@@ -135,7 +141,7 @@ export let defaultLogLevel = (() => {
135
141
  return EnableLogLevel.verbose;
136
142
  }
137
143
  }
138
- })();
144
+ }
139
145
 
140
146
  /**
141
147
  * 手动设置默认日志级别
package/src/common/logger.create.ts CHANGED
@@ -7,6 +7,7 @@ import type { IInstrestedConsole, IMyLogger } from './types.js';
7
7
  export interface ILoggerOptionsReq {
8
8
  readonly colors?: boolean;
9
9
  readonly console: IInstrestedConsole;
10
+ readonly level?: EnableLogLevel;
10
11
  }
11
12
 
12
13
  /**
@@ -15,15 +16,17 @@ export interface ILoggerOptionsReq {
15
16
  * @param colors 是否启用颜色，默认启用
16
17
  * @returns
17
18
  */
18
- export function createLoggerObject(tag: string, { colors = true, console }: ILoggerOptionsReq): IMyLogger {
19
- let level = EnableLogLevel.error;
20
- if (debug_enabled(tag)) {
21
- level = defaultLogLevel;
19
+ export function createLoggerObject(tag: string, { colors = true, console, level }: ILoggerOptionsReq): IMyLogger {
20
+ let logLevel = EnableLogLevel.error;
21
+ if (level !== undefined) {
22
+ logLevel = level;
23
+ } else if (debug_enabled(tag)) {
24
+ logLevel = defaultLogLevel;
22
25
  }
23
26
 
24
- const logger = create(console, tag, level, colors);
27
+ const logger = create(console, tag, logLevel, colors);
25
28
 
26
- (globalLogger || logger).verbose`logger "${tag}" created, level = ${EnableLogLevel[level]}`;
29
+ (globalLogger || logger).verbose`logger "${tag}" created, level = ${EnableLogLevel[logLevel]}`;
27
30
 
28
31
  return logger;
29
32
  }
package/src/common/logger.global.ts CHANGED
@@ -3,7 +3,7 @@ import type { EnableLogLevel } from '../loglevels/loglevel.js';
3
3
  import { create } from './create.logger.js';
4
4
  import type { IInstrestedConsole, IMyLogger } from './types.js';
5
5
 
6
- const symbol = Symbol.for('@idlebox/logger/global/terminal');
6
+ const symbol = Symbol('@idlebox/logger');
7
7
 
8
8
  /**
9
9
  * 作为logger导出，必须在程序入口调用过 createGlobalLogger() 才能使用
package/src/tsconfig.json CHANGED
@@ -1,9 +1,12 @@
1
1
  {
2
- "extends": "@build-script/baseline-rig/package/tsconfig.json",
3
- "compilerOptions": {
4
- "typeRoots": ["../node_modules/@types", "../node_modules"],
5
- "outDir": "../lib",
6
- "rootDir": "./",
7
- "noEmitOnError": false
8
- }
2
+ "extends": "@build-script/baseline-rig/package/tsconfig.json",
3
+ "compilerOptions": {
4
+ "typeRoots": [
5
+ "../node_modules/@types",
6
+ "../node_modules"
7
+ ],
8
+ "outDir": "../lib",
9
+ "rootDir": "./",
10
+ "noEmitOnError": false
11
+ }
9
12
  }