@celljs/core 4.0.0 → 4.2.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 (529) hide show
  1. package/README.md +49 -68
  2. package/esm/browser/static-module.d.ts +1 -1
  3. package/esm/common/annotation/aspect.d.ts +2 -1
  4. package/esm/common/annotation/aspect.js.map +1 -1
  5. package/esm/common/annotation/autowired-provider.d.ts +0 -2
  6. package/esm/common/annotation/autowired-provider.js +4 -13
  7. package/esm/common/annotation/autowired-provider.js.map +1 -1
  8. package/esm/common/annotation/autowired.d.ts +1 -1
  9. package/esm/common/annotation/autowired.js +11 -3
  10. package/esm/common/annotation/autowired.js.map +1 -1
  11. package/esm/common/annotation/component.d.ts +4 -8
  12. package/esm/common/annotation/component.js +0 -6
  13. package/esm/common/annotation/component.js.map +1 -1
  14. package/esm/common/annotation/constant.d.ts +1 -1
  15. package/esm/common/annotation/constant.js +6 -3
  16. package/esm/common/annotation/constant.js.map +1 -1
  17. package/esm/common/annotation/detached/autowired-provider.js +2 -2
  18. package/esm/common/annotation/detached/autowired-provider.js.map +1 -1
  19. package/esm/common/annotation/index.d.ts +0 -6
  20. package/esm/common/annotation/index.js +0 -6
  21. package/esm/common/annotation/index.js.map +1 -1
  22. package/esm/common/annotation/named.d.ts +2 -1
  23. package/esm/common/annotation/named.js +5 -1
  24. package/esm/common/annotation/named.js.map +1 -1
  25. package/esm/common/annotation/optional.d.ts +2 -1
  26. package/esm/common/annotation/optional.js +5 -1
  27. package/esm/common/annotation/optional.js.map +1 -1
  28. package/esm/common/annotation/post-construct.d.ts +2 -1
  29. package/esm/common/annotation/post-construct.js +5 -1
  30. package/esm/common/annotation/post-construct.js.map +1 -1
  31. package/esm/common/annotation/tagged.d.ts +2 -1
  32. package/esm/common/annotation/tagged.js +6 -1
  33. package/esm/common/annotation/tagged.js.map +1 -1
  34. package/esm/common/annotation/value.d.ts +3 -2
  35. package/esm/common/annotation/value.js +7 -10
  36. package/esm/common/annotation/value.js.map +1 -1
  37. package/esm/common/aop/aop-proxy-factory.d.ts +6 -2
  38. package/esm/common/aop/aop-proxy-factory.js +44 -28
  39. package/esm/common/aop/aop-proxy-factory.js.map +1 -1
  40. package/esm/common/aop/class-filter.js +6 -6
  41. package/esm/common/aop/class-filter.js.map +1 -1
  42. package/esm/common/application/application-factory.d.ts +1 -1
  43. package/esm/common/application/application-factory.js +4 -4
  44. package/esm/common/application/application-factory.js.map +1 -1
  45. package/esm/common/application/application-protocol.js +1 -1
  46. package/esm/common/application/application-protocol.js.map +1 -1
  47. package/esm/common/config/config-provider.js +2 -1
  48. package/esm/common/config/config-provider.js.map +1 -1
  49. package/esm/common/container/auto-bind.d.ts +7 -3
  50. package/esm/common/container/auto-bind.js +54 -71
  51. package/esm/common/container/auto-bind.js.map +1 -1
  52. package/esm/common/container/container-error.d.ts +21 -0
  53. package/esm/common/container/container-error.js +22 -0
  54. package/esm/common/container/container-error.js.map +1 -0
  55. package/esm/common/container/container-provider.d.ts +5 -4
  56. package/esm/common/container/container-provider.js +2 -1
  57. package/esm/common/container/container-provider.js.map +1 -1
  58. package/esm/common/container/container-util.d.ts +5 -7
  59. package/esm/common/container/container-util.js +8 -19
  60. package/esm/common/container/container-util.js.map +1 -1
  61. package/esm/common/container/container.d.ts +104 -0
  62. package/esm/common/container/container.js +299 -0
  63. package/esm/common/container/container.js.map +1 -0
  64. package/esm/common/container/dynamic-container.d.ts +1 -1
  65. package/esm/common/container/dynamic-container.js +2 -2
  66. package/esm/common/container/dynamic-container.js.map +1 -1
  67. package/esm/common/container/index.d.ts +5 -6
  68. package/esm/common/container/index.js +5 -3
  69. package/esm/common/container/index.js.map +1 -1
  70. package/esm/common/container/injection.d.ts +40 -0
  71. package/esm/common/container/injection.js +109 -0
  72. package/esm/common/container/injection.js.map +1 -0
  73. package/esm/common/container/scope.d.ts +2 -3
  74. package/esm/common/container/scope.js +2 -3
  75. package/esm/common/container/scope.js.map +1 -1
  76. package/esm/common/el/application-expression-engine.d.ts +7 -0
  77. package/esm/common/{provider/provider-creator.js → el/application-expression-engine.js} +11 -11
  78. package/esm/common/el/application-expression-engine.js.map +1 -0
  79. package/esm/common/el/core-context-initializer.d.ts +3 -2
  80. package/esm/common/el/core-context-initializer.js +10 -8
  81. package/esm/common/el/core-context-initializer.js.map +1 -1
  82. package/esm/common/el/expression-compiler.d.ts +7 -17
  83. package/esm/common/el/expression-compiler.js +10 -166
  84. package/esm/common/el/expression-compiler.js.map +1 -1
  85. package/esm/common/el/expression-engine.d.ts +61 -0
  86. package/esm/common/el/expression-engine.js +459 -0
  87. package/esm/common/el/expression-engine.js.map +1 -0
  88. package/esm/common/el/expression-handler.d.ts +8 -4
  89. package/esm/common/el/expression-handler.js +15 -58
  90. package/esm/common/el/expression-handler.js.map +1 -1
  91. package/esm/common/el/expression-protocol.d.ts +3 -5
  92. package/esm/common/el/expression-protocol.js +0 -1
  93. package/esm/common/el/expression-protocol.js.map +1 -1
  94. package/esm/common/el/expression-util.d.ts +69 -0
  95. package/esm/common/el/expression-util.js +346 -0
  96. package/esm/common/el/expression-util.js.map +1 -0
  97. package/esm/common/el/index.d.ts +3 -1
  98. package/esm/common/el/index.js +3 -1
  99. package/esm/common/el/index.js.map +1 -1
  100. package/esm/common/logger/abstract-logger.d.ts +4 -2
  101. package/esm/common/logger/abstract-logger.js +11 -6
  102. package/esm/common/logger/abstract-logger.js.map +1 -1
  103. package/esm/common/logger/logger-protocol.d.ts +4 -0
  104. package/esm/common/logger/logger-protocol.js +2 -0
  105. package/esm/common/logger/logger-protocol.js.map +1 -1
  106. package/esm/common/logger/logger.js +7 -7
  107. package/esm/common/logger/logger.js.map +1 -1
  108. package/esm/common/provider/index.d.ts +0 -1
  109. package/esm/common/provider/index.js +0 -1
  110. package/esm/common/provider/index.js.map +1 -1
  111. package/esm/common/provider/provider-protocol.d.ts +5 -9
  112. package/esm/common/provider/provider-protocol.js +0 -1
  113. package/esm/common/provider/provider-protocol.js.map +1 -1
  114. package/esm/common/provider/provider-util.d.ts +1 -1
  115. package/esm/common/provider/provider-util.js +2 -2
  116. package/esm/common/provider/provider-util.js.map +1 -1
  117. package/esm/common/provider/provider.d.ts +7 -6
  118. package/esm/common/provider/provider.js +15 -26
  119. package/esm/common/provider/provider.js.map +1 -1
  120. package/esm/common/static-module.d.ts +1 -1
  121. package/esm/common/static-module.js +1 -1
  122. package/esm/common/static-module.js.map +1 -1
  123. package/esm/common/test/mock-logger.d.ts +1 -0
  124. package/esm/common/test/mock-logger.js +5 -13
  125. package/esm/common/test/mock-logger.js.map +1 -1
  126. package/esm/common/test/test-module.d.ts +1 -1
  127. package/esm/common/test/test-module.js +1 -1
  128. package/esm/common/test/test-module.js.map +1 -1
  129. package/esm/common/utils/annotation-util.js +2 -1
  130. package/esm/common/utils/annotation-util.js.map +1 -1
  131. package/esm/common/utils/emitter.d.ts +1 -10
  132. package/esm/common/utils/emitter.js +0 -56
  133. package/esm/common/utils/emitter.js.map +1 -1
  134. package/esm/common/utils/mime-type-util.js +1 -1
  135. package/esm/common/utils/mime-type-util.js.map +1 -1
  136. package/esm/common/utils/mime-type.js +1 -1
  137. package/esm/common/utils/mime-type.js.map +1 -1
  138. package/esm/common/utils/proxy-util.d.ts +5 -2
  139. package/esm/common/utils/proxy-util.js +10 -28
  140. package/esm/common/utils/proxy-util.js.map +1 -1
  141. package/esm/node/context/context.d.ts +11 -2
  142. package/esm/node/context/context.js +36 -12
  143. package/esm/node/context/context.js.map +1 -1
  144. package/esm/node/index.d.ts +0 -1
  145. package/esm/node/index.js +0 -1
  146. package/esm/node/index.js.map +1 -1
  147. package/esm/node/static-module.d.ts +1 -1
  148. package/lib/browser/static-module.d.ts +1 -1
  149. package/lib/common/annotation/aspect.d.ts +2 -1
  150. package/lib/common/annotation/aspect.d.ts.map +1 -1
  151. package/lib/common/annotation/aspect.js.map +1 -1
  152. package/lib/common/annotation/autowired-provider.d.ts +0 -2
  153. package/lib/common/annotation/autowired-provider.d.ts.map +1 -1
  154. package/lib/common/annotation/autowired-provider.js +4 -14
  155. package/lib/common/annotation/autowired-provider.js.map +1 -1
  156. package/lib/common/annotation/autowired.d.ts +1 -1
  157. package/lib/common/annotation/autowired.d.ts.map +1 -1
  158. package/lib/common/annotation/autowired.js +11 -3
  159. package/lib/common/annotation/autowired.js.map +1 -1
  160. package/lib/common/annotation/component.d.ts +4 -8
  161. package/lib/common/annotation/component.d.ts.map +1 -1
  162. package/lib/common/annotation/component.js +0 -6
  163. package/lib/common/annotation/component.js.map +1 -1
  164. package/lib/common/annotation/constant.d.ts +1 -1
  165. package/lib/common/annotation/constant.d.ts.map +1 -1
  166. package/lib/common/annotation/constant.js +6 -3
  167. package/lib/common/annotation/constant.js.map +1 -1
  168. package/lib/common/annotation/detached/autowired-provider.js +2 -2
  169. package/lib/common/annotation/detached/autowired-provider.js.map +1 -1
  170. package/lib/common/annotation/index.d.ts +0 -6
  171. package/lib/common/annotation/index.d.ts.map +1 -1
  172. package/lib/common/annotation/index.js +0 -6
  173. package/lib/common/annotation/index.js.map +1 -1
  174. package/lib/common/annotation/named.d.ts +2 -1
  175. package/lib/common/annotation/named.d.ts.map +1 -1
  176. package/lib/common/annotation/named.js +6 -2
  177. package/lib/common/annotation/named.js.map +1 -1
  178. package/lib/common/annotation/optional.d.ts +2 -1
  179. package/lib/common/annotation/optional.d.ts.map +1 -1
  180. package/lib/common/annotation/optional.js +6 -2
  181. package/lib/common/annotation/optional.js.map +1 -1
  182. package/lib/common/annotation/post-construct.d.ts +2 -1
  183. package/lib/common/annotation/post-construct.d.ts.map +1 -1
  184. package/lib/common/annotation/post-construct.js +6 -2
  185. package/lib/common/annotation/post-construct.js.map +1 -1
  186. package/lib/common/annotation/tagged.d.ts +2 -1
  187. package/lib/common/annotation/tagged.d.ts.map +1 -1
  188. package/lib/common/annotation/tagged.js +7 -2
  189. package/lib/common/annotation/tagged.js.map +1 -1
  190. package/lib/common/annotation/value.d.ts +3 -2
  191. package/lib/common/annotation/value.d.ts.map +1 -1
  192. package/lib/common/annotation/value.js +7 -10
  193. package/lib/common/annotation/value.js.map +1 -1
  194. package/lib/common/aop/aop-proxy-factory.d.ts +6 -2
  195. package/lib/common/aop/aop-proxy-factory.d.ts.map +1 -1
  196. package/lib/common/aop/aop-proxy-factory.js +45 -29
  197. package/lib/common/aop/aop-proxy-factory.js.map +1 -1
  198. package/lib/common/aop/aop.spec.d.ts +2 -0
  199. package/lib/common/aop/aop.spec.d.ts.map +1 -0
  200. package/lib/common/aop/aop.spec.js +170 -0
  201. package/lib/common/aop/aop.spec.js.map +1 -0
  202. package/lib/common/aop/class-filter.js +7 -7
  203. package/lib/common/aop/class-filter.js.map +1 -1
  204. package/lib/common/application/application-factory.d.ts +1 -1
  205. package/lib/common/application/application-factory.d.ts.map +1 -1
  206. package/lib/common/application/application-factory.js +4 -4
  207. package/lib/common/application/application-factory.js.map +1 -1
  208. package/lib/common/application/application-protocol.js +1 -1
  209. package/lib/common/application/application-protocol.js.map +1 -1
  210. package/lib/common/application/lifecycle.spec.d.ts +2 -0
  211. package/lib/common/application/lifecycle.spec.d.ts.map +1 -0
  212. package/lib/common/application/lifecycle.spec.js +155 -0
  213. package/lib/common/application/lifecycle.spec.js.map +1 -0
  214. package/lib/common/config/config-provider.js +2 -1
  215. package/lib/common/config/config-provider.js.map +1 -1
  216. package/lib/common/container/assembly.spec.d.ts +2 -0
  217. package/lib/common/container/assembly.spec.d.ts.map +1 -0
  218. package/lib/common/container/assembly.spec.js +464 -0
  219. package/lib/common/container/assembly.spec.js.map +1 -0
  220. package/lib/common/container/auto-bind.d.ts +7 -3
  221. package/lib/common/container/auto-bind.d.ts.map +1 -1
  222. package/lib/common/container/auto-bind.js +54 -72
  223. package/lib/common/container/auto-bind.js.map +1 -1
  224. package/lib/common/container/container-error.d.ts +22 -0
  225. package/lib/common/container/container-error.d.ts.map +1 -0
  226. package/lib/common/container/container-error.js +26 -0
  227. package/lib/common/container/container-error.js.map +1 -0
  228. package/lib/common/container/container-provider.d.ts +5 -4
  229. package/lib/common/container/container-provider.d.ts.map +1 -1
  230. package/lib/common/container/container-provider.js +3 -2
  231. package/lib/common/container/container-provider.js.map +1 -1
  232. package/lib/common/container/container-util.d.ts +5 -7
  233. package/lib/common/container/container-util.d.ts.map +1 -1
  234. package/lib/common/container/container-util.js +8 -19
  235. package/lib/common/container/container-util.js.map +1 -1
  236. package/lib/common/container/container.d.ts +105 -0
  237. package/lib/common/container/container.d.ts.map +1 -0
  238. package/lib/common/container/container.js +305 -0
  239. package/lib/common/container/container.js.map +1 -0
  240. package/lib/common/container/container.spec.d.ts +2 -0
  241. package/lib/common/container/container.spec.d.ts.map +1 -0
  242. package/lib/common/container/container.spec.js +334 -0
  243. package/lib/common/container/container.spec.js.map +1 -0
  244. package/lib/common/container/dynamic-container.d.ts +1 -1
  245. package/lib/common/container/dynamic-container.d.ts.map +1 -1
  246. package/lib/common/container/dynamic-container.js +3 -3
  247. package/lib/common/container/dynamic-container.js.map +1 -1
  248. package/lib/common/container/index.d.ts +5 -6
  249. package/lib/common/container/index.d.ts.map +1 -1
  250. package/lib/common/container/index.js +5 -3
  251. package/lib/common/container/index.js.map +1 -1
  252. package/lib/common/container/injection.d.ts +41 -0
  253. package/lib/common/container/injection.d.ts.map +1 -0
  254. package/lib/common/container/injection.js +112 -0
  255. package/lib/common/container/injection.js.map +1 -0
  256. package/lib/common/container/scope.d.ts +2 -3
  257. package/lib/common/container/scope.d.ts.map +1 -1
  258. package/lib/common/container/scope.js +2 -3
  259. package/lib/common/container/scope.js.map +1 -1
  260. package/lib/common/el/application-expression-engine.d.ts +8 -0
  261. package/lib/common/el/application-expression-engine.d.ts.map +1 -0
  262. package/lib/common/el/application-expression-engine.js +22 -0
  263. package/lib/common/el/application-expression-engine.js.map +1 -0
  264. package/lib/common/el/core-context-initializer.d.ts +3 -2
  265. package/lib/common/el/core-context-initializer.d.ts.map +1 -1
  266. package/lib/common/el/core-context-initializer.js +9 -7
  267. package/lib/common/el/core-context-initializer.js.map +1 -1
  268. package/lib/common/el/expression-compiler.d.ts +7 -17
  269. package/lib/common/el/expression-compiler.d.ts.map +1 -1
  270. package/lib/common/el/expression-compiler.js +10 -166
  271. package/lib/common/el/expression-compiler.js.map +1 -1
  272. package/lib/common/el/expression-engine.d.ts +62 -0
  273. package/lib/common/el/expression-engine.d.ts.map +1 -0
  274. package/lib/common/el/expression-engine.js +465 -0
  275. package/lib/common/el/expression-engine.js.map +1 -0
  276. package/lib/common/el/expression-engine.spec.d.ts +2 -0
  277. package/lib/common/el/expression-engine.spec.d.ts.map +1 -0
  278. package/lib/common/el/expression-engine.spec.js +100 -0
  279. package/lib/common/el/expression-engine.spec.js.map +1 -0
  280. package/lib/common/el/expression-handler.d.ts +8 -4
  281. package/lib/common/el/expression-handler.d.ts.map +1 -1
  282. package/lib/common/el/expression-handler.js +14 -60
  283. package/lib/common/el/expression-handler.js.map +1 -1
  284. package/lib/common/el/expression-handler.spec.d.ts +2 -0
  285. package/lib/common/el/expression-handler.spec.d.ts.map +1 -0
  286. package/lib/common/el/expression-handler.spec.js +98 -0
  287. package/lib/common/el/expression-handler.spec.js.map +1 -0
  288. package/lib/common/el/expression-protocol.d.ts +3 -5
  289. package/lib/common/el/expression-protocol.d.ts.map +1 -1
  290. package/lib/common/el/expression-protocol.js +1 -2
  291. package/lib/common/el/expression-protocol.js.map +1 -1
  292. package/lib/common/el/expression-util.d.ts +70 -0
  293. package/lib/common/el/expression-util.d.ts.map +1 -0
  294. package/lib/common/el/expression-util.js +351 -0
  295. package/lib/common/el/expression-util.js.map +1 -0
  296. package/lib/common/el/expression-util.spec.d.ts +2 -0
  297. package/lib/common/el/expression-util.spec.d.ts.map +1 -0
  298. package/lib/common/el/expression-util.spec.js +45 -0
  299. package/lib/common/el/expression-util.spec.js.map +1 -0
  300. package/lib/common/el/index.d.ts +3 -1
  301. package/lib/common/el/index.d.ts.map +1 -1
  302. package/lib/common/el/index.js +3 -1
  303. package/lib/common/el/index.js.map +1 -1
  304. package/lib/common/el/value-and-el.spec.d.ts +2 -0
  305. package/lib/common/el/value-and-el.spec.d.ts.map +1 -0
  306. package/lib/common/el/value-and-el.spec.js +216 -0
  307. package/lib/common/el/value-and-el.spec.js.map +1 -0
  308. package/lib/common/logger/abstract-logger.d.ts +4 -2
  309. package/lib/common/logger/abstract-logger.d.ts.map +1 -1
  310. package/lib/common/logger/abstract-logger.js +10 -5
  311. package/lib/common/logger/abstract-logger.js.map +1 -1
  312. package/lib/common/logger/logger-protocol.d.ts +4 -0
  313. package/lib/common/logger/logger-protocol.d.ts.map +1 -1
  314. package/lib/common/logger/logger-protocol.js +3 -1
  315. package/lib/common/logger/logger-protocol.js.map +1 -1
  316. package/lib/common/logger/logger.js +7 -7
  317. package/lib/common/logger/logger.js.map +1 -1
  318. package/lib/common/logger/logger.spec.d.ts +2 -0
  319. package/lib/common/logger/logger.spec.d.ts.map +1 -0
  320. package/lib/common/logger/logger.spec.js +57 -0
  321. package/lib/common/logger/logger.spec.js.map +1 -0
  322. package/lib/common/provider/index.d.ts +0 -1
  323. package/lib/common/provider/index.d.ts.map +1 -1
  324. package/lib/common/provider/index.js +0 -1
  325. package/lib/common/provider/index.js.map +1 -1
  326. package/lib/common/provider/provider-protocol.d.ts +5 -9
  327. package/lib/common/provider/provider-protocol.d.ts.map +1 -1
  328. package/lib/common/provider/provider-protocol.js +1 -2
  329. package/lib/common/provider/provider-protocol.js.map +1 -1
  330. package/lib/common/provider/provider-util.d.ts +1 -1
  331. package/lib/common/provider/provider-util.d.ts.map +1 -1
  332. package/lib/common/provider/provider-util.js +2 -2
  333. package/lib/common/provider/provider-util.js.map +1 -1
  334. package/lib/common/provider/provider.d.ts +7 -6
  335. package/lib/common/provider/provider.d.ts.map +1 -1
  336. package/lib/common/provider/provider.js +16 -26
  337. package/lib/common/provider/provider.js.map +1 -1
  338. package/lib/common/static-module.d.ts +1 -1
  339. package/lib/common/static-module.js +2 -2
  340. package/lib/common/static-module.js.map +1 -1
  341. package/lib/common/test/mock-logger.d.ts +1 -0
  342. package/lib/common/test/mock-logger.d.ts.map +1 -1
  343. package/lib/common/test/mock-logger.js +5 -12
  344. package/lib/common/test/mock-logger.js.map +1 -1
  345. package/lib/common/test/test-module.d.ts +1 -1
  346. package/lib/common/test/test-module.d.ts.map +1 -1
  347. package/lib/common/test/test-module.js +2 -2
  348. package/lib/common/test/test-module.js.map +1 -1
  349. package/lib/common/utils/annotation-util.js +2 -1
  350. package/lib/common/utils/annotation-util.js.map +1 -1
  351. package/lib/common/utils/emitter.d.ts +1 -10
  352. package/lib/common/utils/emitter.d.ts.map +1 -1
  353. package/lib/common/utils/emitter.js +1 -58
  354. package/lib/common/utils/emitter.js.map +1 -1
  355. package/lib/common/utils/mime-type-util.js +1 -1
  356. package/lib/common/utils/mime-type-util.js.map +1 -1
  357. package/lib/common/utils/mime-type.js +1 -1
  358. package/lib/common/utils/mime-type.js.map +1 -1
  359. package/lib/common/utils/proxy-util.d.ts +5 -2
  360. package/lib/common/utils/proxy-util.d.ts.map +1 -1
  361. package/lib/common/utils/proxy-util.js +12 -30
  362. package/lib/common/utils/proxy-util.js.map +1 -1
  363. package/lib/common/utils/utils-behavior.spec.d.ts +2 -0
  364. package/lib/common/utils/utils-behavior.spec.d.ts.map +1 -0
  365. package/lib/common/utils/utils-behavior.spec.js +232 -0
  366. package/lib/common/utils/utils-behavior.spec.js.map +1 -0
  367. package/lib/node/context/context.d.ts +11 -2
  368. package/lib/node/context/context.d.ts.map +1 -1
  369. package/lib/node/context/context.js +36 -10
  370. package/lib/node/context/context.js.map +1 -1
  371. package/lib/node/context/context.spec.d.ts +2 -0
  372. package/lib/node/context/context.spec.d.ts.map +1 -0
  373. package/lib/node/context/context.spec.js +202 -0
  374. package/lib/node/context/context.spec.js.map +1 -0
  375. package/lib/node/index.d.ts +0 -1
  376. package/lib/node/index.d.ts.map +1 -1
  377. package/lib/node/index.js +0 -1
  378. package/lib/node/index.js.map +1 -1
  379. package/lib/node/static-module.d.ts +1 -1
  380. package/package.json +9 -21
  381. package/src/common/annotation/aspect.ts +2 -1
  382. package/src/common/annotation/autowired-provider.ts +4 -17
  383. package/src/common/annotation/autowired.ts +14 -6
  384. package/src/common/annotation/component.ts +6 -26
  385. package/src/common/annotation/constant.ts +10 -7
  386. package/src/common/annotation/detached/autowired-provider.ts +2 -2
  387. package/src/common/annotation/index.ts +0 -6
  388. package/src/common/annotation/named.ts +7 -1
  389. package/src/common/annotation/optional.ts +6 -1
  390. package/src/common/annotation/post-construct.ts +6 -1
  391. package/src/common/annotation/tagged.ts +8 -1
  392. package/src/common/annotation/value.ts +9 -11
  393. package/src/common/aop/aop-proxy-factory.ts +52 -30
  394. package/src/common/aop/aop.spec.ts +145 -0
  395. package/src/common/aop/class-filter.ts +6 -6
  396. package/src/common/application/application-factory.ts +4 -5
  397. package/src/common/application/application-protocol.ts +1 -1
  398. package/src/common/application/lifecycle.spec.ts +148 -0
  399. package/src/common/config/config-provider.ts +1 -1
  400. package/src/common/container/assembly.spec.ts +288 -0
  401. package/src/common/container/auto-bind.ts +56 -74
  402. package/src/common/container/container-error.ts +31 -0
  403. package/src/common/container/container-provider.ts +9 -7
  404. package/src/common/container/container-util.ts +8 -19
  405. package/src/common/container/container.spec.ts +262 -0
  406. package/src/common/container/container.ts +363 -0
  407. package/src/common/container/dynamic-container.ts +2 -2
  408. package/src/common/container/index.ts +5 -7
  409. package/src/common/container/injection.ts +135 -0
  410. package/src/common/container/scope.ts +2 -1
  411. package/src/common/el/application-expression-engine.ts +9 -0
  412. package/src/common/el/core-context-initializer.ts +9 -8
  413. package/src/common/el/expression-compiler.ts +9 -168
  414. package/src/common/el/expression-engine.spec.ts +107 -0
  415. package/src/common/el/expression-engine.ts +487 -0
  416. package/src/common/el/expression-handler.spec.ts +109 -0
  417. package/src/common/el/expression-handler.ts +17 -57
  418. package/src/common/el/expression-protocol.ts +4 -8
  419. package/src/common/el/expression-util.spec.ts +45 -0
  420. package/src/common/el/expression-util.ts +362 -0
  421. package/src/common/el/index.ts +3 -1
  422. package/src/common/el/value-and-el.spec.ts +186 -0
  423. package/src/common/logger/abstract-logger.ts +12 -6
  424. package/src/common/logger/logger-protocol.ts +5 -0
  425. package/src/common/logger/logger.spec.ts +61 -0
  426. package/src/common/logger/logger.ts +7 -7
  427. package/src/common/provider/index.ts +0 -2
  428. package/src/common/provider/provider-protocol.ts +5 -11
  429. package/src/common/provider/provider-util.ts +3 -3
  430. package/src/common/provider/provider.ts +17 -29
  431. package/src/common/static-module.ts +1 -1
  432. package/src/common/test/mock-logger.ts +3 -2
  433. package/src/common/test/test-module.ts +1 -1
  434. package/src/common/utils/annotation-util.ts +2 -2
  435. package/src/common/utils/emitter.ts +1 -63
  436. package/src/common/utils/mime-type-util.ts +1 -1
  437. package/src/common/utils/mime-type.ts +1 -1
  438. package/src/common/utils/proxy-util.ts +8 -28
  439. package/src/common/utils/utils-behavior.spec.ts +259 -0
  440. package/src/node/context/context.spec.ts +219 -0
  441. package/src/node/context/context.ts +35 -10
  442. package/src/node/index.ts +0 -1
  443. package/esm/common/annotation/decorate.d.ts +0 -1
  444. package/esm/common/annotation/decorate.js +0 -2
  445. package/esm/common/annotation/decorate.js.map +0 -1
  446. package/esm/common/annotation/inject.d.ts +0 -1
  447. package/esm/common/annotation/inject.js +0 -2
  448. package/esm/common/annotation/inject.js.map +0 -1
  449. package/esm/common/annotation/injectable.d.ts +0 -1
  450. package/esm/common/annotation/injectable.js +0 -2
  451. package/esm/common/annotation/injectable.js.map +0 -1
  452. package/esm/common/annotation/pre-destroy.d.ts +0 -1
  453. package/esm/common/annotation/pre-destroy.js +0 -2
  454. package/esm/common/annotation/pre-destroy.js.map +0 -1
  455. package/esm/common/annotation/target-name.d.ts +0 -1
  456. package/esm/common/annotation/target-name.js +0 -2
  457. package/esm/common/annotation/target-name.js.map +0 -1
  458. package/esm/common/annotation/unmanaged.d.ts +0 -1
  459. package/esm/common/annotation/unmanaged.js +0 -2
  460. package/esm/common/annotation/unmanaged.js.map +0 -1
  461. package/esm/common/container/container-factory.d.ts +0 -4
  462. package/esm/common/container/container-factory.js +0 -9
  463. package/esm/common/container/container-factory.js.map +0 -1
  464. package/esm/common/el/jexl-engine-provider.d.ts +0 -5
  465. package/esm/common/el/jexl-engine-provider.js +0 -22
  466. package/esm/common/el/jexl-engine-provider.js.map +0 -1
  467. package/esm/common/provider/provider-creator.d.ts +0 -6
  468. package/esm/common/provider/provider-creator.js.map +0 -1
  469. package/esm/node/utils/crc.d.ts +0 -1
  470. package/esm/node/utils/crc.js +0 -7
  471. package/esm/node/utils/crc.js.map +0 -1
  472. package/esm/node/utils/index.d.ts +0 -1
  473. package/esm/node/utils/index.js +0 -2
  474. package/esm/node/utils/index.js.map +0 -1
  475. package/lib/common/annotation/decorate.d.ts +0 -2
  476. package/lib/common/annotation/decorate.d.ts.map +0 -1
  477. package/lib/common/annotation/decorate.js +0 -6
  478. package/lib/common/annotation/decorate.js.map +0 -1
  479. package/lib/common/annotation/inject.d.ts +0 -2
  480. package/lib/common/annotation/inject.d.ts.map +0 -1
  481. package/lib/common/annotation/inject.js +0 -6
  482. package/lib/common/annotation/inject.js.map +0 -1
  483. package/lib/common/annotation/injectable.d.ts +0 -2
  484. package/lib/common/annotation/injectable.d.ts.map +0 -1
  485. package/lib/common/annotation/injectable.js +0 -6
  486. package/lib/common/annotation/injectable.js.map +0 -1
  487. package/lib/common/annotation/pre-destroy.d.ts +0 -2
  488. package/lib/common/annotation/pre-destroy.d.ts.map +0 -1
  489. package/lib/common/annotation/pre-destroy.js +0 -6
  490. package/lib/common/annotation/pre-destroy.js.map +0 -1
  491. package/lib/common/annotation/target-name.d.ts +0 -2
  492. package/lib/common/annotation/target-name.d.ts.map +0 -1
  493. package/lib/common/annotation/target-name.js +0 -6
  494. package/lib/common/annotation/target-name.js.map +0 -1
  495. package/lib/common/annotation/unmanaged.d.ts +0 -2
  496. package/lib/common/annotation/unmanaged.d.ts.map +0 -1
  497. package/lib/common/annotation/unmanaged.js +0 -6
  498. package/lib/common/annotation/unmanaged.js.map +0 -1
  499. package/lib/common/container/container-factory.d.ts +0 -5
  500. package/lib/common/container/container-factory.d.ts.map +0 -1
  501. package/lib/common/container/container-factory.js +0 -13
  502. package/lib/common/container/container-factory.js.map +0 -1
  503. package/lib/common/el/jexl-engine-provider.d.ts +0 -6
  504. package/lib/common/el/jexl-engine-provider.d.ts.map +0 -1
  505. package/lib/common/el/jexl-engine-provider.js +0 -25
  506. package/lib/common/el/jexl-engine-provider.js.map +0 -1
  507. package/lib/common/provider/provider-creator.d.ts +0 -7
  508. package/lib/common/provider/provider-creator.d.ts.map +0 -1
  509. package/lib/common/provider/provider-creator.js +0 -22
  510. package/lib/common/provider/provider-creator.js.map +0 -1
  511. package/lib/node/utils/crc.d.ts +0 -2
  512. package/lib/node/utils/crc.d.ts.map +0 -1
  513. package/lib/node/utils/crc.js +0 -10
  514. package/lib/node/utils/crc.js.map +0 -1
  515. package/lib/node/utils/index.d.ts +0 -2
  516. package/lib/node/utils/index.d.ts.map +0 -1
  517. package/lib/node/utils/index.js +0 -18
  518. package/lib/node/utils/index.js.map +0 -1
  519. package/src/common/annotation/decorate.ts +0 -1
  520. package/src/common/annotation/inject.ts +0 -1
  521. package/src/common/annotation/injectable.ts +0 -1
  522. package/src/common/annotation/pre-destroy.ts +0 -1
  523. package/src/common/annotation/target-name.ts +0 -1
  524. package/src/common/annotation/unmanaged.ts +0 -1
  525. package/src/common/container/container-factory.ts +0 -9
  526. package/src/common/el/jexl-engine-provider.ts +0 -18
  527. package/src/common/provider/provider-creator.ts +0 -12
  528. package/src/node/utils/crc.ts +0 -7
  529. package/src/node/utils/index.ts +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"tagged.js","sourceRoot":"","sources":["../../../src/common/annotation/tagged.ts"],"names":[],"mappings":";;;AAAA,uCAA6C;AAApC,mGAAA,MAAM,OAAU"}
1
+ {"version":3,"file":"tagged.js","sourceRoot":"","sources":["../../../src/common/annotation/tagged.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AAEvD,yFAAyF;AAClF,MAAM,MAAM,GAAG,CAAC,GAA6B,EAAE,KAAc,EAA0C,EAAE,CAC5G,CAAC,MAAW,EAAE,WAAwC,EAAE,KAAc,EAAE,EAAE;IACtE,MAAM,KAAK,GAAG,yBAAa,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC9D,KAAK,CAAC,IAAI,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;AACjD,CAAC,CAAC;AAJO,QAAA,MAAM,GAAN,MAAM,CAIb"}
@@ -1,4 +1,4 @@
1
- import { interfaces } from 'inversify';
1
+ import type { Binding, ComponentId } from '../container/container';
2
2
  export declare const VALUE: unique symbol;
3
3
  export interface ValueOption {
4
4
  el?: string;
@@ -12,5 +12,6 @@ export declare function parseValueOption(target: any, targetKey: string, index?:
12
12
  };
13
13
  export declare function applyValueDecorator(option: ValueOption, target: any, targetKey: string, index?: number): ValueOption | undefined;
14
14
  export declare function createValueProperty(option: ValueOption, target: any, property: string): void;
15
- export declare function bindValue(bind: interfaces.Bind): any;
15
+ /** `@Value('a.b')` is an injection of `VALUE` named `a.b`: the configuration value of that key. */
16
+ export declare function bindValue(bind: <T>(id: ComponentId<T>) => Binding<T>): void;
16
17
  //# sourceMappingURL=value.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"value.d.ts","sourceRoot":"","sources":["../../../src/common/annotation/value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,UAAU,EAAE,MAAM,WAAW,CAAC;AAKtD,eAAO,MAAM,KAAK,eAAkB,CAAC;AAErC,MAAM,WAAW,WAAW;IACxB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,WAAW,CAAC;AAEnD,eAAO,MAAM,KAAK,gBAA0B,eAAe,KAAG,iBAAiB,GAAG,kBAKjF,CAAC;AAMF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,eAAe;SAjBpG,MAAM;eACA,OAAO;EAoBrB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,2BAatG;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAQ5F;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,GAAG,CAOpD"}
1
+ {"version":3,"file":"value.d.ts","sourceRoot":"","sources":["../../../src/common/annotation/value.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEnE,eAAO,MAAM,KAAK,eAAkB,CAAC;AAErC,MAAM,WAAW,WAAW;IACxB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,WAAW,CAAC;AAEnD,eAAO,MAAM,KAAK,gBAA0B,eAAe,KAAG,iBAAiB,GAAG,kBAKjF,CAAC;AAMF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,eAAe;SAjBpG,MAAM;eACA,OAAO;EAoBrB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,2BActG;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAQ5F;AAED,mGAAmG;AACnG,wBAAgB,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAE3E"}
@@ -5,10 +5,10 @@ exports.parseValueOption = parseValueOption;
5
5
  exports.applyValueDecorator = applyValueDecorator;
6
6
  exports.createValueProperty = createValueProperty;
7
7
  exports.bindValue = bindValue;
8
- const inversify_1 = require("inversify");
9
8
  const config_util_1 = require("../config/config-util");
10
9
  const utils_1 = require("../utils");
11
10
  const config_protocol_1 = require("../config/config-protocol");
11
+ const injection_1 = require("../container/injection");
12
12
  exports.VALUE = Symbol('Value');
13
13
  const Value = function (elOrOption) {
14
14
  return (target, targetKey, index) => {
@@ -30,12 +30,13 @@ function applyValueDecorator(option, target, targetKey, index) {
30
30
  if (index !== undefined) {
31
31
  throw new Error(`The ${target.constructor.name} itself is not injected into the container, so the parameter injection of the constructor is not supported.`);
32
32
  }
33
+ injection_1.InjectionUtil.remove(target, targetKey);
33
34
  createValueProperty(option, target, targetKey);
34
35
  return;
35
36
  }
36
- const el = option.el;
37
- (0, inversify_1.inject)(exports.VALUE)(target, targetKey, index);
38
- (0, inversify_1.named)(el)(target, targetKey, index);
37
+ const point = injection_1.InjectionUtil.point(target, targetKey, index);
38
+ point.id = exports.VALUE;
39
+ point.name = option.el;
39
40
  return option;
40
41
  }
41
42
  function createValueProperty(option, target, property) {
@@ -47,12 +48,8 @@ function createValueProperty(option, target, property) {
47
48
  }
48
49
  });
49
50
  }
51
+ /** `@Value('a.b')` is an injection of `VALUE` named `a.b`: the configuration value of that key. */
50
52
  function bindValue(bind) {
51
- bind(exports.VALUE).toDynamicValue(ctx => {
52
- const namedMetadata = ctx.currentRequest.target.getNamedTag();
53
- const el = namedMetadata.value.toString();
54
- const configProvider = ctx.container.get(config_protocol_1.ConfigProvider);
55
- return configProvider.get(el);
56
- });
53
+ bind(exports.VALUE).toDynamicValue(ctx => ctx.container.get(config_protocol_1.ConfigProvider).get(String(ctx.target.name)));
57
54
  }
58
55
  //# sourceMappingURL=value.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"value.js","sourceRoot":"","sources":["../../../src/common/annotation/value.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAsD;AACtD,uDAAmD;AACnD,oCAA0C;AAC1C,+DAA2D;AAE9C,QAAA,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AAS9B,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;AALW,QAAA,KAAK,GAAL,KAAK,CAKhB;AAEF,MAAM,kBAAkB,GAAgB;IACpC,QAAQ,EAAE,KAAK;CAClB,CAAC;AAEF,0BAAiC,MAAW,EAAE,SAAiB,EAAE,KAAc,EAAE,UAA4B;IACzG,MAAM,MAAM,GAAG,sBAAc,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,6BAAoC,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,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/C,OAAO;IACX,CAAC;IAED,MAAM,EAAE,GAAG,MAAM,CAAC,EAAG,CAAC;IACtB,IAAA,kBAAM,EAAC,QAAA,KAAK,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACxC,IAAA,iBAAK,EAAC,EAAE,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACpC,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,6BAAoC,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,wBAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9B,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAED,mBAA0B,IAAqB;IAC3C,IAAI,CAAC,QAAA,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC7B,MAAM,aAAa,GAAG,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC9D,MAAM,EAAE,GAAG,aAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC3C,MAAM,cAAc,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAiB,gCAAc,CAAC,CAAC;QACzE,OAAO,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"value.js","sourceRoot":"","sources":["../../../src/common/annotation/value.ts"],"names":[],"mappings":";;;;;;;AAAA,uDAAmD;AACnD,oCAA0C;AAC1C,+DAA2D;AAC3D,sDAAuD;AAG1C,QAAA,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AAS9B,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;AALW,QAAA,KAAK,GAAL,KAAK,CAKhB;AAEF,MAAM,kBAAkB,GAAgB;IACpC,QAAQ,EAAE,KAAK;CAClB,CAAC;AAEF,0BAAiC,MAAW,EAAE,SAAiB,EAAE,KAAc,EAAE,UAA4B;IACzG,MAAM,MAAM,GAAG,sBAAc,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,6BAAoC,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,yBAAa,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,yBAAa,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAC5D,KAAK,CAAC,EAAE,GAAG,QAAA,KAAK,CAAC;IACjB,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,EAAG,CAAC;IACxB,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,6BAAoC,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,wBAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9B,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAED,mGAAmG;AACnG,mBAA0B,IAA2C;IACjE,IAAI,CAAC,QAAA,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAiB,gCAAc,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACtH,CAAC"}
@@ -1,7 +1,11 @@
1
+ import type { ComponentId } from '../container/container';
1
2
  import { AopProxy, AopProxyFactory, ProxyConfig } from './aop-protocol';
2
- import { interfaces } from 'inversify';
3
3
  export declare class AopProxyFactoryImpl implements AopProxyFactory {
4
- protected getAdvices<T>(id: interfaces.ServiceIdentifier<T>, tagValues: string[]): T[];
4
+ protected getAdvices<T>(id: ComponentId<T>, tagValues: string[]): T[];
5
+ /**
6
+ * Methods become async: they await the before advices, the method, then the after advices. The
7
+ * advices are looked up on the first call and the wrapped methods are created once per method.
8
+ */
5
9
  create(config: ProxyConfig): AopProxy;
6
10
  }
7
11
  //# sourceMappingURL=aop-proxy-factory.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"aop-proxy-factory.d.ts","sourceRoot":"","sources":["../../../src/common/aop/aop-proxy-factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2C,QAAQ,EAAE,eAAe,EAA+B,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE9I,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,qBACa,mBAAoB,YAAW,eAAe;IAEvD,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAS/E;IAED,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,CAsCpC;CAEJ"}
1
+ {"version":3,"file":"aop-proxy-factory.d.ts","sourceRoot":"","sources":["../../../src/common/aop/aop-proxy-factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAA2C,QAAQ,EAAE,eAAe,EAA+B,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAS9I,qBACa,mBAAoB,YAAW,eAAe;IAEvD,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAUpE;IAED;;;OAGG;IACH,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,CAiDpC;CAEJ"}
@@ -7,53 +7,69 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
7
7
  };
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.AopProxyFactoryImpl = void 0;
10
- const utils_1 = require("../utils");
11
- const container_1 = require("../container");
10
+ const proxy_util_1 = require("../utils/proxy-util");
11
+ const container_provider_1 = require("../container/container-provider");
12
12
  const aop_protocol_1 = require("./aop-protocol");
13
13
  const annotation_1 = require("../annotation");
14
14
  let AopProxyFactoryImpl = class AopProxyFactoryImpl {
15
15
  getAdvices(id, tagValues) {
16
- const container = container_1.ContainerProvider.provide();
16
+ const container = container_provider_1.ContainerProvider.provide();
17
17
  const advices = [];
18
18
  for (const tagValue of tagValues) {
19
- if (container.isBoundTagged(id, aop_protocol_1.AOP_TAG, tagValue)) {
20
- advices.push(...container.getAllTagged(id, aop_protocol_1.AOP_TAG, tagValue));
19
+ const query = { tags: { [aop_protocol_1.AOP_TAG]: tagValue } };
20
+ if (container.isBound(id, query)) {
21
+ advices.push(...container.getAll(id, query));
21
22
  }
22
23
  }
23
24
  return advices;
24
25
  }
26
+ /**
27
+ * Methods become async: they await the before advices, the method, then the after advices. The
28
+ * advices are looked up on the first call and the wrapped methods are created once per method.
29
+ */
25
30
  create(config) {
26
31
  const { metadata: { sysTags } } = config;
32
+ let advices;
33
+ const getAdvices = () => advices !== null && advices !== void 0 ? advices : (advices = {
34
+ before: this.getAdvices(aop_protocol_1.MethodBeforeAdvice, sysTags),
35
+ afterReturning: this.getAdvices(aop_protocol_1.AfterReturningAdvice, sysTags),
36
+ afterThrows: this.getAdvices(aop_protocol_1.AfterThrowsAdvice, sysTags)
37
+ });
38
+ const wrappers = new Map();
27
39
  const proxy = new Proxy(config.target, {
28
- get: (target, method, receiver) => {
29
- if ((0, utils_1.isResolveMode)()) {
40
+ get: (target, method) => {
41
+ if (method === proxy_util_1.PROXY_TARGET) {
30
42
  return target;
31
43
  }
32
44
  const func = target[method];
33
- if (typeof func === 'function') {
34
- return async (...args) => {
35
- try {
36
- const beforeAdvices = this.getAdvices(aop_protocol_1.MethodBeforeAdvice, sysTags);
37
- for (const advice of beforeAdvices) {
38
- await advice.before(method, args, target);
39
- }
40
- const returnValue = await func.apply(target, args);
41
- const afterReturningAdvices = this.getAdvices(aop_protocol_1.AfterReturningAdvice, sysTags);
42
- for (const advice of afterReturningAdvices) {
43
- await advice.afterReturning(returnValue, method, args, target);
44
- }
45
- return returnValue;
45
+ if (typeof func !== 'function') {
46
+ return func;
47
+ }
48
+ const cached = wrappers.get(method);
49
+ if (cached && cached.func === func) {
50
+ return cached.wrapper;
51
+ }
52
+ const wrapper = async (...args) => {
53
+ const { before, afterReturning, afterThrows } = getAdvices();
54
+ try {
55
+ for (const advice of before) {
56
+ await advice.before(method, args, target);
46
57
  }
47
- catch (error) {
48
- const afterThrowsAdvices = this.getAdvices(aop_protocol_1.AfterThrowsAdvice, sysTags);
49
- for (const advice of afterThrowsAdvices) {
50
- await advice.afterThrows(error, method, args, target);
51
- }
52
- throw error;
58
+ const returnValue = await func.apply(target, args);
59
+ for (const advice of afterReturning) {
60
+ await advice.afterReturning(returnValue, method, args, target);
53
61
  }
54
- };
55
- }
56
- return func;
62
+ return returnValue;
63
+ }
64
+ catch (error) {
65
+ for (const advice of afterThrows) {
66
+ await advice.afterThrows(error, method, args, target);
67
+ }
68
+ throw error;
69
+ }
70
+ };
71
+ wrappers.set(method, { func, wrapper });
72
+ return wrapper;
57
73
  }
58
74
  });
59
75
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"aop-proxy-factory.js","sourceRoot":"","sources":["../../../src/common/aop/aop-proxy-factory.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oCAAyC;AACzC,4CAAiD;AACjD,iDAA8I;AAC9I,8CAA0C;AAInC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAElB,UAAU,CAAI,EAAmC,EAAE,SAAmB;QAC5E,MAAM,SAAS,GAAG,6BAAiB,CAAC,OAAO,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC/B,IAAI,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,sBAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;gBACjD,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,YAAY,CAAI,EAAE,EAAE,sBAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;YACtE,CAAC;QACL,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,MAAmB;QACtB,MAAM,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE;YACnC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;gBAC9B,IAAI,IAAA,qBAAa,GAAE,EAAE,CAAC;oBAClB,OAAO,MAAM,CAAC;gBAClB,CAAC;gBACD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC5B,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;oBAC7B,OAAO,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE;wBAC5B,IAAI,CAAC;4BACD,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAqB,iCAAkB,EAAE,OAAQ,CAAC,CAAC;4BACxF,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;gCACjC,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;4BAC9C,CAAC;4BACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;4BACnD,MAAM,qBAAqB,GAAG,IAAI,CAAC,UAAU,CAAuB,mCAAoB,EAAE,OAAQ,CAAC,CAAC;4BACpG,KAAK,MAAM,MAAM,IAAI,qBAAqB,EAAE,CAAC;gCACzC,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;4BACnE,CAAC;4BACD,OAAO,WAAW,CAAC;wBACvB,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACb,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAoB,gCAAiB,EAAE,OAAQ,CAAC,CAAC;4BAC3F,KAAK,MAAM,MAAM,IAAI,kBAAkB,EAAE,CAAC;gCACtC,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;4BAC1D,CAAC;4BACD,MAAM,KAAK,CAAC;wBAChB,CAAC;oBACL,CAAC,CAAC;gBACN,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC;SACJ,CAAC,CAAC;QACH,OAAO;YACH,QAAQ;gBACJ,OAAO,KAAK,CAAC;YACjB,CAAC;SACJ,CAAC;IACN,CAAC;CAEJ,CAAA;;8BArDY,mBAAmB;IAD/B,IAAA,sBAAS,EAAC,EAAE,EAAE,EAAE,8BAAe,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GACpC,mBAAmB,CAqD/B"}
1
+ {"version":3,"file":"aop-proxy-factory.js","sourceRoot":"","sources":["../../../src/common/aop/aop-proxy-factory.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=aop.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"aop.spec.d.ts","sourceRoot":"","sources":["../../../src/common/aop/aop.spec.ts"],"names":[],"mappings":""}
@@ -0,0 +1,170 @@
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
+ Object.defineProperty(exports, "__esModule", { value: true });
9
+ const bun_test_1 = require("bun:test");
10
+ const chai_1 = require("chai");
11
+ const application_factory_1 = require("../application/application-factory");
12
+ const annotation_1 = require("../annotation");
13
+ const container_util_1 = require("../container/container-util");
14
+ const aop_protocol_1 = require("./aop-protocol");
15
+ /**
16
+ * AOP 的约定(阶段 1.E 行为测试):@Aspect 登记通知,proxy: true 的组件被代理。
17
+ * 需要 cell.aop.enabled(core 的 cell.yml 默认 true;这里直接放进配置)。
18
+ */
19
+ const AOP_ON = { cell: { aop: { enabled: true } } };
20
+ function recordingAspects(log, pointcut) {
21
+ const opt = (id) => (pointcut ? { id, pointcut } : id);
22
+ let Before = class Before {
23
+ async before(method, args) {
24
+ log.push(`before:${String(method)}(${args.join(',')})`);
25
+ }
26
+ };
27
+ Before = __decorate([
28
+ (0, annotation_1.Aspect)(opt(aop_protocol_1.MethodBeforeAdvice))
29
+ ], Before);
30
+ let AfterReturning = class AfterReturning {
31
+ async afterReturning(returnValue, method) {
32
+ log.push(`after:${String(method)}=${returnValue}`);
33
+ }
34
+ };
35
+ AfterReturning = __decorate([
36
+ (0, annotation_1.Aspect)(opt(aop_protocol_1.AfterReturningAdvice))
37
+ ], AfterReturning);
38
+ let AfterThrows = class AfterThrows {
39
+ async afterThrows(error, method) {
40
+ log.push(`throws:${String(method)}:${error.message}`);
41
+ }
42
+ };
43
+ AfterThrows = __decorate([
44
+ (0, annotation_1.Aspect)(opt(aop_protocol_1.AfterThrowsAdvice))
45
+ ], AfterThrows);
46
+ return [Before, AfterReturning, AfterThrows];
47
+ }
48
+ (0, bun_test_1.describe)('core AOP', () => {
49
+ (0, bun_test_1.it)('proxy: true 的组件:before → 方法 → afterReturning,通知拿到方法名、参数和返回值', async () => {
50
+ const log = [];
51
+ recordingAspects(log);
52
+ let Calc = class Calc {
53
+ async add(a, b) {
54
+ log.push('run');
55
+ return a + b;
56
+ }
57
+ };
58
+ Calc = __decorate([
59
+ (0, annotation_1.Component)({ proxy: true })
60
+ ], Calc);
61
+ await application_factory_1.ApplicationFactory.create(AOP_ON);
62
+ (0, chai_1.expect)(await container_util_1.ContainerUtil.get(Calc).add(1, 2)).to.equal(3);
63
+ (0, chai_1.expect)(log).to.deep.equal(['before:add(1,2)', 'run', 'after:add=3']);
64
+ });
65
+ (0, bun_test_1.it)('方法抛错:调用 afterThrows,然后把原错误抛给调用方,不调用 afterReturning', async () => {
66
+ const log = [];
67
+ recordingAspects(log);
68
+ let Failing = class Failing {
69
+ async go() {
70
+ throw new Error('nope');
71
+ }
72
+ };
73
+ Failing = __decorate([
74
+ (0, annotation_1.Component)({ proxy: true })
75
+ ], Failing);
76
+ await application_factory_1.ApplicationFactory.create(AOP_ON);
77
+ let caught;
78
+ try {
79
+ await container_util_1.ContainerUtil.get(Failing).go();
80
+ }
81
+ catch (e) {
82
+ caught = e;
83
+ }
84
+ (0, chai_1.expect)(caught === null || caught === void 0 ? void 0 : caught.message).to.equal('nope');
85
+ (0, chai_1.expect)(log).to.deep.equal(['before:go()', 'throws:go:nope']);
86
+ });
87
+ (0, bun_test_1.it)('现状:被代理后,同步方法也变成返回 Promise', async () => {
88
+ const log = [];
89
+ recordingAspects(log);
90
+ let Sync = class Sync {
91
+ twice(n) { return n * 2; }
92
+ };
93
+ Sync = __decorate([
94
+ (0, annotation_1.Component)({ proxy: true })
95
+ ], Sync);
96
+ await application_factory_1.ApplicationFactory.create(AOP_ON);
97
+ const result = container_util_1.ContainerUtil.get(Sync).twice(4);
98
+ (0, chai_1.expect)(result).to.be.instanceOf(Promise);
99
+ (0, chai_1.expect)(await result).to.equal(8);
100
+ });
101
+ (0, bun_test_1.it)('没有 proxy: true 的组件不被代理;cell.aop.enabled 为 false 时也不代理', async () => {
102
+ const log = [];
103
+ recordingAspects(log);
104
+ let NotProxied = class NotProxied {
105
+ hi() { return 'hi'; }
106
+ };
107
+ NotProxied = __decorate([
108
+ (0, annotation_1.Component)()
109
+ ], NotProxied);
110
+ await application_factory_1.ApplicationFactory.create(AOP_ON);
111
+ (0, chai_1.expect)(container_util_1.ContainerUtil.get(NotProxied).hi()).to.equal('hi');
112
+ recordingAspects(log);
113
+ let Disabled = class Disabled {
114
+ hi() { return 'hi'; }
115
+ };
116
+ Disabled = __decorate([
117
+ (0, annotation_1.Component)({ proxy: true })
118
+ ], Disabled);
119
+ await application_factory_1.ApplicationFactory.create({ cell: { aop: { enabled: false } } });
120
+ (0, chai_1.expect)(container_util_1.ContainerUtil.get(Disabled).hi()).to.equal('hi');
121
+ (0, chai_1.expect)(log).to.deep.equal([]);
122
+ });
123
+ (0, bun_test_1.it)('没有任何通知时,proxy: true 的组件也不代理(ClassFilter 不匹配)', async () => {
124
+ let Lonely = class Lonely {
125
+ hi() { return 'hi'; }
126
+ };
127
+ Lonely = __decorate([
128
+ (0, annotation_1.Component)({ proxy: true })
129
+ ], Lonely);
130
+ await application_factory_1.ApplicationFactory.create(AOP_ON);
131
+ (0, chai_1.expect)(container_util_1.ContainerUtil.get(Lonely).hi()).to.equal('hi');
132
+ });
133
+ (0, bun_test_1.it)('pointcut:只作用于 sysTags 里带该标签的组件', async () => {
134
+ const log = [];
135
+ recordingAspects(log, 'Audited');
136
+ let Audited = class Audited {
137
+ async save(x) { return `saved ${x}`; }
138
+ };
139
+ Audited = __decorate([
140
+ (0, annotation_1.Component)({ proxy: true, sysTags: ['Audited'] })
141
+ ], Audited);
142
+ let Other = class Other {
143
+ save(x) { return `other ${x}`; }
144
+ };
145
+ Other = __decorate([
146
+ (0, annotation_1.Component)({ proxy: true })
147
+ ], Other);
148
+ await application_factory_1.ApplicationFactory.create(AOP_ON);
149
+ (0, chai_1.expect)(await container_util_1.ContainerUtil.get(Audited).save('a')).to.equal('saved a');
150
+ (0, chai_1.expect)(container_util_1.ContainerUtil.get(Other).save('b')).to.equal('other b');
151
+ (0, chai_1.expect)(log).to.deep.equal(['before:save(a)', 'after:save=saved a']);
152
+ });
153
+ (0, bun_test_1.it)('非函数属性原样透出', async () => {
154
+ const log = [];
155
+ recordingAspects(log);
156
+ let WithField = class WithField {
157
+ constructor() {
158
+ this.label = 'L';
159
+ }
160
+ async m() { return 1; }
161
+ };
162
+ WithField = __decorate([
163
+ (0, annotation_1.Component)({ proxy: true })
164
+ ], WithField);
165
+ await application_factory_1.ApplicationFactory.create(AOP_ON);
166
+ (0, chai_1.expect)(container_util_1.ContainerUtil.get(WithField).label).to.equal('L');
167
+ (0, chai_1.expect)(log).to.deep.equal([]);
168
+ });
169
+ });
170
+ //# sourceMappingURL=aop.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"aop.spec.js","sourceRoot":"","sources":["../../../src/common/aop/aop.spec.ts"],"names":[],"mappings":"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"}
@@ -7,17 +7,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
7
7
  };
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.ClassFilterImpl = void 0;
10
- const container_1 = require("../container");
10
+ const container_provider_1 = require("../container/container-provider");
11
11
  const aop_protocol_1 = require("./aop-protocol");
12
12
  const annotation_1 = require("../annotation");
13
13
  let ClassFilterImpl = class ClassFilterImpl {
14
14
  matches(clazz, metadata) {
15
- const container = container_1.ContainerProvider.provide();
16
- const tagKeys = metadata.sysTags;
17
- for (const tagValue of tagKeys) {
18
- if (container.isBoundTagged(aop_protocol_1.MethodBeforeAdvice, aop_protocol_1.AOP_TAG, tagValue)
19
- || container.isBoundTagged(aop_protocol_1.AfterThrowsAdvice, aop_protocol_1.AOP_TAG, tagValue)
20
- || container.isBoundTagged(aop_protocol_1.AfterReturningAdvice, aop_protocol_1.AOP_TAG, tagValue)) {
15
+ const container = container_provider_1.ContainerProvider.provide();
16
+ for (const tagValue of metadata.sysTags) {
17
+ const query = { tags: { [aop_protocol_1.AOP_TAG]: tagValue } };
18
+ if (container.isBound(aop_protocol_1.MethodBeforeAdvice, query)
19
+ || container.isBound(aop_protocol_1.AfterThrowsAdvice, query)
20
+ || container.isBound(aop_protocol_1.AfterReturningAdvice, query)) {
21
21
  return true;
22
22
  }
23
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"class-filter.js","sourceRoot":"","sources":["../../../src/common/aop/class-filter.ts"],"names":[],"mappings":";;;;;;;;;AACA,4CAAiD;AACjD,iDAAmH;AACnH,8CAA6D;AAGtD,IAAM,eAAe,GAArB,MAAM,eAAe;IAExB,OAAO,CAAC,KAAmB,EAAE,QAA2B;QACpD,MAAM,SAAS,GAAG,6BAAiB,CAAC,OAAO,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QACjC,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,SAAS,CAAC,aAAa,CAAC,iCAAkB,EAAE,sBAAO,EAAE,QAAQ,CAAC;mBAC/D,SAAS,CAAC,aAAa,CAAC,gCAAiB,EAAE,sBAAO,EAAE,QAAQ,CAAC;mBAC7D,SAAS,CAAC,aAAa,CAAC,mCAAoB,EAAE,sBAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAClE,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ,CAAA;;0BAfY,eAAe;IAD3B,IAAA,sBAAS,EAAC,EAAE,EAAE,EAAE,0BAAW,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GAChC,eAAe,CAe3B"}
1
+ {"version":3,"file":"class-filter.js","sourceRoot":"","sources":["../../../src/common/aop/class-filter.ts"],"names":[],"mappings":";;;;;;;;;AACA,wEAAoE;AACpE,iDAAmH;AACnH,8CAA6D;AAGtD,IAAM,eAAe,GAArB,MAAM,eAAe;IAExB,OAAO,CAAC,KAAmB,EAAE,QAA2B;QACpD,MAAM,SAAS,GAAG,sCAAiB,CAAC,OAAO,EAAE,CAAC;QAC9C,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,sBAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC;YAChD,IAAI,SAAS,CAAC,OAAO,CAAC,iCAAkB,EAAE,KAAK,CAAC;mBACzC,SAAS,CAAC,OAAO,CAAC,gCAAiB,EAAE,KAAK,CAAC;mBAC3C,SAAS,CAAC,OAAO,CAAC,mCAAoB,EAAE,KAAK,CAAC,EAAE,CAAC;gBACpD,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ,CAAA;;0BAfY,eAAe;IAD3B,IAAA,sBAAS,EAAC,EAAE,EAAE,EAAE,0BAAW,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GAChC,eAAe,CAe3B"}
@@ -2,7 +2,7 @@ import 'reflect-metadata';
2
2
  import { Application, ApplicationProps } from './application-protocol';
3
3
  import './application';
4
4
  import './application-state';
5
- import { ContainerModule } from 'inversify';
5
+ import { ContainerModule } from '../container/container';
6
6
  export declare class ApplicationFactory {
7
7
  static create(applicationProps: ApplicationProps, ...modules: ContainerModule[]): Promise<Application>;
8
8
  }
@@ -1 +1 @@
1
- {"version":3,"file":"application-factory.d.ts","sourceRoot":"","sources":["../../../src/common/application/application-factory.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,eAAe,CAAC;AACvB,OAAO,qBAAqB,CAAC;AAI7B,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,qBAAa,kBAAkB;IAC3B,OAAa,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAM3G;CACJ"}
1
+ {"version":3,"file":"application-factory.d.ts","sourceRoot":"","sources":["../../../src/common/application/application-factory.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,eAAe,CAAC;AACvB,OAAO,qBAAqB,CAAC;AAI7B,OAAO,EAAa,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEpE,qBAAa,kBAAkB;IAC3B,OAAa,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAM3G;CACJ"}
@@ -12,14 +12,14 @@ require("./application-state");
12
12
  const auto_bind_1 = require("../container/auto-bind");
13
13
  const static_module_1 = __importDefault(require("../static-module"));
14
14
  const utils_1 = require("../utils");
15
- const container_factory_1 = require("../container/container-factory");
15
+ const container_1 = require("../container/container");
16
16
  class ApplicationFactory {
17
17
  static async create(applicationProps, ...modules) {
18
18
  utils_1.currentThis.cellProps = applicationProps;
19
- const container = container_factory_1.ContainerFactory.create(static_module_1.default, (0, auto_bind_1.autoBind)(), ...modules);
19
+ const container = new container_1.Container();
20
+ container.load(static_module_1.default, (0, auto_bind_1.autoBind)(), ...modules);
20
21
  container_provider_1.ContainerProvider.set(container);
21
- const application = container.get(application_protocol_1.Application);
22
- return application;
22
+ return container.get(application_protocol_1.Application);
23
23
  }
24
24
  }
25
25
  exports.ApplicationFactory = ApplicationFactory;
@@ -1 +1 @@
1
- {"version":3,"file":"application-factory.js","sourceRoot":"","sources":["../../../src/common/application/application-factory.ts"],"names":[],"mappings":";;;;;;AAAA,4BAA0B;AAC1B,wEAAoE;AACpE,iEAAuE;AACvE,yBAAuB;AACvB,+BAA6B;AAC7B,sDAAkD;AAClD,qEAA4C;AAC5C,oCAAuC;AAEvC,sEAAkE;AAElE;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAkC,EAAE,GAAG,OAA0B;QACjF,mBAAW,CAAC,SAAS,GAAG,gBAAgB,CAAC;QACzC,MAAM,SAAS,GAAG,oCAAgB,CAAC,MAAM,CAAC,uBAAY,EAAE,IAAA,oBAAQ,GAAE,EAAE,GAAG,OAAO,CAAC,CAAC;QAChF,sCAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjC,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAc,kCAAW,CAAC,CAAC;QAC5D,OAAO,WAAW,CAAC;IACvB,CAAC;CACJ"}
1
+ {"version":3,"file":"application-factory.js","sourceRoot":"","sources":["../../../src/common/application/application-factory.ts"],"names":[],"mappings":";;;;;;AAAA,4BAA0B;AAC1B,wEAAoE;AACpE,iEAAuE;AACvE,yBAAuB;AACvB,+BAA6B;AAC7B,sDAAkD;AAClD,qEAA4C;AAC5C,oCAAuC;AACvC,sDAAoE;AAEpE;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAkC,EAAE,GAAG,OAA0B;QACjF,mBAAW,CAAC,SAAS,GAAG,gBAAgB,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAClC,SAAS,CAAC,IAAI,CAAC,uBAAY,EAAE,IAAA,oBAAQ,GAAE,EAAE,GAAG,OAAO,CAAC,CAAC;QACrD,sCAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjC,OAAO,SAAS,CAAC,GAAG,CAAc,kCAAW,CAAC,CAAC;IACnD,CAAC;CACJ"}
@@ -82,7 +82,7 @@ class AbstractApplicationStateService {
82
82
  }
83
83
  set state(state) {
84
84
  if (state !== this._state) {
85
- this.deferred[this._state] = new promise_util_1.Deferred();
85
+ // A state that was reached stays reached: late `reachedState()` calls resolve at once.
86
86
  this._state = state;
87
87
  if (this.deferred[state] === undefined) {
88
88
  this.deferred[state] = new promise_util_1.Deferred();
@@ -1 +1 @@
1
- {"version":3,"file":"application-protocol.js","sourceRoot":"","sources":["../../../src/common/application/application-protocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"application-protocol.js","sourceRoot":"","sources":["../../../src/common/application/application-protocol.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=lifecycle.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lifecycle.spec.d.ts","sourceRoot":"","sources":["../../../src/common/application/lifecycle.spec.ts"],"names":[],"mappings":""}