@celljs/core 4.5.0 → 4.6.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 (278) hide show
  1. package/README.md +45 -49
  2. package/esm/browser/index.d.ts +0 -1
  3. package/esm/browser/index.js +0 -1
  4. package/esm/browser/index.js.map +1 -1
  5. package/esm/browser/shell/application-shell.d.ts +23 -3
  6. package/esm/browser/shell/application-shell.js +60 -4
  7. package/esm/browser/shell/application-shell.js.map +1 -1
  8. package/esm/browser/shell/index.d.ts +0 -1
  9. package/esm/browser/shell/index.js +0 -1
  10. package/esm/browser/shell/index.js.map +1 -1
  11. package/esm/common/annotation/autowired.d.ts +8 -2
  12. package/esm/common/annotation/autowired.js +7 -8
  13. package/esm/common/annotation/autowired.js.map +1 -1
  14. package/esm/common/annotation/detached/autowired-provider.js +1 -2
  15. package/esm/common/annotation/detached/autowired-provider.js.map +1 -1
  16. package/esm/common/annotation/value.d.ts +1 -0
  17. package/esm/common/annotation/value.js +3 -4
  18. package/esm/common/annotation/value.js.map +1 -1
  19. package/esm/common/aop/aop-proxy-factory.d.ts +2 -1
  20. package/esm/common/aop/aop-proxy-factory.js +10 -3
  21. package/esm/common/aop/aop-proxy-factory.js.map +1 -1
  22. package/esm/common/aop/class-filter.d.ts +2 -0
  23. package/esm/common/aop/class-filter.js +10 -3
  24. package/esm/common/aop/class-filter.js.map +1 -1
  25. package/esm/common/application/application-entry.js +0 -9
  26. package/esm/common/application/application-entry.js.map +1 -1
  27. package/esm/common/application/application-factory.d.ts +9 -3
  28. package/esm/common/application/application-factory.js +13 -6
  29. package/esm/common/application/application-factory.js.map +1 -1
  30. package/esm/common/application/application-protocol.d.ts +12 -0
  31. package/esm/common/application/application-protocol.js +1 -0
  32. package/esm/common/application/application-protocol.js.map +1 -1
  33. package/esm/common/application/application-state.d.ts +1 -1
  34. package/esm/common/application/application-state.js +4 -4
  35. package/esm/common/application/application-state.js.map +1 -1
  36. package/esm/common/application/application.d.ts +4 -2
  37. package/esm/common/application/application.js +19 -7
  38. package/esm/common/application/application.js.map +1 -1
  39. package/esm/common/application/index.d.ts +2 -0
  40. package/esm/common/application/index.js +2 -0
  41. package/esm/common/application/index.js.map +1 -1
  42. package/esm/common/config/config-util.d.ts +0 -1
  43. package/esm/common/config/config-util.js +0 -6
  44. package/esm/common/config/config-util.js.map +1 -1
  45. package/esm/common/container/container-error.d.ts +1 -1
  46. package/esm/common/container/container-error.js.map +1 -1
  47. package/esm/common/container/container.d.ts +1 -0
  48. package/esm/common/container/container.js +6 -1
  49. package/esm/common/container/container.js.map +1 -1
  50. package/esm/common/container/index.d.ts +0 -2
  51. package/esm/common/container/index.js +0 -2
  52. package/esm/common/container/index.js.map +1 -1
  53. package/esm/common/container/injection.d.ts +15 -1
  54. package/esm/common/container/injection.js +37 -1
  55. package/esm/common/container/injection.js.map +1 -1
  56. package/esm/common/el/core-context-initializer.d.ts +2 -1
  57. package/esm/common/el/core-context-initializer.js +5 -3
  58. package/esm/common/el/core-context-initializer.js.map +1 -1
  59. package/esm/common/provider/index.d.ts +0 -1
  60. package/esm/common/provider/index.js +0 -1
  61. package/esm/common/provider/index.js.map +1 -1
  62. package/esm/common/test/assembly-test-util.d.ts +16 -0
  63. package/esm/common/test/assembly-test-util.js +34 -0
  64. package/esm/common/test/assembly-test-util.js.map +1 -0
  65. package/esm/node/application/exit-signal-lifecycle.d.ts +5 -0
  66. package/esm/node/application/exit-signal-lifecycle.js +30 -0
  67. package/esm/node/application/exit-signal-lifecycle.js.map +1 -0
  68. package/esm/node/application/index.d.ts +1 -2
  69. package/esm/node/application/index.js +1 -2
  70. package/esm/node/application/index.js.map +1 -1
  71. package/lib/browser/index.d.ts +0 -1
  72. package/lib/browser/index.d.ts.map +1 -1
  73. package/lib/browser/index.js +0 -1
  74. package/lib/browser/index.js.map +1 -1
  75. package/lib/browser/shell/application-shell.d.ts +23 -3
  76. package/lib/browser/shell/application-shell.d.ts.map +1 -1
  77. package/lib/browser/shell/application-shell.js +62 -5
  78. package/lib/browser/shell/application-shell.js.map +1 -1
  79. package/lib/browser/shell/index.d.ts +0 -1
  80. package/lib/browser/shell/index.d.ts.map +1 -1
  81. package/lib/browser/shell/index.js +0 -1
  82. package/lib/browser/shell/index.js.map +1 -1
  83. package/lib/common/annotation/autowired.d.ts +8 -2
  84. package/lib/common/annotation/autowired.d.ts.map +1 -1
  85. package/lib/common/annotation/autowired.js +7 -8
  86. package/lib/common/annotation/autowired.js.map +1 -1
  87. package/lib/common/annotation/detached/autowired-provider.d.ts.map +1 -1
  88. package/lib/common/annotation/detached/autowired-provider.js +1 -2
  89. package/lib/common/annotation/detached/autowired-provider.js.map +1 -1
  90. package/lib/common/annotation/value.d.ts +1 -0
  91. package/lib/common/annotation/value.d.ts.map +1 -1
  92. package/lib/common/annotation/value.js +3 -4
  93. package/lib/common/annotation/value.js.map +1 -1
  94. package/lib/common/aop/aop-proxy-factory.d.ts +2 -1
  95. package/lib/common/aop/aop-proxy-factory.d.ts.map +1 -1
  96. package/lib/common/aop/aop-proxy-factory.js +9 -2
  97. package/lib/common/aop/aop-proxy-factory.js.map +1 -1
  98. package/lib/common/aop/aop.spec.js +24 -18
  99. package/lib/common/aop/aop.spec.js.map +1 -1
  100. package/lib/common/aop/class-filter.d.ts +2 -0
  101. package/lib/common/aop/class-filter.d.ts.map +1 -1
  102. package/lib/common/aop/class-filter.js +9 -2
  103. package/lib/common/aop/class-filter.js.map +1 -1
  104. package/lib/common/application/application-entry.d.ts.map +1 -1
  105. package/lib/common/application/application-entry.js +0 -9
  106. package/lib/common/application/application-entry.js.map +1 -1
  107. package/lib/common/application/application-factory.d.ts +9 -3
  108. package/lib/common/application/application-factory.d.ts.map +1 -1
  109. package/lib/common/application/application-factory.js +13 -6
  110. package/lib/common/application/application-factory.js.map +1 -1
  111. package/lib/common/application/application-protocol.d.ts +12 -0
  112. package/lib/common/application/application-protocol.d.ts.map +1 -1
  113. package/lib/common/application/application-protocol.js +2 -1
  114. package/lib/common/application/application-protocol.js.map +1 -1
  115. package/lib/common/application/application-state.d.ts +1 -1
  116. package/lib/common/application/application-state.d.ts.map +1 -1
  117. package/lib/common/application/application-state.js +5 -5
  118. package/lib/common/application/application-state.js.map +1 -1
  119. package/lib/common/application/application.d.ts +4 -2
  120. package/lib/common/application/application.d.ts.map +1 -1
  121. package/lib/common/application/application.js +18 -6
  122. package/lib/common/application/application.js.map +1 -1
  123. package/lib/common/application/index.d.ts +2 -0
  124. package/lib/common/application/index.d.ts.map +1 -1
  125. package/lib/common/application/index.js +2 -0
  126. package/lib/common/application/index.js.map +1 -1
  127. package/lib/common/application/lifecycle.spec.js +18 -13
  128. package/lib/common/application/lifecycle.spec.js.map +1 -1
  129. package/lib/common/config/config-util.d.ts +0 -1
  130. package/lib/common/config/config-util.d.ts.map +1 -1
  131. package/lib/common/config/config-util.js +0 -6
  132. package/lib/common/config/config-util.js.map +1 -1
  133. package/lib/common/container/assembly.spec.js +115 -43
  134. package/lib/common/container/assembly.spec.js.map +1 -1
  135. package/lib/common/container/container-error.d.ts +1 -1
  136. package/lib/common/container/container-error.d.ts.map +1 -1
  137. package/lib/common/container/container-error.js.map +1 -1
  138. package/lib/common/container/container.d.ts +1 -0
  139. package/lib/common/container/container.d.ts.map +1 -1
  140. package/lib/common/container/container.js +6 -1
  141. package/lib/common/container/container.js.map +1 -1
  142. package/lib/common/container/container.spec.js +6 -1
  143. package/lib/common/container/container.spec.js.map +1 -1
  144. package/lib/common/container/index.d.ts +0 -2
  145. package/lib/common/container/index.d.ts.map +1 -1
  146. package/lib/common/container/index.js +0 -2
  147. package/lib/common/container/index.js.map +1 -1
  148. package/lib/common/container/injection.d.ts +15 -1
  149. package/lib/common/container/injection.d.ts.map +1 -1
  150. package/lib/common/container/injection.js +37 -1
  151. package/lib/common/container/injection.js.map +1 -1
  152. package/lib/common/el/core-context-initializer.d.ts +2 -1
  153. package/lib/common/el/core-context-initializer.d.ts.map +1 -1
  154. package/lib/common/el/core-context-initializer.js +5 -3
  155. package/lib/common/el/core-context-initializer.js.map +1 -1
  156. package/lib/common/el/value-and-el.spec.js +35 -26
  157. package/lib/common/el/value-and-el.spec.js.map +1 -1
  158. package/lib/common/provider/index.d.ts +0 -1
  159. package/lib/common/provider/index.d.ts.map +1 -1
  160. package/lib/common/provider/index.js +0 -1
  161. package/lib/common/provider/index.js.map +1 -1
  162. package/lib/common/test/assembly-test-util.d.ts +17 -0
  163. package/lib/common/test/assembly-test-util.d.ts.map +1 -0
  164. package/lib/common/test/assembly-test-util.js +37 -0
  165. package/lib/common/test/assembly-test-util.js.map +1 -0
  166. package/lib/node/application/exit-signal-lifecycle.d.ts +6 -0
  167. package/lib/node/application/exit-signal-lifecycle.d.ts.map +1 -0
  168. package/lib/node/application/exit-signal-lifecycle.js +33 -0
  169. package/lib/node/application/exit-signal-lifecycle.js.map +1 -0
  170. package/lib/node/application/index.d.ts +1 -2
  171. package/lib/node/application/index.d.ts.map +1 -1
  172. package/lib/node/application/index.js +1 -2
  173. package/lib/node/application/index.js.map +1 -1
  174. package/lib/package.spec.js +17 -2
  175. package/lib/package.spec.js.map +1 -1
  176. package/package.json +1 -5
  177. package/src/browser/index.ts +0 -1
  178. package/src/browser/shell/application-shell.ts +64 -5
  179. package/src/browser/shell/index.ts +0 -1
  180. package/src/common/annotation/autowired.ts +14 -11
  181. package/src/common/annotation/detached/autowired-provider.ts +1 -2
  182. package/src/common/annotation/value.ts +4 -4
  183. package/src/common/aop/aop-proxy-factory.ts +6 -4
  184. package/src/common/aop/aop.spec.ts +26 -18
  185. package/src/common/aop/class-filter.ts +6 -3
  186. package/src/common/application/application-entry.ts +1 -9
  187. package/src/common/application/application-factory.ts +15 -6
  188. package/src/common/application/application-protocol.ts +14 -1
  189. package/src/common/application/application-state.ts +1 -1
  190. package/src/common/application/application.ts +13 -3
  191. package/src/common/application/index.ts +2 -0
  192. package/src/common/application/lifecycle.spec.ts +20 -13
  193. package/src/common/config/config-util.ts +0 -6
  194. package/src/common/container/assembly.spec.ts +100 -44
  195. package/src/common/container/container-error.ts +3 -2
  196. package/src/common/container/container.spec.ts +8 -2
  197. package/src/common/container/container.ts +7 -2
  198. package/src/common/container/index.ts +0 -2
  199. package/src/common/container/injection.ts +40 -3
  200. package/src/common/el/core-context-initializer.ts +6 -4
  201. package/src/common/el/value-and-el.spec.ts +34 -25
  202. package/src/common/provider/index.ts +0 -1
  203. package/src/common/test/assembly-test-util.ts +41 -0
  204. package/src/node/application/exit-signal-lifecycle.ts +23 -0
  205. package/src/node/application/index.ts +1 -2
  206. package/src/package.spec.ts +16 -3
  207. package/esm/browser/application/frontend-application-state.d.ts +0 -4
  208. package/esm/browser/application/frontend-application-state.js +0 -14
  209. package/esm/browser/application/frontend-application-state.js.map +0 -1
  210. package/esm/browser/application/frontend-application.d.ts +0 -30
  211. package/esm/browser/application/frontend-application.js +0 -123
  212. package/esm/browser/application/frontend-application.js.map +0 -1
  213. package/esm/browser/application/index.d.ts +0 -2
  214. package/esm/browser/application/index.js +0 -3
  215. package/esm/browser/application/index.js.map +0 -1
  216. package/esm/browser/shell/shell-protocol.d.ts +0 -4
  217. package/esm/browser/shell/shell-protocol.js +0 -2
  218. package/esm/browser/shell/shell-protocol.js.map +0 -1
  219. package/esm/common/container/container-provider.d.ts +0 -7
  220. package/esm/common/container/container-provider.js +0 -24
  221. package/esm/common/container/container-provider.js.map +0 -1
  222. package/esm/common/container/container-util.d.ts +0 -7
  223. package/esm/common/container/container-util.js +0 -18
  224. package/esm/common/container/container-util.js.map +0 -1
  225. package/esm/common/provider/provider-util.d.ts +0 -5
  226. package/esm/common/provider/provider-util.js +0 -10
  227. package/esm/common/provider/provider-util.js.map +0 -1
  228. package/esm/node/application/backend-application-state.d.ts +0 -4
  229. package/esm/node/application/backend-application-state.js +0 -14
  230. package/esm/node/application/backend-application-state.js.map +0 -1
  231. package/esm/node/application/backend-application.d.ts +0 -10
  232. package/esm/node/application/backend-application.js +0 -52
  233. package/esm/node/application/backend-application.js.map +0 -1
  234. package/lib/browser/application/frontend-application-state.d.ts +0 -5
  235. package/lib/browser/application/frontend-application-state.d.ts.map +0 -1
  236. package/lib/browser/application/frontend-application-state.js +0 -17
  237. package/lib/browser/application/frontend-application-state.js.map +0 -1
  238. package/lib/browser/application/frontend-application.d.ts +0 -31
  239. package/lib/browser/application/frontend-application.d.ts.map +0 -1
  240. package/lib/browser/application/frontend-application.js +0 -126
  241. package/lib/browser/application/frontend-application.js.map +0 -1
  242. package/lib/browser/application/index.d.ts +0 -3
  243. package/lib/browser/application/index.d.ts.map +0 -1
  244. package/lib/browser/application/index.js +0 -19
  245. package/lib/browser/application/index.js.map +0 -1
  246. package/lib/browser/shell/shell-protocol.d.ts +0 -5
  247. package/lib/browser/shell/shell-protocol.d.ts.map +0 -1
  248. package/lib/browser/shell/shell-protocol.js +0 -5
  249. package/lib/browser/shell/shell-protocol.js.map +0 -1
  250. package/lib/common/container/container-provider.d.ts +0 -8
  251. package/lib/common/container/container-provider.d.ts.map +0 -1
  252. package/lib/common/container/container-provider.js +0 -27
  253. package/lib/common/container/container-provider.js.map +0 -1
  254. package/lib/common/container/container-util.d.ts +0 -8
  255. package/lib/common/container/container-util.d.ts.map +0 -1
  256. package/lib/common/container/container-util.js +0 -21
  257. package/lib/common/container/container-util.js.map +0 -1
  258. package/lib/common/provider/provider-util.d.ts +0 -6
  259. package/lib/common/provider/provider-util.d.ts.map +0 -1
  260. package/lib/common/provider/provider-util.js +0 -13
  261. package/lib/common/provider/provider-util.js.map +0 -1
  262. package/lib/node/application/backend-application-state.d.ts +0 -5
  263. package/lib/node/application/backend-application-state.d.ts.map +0 -1
  264. package/lib/node/application/backend-application-state.js +0 -17
  265. package/lib/node/application/backend-application-state.js.map +0 -1
  266. package/lib/node/application/backend-application.d.ts +0 -11
  267. package/lib/node/application/backend-application.d.ts.map +0 -1
  268. package/lib/node/application/backend-application.js +0 -55
  269. package/lib/node/application/backend-application.js.map +0 -1
  270. package/src/browser/application/frontend-application-state.ts +0 -11
  271. package/src/browser/application/frontend-application.ts +0 -121
  272. package/src/browser/application/index.ts +0 -2
  273. package/src/browser/shell/shell-protocol.ts +0 -5
  274. package/src/common/container/container-provider.ts +0 -25
  275. package/src/common/container/container-util.ts +0 -17
  276. package/src/common/provider/provider-util.ts +0 -10
  277. package/src/node/application/backend-application-state.ts +0 -9
  278. package/src/node/application/backend-application.ts +0 -43
package/README.md CHANGED
@@ -38,7 +38,8 @@ export class HelloWorld {
38
38
  然后,在另一个对象中使用 `@Autowired` 注解来注入 `HelloWorld` 类对象:
39
39
 
40
40
  ```typescript
41
- import { Autowired, ApplicationFactory } from '@celljs/core';
41
+ import { Autowired } from '@celljs/core';
42
+ import { ApplicationFactory } from '@celljs/core/lib/common/application/application-factory';
42
43
  import { HelloWorld } from './hello-world';
43
44
 
44
45
  export class SampleService {
@@ -67,7 +68,8 @@ export default autoBind();
67
68
  不经工具链、在自己的脚本里组装容器时,用 `ApplicationFactory`:
68
69
 
69
70
  ```typescript
70
- import { ApplicationFactory, autoBind } from '@celljs/core';
71
+ import { autoBind } from '@celljs/core';
72
+ import { ApplicationFactory } from '@celljs/core/lib/common/application/application-factory';
71
73
  import './hello-world';
72
74
  import './sample-service';
73
75
 
@@ -121,7 +123,7 @@ export class SampleService {
121
123
  可以被注入的属性是在应用启动时通过 `ApplicationFactory` 的 `create` 方法传入的 `appProps` 对象中定义的。例如:
122
124
 
123
125
  ```typescript
124
- import { ApplicationFactory } from '@celljs/core';
126
+ import { ApplicationFactory } from '@celljs/core/lib/common/application/application-factory';
125
127
  import { SampleService } from './sample-service';
126
128
 
127
129
  (async () => {
@@ -198,7 +200,8 @@ IoC 容器是由一些列容器模块组成的,每个容器模块是由一些
198
200
  以下是一个简单的 IoC 容器示例:
199
201
 
200
202
  ```typescript
201
- import { Component, Autowired, ApplicationFactory } from '@celljs/core';
203
+ import { Component, Autowired } from '@celljs/core';
204
+ import { ApplicationFactory } from '@celljs/core/lib/common/application/application-factory';
202
205
 
203
206
  @Component()
204
207
  export class HelloWorld {
@@ -258,24 +261,26 @@ sampleService.run();
258
261
  | `CELL_DI_CIRCULAR` | 循环依赖,例如 `A → B → A` |
259
262
  | `CELL_DI_MISSING_INJECT` | 构造器参数或属性没有 `@Autowired`,类型也不能作为标识(接口、联合类型、基本类型) |
260
263
  | `CELL_DI_INCOMPLETE_BINDING` | `bind(id)` 之后没有 `to...` |
264
+ | `CELL_DI_NO_CONTAINER` | 读取 `detached` 属性的对象不是容器创建的(用 `new` 创建的) |
261
265
 
262
- 除了使用 `@Autowired` 装饰器来注入依赖对象,还可以使用 `ContainerUtil` 工具类来手动获取容器中的对象。例如:
266
+ 没有全局容器:组件之间只通过注入相互获取。容器绑定了自己,组件需要按运行时决定的标识取组件时,注入 `Container`:
263
267
 
264
268
  ```typescript
265
- import { ContainerUtil } from '@celljs/core';
266
- import { SampleService } from './sample-service';
269
+ import { Autowired, Component, Container } from '@celljs/core';
267
270
 
268
271
  @Component()
269
- export class SampleService {
272
+ export class HandlerRegistry {
270
273
 
271
- run() {
272
- const helloWorld = ContainerUtil.get(HelloWorld);
273
- console.log(this.helloWorld.greet());
274
+ @Autowired(Container)
275
+ protected readonly container: Container;
276
+
277
+ handler(id: symbol) {
278
+ return this.container.get(id);
274
279
  }
275
280
  }
276
281
  ```
277
282
 
278
- 注意:`ContainerUtil` 工具类只能容器加载完后才能使用,否则会报错。
283
+ 不是组件的代码(脚本、测试)从创建容器的地方拿容器:`ApplicationFactory.createContainer(props, ...modules)` 返回它,`cell dev` 和测试宿主在 `ApplicationHost.started()` 里收到它。
279
284
 
280
285
  ## 配置属性
281
286
 
@@ -284,7 +289,7 @@ Cell 核心组件提供了配置属性功能,支持将配置属性注入到类
284
289
  配置属性是在应用启动时通过 `ApplicationFactory` 的 `create` 方法传入的 `appProps` 对象中定义的。例如:
285
290
 
286
291
  ```typescript
287
- import { ApplicationFactory } from '@celljs/core';
292
+ import { ApplicationFactory } from '@celljs/core/lib/common/application/application-factory';
288
293
  import { SampleService } from './sample-service';
289
294
 
290
295
  (async () => {
@@ -309,18 +314,19 @@ export class MyConfigProvider implements ConfigProvider {
309
314
  }
310
315
  ```
311
316
 
312
- 除了前面介绍的使用 `@Value` 注解来注入配置属性,还可以使用 `ConfigUtil` 工具类来手动获取配置属性。例如:
317
+ 除了前面介绍的使用 `@Value` 注解来注入配置属性,还可以注入 `ConfigProvider`,在运行时按键取值。例如:
313
318
 
314
319
  ```typescript
315
- import { ConfigUtil } from '@celljs/core';
316
- import { SampleService } from './sample-service';
320
+ import { Autowired, Component, ConfigProvider } from '@celljs/core';
317
321
 
318
322
  @Component()
319
323
  export class SampleService {
320
324
 
325
+ @Autowired(ConfigProvider)
326
+ protected readonly config: ConfigProvider;
327
+
321
328
  run() {
322
- const appName = ConfigUtil.get('app.name');
323
- console.log(`App Name: ${appName}`);
329
+ console.log(`App Name: ${this.config.get('app.name')}`);
324
330
  }
325
331
  }
326
332
  ```
@@ -341,28 +347,17 @@ Cell 核心组件提供了一套类似 Spring 的装饰器,用于注册类对
341
347
  - `@AutowiredProvider`:注入依赖提供者,通过依赖提供者对象,获取一类对象列表,支持排序能力。
342
348
  - `@Constant`:注册常量对象到 IoC 容器中。
343
349
 
344
- 除此之外,还提供了一些装饰器,用于在非托管类对象中使用(当然,也可以直接使用 `ContainerUtil` 工具类来手动获取容器中的对象),例如在前端的 React 类组件中使用。以下是一些常用的非托管类对象的装饰器:
350
+ `@Autowired`、`@Value`、`@AutowiredProvider` 都有 `detached` 形式(选项 `{ detached: true }`,或从 `@celljs/core/lib/common/annotation/detached` 导入):属性第一次被读取时才从创建实例的容器里取值,用来打破循环依赖。它只用于属性,实例必须是容器创建的;用 `new` 创建的对象读取时报 `CELL_DI_NO_CONTAINER`。React 组件用 `@celljs/react` 的 `useInject` / `useValue`。
345
351
 
346
- - `@Autowired`:注入依赖对象。
347
- - `@Value`:注入配置属性。
348
- - `@AutowiredProvider`:注入依赖提供者,通过依赖提供者对象,获取一类对象列表,支持排序能力。
349
-
350
- 例如:
351
-
352
- ```tsx
353
- import { Autowired, Value } from '@celljs/core/lib/common/annotation/detached';
354
-
355
- export class SampleComponent extends React.Component {
356
-
357
- @Autowired()
358
- sampleService: SampleService;
352
+ ```typescript
353
+ import { Autowired, Component } from '@celljs/core';
359
354
 
360
- @Value('app.name')
361
- appName: string;
355
+ @Component()
356
+ export class OrderService {
362
357
 
363
- render() {
364
- return <div>{this.appName}</div>;
365
- }
358
+ // InvoiceService 也依赖 OrderService:在第一次使用时再取
359
+ @Autowired({ id: InvoiceService, detached: true })
360
+ protected readonly invoices: InvoiceService;
366
361
  }
367
362
  ```
368
363
 
@@ -449,7 +444,7 @@ export class SampleService {
449
444
 
450
445
  - `id`:类对象的标识符。
451
446
  - `multi`:是否是多个依赖对象。默认是根据属性类型是否为数组,自动判断,在某些情况下,需要强制指定为 `true`。
452
- - `detached`:是否是非托管类对象。默认是 `false`。
447
+ - `detached`:属性第一次被读取时才从创建实例的容器取值(`@Value` 每次读取都取),用于打破循环依赖。默认是 `false`。
453
448
 
454
449
  例如:
455
450
 
@@ -523,7 +518,7 @@ export class SampleService {
523
518
  `@Value` 装饰器用于注入配置属性。该装饰器有以下属性:
524
519
 
525
520
  - `el`:配置属性的 EL 表达式。
526
- - `detached`:是否是非托管类对象。默认是 `false`。
521
+ - `detached`:属性第一次被读取时才从创建实例的容器取值(`@Value` 每次读取都取),用于打破循环依赖。默认是 `false`。
527
522
 
528
523
  例如:
529
524
 
@@ -785,10 +780,10 @@ export class TestAfterThrowsAdvice implements AfterThrowsAdvice {
785
780
 
786
781
  Cell 核心组件提供了一个轻量级的应用框架,用于搭建应用程序。通过 `Application` 接口可以定义应用程序,通过 `ApplicationLifecycle` 接口可以定义应用程序的生命周期。通过 `ApplicationLifecycle` 接口可以定义应用程序的生命周期。通过 `ApplicationStateService` 接口可以定义应用程序的状态管理。通过 `ApplicationFactory` 可以创建应用实例。
787
782
 
788
- 一般使用 ApplicationFactory 创建应用实例,加载 IoC 容器模块,组装成一个完整的 IoC 容器。例如:
783
+ 一般使用 ApplicationFactory 创建应用实例,加载 IoC 容器模块,组装成一个完整的 IoC 容器(`createContainer` 返回容器,`create` 返回其中的应用)。例如:
789
784
 
790
785
  ```typescript
791
- import { ApplicationFactory } from '@celljs/core';
786
+ import { ApplicationFactory } from '@celljs/core/lib/common/application/application-factory';
792
787
  import { SampleService } from './sample-service';
793
788
  import { SampleModule } from './sample-module';
794
789
 
@@ -817,14 +812,13 @@ export class SampleLifecycle implements ApplicationLifecycle {
817
812
  }
818
813
  ```
819
814
 
820
- 另外,在 browser 和 node 目录下,提供了 `Application` 的实现,可以直接使用。
815
+ `Application` 只有一个实现,前后端相同:依次运行生命周期,然后在有 `ApplicationShell` 时挂载它(浏览器端由 `@celljs/core/lib/browser` 绑定,`@celljs/react` 替换)。Node.js 端的 `ExitSignalLifecycle` 在收到 SIGINT / SIGTERM 时停止应用并退出进程。
821
816
 
822
817
  ## 目录结构说明
823
818
 
824
819
  ```shell
825
820
  .
826
821
  ├── browser # 浏览器端应用
827
- │ ├── application # 前端应用程序
828
822
  │ ├── browser.ts # 与浏览器相关的工具方法
829
823
  │ ├── index.ts # 导出模块
830
824
  │ ├── shell # 前端应用程序启动入口
@@ -832,7 +826,7 @@ export class SampleLifecycle implements ApplicationLifecycle {
832
826
  ├── common # 公共模块
833
827
  │ ├── annotation # 装饰器定义目录
834
828
  │ ├── aop # AOP 相关
835
- │ ├── application # 后端应用程序
829
+ │ ├── application # 应用程序(前后端同一个实现)
836
830
  │ ├── config # 配置属性
837
831
  │ ├── constants.ts # 常量定义
838
832
  │ ├── container # IoC 容器
@@ -845,7 +839,7 @@ export class SampleLifecycle implements ApplicationLifecycle {
845
839
  │ ├── test # 测试
846
840
  │ └── utils # 工具方法
847
841
  ├── node # Node.js 端应用
848
- │ ├── application # 后端应用程序
842
+ │ ├── application # 退出信号的生命周期
849
843
  │ ├── constants.ts # 常量定义
850
844
  │ ├── context # 上下文
851
845
  │ ├── index.ts # 导出模块
@@ -1076,15 +1070,17 @@ export class CoreContextInitializer implements ContextInitializer {
1076
1070
  @Autowired(ExpressionEngine)
1077
1071
  protected readonly engine: ExpressionEngine;
1078
1072
 
1073
+ @Autowired({ id: ExpressionHandler, detached: true })
1074
+ protected readonly expressionHandler: ExpressionHandler;
1075
+
1079
1076
  initialize(ctx: ExpressionContext): void {
1080
1077
  if (typeof process !== 'undefined') {
1081
1078
  ctx.env = { ...process.env, _ignoreEl: true };
1082
1079
  }
1083
- const expressionHandler = ContainerUtil.get<ExpressionHandler>(ExpressionHandler);
1084
1080
  this.engine.addTransforms({
1085
1081
  replace: (val: string, searchValue: string | RegExp, replaceValue: string) => val && val.replace(new RegExp(searchValue, 'g'), replaceValue),
1086
1082
  regexp: (pattern: string, flags?? string) => new RegExp(pattern, flags),
1087
- eval: (text: string) => expressionHandler.handle(text)
1083
+ eval: (text: string) => this.expressionHandler.handle(text)
1088
1084
  });
1089
1085
  }
1090
1086
 
@@ -1096,7 +1092,7 @@ export class CoreContextInitializer implements ContextInitializer {
1096
1092
  应用的属性配置默认支持 EL 表达式模版字符串,例如:
1097
1093
 
1098
1094
  ```typescript
1099
- import { ApplicationFactory } from '@celljs/core';
1095
+ import { ApplicationFactory } from '@celljs/core/lib/common/application/application-factory';
1100
1096
 
1101
1097
  (async () => {
1102
1098
  const appProps = {
@@ -1113,4 +1109,4 @@ import { ApplicationFactory } from '@celljs/core';
1113
1109
 
1114
1110
  ## 许可证
1115
1111
 
1116
- 本项目采用 MIT 许可证。
1112
+ 本项目采用 MIT 许可证。
@@ -1,3 +1,2 @@
1
- export * from './application/index.js';
2
1
  export * from './shell/index.js';
3
2
  export * from './browser.js';
@@ -1,4 +1,3 @@
1
- export * from './application/index.js';
2
1
  export * from './shell/index.js';
3
2
  export * from './browser.js';
4
3
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}
@@ -1,4 +1,24 @@
1
- import { ApplicationShell } from './shell-protocol.js';
2
- export declare class ApplicationShellImpl implements ApplicationShell {
3
- attach(host: HTMLElement): void;
1
+ import { Application, ApplicationShell } from '../../common/index.js';
2
+ /**
3
+ * Attaches the UI to the page: renders it into the element of `html.rootId` (else the body), removes the
4
+ * `cell-preload` indicator once its CSS transition is over, and stops the application when the page goes
5
+ * away (`pagehide`). A UI library implements {@link render}.
6
+ */
7
+ export declare abstract class AbstractApplicationShell implements ApplicationShell {
8
+ protected readonly hostDomId: string;
9
+ attach(application: Application): Promise<void>;
10
+ protected abstract render(host: HTMLElement): void;
11
+ /** The element of `html.rootId`, else the body, once the document has one. */
12
+ protected getHost(): Promise<HTMLElement>;
13
+ /** The element that shows while the application starts (a splash screen). */
14
+ protected getStartupIndicator(host: HTMLElement): HTMLElement | undefined;
15
+ /**
16
+ * Hides the startup indicator with the `cell-hidden` CSS class, then removes it after its CSS
17
+ * transition.
18
+ */
19
+ protected revealShell(host: HTMLElement): Promise<void>;
20
+ }
21
+ /** The shell of an application without a UI library. */
22
+ export declare class ApplicationShellImpl extends AbstractApplicationShell {
23
+ protected render(host: HTMLElement): void;
4
24
  }
@@ -4,10 +4,66 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
4
4
  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;
5
5
  return c > 3 && r && Object.defineProperty(target, key, r), r;
6
6
  };
7
- import { Component } from '../../common/index.js';
8
- import { ApplicationShell } from './shell-protocol.js';
9
- let ApplicationShellImpl = class ApplicationShellImpl {
10
- attach(host) {
7
+ var __metadata = (this && this.__metadata) || function (k, v) {
8
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
+ };
10
+ import { ApplicationShell, Component, Value } from '../../common/index.js';
11
+ import { parseCssTime } from '../browser.js';
12
+ /**
13
+ * Attaches the UI to the page: renders it into the element of `html.rootId` (else the body), removes the
14
+ * `cell-preload` indicator once its CSS transition is over, and stops the application when the page goes
15
+ * away (`pagehide`). A UI library implements {@link render}.
16
+ */
17
+ export class AbstractApplicationShell {
18
+ async attach(application) {
19
+ const host = await this.getHost();
20
+ this.render(host);
21
+ await new Promise(resolve => requestAnimationFrame(() => resolve()));
22
+ await this.revealShell(host);
23
+ // pagehide, not unload: browsers deprecate unload and block it by permissions policy.
24
+ window.addEventListener('pagehide', () => void application.stop());
25
+ }
26
+ /** The element of `html.rootId`, else the body, once the document has one. */
27
+ getHost() {
28
+ if (document.body) {
29
+ return Promise.resolve(document.getElementById(this.hostDomId) || document.body);
30
+ }
31
+ return new Promise(resolve => window.addEventListener('load', () => resolve(document.getElementById(this.hostDomId) || document.body), { once: true }));
32
+ }
33
+ /** The element that shows while the application starts (a splash screen). */
34
+ getStartupIndicator(host) {
35
+ const startupElements = host.getElementsByClassName('cell-preload');
36
+ return startupElements.length === 0 ? undefined : startupElements[0];
37
+ }
38
+ /**
39
+ * Hides the startup indicator with the `cell-hidden` CSS class, then removes it after its CSS
40
+ * transition.
41
+ */
42
+ revealShell(host) {
43
+ const startupElem = this.getStartupIndicator(host);
44
+ if (!startupElem) {
45
+ return Promise.resolve();
46
+ }
47
+ return new Promise(resolve => {
48
+ window.requestAnimationFrame(() => {
49
+ startupElem.classList.add('cell-hidden');
50
+ const transitionDuration = parseCssTime(window.getComputedStyle(startupElem).transitionDuration, 0);
51
+ window.setTimeout(() => {
52
+ var _a;
53
+ (_a = startupElem.parentElement) === null || _a === void 0 ? void 0 : _a.removeChild(startupElem);
54
+ resolve();
55
+ }, transitionDuration);
56
+ });
57
+ });
58
+ }
59
+ }
60
+ __decorate([
61
+ Value('html.rootId'),
62
+ __metadata("design:type", String)
63
+ ], AbstractApplicationShell.prototype, "hostDomId", void 0);
64
+ /** The shell of an application without a UI library. */
65
+ let ApplicationShellImpl = class ApplicationShellImpl extends AbstractApplicationShell {
66
+ render(host) {
11
67
  host.textContent = 'Hello, Cell.';
12
68
  }
13
69
  };
@@ -1 +1 @@
1
- {"version":3,"file":"application-shell.js","sourceRoot":"","sources":["../../../src/browser/shell/application-shell.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAG7C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC7B,MAAM,CAAC,IAAiB;QACpB,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC;IACtC,CAAC;CAEJ,CAAA;AALY,oBAAoB;IADhC,SAAS,CAAC,gBAAgB,CAAC;GACf,oBAAoB,CAKhC"}
1
+ {"version":3,"file":"application-shell.js","sourceRoot":"","sources":["../../../src/browser/shell/application-shell.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAe,gBAAgB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C;;;;GAIG;AACH,MAAM,OAAgB,wBAAwB;IAK1C,KAAK,CAAC,MAAM,CAAC,WAAwB;QACjC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClB,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC3E,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC7B,sFAAsF;QACtF,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;IAID,8EAA8E;IACpE,OAAO;QACb,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAChB,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,IAAI,OAAO,CAAc,OAAO,CAAC,EAAE,CACtC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAC3H,CAAC;IACN,CAAC;IAED,6EAA6E;IACnE,mBAAmB,CAAC,IAAiB;QAC3C,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACpE,OAAO,eAAe,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAgB,CAAC;IACxF,CAAC;IAED;;;OAGG;IACO,WAAW,CAAC,IAAiB;QACnC,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACzB,MAAM,CAAC,qBAAqB,CAAC,GAAG,EAAE;gBAC9B,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBACzC,MAAM,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;gBACpG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;;oBACnB,MAAA,WAAW,CAAC,aAAa,0CAAE,WAAW,CAAC,WAAW,CAAC,CAAC;oBACpD,OAAO,EAAE,CAAC;gBACd,CAAC,EAAE,kBAAkB,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAjDsB;IADlB,KAAK,CAAC,aAAa,CAAC;;2DACgB;AAmDzC,wDAAwD;AAEjD,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,wBAAwB;IACpD,MAAM,CAAC,IAAiB;QAC9B,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC;IACtC,CAAC;CACJ,CAAA;AAJY,oBAAoB;IADhC,SAAS,CAAC,gBAAgB,CAAC;GACf,oBAAoB,CAIhC"}
@@ -1,2 +1 @@
1
1
  export * from './application-shell.js';
2
- export * from './shell-protocol.js';
@@ -1,3 +1,2 @@
1
1
  export * from './application-shell.js';
2
- export * from './shell-protocol.js';
3
2
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/shell/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/shell/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC"}
@@ -1,14 +1,19 @@
1
- import type { ComponentId } from '../container/container.js';
1
+ import type { ComponentId, Container } from '../container/container.js';
2
2
  export interface AutowiredOption {
3
3
  id?: ComponentId;
4
4
  multi?: boolean;
5
+ /**
6
+ * Resolved when the property is first read, from the container that created the instance, instead of
7
+ * when the instance is created: breaks a circular dependency. Properties only.
8
+ */
5
9
  detached?: boolean;
6
10
  }
7
11
  export type IdOrAutowiredOption = ComponentId | AutowiredOption;
8
12
  export type IdOrAutowiredOptionWithoutMulti = ComponentId | Omit<AutowiredOption, 'multi'>;
9
13
  export declare const Autowired: (idOrOption?: IdOrAutowiredOption) => PropertyDecorator & ParameterDecorator;
14
+ /** The value of a `detached` property, from the container that created the instance. */
10
15
  export interface DoGetValue {
11
- (option: AutowiredOption, target: any, property: string): any;
16
+ (option: AutowiredOption, container: Container): any;
12
17
  }
13
18
  export interface DoInject {
14
19
  (option: AutowiredOption, t: any, k: string, i?: number): any;
@@ -19,4 +24,5 @@ export declare function parseAutowiredOption(target: any, targetKey: string, ind
19
24
  detached?: boolean;
20
25
  };
21
26
  export declare function applyAutowiredDecorator(option: AutowiredOption, target: any, targetKey: string, index?: number, doInject?: DoInject, doGetValue?: DoGetValue): AutowiredOption;
27
+ /** A getter on the prototype that resolves the value once per instance, then keeps it on the instance. */
22
28
  export declare function createAutowiredProperty(option: AutowiredOption, doGetValue: DoGetValue, target: any, property: string): void;
@@ -1,4 +1,3 @@
1
- import { ContainerUtil } from '../container/container-util.js';
2
1
  import { InjectionUtil } from '../container/injection.js';
3
2
  import { AnnotationUtil } from '../utils/index.js';
4
3
  export const Autowired = function (idOrOption) {
@@ -25,14 +24,15 @@ const doInjectDefault = ({ id, multi }, t, k, i) => {
25
24
  point.id = id;
26
25
  point.multi = multi;
27
26
  };
28
- const doGetValueDefault = ({ id, multi }) => multi ? ContainerUtil.getAll(id) : ContainerUtil.get(id);
27
+ const doGetValueDefault = ({ id, multi }, container) => multi ? container.getAll(id) : container.get(id);
29
28
  export function applyAutowiredDecorator(option, target, targetKey, index, doInject = doInjectDefault, doGetValue = doGetValueDefault) {
30
29
  if (option.detached) {
31
30
  if (index !== undefined) {
32
- throw new Error(`The ${target.constructor.name} itself is not injected into the container, so the parameter injection of the constructor is not supported.`);
31
+ throw new Error(`${target.name}: a detached injection is resolved when its property is read, so it cannot be a constructor parameter.`);
33
32
  }
34
33
  // The value comes from the getter: the container leaves the property alone.
35
34
  InjectionUtil.remove(target, targetKey);
35
+ InjectionUtil.keepContainer(target);
36
36
  createAutowiredProperty(option, doGetValue, target, targetKey);
37
37
  }
38
38
  else {
@@ -40,15 +40,14 @@ export function applyAutowiredDecorator(option, target, targetKey, index, doInje
40
40
  }
41
41
  return option;
42
42
  }
43
+ /** A getter on the prototype that resolves the value once per instance, then keeps it on the instance. */
43
44
  export function createAutowiredProperty(option, doGetValue, target, property) {
44
- let value;
45
45
  Object.defineProperty(target, property, {
46
46
  enumerable: true,
47
+ configurable: true,
47
48
  get() {
48
- if (value !== undefined) {
49
- return value;
50
- }
51
- value = doGetValue(option, target, property);
49
+ const value = doGetValue(option, InjectionUtil.containerOf(this, property));
50
+ Object.defineProperty(this, property, { value, enumerable: true, configurable: true, writable: true });
52
51
  return value;
53
52
  }
54
53
  });
@@ -1 +1 @@
1
- {"version":3,"file":"autowired.js","sourceRoot":"","sources":["../../../src/common/annotation/autowired.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"autowired.js","sourceRoot":"","sources":["../../../src/common/annotation/autowired.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- import { ContainerUtil } from '../../container/container-util.js';
2
1
  import { applyAutowiredDecorator, parseAutowiredOption } from '../autowired.js';
3
2
  import { PROVIDER, ID_KEY, doInjectForAutowiredProvider } from '../autowired-provider.js';
4
3
  export const AutowiredProvider = function (idOrOption) {
@@ -8,5 +7,5 @@ export const AutowiredProvider = function (idOrOption) {
8
7
  applyAutowiredDecorator(option, target, targetKey, index, doInjectForAutowiredProvider, doGetValueForProvider);
9
8
  };
10
9
  };
11
- const doGetValueForProvider = option => ContainerUtil.get(PROVIDER, { tags: { [ID_KEY]: option.id } });
10
+ const doGetValueForProvider = (option, container) => container.get(PROVIDER, { tags: { [ID_KEY]: option.id } });
12
11
  //# sourceMappingURL=autowired-provider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"autowired-provider.js","sourceRoot":"","sources":["../../../../src/common/annotation/detached/autowired-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAA+C,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC1H,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAEvF,MAAM,CAAC,MAAM,iBAAiB,GAAG,UAAU,UAA4C;IACnF,OAAO,CAAC,MAAW,EAAE,SAAiB,EAAE,KAAc,EAAE,EAAE;QACtD,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC1E,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,CAAC,CAAC;IACnH,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAe,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"autowired-provider.js","sourceRoot":"","sources":["../../../../src/common/annotation/detached/autowired-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAA+C,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC1H,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAEvF,MAAM,CAAC,MAAM,iBAAiB,GAAG,UAAU,UAA4C;IACnF,OAAO,CAAC,MAAW,EAAE,SAAiB,EAAE,KAAc,EAAE,EAAE;QACtD,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC1E,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,CAAC,CAAC;IACnH,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAe,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC"}
@@ -2,6 +2,7 @@ import type { Binding, ComponentId } from '../container/container.js';
2
2
  export declare const VALUE: unique symbol;
3
3
  export interface ValueOption {
4
4
  el?: string;
5
+ /** Read every time the property is read, from the container that created the instance. Properties only. */
5
6
  detached?: boolean;
6
7
  }
7
8
  export type ElOrValueOption = string | ValueOption;
@@ -1,4 +1,3 @@
1
- import { ConfigUtil } from '../config/config-util.js';
2
1
  import { AnnotationUtil } from '../utils/index.js';
3
2
  import { ConfigProvider } from '../config/config-protocol.js';
4
3
  import { InjectionUtil } from '../container/injection.js';
@@ -20,9 +19,10 @@ export function parseValueOption(target, targetKey, index, elOrOption) {
20
19
  export function applyValueDecorator(option, target, targetKey, index) {
21
20
  if (option.detached) {
22
21
  if (index !== undefined) {
23
- throw new Error(`The ${target.constructor.name} itself is not injected into the container, so the parameter injection of the constructor is not supported.`);
22
+ throw new Error(`${target.name}: a detached @Value is read when its property is read, so it cannot be a constructor parameter.`);
24
23
  }
25
24
  InjectionUtil.remove(target, targetKey);
25
+ InjectionUtil.keepContainer(target);
26
26
  createValueProperty(option, target, targetKey);
27
27
  return;
28
28
  }
@@ -35,8 +35,7 @@ export function createValueProperty(option, target, property) {
35
35
  Object.defineProperty(target, property, {
36
36
  enumerable: true,
37
37
  get() {
38
- const el = option.el;
39
- return ConfigUtil.get(el);
38
+ return InjectionUtil.containerOf(this, property).get(ConfigProvider).get(option.el);
40
39
  }
41
40
  });
42
41
  }
@@ -1 +1 @@
1
- {"version":3,"file":"value.js","sourceRoot":"","sources":["../../../src/common/annotation/value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,MAAM,CAAC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AASrC,MAAM,CAAC,MAAM,KAAK,GAAG,UAAU,UAA4B;IACvD,OAAO,CAAC,MAAW,EAAE,SAAiB,EAAE,KAAc,EAAE,EAAE;QACtD,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACtE,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAgB;IACpC,QAAQ,EAAE,KAAK;CAClB,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,MAAW,EAAE,SAAiB,EAAE,KAAc,EAAE,UAA4B;IACzG,MAAM,MAAM,GAAG,cAAc,CAAC,gBAAgB,CAAc,UAAU,EAAE,IAAI,CAAC,CAAC;IAC9E,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,IAAI,SAAS,CAAC;IACnC,OAAO,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAmB,EAAE,MAAW,EAAE,SAAiB,EAAE,KAAc;IACnG,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,6GAA6G,CAAC,CAAC;QACjK,CAAC;QACD,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACxC,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/C,OAAO;IACX,CAAC;IAED,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAC5D,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC;IACjB,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,EAAG,CAAC;IACxB,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAmB,EAAE,MAAW,EAAE,QAAgB;IAClF,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE;QACpC,UAAU,EAAE,IAAI;QAChB,GAAG;YACC,MAAM,EAAE,GAAG,MAAM,CAAC,EAAG,CAAC;YACtB,OAAO,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9B,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,SAAS,CAAC,IAA2C;IACjE,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAiB,cAAc,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACtH,CAAC"}
1
+ {"version":3,"file":"value.js","sourceRoot":"","sources":["../../../src/common/annotation/value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,MAAM,CAAC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AAUrC,MAAM,CAAC,MAAM,KAAK,GAAG,UAAU,UAA4B;IACvD,OAAO,CAAC,MAAW,EAAE,SAAiB,EAAE,KAAc,EAAE,EAAE;QACtD,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACtE,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAgB;IACpC,QAAQ,EAAE,KAAK;CAClB,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,MAAW,EAAE,SAAiB,EAAE,KAAc,EAAE,UAA4B;IACzG,MAAM,MAAM,GAAG,cAAc,CAAC,gBAAgB,CAAc,UAAU,EAAE,IAAI,CAAC,CAAC;IAC9E,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,IAAI,SAAS,CAAC;IACnC,OAAO,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAmB,EAAE,MAAW,EAAE,SAAiB,EAAE,KAAc;IACnG,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,iGAAiG,CAAC,CAAC;QACrI,CAAC;QACD,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACxC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACpC,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/C,OAAO;IACX,CAAC;IAED,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAC5D,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC;IACjB,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,EAAG,CAAC;IACxB,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAmB,EAAE,MAAW,EAAE,QAAgB;IAClF,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE;QACpC,UAAU,EAAE,IAAI;QAChB,GAAG;YACC,OAAO,aAAa,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAiB,cAAc,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAG,CAAC,CAAC;QACzG,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,SAAS,CAAC,IAA2C;IACjE,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAiB,cAAc,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACtH,CAAC"}
@@ -1,6 +1,7 @@
1
- import type { ComponentId } from '../container/container.js';
1
+ import { ComponentId, Container } from '../container/container.js';
2
2
  import { AopProxy, AopProxyFactory, ProxyConfig } from './aop-protocol.js';
3
3
  export declare class AopProxyFactoryImpl implements AopProxyFactory {
4
+ protected readonly container: Container;
4
5
  protected getAdvices<T>(id: ComponentId<T>, tagValues: string[]): T[];
5
6
  /**
6
7
  * Methods become async: they await the before advices, the method, then the after advices. The
@@ -4,13 +4,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
4
4
  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;
5
5
  return c > 3 && r && Object.defineProperty(target, key, r), r;
6
6
  };
7
+ var __metadata = (this && this.__metadata) || function (k, v) {
8
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
+ };
7
10
  import { PROXY_TARGET } from '../utils/proxy-util.js';
8
- import { ContainerProvider } from '../container/container-provider.js';
11
+ import { Container } from '../container/container.js';
9
12
  import { AfterReturningAdvice, AfterThrowsAdvice, AopProxyFactory, AOP_TAG, MethodBeforeAdvice } from './aop-protocol.js';
10
- import { Component } from '../annotation/index.js';
13
+ import { Autowired, Component } from '../annotation/index.js';
11
14
  let AopProxyFactoryImpl = class AopProxyFactoryImpl {
12
15
  getAdvices(id, tagValues) {
13
- const container = ContainerProvider.provide();
16
+ const container = this.container;
14
17
  const advices = [];
15
18
  for (const tagValue of tagValues) {
16
19
  const query = { tags: { [AOP_TAG]: tagValue } };
@@ -76,6 +79,10 @@ let AopProxyFactoryImpl = class AopProxyFactoryImpl {
76
79
  };
77
80
  }
78
81
  };
82
+ __decorate([
83
+ Autowired(Container),
84
+ __metadata("design:type", Container)
85
+ ], AopProxyFactoryImpl.prototype, "container", void 0);
79
86
  AopProxyFactoryImpl = __decorate([
80
87
  Component({ id: AopProxyFactory, proxy: false })
81
88
  ], AopProxyFactoryImpl);
@@ -1 +1 @@
1
- {"version":3,"file":"aop-proxy-factory.js","sourceRoot":"","sources":["../../../src/common/aop/aop-proxy-factory.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAY,eAAe,EAAE,OAAO,EAAE,kBAAkB,EAAe,MAAM,gBAAgB,CAAC;AAC9I,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AASnC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAElB,UAAU,CAAI,EAAkB,EAAE,SAAmB;QAC3D,MAAM,SAAS,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC;YAChD,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,CAAI,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;YACpD,CAAC;QACL,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,MAAmB;QACtB,MAAM,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC;QACzC,IAAI,OAA4B,CAAC;QACjC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,IAAP,OAAO,GAAK;YACjC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAqB,kBAAkB,EAAE,OAAO,CAAC;YACxE,cAAc,EAAE,IAAI,CAAC,UAAU,CAAuB,oBAAoB,EAAE,OAAO,CAAC;YACpF,WAAW,EAAE,IAAI,CAAC,UAAU,CAAoB,iBAAiB,EAAE,OAAO,CAAC;SAC9E,CAAA,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAsD,CAAC;QAC/E,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE;YACnC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;gBACpB,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;oBAC1B,OAAO,MAAM,CAAC;gBAClB,CAAC;gBACD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC5B,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;oBAC7B,OAAO,IAAI,CAAC;gBAChB,CAAC;gBACD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;oBACjC,OAAO,MAAM,CAAC,OAAO,CAAC;gBAC1B,CAAC;gBACD,MAAM,OAAO,GAAG,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE;oBACrC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,UAAU,EAAE,CAAC;oBAC7D,IAAI,CAAC;wBACD,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;4BAC1B,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;wBAC9C,CAAC;wBACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;wBACnD,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;4BAClC,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;wBACnE,CAAC;wBACD,OAAO,WAAW,CAAC;oBACvB,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACb,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;4BAC/B,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;wBAC1D,CAAC;wBACD,MAAM,KAAK,CAAC;oBAChB,CAAC;gBACL,CAAC,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBACxC,OAAO,OAAO,CAAC;YACnB,CAAC;SACJ,CAAC,CAAC;QACH,OAAO;YACH,QAAQ;gBACJ,OAAO,KAAK,CAAC;YACjB,CAAC;SACJ,CAAC;IACN,CAAC;CAEJ,CAAA;AArEY,mBAAmB;IAD/B,SAAS,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GACpC,mBAAmB,CAqE/B"}
1
+ {"version":3,"file":"aop-proxy-factory.js","sourceRoot":"","sources":["../../../src/common/aop/aop-proxy-factory.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,8 @@
1
1
  import { Newable } from '../utils/index.js';
2
+ import { Container } from '../container/container.js';
2
3
  import { ClassFilter } from './aop-protocol.js';
3
4
  import { ComponentMetadata } from '../annotation/index.js';
4
5
  export declare class ClassFilterImpl implements ClassFilter {
6
+ protected readonly container: Container;
5
7
  matches(clazz: Newable<any>, metadata: ComponentMetadata): boolean;
6
8
  }