@celljs/core 4.0.0 → 4.1.0

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 (173) hide show
  1. package/README.md +0 -6
  2. package/esm/common/application/application-protocol.js +1 -1
  3. package/esm/common/application/application-protocol.js.map +1 -1
  4. package/esm/common/config/config-provider.js +2 -1
  5. package/esm/common/config/config-provider.js.map +1 -1
  6. package/esm/common/container/auto-bind.js +26 -12
  7. package/esm/common/container/auto-bind.js.map +1 -1
  8. package/esm/common/el/expression-compiler.d.ts +4 -15
  9. package/esm/common/el/expression-compiler.js +6 -163
  10. package/esm/common/el/expression-compiler.js.map +1 -1
  11. package/esm/common/el/expression-handler.d.ts +7 -2
  12. package/esm/common/el/expression-handler.js +14 -53
  13. package/esm/common/el/expression-handler.js.map +1 -1
  14. package/esm/common/el/expression-util.d.ts +68 -0
  15. package/esm/common/el/expression-util.js +347 -0
  16. package/esm/common/el/expression-util.js.map +1 -0
  17. package/esm/common/el/index.d.ts +1 -0
  18. package/esm/common/el/index.js +1 -0
  19. package/esm/common/el/index.js.map +1 -1
  20. package/esm/common/logger/abstract-logger.d.ts +4 -2
  21. package/esm/common/logger/abstract-logger.js +11 -6
  22. package/esm/common/logger/abstract-logger.js.map +1 -1
  23. package/esm/common/logger/logger-protocol.d.ts +4 -0
  24. package/esm/common/logger/logger-protocol.js +2 -0
  25. package/esm/common/logger/logger-protocol.js.map +1 -1
  26. package/esm/common/logger/logger.js +7 -7
  27. package/esm/common/logger/logger.js.map +1 -1
  28. package/esm/common/test/mock-logger.d.ts +1 -0
  29. package/esm/common/test/mock-logger.js +3 -0
  30. package/esm/common/test/mock-logger.js.map +1 -1
  31. package/esm/common/utils/emitter.d.ts +1 -10
  32. package/esm/common/utils/emitter.js +0 -56
  33. package/esm/common/utils/emitter.js.map +1 -1
  34. package/esm/common/utils/mime-type-util.js +1 -1
  35. package/esm/common/utils/mime-type-util.js.map +1 -1
  36. package/esm/common/utils/mime-type.js +1 -1
  37. package/esm/common/utils/mime-type.js.map +1 -1
  38. package/esm/node/context/context.d.ts +11 -2
  39. package/esm/node/context/context.js +36 -12
  40. package/esm/node/context/context.js.map +1 -1
  41. package/esm/node/index.d.ts +0 -1
  42. package/esm/node/index.js +0 -1
  43. package/esm/node/index.js.map +1 -1
  44. package/lib/common/aop/aop.spec.d.ts +2 -0
  45. package/lib/common/aop/aop.spec.d.ts.map +1 -0
  46. package/lib/common/aop/aop.spec.js +170 -0
  47. package/lib/common/aop/aop.spec.js.map +1 -0
  48. package/lib/common/application/application-protocol.js +1 -1
  49. package/lib/common/application/application-protocol.js.map +1 -1
  50. package/lib/common/application/lifecycle.spec.d.ts +2 -0
  51. package/lib/common/application/lifecycle.spec.d.ts.map +1 -0
  52. package/lib/common/application/lifecycle.spec.js +155 -0
  53. package/lib/common/application/lifecycle.spec.js.map +1 -0
  54. package/lib/common/config/config-provider.js +2 -1
  55. package/lib/common/config/config-provider.js.map +1 -1
  56. package/lib/common/container/assembly.spec.d.ts +2 -0
  57. package/lib/common/container/assembly.spec.d.ts.map +1 -0
  58. package/lib/common/container/assembly.spec.js +464 -0
  59. package/lib/common/container/assembly.spec.js.map +1 -0
  60. package/lib/common/container/auto-bind.js +26 -12
  61. package/lib/common/container/auto-bind.js.map +1 -1
  62. package/lib/common/el/expression-compiler.d.ts +4 -15
  63. package/lib/common/el/expression-compiler.d.ts.map +1 -1
  64. package/lib/common/el/expression-compiler.js +6 -163
  65. package/lib/common/el/expression-compiler.js.map +1 -1
  66. package/lib/common/el/expression-handler.d.ts +7 -2
  67. package/lib/common/el/expression-handler.d.ts.map +1 -1
  68. package/lib/common/el/expression-handler.js +14 -56
  69. package/lib/common/el/expression-handler.js.map +1 -1
  70. package/lib/common/el/expression-handler.spec.d.ts +2 -0
  71. package/lib/common/el/expression-handler.spec.d.ts.map +1 -0
  72. package/lib/common/el/expression-handler.spec.js +99 -0
  73. package/lib/common/el/expression-handler.spec.js.map +1 -0
  74. package/lib/common/el/expression-util.d.ts +69 -0
  75. package/lib/common/el/expression-util.d.ts.map +1 -0
  76. package/lib/common/el/expression-util.js +352 -0
  77. package/lib/common/el/expression-util.js.map +1 -0
  78. package/lib/common/el/expression-util.spec.d.ts +2 -0
  79. package/lib/common/el/expression-util.spec.d.ts.map +1 -0
  80. package/lib/common/el/expression-util.spec.js +45 -0
  81. package/lib/common/el/expression-util.spec.js.map +1 -0
  82. package/lib/common/el/index.d.ts +1 -0
  83. package/lib/common/el/index.d.ts.map +1 -1
  84. package/lib/common/el/index.js +1 -0
  85. package/lib/common/el/index.js.map +1 -1
  86. package/lib/common/el/value-and-el.spec.d.ts +2 -0
  87. package/lib/common/el/value-and-el.spec.d.ts.map +1 -0
  88. package/lib/common/el/value-and-el.spec.js +216 -0
  89. package/lib/common/el/value-and-el.spec.js.map +1 -0
  90. package/lib/common/logger/abstract-logger.d.ts +4 -2
  91. package/lib/common/logger/abstract-logger.d.ts.map +1 -1
  92. package/lib/common/logger/abstract-logger.js +10 -5
  93. package/lib/common/logger/abstract-logger.js.map +1 -1
  94. package/lib/common/logger/logger-protocol.d.ts +4 -0
  95. package/lib/common/logger/logger-protocol.d.ts.map +1 -1
  96. package/lib/common/logger/logger-protocol.js +3 -1
  97. package/lib/common/logger/logger-protocol.js.map +1 -1
  98. package/lib/common/logger/logger.js +7 -7
  99. package/lib/common/logger/logger.js.map +1 -1
  100. package/lib/common/logger/logger.spec.d.ts +2 -0
  101. package/lib/common/logger/logger.spec.d.ts.map +1 -0
  102. package/lib/common/logger/logger.spec.js +57 -0
  103. package/lib/common/logger/logger.spec.js.map +1 -0
  104. package/lib/common/test/mock-logger.d.ts +1 -0
  105. package/lib/common/test/mock-logger.d.ts.map +1 -1
  106. package/lib/common/test/mock-logger.js +3 -0
  107. package/lib/common/test/mock-logger.js.map +1 -1
  108. package/lib/common/utils/emitter.d.ts +1 -10
  109. package/lib/common/utils/emitter.d.ts.map +1 -1
  110. package/lib/common/utils/emitter.js +1 -58
  111. package/lib/common/utils/emitter.js.map +1 -1
  112. package/lib/common/utils/mime-type-util.js +1 -1
  113. package/lib/common/utils/mime-type-util.js.map +1 -1
  114. package/lib/common/utils/mime-type.js +1 -1
  115. package/lib/common/utils/mime-type.js.map +1 -1
  116. package/lib/common/utils/utils-behavior.spec.d.ts +2 -0
  117. package/lib/common/utils/utils-behavior.spec.d.ts.map +1 -0
  118. package/lib/common/utils/utils-behavior.spec.js +232 -0
  119. package/lib/common/utils/utils-behavior.spec.js.map +1 -0
  120. package/lib/node/context/context.d.ts +11 -2
  121. package/lib/node/context/context.d.ts.map +1 -1
  122. package/lib/node/context/context.js +36 -10
  123. package/lib/node/context/context.js.map +1 -1
  124. package/lib/node/context/context.spec.d.ts +2 -0
  125. package/lib/node/context/context.spec.d.ts.map +1 -0
  126. package/lib/node/context/context.spec.js +202 -0
  127. package/lib/node/context/context.spec.js.map +1 -0
  128. package/lib/node/index.d.ts +0 -1
  129. package/lib/node/index.d.ts.map +1 -1
  130. package/lib/node/index.js +0 -1
  131. package/lib/node/index.js.map +1 -1
  132. package/package.json +7 -17
  133. package/src/common/aop/aop.spec.ts +145 -0
  134. package/src/common/application/application-protocol.ts +1 -1
  135. package/src/common/application/lifecycle.spec.ts +148 -0
  136. package/src/common/config/config-provider.ts +1 -1
  137. package/src/common/container/assembly.spec.ts +293 -0
  138. package/src/common/container/auto-bind.ts +23 -10
  139. package/src/common/el/expression-compiler.ts +6 -166
  140. package/src/common/el/expression-handler.spec.ts +110 -0
  141. package/src/common/el/expression-handler.ts +14 -51
  142. package/src/common/el/expression-util.spec.ts +45 -0
  143. package/src/common/el/expression-util.ts +363 -0
  144. package/src/common/el/index.ts +2 -1
  145. package/src/common/el/value-and-el.spec.ts +186 -0
  146. package/src/common/logger/abstract-logger.ts +12 -6
  147. package/src/common/logger/logger-protocol.ts +5 -0
  148. package/src/common/logger/logger.spec.ts +61 -0
  149. package/src/common/logger/logger.ts +7 -7
  150. package/src/common/test/mock-logger.ts +3 -0
  151. package/src/common/utils/emitter.ts +1 -63
  152. package/src/common/utils/mime-type-util.ts +1 -1
  153. package/src/common/utils/mime-type.ts +1 -1
  154. package/src/common/utils/utils-behavior.spec.ts +259 -0
  155. package/src/node/context/context.spec.ts +219 -0
  156. package/src/node/context/context.ts +35 -10
  157. package/src/node/index.ts +0 -1
  158. package/esm/node/utils/crc.d.ts +0 -1
  159. package/esm/node/utils/crc.js +0 -7
  160. package/esm/node/utils/crc.js.map +0 -1
  161. package/esm/node/utils/index.d.ts +0 -1
  162. package/esm/node/utils/index.js +0 -2
  163. package/esm/node/utils/index.js.map +0 -1
  164. package/lib/node/utils/crc.d.ts +0 -2
  165. package/lib/node/utils/crc.d.ts.map +0 -1
  166. package/lib/node/utils/crc.js +0 -10
  167. package/lib/node/utils/crc.js.map +0 -1
  168. package/lib/node/utils/index.d.ts +0 -2
  169. package/lib/node/utils/index.d.ts.map +0 -1
  170. package/lib/node/utils/index.js +0 -18
  171. package/lib/node/utils/index.js.map +0 -1
  172. package/src/node/utils/crc.ts +0 -7
  173. package/src/node/utils/index.ts +0 -1
@@ -0,0 +1,186 @@
1
+ import { describe, it, afterAll } from 'bun:test';
2
+ import { expect } from 'chai';
3
+ import { ApplicationFactory } from '../application/application-factory';
4
+ import { Component, Value } from '../annotation';
5
+ import { ContainerUtil } from '../container/container-util';
6
+ import { ConfigUtil } from '../config/config-util';
7
+ import { ExpressionHandler } from './expression-protocol';
8
+
9
+ /**
10
+ * @Value、ConfigUtil 与 EL(${...},jexl)的约定(阶段 1.E 行为测试)。
11
+ * 配置就是 ApplicationFactory.create() 的第一个参数(CLI 生成的入口会把合并后的 cell.yml 传进来)。
12
+ */
13
+ const boot = (props: Record<string, any>) => ApplicationFactory.create(props);
14
+ const el = () => ContainerUtil.get<ExpressionHandler>(ExpressionHandler);
15
+
16
+ describe('core @Value 与配置', () => {
17
+
18
+ it('@Value(key) 读配置;@Value() 不带参数时以属性名为 key', async () => {
19
+ @Component()
20
+ class Settings {
21
+ @Value('cell.name')
22
+ readonly name: string;
23
+ @Value()
24
+ readonly port: number;
25
+ }
26
+ await boot({ cell: { name: 'demo' }, port: 8080 });
27
+ const s = ContainerUtil.get(Settings);
28
+ expect(s.name).to.equal('demo');
29
+ expect(s.port).to.equal(8080);
30
+ });
31
+
32
+ it('值里的 ${...} 会求值,可以引用其他配置,多层引用也会继续求值', async () => {
33
+ @Component()
34
+ class Urls {
35
+ @Value('cell.url')
36
+ readonly url: string;
37
+ @Value('cell.chain')
38
+ readonly chain: string;
39
+ }
40
+ await boot({ cell: { host: 'example.com', url: 'https://${cell.host}:443/api', chain: '${cell.url}', } });
41
+ const u = ContainerUtil.get(Urls);
42
+ expect(u.url).to.equal('https://example.com:443/api');
43
+ expect(u.chain).to.equal('https://example.com:443/api');
44
+ });
45
+
46
+ it('取对象时,对象里的字符串也会求值;取不到的 key 为 undefined', async () => {
47
+ @Component()
48
+ class Db {
49
+ @Value('cell.db')
50
+ readonly db: { host: string, port: number, hosts: string[] };
51
+ @Value('cell.missing.deep')
52
+ readonly missing?: unknown;
53
+ }
54
+ await boot({ cell: { region: 'eu', db: { host: 'db.${cell.region}.local', port: 5432, hosts: ['a.${cell.region}', 'b'] } } });
55
+ const d = ContainerUtil.get(Db);
56
+ expect(d.db).to.deep.equal({ host: 'db.eu.local', port: 5432, hosts: ['a.eu', 'b'] });
57
+ expect(d.missing).to.equal(undefined);
58
+ });
59
+
60
+ it('构造器参数也能用 @Value', async () => {
61
+ @Component()
62
+ class WithCtor {
63
+ constructor(@Value('cell.size') readonly size: number) { }
64
+ }
65
+ await boot({ cell: { size: 3 } });
66
+ expect(ContainerUtil.get(WithCtor).size).to.equal(3);
67
+ });
68
+
69
+ it('detached 的 @Value:不在容器里的对象每次读取都取当前容器的配置', async () => {
70
+ class Plain {
71
+ @Value({ el: 'cell.mode', detached: true })
72
+ readonly mode: string;
73
+ }
74
+ const p = new Plain();
75
+ await boot({ cell: { mode: 'a' } });
76
+ expect(p.mode).to.equal('a');
77
+ await boot({ cell: { mode: 'b' } });
78
+ expect(p.mode).to.equal('b');
79
+ });
80
+
81
+ it('ConfigUtil.get:取值、默认值', async () => {
82
+ await boot({ cell: { a: 1, ref: '${cell.a}' } });
83
+ expect(ConfigUtil.get('cell.a')).to.equal(1);
84
+ expect(ConfigUtil.get('cell.ref')).to.equal(1);
85
+ expect(ConfigUtil.get('cell.none', 'dflt')).to.equal('dflt');
86
+ });
87
+
88
+ it('现状:create() 过程中第一次求值就会就地改写传入的配置对象,getRaw() 拿到的也是求值后的结果', async () => {
89
+ // expression-handler.ts getContext():第一次拿到上下文时 this.handle(c, c),把整份配置原地求值;
90
+ // 创建 Application 时注入的组件(如 Logger)读配置,这一步在 create() 返回前就发生了
91
+ const props = { cell: { a: 1, ref: '${cell.a}' as unknown, nested: ['${cell.a}'] as unknown[] } };
92
+ await boot(props);
93
+ expect(ConfigUtil.getRaw()).to.equal(props);
94
+ expect(props.cell.ref).to.equal(1);
95
+ expect(props.cell.nested[0]).to.equal(1);
96
+ });
97
+
98
+ it('false、0、空串都是有效的值:@Value 拿得到,ConfigUtil.get 只在值为 undefined 时用默认值(F3)', async () => {
99
+ @Component()
100
+ class Flags {
101
+ @Value('cell.enabled')
102
+ readonly enabled: boolean;
103
+ @Value('cell.retries')
104
+ readonly retries: number;
105
+ @Value('cell.prefix')
106
+ readonly prefix: string;
107
+ }
108
+ await boot({ cell: { enabled: false, retries: 0, prefix: '' } });
109
+ const f = ContainerUtil.get(Flags);
110
+ expect(f.enabled).to.equal(false);
111
+ expect(f.retries).to.equal(0);
112
+ expect(f.prefix).to.equal('');
113
+ expect(ConfigUtil.get('cell.retries', 3)).to.equal(0);
114
+ expect(ConfigUtil.get('cell.enabled', true)).to.equal(false);
115
+ expect(ConfigUtil.get('cell.missing', 3)).to.equal(3);
116
+ });
117
+ });
118
+
119
+ describe('core EL(ExpressionHandler)', () => {
120
+ const ENV_KEY = 'CELL_T13_EL_PROBE';
121
+ afterAll(() => {
122
+ delete process.env[ENV_KEY];
123
+ });
124
+
125
+ it('没有 ${ 的文本原样返回;只有一个表达式时保留类型,混排时拼成字符串', async () => {
126
+ await boot({ cell: { n: 2 } });
127
+ expect(el().handle('plain text')).to.equal('plain text');
128
+ expect(el().handle('${cell.n + 1}')).to.equal(3);
129
+ expect(el().handle('${cell.n > 1}')).to.equal(true);
130
+ expect(el().handle('n=${cell.n}, n2=${cell.n * cell.n}')).to.equal('n=2, n2=4');
131
+ });
132
+
133
+ it('jexl 的运算、三元、字符串里的 } 都能正确切分', async () => {
134
+ await boot({ cell: { port: 3000, name: 'x' } });
135
+ expect(el().handle('${cell.port > 1000 ? "high" : "low"}')).to.equal('high');
136
+ expect(el().handle('${"a}b" + cell.name}')).to.equal('a}bx');
137
+ expect(el().handle('[${cell.name}]')).to.equal('[x]');
138
+ });
139
+
140
+ it('现状:反斜杠转义只阻止求值,反斜杠本身留在结果里', async () => {
141
+ await boot({ cell: { name: 'x' } });
142
+ expect(el().handle('cost \\${cell.name}')).to.equal('cost \\${cell.name}');
143
+ });
144
+
145
+ it.todo('期望:\\${...} 得到字面量 ${...}(去掉转义符),否则配置里无法写出 ${', () => { });
146
+
147
+ it('内置 transform:replace、regexp、eval', async () => {
148
+ await boot({ cell: { name: 'svc', tpl: '${cell.name}-v1' } });
149
+ expect(el().handle('${"a-b-c"|replace("-", "_")}')).to.equal('a_b_c');
150
+ const re = el().handle('${"^ab+$"|regexp("i")}');
151
+ expect(re).to.be.instanceOf(RegExp);
152
+ expect(re.test('ABBB')).to.equal(true);
153
+ expect(el().handle('${"${cell.name}"|eval}')).to.equal('svc');
154
+ });
155
+
156
+ it('可以传入自己的上下文;未定义的变量为 undefined', async () => {
157
+ await boot({});
158
+ expect(el().handle('${a.b * 2}', { a: { b: 21 } })).to.equal(42);
159
+ expect(el().handle('${nothing.here}', {})).to.equal(undefined);
160
+ });
161
+
162
+ it('处理对象时就地求值;带 _ignoreEl 的子对象不求值', async () => {
163
+ await boot({ cell: { v: 'ok' } });
164
+ const obj = { a: '${cell.v}', nested: { b: ['${cell.v}!'] }, raw: { _ignoreEl: true, c: '${cell.v}' } };
165
+ const out = el().handle(obj);
166
+ expect(out).to.equal(obj);
167
+ expect(obj.a).to.equal('ok');
168
+ expect(obj.nested.b[0]).to.equal('ok!');
169
+ expect(obj.raw.c).to.equal('${cell.v}');
170
+ });
171
+
172
+ it('env 是进程环境变量(遍历整份配置时 env 子树带 _ignoreEl,不会被就地求值)', async () => {
173
+ process.env[ENV_KEY] = 'plain-value';
174
+ await boot({ cell: {} });
175
+ expect(el().handle(`\${env.${ENV_KEY}}`)).to.equal('plain-value');
176
+ expect(ConfigUtil.getRaw().env?.[ENV_KEY]).to.equal('plain-value');
177
+ });
178
+
179
+ it('来自 env 的字符串不再求值,经配置间接引用时也一样(F6)', async () => {
180
+ process.env[ENV_KEY] = '${cell.other}';
181
+ await boot({ cell: { other: 'from-config', viaEnv: `\${env.${ENV_KEY}}`, viaKey: '${cell.viaEnv}' } });
182
+ expect(el().handle(`\${env.${ENV_KEY}}`)).to.equal('${cell.other}');
183
+ expect(el().handle('${cell.viaEnv}')).to.equal('${cell.other}');
184
+ expect(el().handle('${cell.viaKey}')).to.equal('${cell.other}');
185
+ });
186
+ });
@@ -1,5 +1,5 @@
1
1
  import { Autowired, Optional, Value } from '../annotation';
2
- import { Logger, LOGGER_LEVEL, LogLevel, onLogEmitter, TraceIdProvider } from './logger-protocol';
2
+ import { Logger, LOGGER_LEVEL, LOG_LEVELS, LogLevel, onLogEmitter, TraceIdProvider } from './logger-protocol';
3
3
 
4
4
  export abstract class AbstractLogger implements Logger {
5
5
  protected instance: Logger;
@@ -24,18 +24,24 @@ export abstract class AbstractLogger implements Logger {
24
24
  return context ? `[${context}] ` : '';
25
25
  }
26
26
 
27
- protected resolvePrefix(): string {
27
+ isEnabled(level: LogLevel): boolean {
28
+ const configured = LOG_LEVELS.indexOf(this.level);
29
+ return LOG_LEVELS.indexOf(level) >= (configured < 0 ? LOG_LEVELS.indexOf('info') : configured);
30
+ }
31
+
32
+ /** `level` is the level of the message, not the configured one. */
33
+ protected resolvePrefix(level: LogLevel): string {
28
34
  const time = new Date().toISOString();
29
- return `${time} [${this.level}]`;
35
+ return `${time} [${level}]`;
30
36
  }
31
37
 
32
- protected log(message: any, context?: string, logFn: (...args: any[]) => void = console.info): void {
38
+ protected log(message: any, context?: string, logFn: (...args: any[]) => void = console.info, level: LogLevel = 'info'): void {
33
39
  const traceId = this.traceIdProvider?.provide();
34
40
  const traceStr = traceId ? ` [trace: ${traceId}]` : '';
35
41
  const contextStr = this.resolveContextString(context);
36
- logFn(`${this.resolvePrefix()}${traceStr}${contextStr}${message}`);
42
+ logFn(`${this.resolvePrefix(level)}${traceStr}${contextStr}${message}`);
37
43
  onLogEmitter.fire({
38
- level: this.level,
44
+ level,
39
45
  traceId,
40
46
  rootContext: this.context,
41
47
  context,
@@ -7,6 +7,9 @@ export const TraceIdProvider = Symbol('TraceIdProvider');
7
7
  export const LoggerService = Symbol('LoggerService');
8
8
 
9
9
  export type LogLevel = 'verbose' | 'debug' | 'info' | 'warn' | 'error';
10
+
11
+ /** Levels from the most to the least verbose: a logger at a level writes that level and the ones after it. */
12
+ export const LOG_LEVELS: readonly LogLevel[] = ['verbose', 'debug', 'info', 'warn', 'error'];
10
13
  export interface LogMessage {
11
14
  level: LogLevel;
12
15
  traceId?: string;
@@ -25,6 +28,8 @@ export interface Logger {
25
28
  error(message: any, context?: string): void;
26
29
  warn(message: any, context?: string): void;
27
30
  debug(message: any, context?: string): void;
31
+ /** Whether messages of `level` are written; check it before building an expensive message. */
32
+ isEnabled(level: LogLevel): boolean;
28
33
  time(label: string): void;
29
34
  timeEnd(label: string, context?: string): number | undefined;
30
35
 
@@ -0,0 +1,61 @@
1
+ import { afterEach, describe, it } from 'bun:test';
2
+ import { expect } from 'chai';
3
+ import { LoggerImpl } from './logger';
4
+ import { LogLevel, LogMessage, onLogEmitter } from './logger-protocol';
5
+
6
+ const consoleFns = ['info', 'warn', 'error', 'debug'] as const;
7
+ const originals = Object.fromEntries(consoleFns.map(name => [name, console[name]]));
8
+
9
+ function capture(level: LogLevel) {
10
+ const lines: { fn: string; text: string }[] = [];
11
+ for (const name of consoleFns) {
12
+ console[name] = (text: string) => lines.push({ fn: name, text });
13
+ }
14
+ const logger = new LoggerImpl();
15
+ Object.assign(logger, { level });
16
+ return { logger, lines };
17
+ }
18
+
19
+ afterEach(() => Object.assign(console, originals));
20
+
21
+ describe('LoggerImpl', () => {
22
+ it('labels each line with the level of the message, not the configured one', () => {
23
+ const { logger, lines } = capture('debug');
24
+ logger.debug('d');
25
+ logger.info('i');
26
+ logger.warn('w');
27
+ logger.error('e');
28
+ expect(lines.map(l => [l.fn, /\[(\w+)\]/.exec(l.text)?.[1], l.text.slice(-1)])).to.deep.equal([
29
+ ['debug', 'debug', 'd'],
30
+ ['info', 'info', 'i'],
31
+ ['warn', 'warn', 'w'],
32
+ ['error', 'error', 'e'],
33
+ ]);
34
+ });
35
+
36
+ it('writes the configured level and the ones after it', () => {
37
+ const { logger, lines } = capture('warn');
38
+ logger.debug('d');
39
+ logger.info('i');
40
+ logger.warn('w');
41
+ logger.error('e');
42
+ expect(lines.map(l => l.fn)).to.deep.equal(['warn', 'error']);
43
+ expect([logger.isEnabled('verbose'), logger.isEnabled('debug'), logger.isEnabled('info'), logger.isEnabled('warn'), logger.isEnabled('error')])
44
+ .to.deep.equal([false, false, false, true, true]);
45
+ });
46
+
47
+ it('treats an unknown configured level as info', () => {
48
+ const { logger } = capture('loud' as LogLevel);
49
+ expect(logger.isEnabled('debug')).to.equal(false);
50
+ expect(logger.isEnabled('info')).to.equal(true);
51
+ });
52
+
53
+ it('reports the level of the message to onLog', () => {
54
+ const { logger } = capture('info');
55
+ const seen: LogMessage[] = [];
56
+ const listener = onLogEmitter.event(m => seen.push(m));
57
+ logger.warn('w');
58
+ listener.dispose();
59
+ expect(seen.map(m => [m.level, m.message])).to.deep.equal([['warn', 'w']]);
60
+ });
61
+ });
@@ -7,24 +7,24 @@ import { Logger } from './logger-protocol';
7
7
  export class LoggerImpl extends AbstractLogger {
8
8
 
9
9
  error(message: any, context?: string): void {
10
- this.log(message, context, console.error.bind(console));
10
+ this.log(message, context, console.error.bind(console), 'error');
11
11
  }
12
12
 
13
13
  info(message: any, context?: string): void {
14
- if (['info', 'debug'].includes(this.level)) {
15
- this.log(message, context);
14
+ if (this.isEnabled('info')) {
15
+ this.log(message, context, console.info.bind(console), 'info');
16
16
  }
17
17
  }
18
18
 
19
19
  warn(message: any, context?: string): void {
20
- if (['info', 'debug', 'warn'].includes(this.level)) {
21
- this.log(message, context, console.warn.bind(console));
20
+ if (this.isEnabled('warn')) {
21
+ this.log(message, context, console.warn.bind(console), 'warn');
22
22
  }
23
23
  }
24
24
 
25
25
  debug(message: any, context?: string): void {
26
- if (this.level === 'debug') {
27
- this.log(message, context, console.debug.bind(console));
26
+ if (this.isEnabled('debug')) {
27
+ this.log(message, context, console.debug.bind(console), 'debug');
28
28
  }
29
29
  }
30
30
 
@@ -28,4 +28,7 @@ export class MockLogger implements Logger {
28
28
  debug(message: any, context?: string): void {
29
29
  // do nothing
30
30
  }
31
+ isEnabled(level: LogLevel): boolean {
32
+ return false;
33
+ }
31
34
  }
@@ -1,4 +1,4 @@
1
- import { Event, Callback, CallbackList } from './event';
1
+ import { Event, CallbackList } from './event';
2
2
  import { Disposable } from './disposable';
3
3
  import { MaybePromise } from './prioritizeable';
4
4
 
@@ -204,65 +204,3 @@ export namespace WaitUntilEvent {
204
204
  }
205
205
  }
206
206
  }
207
-
208
- import { CancellationToken } from './cancellation';
209
-
210
- export class AsyncEmitter<T extends WaitUntilEvent> extends Emitter<T> {
211
-
212
- protected deliveryQueue: Promise<void> | undefined;
213
-
214
- /**
215
- * Fire listeners async one after another.
216
- */
217
- override fire(event: Omit<T, 'waitUntil'>, token: CancellationToken = CancellationToken.None,
218
- promiseJoin?: (p: Promise<any>, listener: Function) => Promise<any>): Promise<void> {
219
- const callbacks = this._callbacks;
220
- if (!callbacks) {
221
- return Promise.resolve();
222
- }
223
- const listeners = [...callbacks];
224
- if (this.deliveryQueue) {
225
- return this.deliveryQueue = this.deliveryQueue.then(() => this.deliver(listeners, event, token, promiseJoin));
226
- }
227
- return this.deliveryQueue = this.deliver(listeners, event, token, promiseJoin);
228
- }
229
-
230
- protected async deliver(listeners: Callback[], event: Omit<T, 'waitUntil'>, token: CancellationToken,
231
- promiseJoin?: (p: Promise<any>, listener: Function) => Promise<any>): Promise<void> {
232
- for (const listener of listeners) {
233
- if (token.isCancellationRequested) {
234
- return;
235
- }
236
- const waitables: Promise<void>[] = [];
237
- const asyncEvent = Object.assign(event, {
238
- waitUntil: (thenable: Promise<any>) => {
239
- if (Object.isFrozen(waitables)) {
240
- throw new Error('waitUntil cannot be called asynchronously.');
241
- }
242
- if (promiseJoin) {
243
- thenable = promiseJoin(thenable, listener);
244
- }
245
- waitables.push(thenable);
246
- }
247
- }) as T;
248
- try {
249
- listener(event);
250
- // Asynchronous calls to `waitUntil` should fail.
251
- Object.freeze(waitables);
252
- } catch (e) {
253
- console.error(e);
254
- } finally {
255
- delete (asyncEvent as any)['waitUntil'];
256
- }
257
- if (!waitables.length) {
258
- return;
259
- }
260
- try {
261
- await Promise.all(waitables);
262
- } catch (e) {
263
- console.error(e);
264
- }
265
- }
266
- }
267
-
268
- }
@@ -110,7 +110,7 @@ export abstract class MimeTypeUtils {
110
110
  if (!mimeTypes) {
111
111
  return [];
112
112
  }
113
- return this.tokenize(mimeTypes).filter(mimeType => !!mimeType).map(this.parseMimeType);
113
+ return this.tokenize(mimeTypes).filter(mimeType => !!mimeType).map(mimeType => this.parseMimeType(mimeType));
114
114
  }
115
115
 
116
116
  static tokenize(mimeTypes: string): string[] {
@@ -57,7 +57,7 @@ export class MimeType {
57
57
  this.subtype = subtype.toLowerCase();
58
58
  if (parameters) {
59
59
  const map: Map<string, string> = new Map();
60
- for (const [key, value] of Object.entries(parameters)) {
60
+ for (const [key, value] of parameters.entries()) {
61
61
  this.checkParameters(key, value);
62
62
  map.set(key.toLowerCase(), value);
63
63
  }