@celljs/core 3.9.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 (219) hide show
  1. package/README.md +0 -6
  2. package/cell.remote.yml +8 -0
  3. package/cell.yml +0 -3
  4. package/esm/common/application/application-entry.js +21 -3
  5. package/esm/common/application/application-entry.js.map +1 -1
  6. package/esm/common/application/application-host.d.ts +38 -0
  7. package/esm/common/application/application-host.js +17 -0
  8. package/esm/common/application/application-host.js.map +1 -0
  9. package/esm/common/application/application-protocol.js +1 -1
  10. package/esm/common/application/application-protocol.js.map +1 -1
  11. package/esm/common/application/index.d.ts +1 -0
  12. package/esm/common/application/index.js +1 -0
  13. package/esm/common/application/index.js.map +1 -1
  14. package/esm/common/config/config-provider.js +2 -1
  15. package/esm/common/config/config-provider.js.map +1 -1
  16. package/esm/common/config/env-config-util.d.ts +48 -0
  17. package/esm/common/config/env-config-util.js +185 -0
  18. package/esm/common/config/env-config-util.js.map +1 -0
  19. package/esm/common/config/index.d.ts +1 -0
  20. package/esm/common/config/index.js +1 -0
  21. package/esm/common/config/index.js.map +1 -1
  22. package/esm/common/container/auto-bind.js +26 -12
  23. package/esm/common/container/auto-bind.js.map +1 -1
  24. package/esm/common/el/expression-compiler.d.ts +4 -15
  25. package/esm/common/el/expression-compiler.js +6 -163
  26. package/esm/common/el/expression-compiler.js.map +1 -1
  27. package/esm/common/el/expression-handler.d.ts +7 -2
  28. package/esm/common/el/expression-handler.js +14 -53
  29. package/esm/common/el/expression-handler.js.map +1 -1
  30. package/esm/common/el/expression-util.d.ts +68 -0
  31. package/esm/common/el/expression-util.js +347 -0
  32. package/esm/common/el/expression-util.js.map +1 -0
  33. package/esm/common/el/index.d.ts +1 -0
  34. package/esm/common/el/index.js +1 -0
  35. package/esm/common/el/index.js.map +1 -1
  36. package/esm/common/logger/abstract-logger.d.ts +4 -2
  37. package/esm/common/logger/abstract-logger.js +11 -6
  38. package/esm/common/logger/abstract-logger.js.map +1 -1
  39. package/esm/common/logger/logger-protocol.d.ts +4 -0
  40. package/esm/common/logger/logger-protocol.js +2 -0
  41. package/esm/common/logger/logger-protocol.js.map +1 -1
  42. package/esm/common/logger/logger.js +7 -7
  43. package/esm/common/logger/logger.js.map +1 -1
  44. package/esm/common/test/mock-logger.d.ts +1 -0
  45. package/esm/common/test/mock-logger.js +3 -0
  46. package/esm/common/test/mock-logger.js.map +1 -1
  47. package/esm/common/utils/emitter.d.ts +1 -10
  48. package/esm/common/utils/emitter.js +0 -56
  49. package/esm/common/utils/emitter.js.map +1 -1
  50. package/esm/common/utils/mime-type-util.js +1 -1
  51. package/esm/common/utils/mime-type-util.js.map +1 -1
  52. package/esm/common/utils/mime-type.js +1 -1
  53. package/esm/common/utils/mime-type.js.map +1 -1
  54. package/esm/node/context/context.d.ts +11 -2
  55. package/esm/node/context/context.js +36 -12
  56. package/esm/node/context/context.js.map +1 -1
  57. package/esm/node/index.d.ts +0 -1
  58. package/esm/node/index.js +0 -1
  59. package/esm/node/index.js.map +1 -1
  60. package/lib/common/aop/aop.spec.d.ts +2 -0
  61. package/lib/common/aop/aop.spec.d.ts.map +1 -0
  62. package/lib/common/aop/aop.spec.js +170 -0
  63. package/lib/common/aop/aop.spec.js.map +1 -0
  64. package/lib/common/application/application-entry.d.ts.map +1 -1
  65. package/lib/common/application/application-entry.js +21 -3
  66. package/lib/common/application/application-entry.js.map +1 -1
  67. package/lib/common/application/application-host.d.ts +39 -0
  68. package/lib/common/application/application-host.d.ts.map +1 -0
  69. package/lib/common/application/application-host.js +20 -0
  70. package/lib/common/application/application-host.js.map +1 -0
  71. package/lib/common/application/application-protocol.js +1 -1
  72. package/lib/common/application/application-protocol.js.map +1 -1
  73. package/lib/common/application/index.d.ts +1 -0
  74. package/lib/common/application/index.d.ts.map +1 -1
  75. package/lib/common/application/index.js +1 -0
  76. package/lib/common/application/index.js.map +1 -1
  77. package/lib/common/application/lifecycle.spec.d.ts +2 -0
  78. package/lib/common/application/lifecycle.spec.d.ts.map +1 -0
  79. package/lib/common/application/lifecycle.spec.js +155 -0
  80. package/lib/common/application/lifecycle.spec.js.map +1 -0
  81. package/lib/common/config/config-provider.js +2 -1
  82. package/lib/common/config/config-provider.js.map +1 -1
  83. package/lib/common/config/env-config-util.d.ts +49 -0
  84. package/lib/common/config/env-config-util.d.ts.map +1 -0
  85. package/lib/common/config/env-config-util.js +188 -0
  86. package/lib/common/config/env-config-util.js.map +1 -0
  87. package/lib/common/config/env-config-util.spec.d.ts +2 -0
  88. package/lib/common/config/env-config-util.spec.d.ts.map +1 -0
  89. package/lib/common/config/env-config-util.spec.js +314 -0
  90. package/lib/common/config/env-config-util.spec.js.map +1 -0
  91. package/lib/common/config/index.d.ts +1 -0
  92. package/lib/common/config/index.d.ts.map +1 -1
  93. package/lib/common/config/index.js +1 -0
  94. package/lib/common/config/index.js.map +1 -1
  95. package/lib/common/container/assembly.spec.d.ts +2 -0
  96. package/lib/common/container/assembly.spec.d.ts.map +1 -0
  97. package/lib/common/container/assembly.spec.js +464 -0
  98. package/lib/common/container/assembly.spec.js.map +1 -0
  99. package/lib/common/container/auto-bind.js +26 -12
  100. package/lib/common/container/auto-bind.js.map +1 -1
  101. package/lib/common/el/expression-compiler.d.ts +4 -15
  102. package/lib/common/el/expression-compiler.d.ts.map +1 -1
  103. package/lib/common/el/expression-compiler.js +6 -163
  104. package/lib/common/el/expression-compiler.js.map +1 -1
  105. package/lib/common/el/expression-handler.d.ts +7 -2
  106. package/lib/common/el/expression-handler.d.ts.map +1 -1
  107. package/lib/common/el/expression-handler.js +14 -56
  108. package/lib/common/el/expression-handler.js.map +1 -1
  109. package/lib/common/el/expression-handler.spec.d.ts +2 -0
  110. package/lib/common/el/expression-handler.spec.d.ts.map +1 -0
  111. package/lib/common/el/expression-handler.spec.js +99 -0
  112. package/lib/common/el/expression-handler.spec.js.map +1 -0
  113. package/lib/common/el/expression-util.d.ts +69 -0
  114. package/lib/common/el/expression-util.d.ts.map +1 -0
  115. package/lib/common/el/expression-util.js +352 -0
  116. package/lib/common/el/expression-util.js.map +1 -0
  117. package/lib/common/el/expression-util.spec.d.ts +2 -0
  118. package/lib/common/el/expression-util.spec.d.ts.map +1 -0
  119. package/lib/common/el/expression-util.spec.js +45 -0
  120. package/lib/common/el/expression-util.spec.js.map +1 -0
  121. package/lib/common/el/index.d.ts +1 -0
  122. package/lib/common/el/index.d.ts.map +1 -1
  123. package/lib/common/el/index.js +1 -0
  124. package/lib/common/el/index.js.map +1 -1
  125. package/lib/common/el/value-and-el.spec.d.ts +2 -0
  126. package/lib/common/el/value-and-el.spec.d.ts.map +1 -0
  127. package/lib/common/el/value-and-el.spec.js +216 -0
  128. package/lib/common/el/value-and-el.spec.js.map +1 -0
  129. package/lib/common/logger/abstract-logger.d.ts +4 -2
  130. package/lib/common/logger/abstract-logger.d.ts.map +1 -1
  131. package/lib/common/logger/abstract-logger.js +10 -5
  132. package/lib/common/logger/abstract-logger.js.map +1 -1
  133. package/lib/common/logger/logger-protocol.d.ts +4 -0
  134. package/lib/common/logger/logger-protocol.d.ts.map +1 -1
  135. package/lib/common/logger/logger-protocol.js +3 -1
  136. package/lib/common/logger/logger-protocol.js.map +1 -1
  137. package/lib/common/logger/logger.js +7 -7
  138. package/lib/common/logger/logger.js.map +1 -1
  139. package/lib/common/logger/logger.spec.d.ts +2 -0
  140. package/lib/common/logger/logger.spec.d.ts.map +1 -0
  141. package/lib/common/logger/logger.spec.js +57 -0
  142. package/lib/common/logger/logger.spec.js.map +1 -0
  143. package/lib/common/test/mock-logger.d.ts +1 -0
  144. package/lib/common/test/mock-logger.d.ts.map +1 -1
  145. package/lib/common/test/mock-logger.js +3 -0
  146. package/lib/common/test/mock-logger.js.map +1 -1
  147. package/lib/common/utils/emitter.d.ts +1 -10
  148. package/lib/common/utils/emitter.d.ts.map +1 -1
  149. package/lib/common/utils/emitter.js +1 -58
  150. package/lib/common/utils/emitter.js.map +1 -1
  151. package/lib/common/utils/mime-type-util.js +1 -1
  152. package/lib/common/utils/mime-type-util.js.map +1 -1
  153. package/lib/common/utils/mime-type.js +1 -1
  154. package/lib/common/utils/mime-type.js.map +1 -1
  155. package/lib/common/utils/utils-behavior.spec.d.ts +2 -0
  156. package/lib/common/utils/utils-behavior.spec.d.ts.map +1 -0
  157. package/lib/common/utils/utils-behavior.spec.js +232 -0
  158. package/lib/common/utils/utils-behavior.spec.js.map +1 -0
  159. package/lib/node/context/context.d.ts +11 -2
  160. package/lib/node/context/context.d.ts.map +1 -1
  161. package/lib/node/context/context.js +36 -10
  162. package/lib/node/context/context.js.map +1 -1
  163. package/lib/node/context/context.spec.d.ts +2 -0
  164. package/lib/node/context/context.spec.d.ts.map +1 -0
  165. package/lib/node/context/context.spec.js +202 -0
  166. package/lib/node/context/context.spec.js.map +1 -0
  167. package/lib/node/index.d.ts +0 -1
  168. package/lib/node/index.d.ts.map +1 -1
  169. package/lib/node/index.js +0 -1
  170. package/lib/node/index.js.map +1 -1
  171. package/package.json +20 -41
  172. package/src/common/aop/aop.spec.ts +145 -0
  173. package/src/common/application/application-entry.ts +20 -4
  174. package/src/common/application/application-host.ts +46 -0
  175. package/src/common/application/application-protocol.ts +1 -1
  176. package/src/common/application/index.ts +1 -0
  177. package/src/common/application/lifecycle.spec.ts +148 -0
  178. package/src/common/config/config-provider.ts +1 -1
  179. package/src/common/config/env-config-util.spec.ts +341 -0
  180. package/src/common/config/env-config-util.ts +225 -0
  181. package/src/common/config/index.ts +1 -0
  182. package/src/common/container/assembly.spec.ts +293 -0
  183. package/src/common/container/auto-bind.ts +23 -10
  184. package/src/common/el/expression-compiler.ts +6 -166
  185. package/src/common/el/expression-handler.spec.ts +110 -0
  186. package/src/common/el/expression-handler.ts +14 -51
  187. package/src/common/el/expression-util.spec.ts +45 -0
  188. package/src/common/el/expression-util.ts +363 -0
  189. package/src/common/el/index.ts +2 -1
  190. package/src/common/el/value-and-el.spec.ts +186 -0
  191. package/src/common/logger/abstract-logger.ts +12 -6
  192. package/src/common/logger/logger-protocol.ts +5 -0
  193. package/src/common/logger/logger.spec.ts +61 -0
  194. package/src/common/logger/logger.ts +7 -7
  195. package/src/common/test/mock-logger.ts +3 -0
  196. package/src/common/utils/emitter.ts +1 -63
  197. package/src/common/utils/mime-type-util.ts +1 -1
  198. package/src/common/utils/mime-type.ts +1 -1
  199. package/src/common/utils/utils-behavior.spec.ts +259 -0
  200. package/src/node/context/context.spec.ts +219 -0
  201. package/src/node/context/context.ts +35 -10
  202. package/src/node/index.ts +0 -1
  203. package/cell-remote.yml +0 -3
  204. package/esm/node/utils/crc.d.ts +0 -1
  205. package/esm/node/utils/crc.js +0 -7
  206. package/esm/node/utils/crc.js.map +0 -1
  207. package/esm/node/utils/index.d.ts +0 -1
  208. package/esm/node/utils/index.js +0 -2
  209. package/esm/node/utils/index.js.map +0 -1
  210. package/lib/node/utils/crc.d.ts +0 -2
  211. package/lib/node/utils/crc.d.ts.map +0 -1
  212. package/lib/node/utils/crc.js +0 -10
  213. package/lib/node/utils/crc.js.map +0 -1
  214. package/lib/node/utils/index.d.ts +0 -2
  215. package/lib/node/utils/index.d.ts.map +0 -1
  216. package/lib/node/utils/index.js +0 -18
  217. package/lib/node/utils/index.js.map +0 -1
  218. package/src/node/utils/crc.ts +0 -7
  219. package/src/node/utils/index.ts +0 -1
@@ -0,0 +1,216 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ var __metadata = (this && this.__metadata) || function (k, v) {
9
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
+ };
11
+ var __param = (this && this.__param) || function (paramIndex, decorator) {
12
+ return function (target, key) { decorator(target, key, paramIndex); }
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ const bun_test_1 = require("bun:test");
16
+ const chai_1 = require("chai");
17
+ const application_factory_1 = require("../application/application-factory");
18
+ const annotation_1 = require("../annotation");
19
+ const container_util_1 = require("../container/container-util");
20
+ const config_util_1 = require("../config/config-util");
21
+ const expression_protocol_1 = require("./expression-protocol");
22
+ /**
23
+ * @Value、ConfigUtil 与 EL(${...},jexl)的约定(阶段 1.E 行为测试)。
24
+ * 配置就是 ApplicationFactory.create() 的第一个参数(CLI 生成的入口会把合并后的 cell.yml 传进来)。
25
+ */
26
+ const boot = (props) => application_factory_1.ApplicationFactory.create(props);
27
+ const el = () => container_util_1.ContainerUtil.get(expression_protocol_1.ExpressionHandler);
28
+ (0, bun_test_1.describe)('core @Value 与配置', () => {
29
+ (0, bun_test_1.it)('@Value(key) 读配置;@Value() 不带参数时以属性名为 key', async () => {
30
+ let Settings = class Settings {
31
+ };
32
+ __decorate([
33
+ (0, annotation_1.Value)('cell.name'),
34
+ __metadata("design:type", String)
35
+ ], Settings.prototype, "name", void 0);
36
+ __decorate([
37
+ (0, annotation_1.Value)(),
38
+ __metadata("design:type", Number)
39
+ ], Settings.prototype, "port", void 0);
40
+ Settings = __decorate([
41
+ (0, annotation_1.Component)()
42
+ ], Settings);
43
+ await boot({ cell: { name: 'demo' }, port: 8080 });
44
+ const s = container_util_1.ContainerUtil.get(Settings);
45
+ (0, chai_1.expect)(s.name).to.equal('demo');
46
+ (0, chai_1.expect)(s.port).to.equal(8080);
47
+ });
48
+ (0, bun_test_1.it)('值里的 ${...} 会求值,可以引用其他配置,多层引用也会继续求值', async () => {
49
+ let Urls = class Urls {
50
+ };
51
+ __decorate([
52
+ (0, annotation_1.Value)('cell.url'),
53
+ __metadata("design:type", String)
54
+ ], Urls.prototype, "url", void 0);
55
+ __decorate([
56
+ (0, annotation_1.Value)('cell.chain'),
57
+ __metadata("design:type", String)
58
+ ], Urls.prototype, "chain", void 0);
59
+ Urls = __decorate([
60
+ (0, annotation_1.Component)()
61
+ ], Urls);
62
+ await boot({ cell: { host: 'example.com', url: 'https://${cell.host}:443/api', chain: '${cell.url}', } });
63
+ const u = container_util_1.ContainerUtil.get(Urls);
64
+ (0, chai_1.expect)(u.url).to.equal('https://example.com:443/api');
65
+ (0, chai_1.expect)(u.chain).to.equal('https://example.com:443/api');
66
+ });
67
+ (0, bun_test_1.it)('取对象时,对象里的字符串也会求值;取不到的 key 为 undefined', async () => {
68
+ let Db = class Db {
69
+ };
70
+ __decorate([
71
+ (0, annotation_1.Value)('cell.db'),
72
+ __metadata("design:type", Object)
73
+ ], Db.prototype, "db", void 0);
74
+ __decorate([
75
+ (0, annotation_1.Value)('cell.missing.deep'),
76
+ __metadata("design:type", Object)
77
+ ], Db.prototype, "missing", void 0);
78
+ Db = __decorate([
79
+ (0, annotation_1.Component)()
80
+ ], Db);
81
+ await boot({ cell: { region: 'eu', db: { host: 'db.${cell.region}.local', port: 5432, hosts: ['a.${cell.region}', 'b'] } } });
82
+ const d = container_util_1.ContainerUtil.get(Db);
83
+ (0, chai_1.expect)(d.db).to.deep.equal({ host: 'db.eu.local', port: 5432, hosts: ['a.eu', 'b'] });
84
+ (0, chai_1.expect)(d.missing).to.equal(undefined);
85
+ });
86
+ (0, bun_test_1.it)('构造器参数也能用 @Value', async () => {
87
+ let WithCtor = class WithCtor {
88
+ constructor(size) {
89
+ this.size = size;
90
+ }
91
+ };
92
+ WithCtor = __decorate([
93
+ (0, annotation_1.Component)(),
94
+ __param(0, (0, annotation_1.Value)('cell.size')),
95
+ __metadata("design:paramtypes", [Number])
96
+ ], WithCtor);
97
+ await boot({ cell: { size: 3 } });
98
+ (0, chai_1.expect)(container_util_1.ContainerUtil.get(WithCtor).size).to.equal(3);
99
+ });
100
+ (0, bun_test_1.it)('detached 的 @Value:不在容器里的对象每次读取都取当前容器的配置', async () => {
101
+ class Plain {
102
+ }
103
+ __decorate([
104
+ (0, annotation_1.Value)({ el: 'cell.mode', detached: true }),
105
+ __metadata("design:type", String)
106
+ ], Plain.prototype, "mode", void 0);
107
+ const p = new Plain();
108
+ await boot({ cell: { mode: 'a' } });
109
+ (0, chai_1.expect)(p.mode).to.equal('a');
110
+ await boot({ cell: { mode: 'b' } });
111
+ (0, chai_1.expect)(p.mode).to.equal('b');
112
+ });
113
+ (0, bun_test_1.it)('ConfigUtil.get:取值、默认值', async () => {
114
+ await boot({ cell: { a: 1, ref: '${cell.a}' } });
115
+ (0, chai_1.expect)(config_util_1.ConfigUtil.get('cell.a')).to.equal(1);
116
+ (0, chai_1.expect)(config_util_1.ConfigUtil.get('cell.ref')).to.equal(1);
117
+ (0, chai_1.expect)(config_util_1.ConfigUtil.get('cell.none', 'dflt')).to.equal('dflt');
118
+ });
119
+ (0, bun_test_1.it)('现状:create() 过程中第一次求值就会就地改写传入的配置对象,getRaw() 拿到的也是求值后的结果', async () => {
120
+ // expression-handler.ts getContext():第一次拿到上下文时 this.handle(c, c),把整份配置原地求值;
121
+ // 创建 Application 时注入的组件(如 Logger)读配置,这一步在 create() 返回前就发生了
122
+ const props = { cell: { a: 1, ref: '${cell.a}', nested: ['${cell.a}'] } };
123
+ await boot(props);
124
+ (0, chai_1.expect)(config_util_1.ConfigUtil.getRaw()).to.equal(props);
125
+ (0, chai_1.expect)(props.cell.ref).to.equal(1);
126
+ (0, chai_1.expect)(props.cell.nested[0]).to.equal(1);
127
+ });
128
+ (0, bun_test_1.it)('false、0、空串都是有效的值:@Value 拿得到,ConfigUtil.get 只在值为 undefined 时用默认值(F3)', async () => {
129
+ let Flags = class Flags {
130
+ };
131
+ __decorate([
132
+ (0, annotation_1.Value)('cell.enabled'),
133
+ __metadata("design:type", Boolean)
134
+ ], Flags.prototype, "enabled", void 0);
135
+ __decorate([
136
+ (0, annotation_1.Value)('cell.retries'),
137
+ __metadata("design:type", Number)
138
+ ], Flags.prototype, "retries", void 0);
139
+ __decorate([
140
+ (0, annotation_1.Value)('cell.prefix'),
141
+ __metadata("design:type", String)
142
+ ], Flags.prototype, "prefix", void 0);
143
+ Flags = __decorate([
144
+ (0, annotation_1.Component)()
145
+ ], Flags);
146
+ await boot({ cell: { enabled: false, retries: 0, prefix: '' } });
147
+ const f = container_util_1.ContainerUtil.get(Flags);
148
+ (0, chai_1.expect)(f.enabled).to.equal(false);
149
+ (0, chai_1.expect)(f.retries).to.equal(0);
150
+ (0, chai_1.expect)(f.prefix).to.equal('');
151
+ (0, chai_1.expect)(config_util_1.ConfigUtil.get('cell.retries', 3)).to.equal(0);
152
+ (0, chai_1.expect)(config_util_1.ConfigUtil.get('cell.enabled', true)).to.equal(false);
153
+ (0, chai_1.expect)(config_util_1.ConfigUtil.get('cell.missing', 3)).to.equal(3);
154
+ });
155
+ });
156
+ (0, bun_test_1.describe)('core EL(ExpressionHandler)', () => {
157
+ const ENV_KEY = 'CELL_T13_EL_PROBE';
158
+ (0, bun_test_1.afterAll)(() => {
159
+ delete process.env[ENV_KEY];
160
+ });
161
+ (0, bun_test_1.it)('没有 ${ 的文本原样返回;只有一个表达式时保留类型,混排时拼成字符串', async () => {
162
+ await boot({ cell: { n: 2 } });
163
+ (0, chai_1.expect)(el().handle('plain text')).to.equal('plain text');
164
+ (0, chai_1.expect)(el().handle('${cell.n + 1}')).to.equal(3);
165
+ (0, chai_1.expect)(el().handle('${cell.n > 1}')).to.equal(true);
166
+ (0, chai_1.expect)(el().handle('n=${cell.n}, n2=${cell.n * cell.n}')).to.equal('n=2, n2=4');
167
+ });
168
+ (0, bun_test_1.it)('jexl 的运算、三元、字符串里的 } 都能正确切分', async () => {
169
+ await boot({ cell: { port: 3000, name: 'x' } });
170
+ (0, chai_1.expect)(el().handle('${cell.port > 1000 ? "high" : "low"}')).to.equal('high');
171
+ (0, chai_1.expect)(el().handle('${"a}b" + cell.name}')).to.equal('a}bx');
172
+ (0, chai_1.expect)(el().handle('[${cell.name}]')).to.equal('[x]');
173
+ });
174
+ (0, bun_test_1.it)('现状:反斜杠转义只阻止求值,反斜杠本身留在结果里', async () => {
175
+ await boot({ cell: { name: 'x' } });
176
+ (0, chai_1.expect)(el().handle('cost \\${cell.name}')).to.equal('cost \\${cell.name}');
177
+ });
178
+ bun_test_1.it.todo('期望:\\${...} 得到字面量 ${...}(去掉转义符),否则配置里无法写出 ${', () => { });
179
+ (0, bun_test_1.it)('内置 transform:replace、regexp、eval', async () => {
180
+ await boot({ cell: { name: 'svc', tpl: '${cell.name}-v1' } });
181
+ (0, chai_1.expect)(el().handle('${"a-b-c"|replace("-", "_")}')).to.equal('a_b_c');
182
+ const re = el().handle('${"^ab+$"|regexp("i")}');
183
+ (0, chai_1.expect)(re).to.be.instanceOf(RegExp);
184
+ (0, chai_1.expect)(re.test('ABBB')).to.equal(true);
185
+ (0, chai_1.expect)(el().handle('${"${cell.name}"|eval}')).to.equal('svc');
186
+ });
187
+ (0, bun_test_1.it)('可以传入自己的上下文;未定义的变量为 undefined', async () => {
188
+ await boot({});
189
+ (0, chai_1.expect)(el().handle('${a.b * 2}', { a: { b: 21 } })).to.equal(42);
190
+ (0, chai_1.expect)(el().handle('${nothing.here}', {})).to.equal(undefined);
191
+ });
192
+ (0, bun_test_1.it)('处理对象时就地求值;带 _ignoreEl 的子对象不求值', async () => {
193
+ await boot({ cell: { v: 'ok' } });
194
+ const obj = { a: '${cell.v}', nested: { b: ['${cell.v}!'] }, raw: { _ignoreEl: true, c: '${cell.v}' } };
195
+ const out = el().handle(obj);
196
+ (0, chai_1.expect)(out).to.equal(obj);
197
+ (0, chai_1.expect)(obj.a).to.equal('ok');
198
+ (0, chai_1.expect)(obj.nested.b[0]).to.equal('ok!');
199
+ (0, chai_1.expect)(obj.raw.c).to.equal('${cell.v}');
200
+ });
201
+ (0, bun_test_1.it)('env 是进程环境变量(遍历整份配置时 env 子树带 _ignoreEl,不会被就地求值)', async () => {
202
+ var _a;
203
+ process.env[ENV_KEY] = 'plain-value';
204
+ await boot({ cell: {} });
205
+ (0, chai_1.expect)(el().handle(`\${env.${ENV_KEY}}`)).to.equal('plain-value');
206
+ (0, chai_1.expect)((_a = config_util_1.ConfigUtil.getRaw().env) === null || _a === void 0 ? void 0 : _a[ENV_KEY]).to.equal('plain-value');
207
+ });
208
+ (0, bun_test_1.it)('来自 env 的字符串不再求值,经配置间接引用时也一样(F6)', async () => {
209
+ process.env[ENV_KEY] = '${cell.other}';
210
+ await boot({ cell: { other: 'from-config', viaEnv: `\${env.${ENV_KEY}}`, viaKey: '${cell.viaEnv}' } });
211
+ (0, chai_1.expect)(el().handle(`\${env.${ENV_KEY}}`)).to.equal('${cell.other}');
212
+ (0, chai_1.expect)(el().handle('${cell.viaEnv}')).to.equal('${cell.other}');
213
+ (0, chai_1.expect)(el().handle('${cell.viaKey}')).to.equal('${cell.other}');
214
+ });
215
+ });
216
+ //# sourceMappingURL=value-and-el.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"value-and-el.spec.js","sourceRoot":"","sources":["../../../src/common/el/value-and-el.spec.ts"],"names":[],"mappings":"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"}
@@ -7,8 +7,10 @@ export declare abstract class AbstractLogger implements Logger {
7
7
  protected timeRecords: Map<string, number>;
8
8
  setContext(context?: string): void;
9
9
  protected resolveContextString(context?: string): string;
10
- protected resolvePrefix(): string;
11
- protected log(message: any, context?: string, logFn?: (...args: any[]) => void): void;
10
+ isEnabled(level: LogLevel): boolean;
11
+ /** `level` is the level of the message, not the configured one. */
12
+ protected resolvePrefix(level: LogLevel): string;
13
+ protected log(message: any, context?: string, logFn?: (...args: any[]) => void, level?: LogLevel): void;
12
14
  time(label: string): void;
13
15
  timeEnd(label: string, context?: string): number | undefined;
14
16
  abstract info(message: any, context?: string | undefined): void;
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-logger.d.ts","sourceRoot":"","sources":["../../../src/common/logger/abstract-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAgB,QAAQ,EAAgB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAElG,8BAAsB,cAAe,YAAW,MAAM;IAClD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAG3B,KAAK,EAAE,QAAQ,CAAC;IAGhB,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAErD,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAEjC;IAED,SAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAKvD;IAED,SAAS,CAAC,aAAa,IAAI,MAAM,CAGhC;IAED,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,GAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAmB,GAAG,IAAI,CAYlG;IAED,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAExB;IAED,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW3D;IAED,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAChE,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAChE,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CACpE"}
1
+ {"version":3,"file":"abstract-logger.d.ts","sourceRoot":"","sources":["../../../src/common/logger/abstract-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAA4B,QAAQ,EAAgB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE9G,8BAAsB,cAAe,YAAW,MAAM;IAClD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAG3B,KAAK,EAAE,QAAQ,CAAC;IAGhB,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAErD,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAEjC;IAED,SAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAKvD;IAED,SAAS,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAGlC;IAED,mEAAmE;IACnE,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAG/C;IAED,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,GAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAmB,EAAE,KAAK,GAAE,QAAiB,GAAG,IAAI,CAY5H;IAED,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAExB;IAED,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW3D;IAED,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAChE,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAChE,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CACpE"}
@@ -25,18 +25,23 @@ class AbstractLogger {
25
25
  }
26
26
  return context ? `[${context}] ` : '';
27
27
  }
28
- resolvePrefix() {
28
+ isEnabled(level) {
29
+ const configured = logger_protocol_1.LOG_LEVELS.indexOf(this.level);
30
+ return logger_protocol_1.LOG_LEVELS.indexOf(level) >= (configured < 0 ? logger_protocol_1.LOG_LEVELS.indexOf('info') : configured);
31
+ }
32
+ /** `level` is the level of the message, not the configured one. */
33
+ resolvePrefix(level) {
29
34
  const time = new Date().toISOString();
30
- return `${time} [${this.level}]`;
35
+ return `${time} [${level}]`;
31
36
  }
32
- log(message, context, logFn = console.info) {
37
+ log(message, context, logFn = console.info, level = 'info') {
33
38
  var _a;
34
39
  const traceId = (_a = this.traceIdProvider) === null || _a === void 0 ? void 0 : _a.provide();
35
40
  const traceStr = traceId ? ` [trace: ${traceId}]` : '';
36
41
  const contextStr = this.resolveContextString(context);
37
- logFn(`${this.resolvePrefix()}${traceStr}${contextStr}${message}`);
42
+ logFn(`${this.resolvePrefix(level)}${traceStr}${contextStr}${message}`);
38
43
  logger_protocol_1.onLogEmitter.fire({
39
- level: this.level,
44
+ level,
40
45
  traceId,
41
46
  rootContext: this.context,
42
47
  context,
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-logger.js","sourceRoot":"","sources":["../../../src/common/logger/abstract-logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA2D;AAC3D,uDAAkG;AAElG;IAAA;QAUc,gBAAW,GAAwB,IAAI,GAAG,EAAE,CAAC;IAqD3D,CAAC;IAnDG,UAAU,CAAC,OAAgB;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAES,oBAAoB,CAAC,OAAgB;QAC3C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,MAAM,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC;QAC9E,CAAC;QACD,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1C,CAAC;IAES,aAAa;QACnB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACtC,OAAO,GAAG,IAAI,KAAK,IAAI,CAAC,KAAK,GAAG,CAAC;IACrC,CAAC;IAES,GAAG,CAAC,OAAY,EAAE,OAAgB,EAAE,KAAK,GAA6B,OAAO,CAAC,IAAI;;QACxF,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,eAAe,0CAAE,OAAO,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACtD,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,EAAE,CAAC,CAAC;QACnE,8BAAY,CAAC,IAAI,CAAC;YACd,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO;YACP,WAAW,EAAE,IAAI,CAAC,OAAO;YACzB,OAAO;YACP,OAAO;SACV,CAAC,CAAC;IACP,CAAC;IAED,IAAI,CAAC,KAAa;QACd,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,KAAa,EAAE,OAAgB;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YACpC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,QAAQ,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9C,OAAO,QAAQ,CAAC;QACpB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,GAAG,CAAC,kBAAkB,KAAK,cAAc,EAAE,OAAO,CAAC,CAAC;YACzD,OAAO;QACX,CAAC;IACL,CAAC;CAMJ;;AA1DG;IADC,IAAA,kBAAK,EAAC,GAAG,8BAAY,YAAY,CAAC;;6CACnB;AAGG;IADlB,IAAA,sBAAS,EAAC,iCAAe,CAAC;IAAE,IAAA,qBAAQ,GAAE;;uDACc"}
1
+ {"version":3,"file":"abstract-logger.js","sourceRoot":"","sources":["../../../src/common/logger/abstract-logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA2D;AAC3D,uDAA8G;AAE9G;IAAA;QAUc,gBAAW,GAAwB,IAAI,GAAG,EAAE,CAAC;IA2D3D,CAAC;IAzDG,UAAU,CAAC,OAAgB;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAES,oBAAoB,CAAC,OAAgB;QAC3C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,MAAM,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC;QAC9E,CAAC;QACD,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1C,CAAC;IAED,SAAS,CAAC,KAAe;QACrB,MAAM,UAAU,GAAG,4BAAU,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,OAAO,4BAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,4BAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACnG,CAAC;IAED,mEAAmE;IACzD,aAAa,CAAC,KAAe;QACnC,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACtC,OAAO,GAAG,IAAI,KAAK,KAAK,GAAG,CAAC;IAChC,CAAC;IAES,GAAG,CAAC,OAAY,EAAE,OAAgB,EAAE,KAAK,GAA6B,OAAO,CAAC,IAAI,EAAE,KAAK,GAAa,MAAM;;QAClH,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,eAAe,0CAAE,OAAO,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACtD,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,EAAE,CAAC,CAAC;QACxE,8BAAY,CAAC,IAAI,CAAC;YACd,KAAK;YACL,OAAO;YACP,WAAW,EAAE,IAAI,CAAC,OAAO;YACzB,OAAO;YACP,OAAO;SACV,CAAC,CAAC;IACP,CAAC;IAED,IAAI,CAAC,KAAa;QACd,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,KAAa,EAAE,OAAgB;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YACpC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,QAAQ,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9C,OAAO,QAAQ,CAAC;QACpB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,GAAG,CAAC,kBAAkB,KAAK,cAAc,EAAE,OAAO,CAAC,CAAC;YACzD,OAAO;QACX,CAAC;IACL,CAAC;CAMJ;;AAhEG;IADC,IAAA,kBAAK,EAAC,GAAG,8BAAY,YAAY,CAAC;;6CACnB;AAGG;IADlB,IAAA,sBAAS,EAAC,iCAAe,CAAC;IAAE,IAAA,qBAAQ,GAAE;;uDACc"}
@@ -5,6 +5,8 @@ export declare const Logger: unique symbol;
5
5
  export declare const TraceIdProvider: unique symbol;
6
6
  export declare const LoggerService: unique symbol;
7
7
  export type LogLevel = 'verbose' | 'debug' | 'info' | 'warn' | 'error';
8
+ /** Levels from the most to the least verbose: a logger at a level writes that level and the ones after it. */
9
+ export declare const LOG_LEVELS: readonly LogLevel[];
8
10
  export interface LogMessage {
9
11
  level: LogLevel;
10
12
  traceId?: string;
@@ -18,6 +20,8 @@ export interface Logger {
18
20
  error(message: any, context?: string): void;
19
21
  warn(message: any, context?: string): void;
20
22
  debug(message: any, context?: string): void;
23
+ /** Whether messages of `level` are written; check it before building an expensive message. */
24
+ isEnabled(level: LogLevel): boolean;
21
25
  time(label: string): void;
22
26
  timeEnd(label: string, context?: string): number | undefined;
23
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"logger-protocol.d.ts","sourceRoot":"","sources":["../../../src/common/logger/logger-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,eAAO,MAAM,aAAa,gBAAgB,CAAC;AAC3C,eAAO,MAAM,YAAY,sBAA2B,CAAC;AAErD,eAAO,MAAM,MAAM,eAAmB,CAAC;AACvC,eAAO,MAAM,eAAe,eAA4B,CAAC;AACzD,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AACvE,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,MAAM;IAKnB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAEhE;AAED,eAAO,MAAM,YAAY,qBAA4B,CAAC;AAEtD,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC5B,OAAO,IAAI,MAAM,GAAG,SAAS,CAAC;CACjC"}
1
+ {"version":3,"file":"logger-protocol.d.ts","sourceRoot":"","sources":["../../../src/common/logger/logger-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,eAAO,MAAM,aAAa,gBAAgB,CAAC;AAC3C,eAAO,MAAM,YAAY,sBAA2B,CAAC;AAErD,eAAO,MAAM,MAAM,eAAmB,CAAC;AACvC,eAAO,MAAM,eAAe,eAA4B,CAAC;AACzD,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAEvE,8GAA8G;AAC9G,eAAO,MAAM,UAAU,EAAE,SAAS,QAAQ,EAAkD,CAAC;AAC7F,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,MAAM;IAKnB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,8FAA8F;IAC9F,SAAS,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC;IACpC,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAEhE;AAED,eAAO,MAAM,YAAY,qBAA4B,CAAC;AAEtD,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC5B,OAAO,IAAI,MAAM,GAAG,SAAS,CAAC;CACjC"}
@@ -1,11 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.onLogEmitter = exports.LoggerService = exports.TraceIdProvider = exports.Logger = exports.LOGGER_LEVEL = exports.LOGGER_CONFIG = void 0;
3
+ exports.onLogEmitter = exports.LOG_LEVELS = exports.LoggerService = exports.TraceIdProvider = exports.Logger = exports.LOGGER_LEVEL = exports.LOGGER_CONFIG = void 0;
4
4
  const utils_1 = require("../utils");
5
5
  exports.LOGGER_CONFIG = 'cell.logger';
6
6
  exports.LOGGER_LEVEL = `${exports.LOGGER_CONFIG}.level`;
7
7
  exports.Logger = Symbol('Logger');
8
8
  exports.TraceIdProvider = Symbol('TraceIdProvider');
9
9
  exports.LoggerService = Symbol('LoggerService');
10
+ /** Levels from the most to the least verbose: a logger at a level writes that level and the ones after it. */
11
+ exports.LOG_LEVELS = ['verbose', 'debug', 'info', 'warn', 'error'];
10
12
  exports.onLogEmitter = new utils_1.Emitter();
11
13
  //# sourceMappingURL=logger-protocol.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger-protocol.js","sourceRoot":"","sources":["../../../src/common/logger/logger-protocol.ts"],"names":[],"mappings":";;;AAAA,oCAA0C;AAC7B,QAAA,aAAa,GAAG,aAAa,CAAC;AAC9B,QAAA,YAAY,GAAG,GAAG,QAAA,aAAa,QAAQ,CAAC;AAExC,QAAA,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC1B,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAC5C,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AA0BxC,QAAA,YAAY,GAAG,IAAI,eAAO,EAAc,CAAC"}
1
+ {"version":3,"file":"logger-protocol.js","sourceRoot":"","sources":["../../../src/common/logger/logger-protocol.ts"],"names":[],"mappings":";;;AAAA,oCAA0C;AAC7B,QAAA,aAAa,GAAG,aAAa,CAAC;AAC9B,QAAA,YAAY,GAAG,GAAG,QAAA,aAAa,QAAQ,CAAC;AAExC,QAAA,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC1B,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAC5C,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAIrD,8GAA8G;AACjG,QAAA,UAAU,GAAwB,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AA0BhF,QAAA,YAAY,GAAG,IAAI,eAAO,EAAc,CAAC"}
@@ -13,21 +13,21 @@ const abstract_logger_1 = require("./abstract-logger");
13
13
  const logger_protocol_1 = require("./logger-protocol");
14
14
  let LoggerImpl = class LoggerImpl extends abstract_logger_1.AbstractLogger {
15
15
  error(message, context) {
16
- this.log(message, context, console.error.bind(console));
16
+ this.log(message, context, console.error.bind(console), 'error');
17
17
  }
18
18
  info(message, context) {
19
- if (['info', 'debug'].includes(this.level)) {
20
- this.log(message, context);
19
+ if (this.isEnabled('info')) {
20
+ this.log(message, context, console.info.bind(console), 'info');
21
21
  }
22
22
  }
23
23
  warn(message, context) {
24
- if (['info', 'debug', 'warn'].includes(this.level)) {
25
- this.log(message, context, console.warn.bind(console));
24
+ if (this.isEnabled('warn')) {
25
+ this.log(message, context, console.warn.bind(console), 'warn');
26
26
  }
27
27
  }
28
28
  debug(message, context) {
29
- if (this.level === 'debug') {
30
- this.log(message, context, console.debug.bind(console));
29
+ if (this.isEnabled('debug')) {
30
+ this.log(message, context, console.debug.bind(console), 'debug');
31
31
  }
32
32
  }
33
33
  };
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logger/logger.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAA0C;AAC1C,4CAAqC;AACrC,uDAAmD;AACnD,uDAA2C;AAGpC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,gCAAc;IAE1C,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,CAAC;IACL,CAAC;CAEJ,CAAA;;qBAxBY,UAAU;IADtB,IAAA,sBAAS,EAAC,EAAE,EAAE,EAAE,wBAAM,EAAE,KAAK,EAAE,iBAAK,CAAC,SAAS,EAAE,CAAC;GACrC,UAAU,CAwBtB"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logger/logger.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAA0C;AAC1C,4CAAqC;AACrC,uDAAmD;AACnD,uDAA2C;AAGpC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,gCAAc;IAE1C,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC;IACL,CAAC;IAED,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QACrE,CAAC;IACL,CAAC;CAEJ,CAAA;;qBAxBY,UAAU;IADtB,IAAA,sBAAS,EAAC,EAAE,EAAE,EAAE,wBAAM,EAAE,KAAK,EAAE,iBAAK,CAAC,SAAS,EAAE,CAAC;GACrC,UAAU,CAwBtB"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=logger.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logger.spec.d.ts","sourceRoot":"","sources":["../../../src/common/logger/logger.spec.ts"],"names":[],"mappings":""}
@@ -0,0 +1,57 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const bun_test_1 = require("bun:test");
4
+ const chai_1 = require("chai");
5
+ const logger_1 = require("./logger");
6
+ const logger_protocol_1 = require("./logger-protocol");
7
+ const consoleFns = ['info', 'warn', 'error', 'debug'];
8
+ const originals = Object.fromEntries(consoleFns.map(name => [name, console[name]]));
9
+ function capture(level) {
10
+ const lines = [];
11
+ for (const name of consoleFns) {
12
+ console[name] = (text) => lines.push({ fn: name, text });
13
+ }
14
+ const logger = new logger_1.LoggerImpl();
15
+ Object.assign(logger, { level });
16
+ return { logger, lines };
17
+ }
18
+ (0, bun_test_1.afterEach)(() => Object.assign(console, originals));
19
+ (0, bun_test_1.describe)('LoggerImpl', () => {
20
+ (0, bun_test_1.it)('labels each line with the level of the message, not the configured one', () => {
21
+ const { logger, lines } = capture('debug');
22
+ logger.debug('d');
23
+ logger.info('i');
24
+ logger.warn('w');
25
+ logger.error('e');
26
+ (0, chai_1.expect)(lines.map(l => { var _a; return [l.fn, (_a = /\[(\w+)\]/.exec(l.text)) === null || _a === void 0 ? void 0 : _a[1], l.text.slice(-1)]; })).to.deep.equal([
27
+ ['debug', 'debug', 'd'],
28
+ ['info', 'info', 'i'],
29
+ ['warn', 'warn', 'w'],
30
+ ['error', 'error', 'e'],
31
+ ]);
32
+ });
33
+ (0, bun_test_1.it)('writes the configured level and the ones after it', () => {
34
+ const { logger, lines } = capture('warn');
35
+ logger.debug('d');
36
+ logger.info('i');
37
+ logger.warn('w');
38
+ logger.error('e');
39
+ (0, chai_1.expect)(lines.map(l => l.fn)).to.deep.equal(['warn', 'error']);
40
+ (0, chai_1.expect)([logger.isEnabled('verbose'), logger.isEnabled('debug'), logger.isEnabled('info'), logger.isEnabled('warn'), logger.isEnabled('error')])
41
+ .to.deep.equal([false, false, false, true, true]);
42
+ });
43
+ (0, bun_test_1.it)('treats an unknown configured level as info', () => {
44
+ const { logger } = capture('loud');
45
+ (0, chai_1.expect)(logger.isEnabled('debug')).to.equal(false);
46
+ (0, chai_1.expect)(logger.isEnabled('info')).to.equal(true);
47
+ });
48
+ (0, bun_test_1.it)('reports the level of the message to onLog', () => {
49
+ const { logger } = capture('info');
50
+ const seen = [];
51
+ const listener = logger_protocol_1.onLogEmitter.event(m => seen.push(m));
52
+ logger.warn('w');
53
+ listener.dispose();
54
+ (0, chai_1.expect)(seen.map(m => [m.level, m.message])).to.deep.equal([['warn', 'w']]);
55
+ });
56
+ });
57
+ //# sourceMappingURL=logger.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logger.spec.js","sourceRoot":"","sources":["../../../src/common/logger/logger.spec.ts"],"names":[],"mappings":"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"}
@@ -11,5 +11,6 @@ export declare class MockLogger implements Logger {
11
11
  error(message: any, context?: string): void;
12
12
  warn(message: any, context?: string): void;
13
13
  debug(message: any, context?: string): void;
14
+ isEnabled(level: LogLevel): boolean;
14
15
  }
15
16
  //# sourceMappingURL=mock-logger.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"mock-logger.d.ts","sourceRoot":"","sources":["../../../src/common/test/mock-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,qBACa,UAAW,YAAW,MAAM;IACrC,KAAK,EAAE,QAAQ,CAAU;IACzB,SAAS,CAAC,QAAQ,CAAC,YAAY,sBAA6B;IAC5D,KAAK,uCAA2B;IAChC,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAExB;IACD,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE3D;IACD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAEjC;IACD,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAEzC;IACD,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAE1C;IACD,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAEzC;IACD,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAE1C;CACJ"}
1
+ {"version":3,"file":"mock-logger.d.ts","sourceRoot":"","sources":["../../../src/common/test/mock-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,qBACa,UAAW,YAAW,MAAM;IACrC,KAAK,EAAE,QAAQ,CAAU;IACzB,SAAS,CAAC,QAAQ,CAAC,YAAY,sBAA6B;IAC5D,KAAK,uCAA2B;IAChC,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAExB;IACD,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE3D;IACD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAEjC;IACD,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAEzC;IACD,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAE1C;IACD,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAEzC;IACD,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAE1C;IACD,SAAS,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAElC;CACJ"}
@@ -36,6 +36,9 @@ let MockLogger = class MockLogger {
36
36
  debug(message, context) {
37
37
  // do nothing
38
38
  }
39
+ isEnabled(level) {
40
+ return false;
41
+ }
39
42
  };
40
43
  exports.MockLogger = MockLogger;
41
44
  exports.MockLogger = MockLogger = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"mock-logger.js","sourceRoot":"","sources":["../../../src/common/test/mock-logger.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAA2C;AAE3C,oCAAmC;AAG5B,IAAM,UAAU,GAAhB,MAAM,UAAU;IAAhB;QACH,UAAK,GAAa,MAAM,CAAC;QACN,iBAAY,GAAG,IAAI,eAAO,EAAc,CAAC;QAC5D,UAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;IAsBpC,CAAC;IArBG,IAAI,CAAC,KAAa;QACd,aAAa;IACjB,CAAC;IACD,OAAO,CAAC,KAAa,EAAE,OAAgB;QACnC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,UAAU,CAAC,OAAgB;QACvB,aAAa;IACjB,CAAC;IACD,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,aAAa;IACjB,CAAC;IACD,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,aAAa;IACjB,CAAC;IACD,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,aAAa;IACjB,CAAC;IACD,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,aAAa;IACjB,CAAC;CACJ,CAAA;;qBAzBY,UAAU;IADtB,IAAA,uBAAU,GAAE;GACA,UAAU,CAyBtB"}
1
+ {"version":3,"file":"mock-logger.js","sourceRoot":"","sources":["../../../src/common/test/mock-logger.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAA2C;AAE3C,oCAAmC;AAG5B,IAAM,UAAU,GAAhB,MAAM,UAAU;IAAhB;QACH,UAAK,GAAa,MAAM,CAAC;QACN,iBAAY,GAAG,IAAI,eAAO,EAAc,CAAC;QAC5D,UAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;IAyBpC,CAAC;IAxBG,IAAI,CAAC,KAAa;QACd,aAAa;IACjB,CAAC;IACD,OAAO,CAAC,KAAa,EAAE,OAAgB;QACnC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,UAAU,CAAC,OAAgB;QACvB,aAAa;IACjB,CAAC;IACD,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,aAAa;IACjB,CAAC;IACD,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,aAAa;IACjB,CAAC;IACD,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,aAAa;IACjB,CAAC;IACD,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,aAAa;IACjB,CAAC;IACD,SAAS,CAAC,KAAe;QACrB,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;;qBA5BY,UAAU;IADtB,IAAA,uBAAU,GAAE;GACA,UAAU,CA4BtB"}
@@ -1,4 +1,4 @@
1
- import { Event, Callback, CallbackList } from './event';
1
+ import { Event, CallbackList } from './event';
2
2
  import { MaybePromise } from './prioritizeable';
3
3
  export interface EmitterOptions {
4
4
  onFirstListenerAdd?: Function;
@@ -52,13 +52,4 @@ export declare namespace WaitUntilEvent {
52
52
  */
53
53
  function fire<T extends WaitUntilEvent>(emitter: Emitter<T>, event: Omit<T, 'waitUntil'>, timeout?: number | undefined): Promise<void>;
54
54
  }
55
- import { CancellationToken } from './cancellation';
56
- export declare class AsyncEmitter<T extends WaitUntilEvent> extends Emitter<T> {
57
- protected deliveryQueue: Promise<void> | undefined;
58
- /**
59
- * Fire listeners async one after another.
60
- */
61
- fire(event: Omit<T, 'waitUntil'>, token?: CancellationToken, promiseJoin?: (p: Promise<any>, listener: Function) => Promise<any>): Promise<void>;
62
- protected deliver(listeners: Callback[], event: Omit<T, 'waitUntil'>, token: CancellationToken, promiseJoin?: (p: Promise<any>, listener: Function) => Promise<any>): Promise<void>;
63
- }
64
55
  //# sourceMappingURL=emitter.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../../src/common/utils/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC3B,kBAAkB,CAAC,EAAE,QAAQ,CAAC;IAC9B,oBAAoB,CAAC,EAAE,QAAQ,CAAC;CACnC;AAED,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG;IAcpB,OAAO,CAAC,QAAQ,CAAC;IAZrB,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAO;IAE7C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAyB;IAE7C,OAAO,CAAC,MAAM,CAAW;IACzB,SAAS,CAAC,UAAU,EAAE,YAAY,GAAG,SAAS,CAAC;IAC/C,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,kBAAkB,CAAK;IAE/B,YACY,QAAQ,CAAC,EAAE,cAAc,YAAA,EAChC;IAEL;;;OAGG;IACH,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAsCpB;IAED,SAAS,CAAC,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAgC1E;IAED,SAAS,CAAC,gBAAgB,IAAI,MAAM,IAAI,CAQvC;IAED,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAM7C;IAED;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,GAAG,CAIlB;IAED;;;OAGG;IACG,QAAQ,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,KAAK,YAAY,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ3F;IAED,OAAO,IAAI,IAAI,CAUd;CACJ;AAED,MAAM,WAAW,cAAc;IAC3B;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;CAC3C;AACD,yBAAiB,cAAc,CAAC;IAC5B;;;;OAIG;IACH,SAAsB,IAAI,CAAC,CAAC,SAAS,cAAc,EAC/C,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,EAC3B,OAAO,GAAE,MAAM,GAAG,SAAqB,GACxC,OAAO,CAAC,IAAI,CAAC,CAyBf;CACJ;AAED,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,qBAAa,YAAY,CAAC,CAAC,SAAS,cAAc,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IAElE,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAEnD;;OAEG;IACM,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,KAAK,GAAE,iBAA0C,EACxF,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAUtF;IAED,UAAgB,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAChG,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCtF;CAEJ"}
1
+ {"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../../src/common/utils/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC3B,kBAAkB,CAAC,EAAE,QAAQ,CAAC;IAC9B,oBAAoB,CAAC,EAAE,QAAQ,CAAC;CACnC;AAED,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG;IAcpB,OAAO,CAAC,QAAQ,CAAC;IAZrB,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAO;IAE7C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAyB;IAE7C,OAAO,CAAC,MAAM,CAAW;IACzB,SAAS,CAAC,UAAU,EAAE,YAAY,GAAG,SAAS,CAAC;IAC/C,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,kBAAkB,CAAK;IAE/B,YACY,QAAQ,CAAC,EAAE,cAAc,YAAA,EAChC;IAEL;;;OAGG;IACH,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAsCpB;IAED,SAAS,CAAC,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAgC1E;IAED,SAAS,CAAC,gBAAgB,IAAI,MAAM,IAAI,CAQvC;IAED,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAM7C;IAED;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,GAAG,CAIlB;IAED;;;OAGG;IACG,QAAQ,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,KAAK,YAAY,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ3F;IAED,OAAO,IAAI,IAAI,CAUd;CACJ;AAED,MAAM,WAAW,cAAc;IAC3B;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;CAC3C;AACD,yBAAiB,cAAc,CAAC;IAC5B;;;;OAIG;IACH,SAAsB,IAAI,CAAC,CAAC,SAAS,cAAc,EAC/C,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,EAC3B,OAAO,GAAE,MAAM,GAAG,SAAqB,GACxC,OAAO,CAAC,IAAI,CAAC,CAyBf;CACJ"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.AsyncEmitter = exports.WaitUntilEvent = exports.Emitter = void 0;
3
+ exports.WaitUntilEvent = exports.Emitter = void 0;
4
4
  const event_1 = require("./event");
5
5
  class Emitter {
6
6
  constructor(_options) {
@@ -166,61 +166,4 @@ var WaitUntilEvent;
166
166
  }
167
167
  WaitUntilEvent.fire = fire;
168
168
  })(WaitUntilEvent || (exports.WaitUntilEvent = WaitUntilEvent = {}));
169
- const cancellation_1 = require("./cancellation");
170
- class AsyncEmitter extends Emitter {
171
- /**
172
- * Fire listeners async one after another.
173
- */
174
- fire(event, token = cancellation_1.CancellationToken.None, promiseJoin) {
175
- const callbacks = this._callbacks;
176
- if (!callbacks) {
177
- return Promise.resolve();
178
- }
179
- const listeners = [...callbacks];
180
- if (this.deliveryQueue) {
181
- return this.deliveryQueue = this.deliveryQueue.then(() => this.deliver(listeners, event, token, promiseJoin));
182
- }
183
- return this.deliveryQueue = this.deliver(listeners, event, token, promiseJoin);
184
- }
185
- async deliver(listeners, event, token, promiseJoin) {
186
- for (const listener of listeners) {
187
- if (token.isCancellationRequested) {
188
- return;
189
- }
190
- const waitables = [];
191
- const asyncEvent = Object.assign(event, {
192
- waitUntil: (thenable) => {
193
- if (Object.isFrozen(waitables)) {
194
- throw new Error('waitUntil cannot be called asynchronously.');
195
- }
196
- if (promiseJoin) {
197
- thenable = promiseJoin(thenable, listener);
198
- }
199
- waitables.push(thenable);
200
- }
201
- });
202
- try {
203
- listener(event);
204
- // Asynchronous calls to `waitUntil` should fail.
205
- Object.freeze(waitables);
206
- }
207
- catch (e) {
208
- console.error(e);
209
- }
210
- finally {
211
- delete asyncEvent['waitUntil'];
212
- }
213
- if (!waitables.length) {
214
- return;
215
- }
216
- try {
217
- await Promise.all(waitables);
218
- }
219
- catch (e) {
220
- console.error(e);
221
- }
222
- }
223
- }
224
- }
225
- exports.AsyncEmitter = AsyncEmitter;
226
169
  //# sourceMappingURL=emitter.js.map