@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,13 +1,15 @@
1
1
  import { Component, Autowired } from '../annotation';
2
- import { JexlEngineProvider, ExpressionHandler, ExpressionContextProvider, ExpressionCompiler, ExpressionContext, ExpressionCompilerOptions } from './expression-protocol';
3
- import traverse from 'traverse';
4
-
2
+ import { ExpressionHandler, ExpressionContextProvider, ExpressionCompiler, ExpressionContext, ExpressionCompilerOptions } from './expression-protocol';
3
+ import { ExpressionUtil } from './expression-util';
4
+
5
+ /**
6
+ * Evaluates `${...}` expressions with {@link ExpressionUtil}: the result of an expression is never
7
+ * evaluated again, references between configuration keys still resolve. Evaluate a text on purpose
8
+ * with the `eval` transform.
9
+ */
5
10
  @Component(ExpressionHandler)
6
11
  export class ExpressionHandlerImpl implements ExpressionHandler {
7
12
 
8
- @Autowired(JexlEngineProvider)
9
- protected readonly jexlEngineProvider: JexlEngineProvider<any>;
10
-
11
13
  @Autowired(ExpressionContextProvider)
12
14
  protected readonly expressionContextProvider: ExpressionContextProvider;
13
15
 
@@ -21,65 +23,23 @@ export class ExpressionHandlerImpl implements ExpressionHandler {
21
23
 
22
24
  if (!ctx && c !== this._ctx && !expressionCompilerOptions?.ignoreContextExpression) {
23
25
  this._ctx = c;
24
- this.handle(c, c);
26
+ ExpressionUtil.evaluateConfiguration(c, this.options(expressionCompilerOptions));
25
27
  }
26
28
  return c;
27
29
  }
28
30
 
29
31
  handle(textOrObj: string | Object, ctx?: ExpressionContext, expressionCompilerOptions?: ExpressionCompilerOptions): any {
32
+ const options = this.options(expressionCompilerOptions);
33
+ const context = () => this.getContext(ctx, expressionCompilerOptions);
30
34
  if (typeof textOrObj === 'string') {
31
- return this.doHandle(textOrObj, ctx, expressionCompilerOptions);
32
- } else {
33
- /* eslint-disable-next-line @typescript-eslint/no-this-alias */
34
- const self = this;
35
- traverse(textOrObj).forEach(function (value: any) {
36
- if (typeof value === 'string') {
37
- this.update(self.handle(value, ctx, expressionCompilerOptions));
38
- } else if (value && (value as any)._ignoreEl === true) {
39
- this.update(value, true);
40
- }
41
- });
42
- return textOrObj;
43
- }
44
- }
45
-
46
- protected doHandle(text: string, ctx?: ExpressionContext, expressionCompilerOptions?: ExpressionCompilerOptions): any {
47
- const sections = this.expressionCompiler.compileSections(text, expressionCompilerOptions);
48
- if (sections.length > 0) {
49
- if (this.hasExpression(sections)) {
50
- const c = this.getContext(ctx, expressionCompilerOptions);
51
- if (sections.length === 1) {
52
- let value = sections[0].evalSync(c);
53
- if (typeof value === 'string') {
54
- value = this.handle(value, c);
55
- }
56
- return value;
57
- }
58
- const result: string[] = [];
59
- for (const section of sections) {
60
- if (typeof section === 'string') {
61
- result.push(section);
62
- } else {
63
- let value = section.evalSync(c);
64
- if (typeof value === 'string') {
65
- value = this.handle(value, c);
66
- }
67
- result.push(value);
68
- }
69
- }
70
- return result.join('');
71
- }
35
+ return ExpressionUtil.evaluateText(textOrObj, context, options);
72
36
  }
73
- return text;
37
+ ExpressionUtil.walk(textOrObj, text => ExpressionUtil.evaluateText(text, context, options));
38
+ return textOrObj;
74
39
  }
75
40
 
76
- protected hasExpression(sections: any[]) {
77
- for (const section of sections) {
78
- if (typeof section !== 'string') {
79
- return true;
80
- }
81
- }
82
- return false;
41
+ protected options(compilerOptions?: ExpressionCompilerOptions): ExpressionUtil.Options {
42
+ return { compiler: this.expressionCompiler, compilerOptions };
83
43
  }
84
44
 
85
- }
45
+ }
@@ -1,11 +1,13 @@
1
+ import type { Expression } from './expression-engine';
2
+
1
3
  export const ExpressionCompiler = Symbol('ExpressionCompiler');
2
4
  export const ExpressionHandler = Symbol('ExpressionHandler');
3
5
  export const ContextInitializer = Symbol('ContextInitializer');
4
6
  export const ExpressionContextProvider = Symbol('ExpressionContextProvider');
5
- export const JexlEngineProvider = Symbol('JexlEngineProvider');
6
7
 
8
+ /** Splits a text into literal sections and compiled `${...}` expressions. */
7
9
  export interface ExpressionCompiler {
8
- compileSections(text: string, options?: ExpressionCompilerOptions): any[]
10
+ compileSections(text: string, options?: ExpressionCompilerOptions): (string | Expression)[]
9
11
  }
10
12
 
11
13
  export interface ExpressionHandler {
@@ -37,9 +39,3 @@ export interface ExpressionContextProvider {
37
39
 
38
40
  provide(): ExpressionContext;
39
41
  }
40
-
41
- export interface JexlEngineProvider<T> {
42
-
43
- provide(): T
44
- }
45
-
@@ -0,0 +1,45 @@
1
+ import { describe, it } from 'bun:test';
2
+ import { expect } from 'chai';
3
+ import { ExpressionError, ExpressionUtil } from './expression-util';
4
+
5
+ /** ExpressionUtil is the evaluation shared with @celljs/vite (`@celljs/core/el`): no container involved. */
6
+ describe('ExpressionUtil', () => {
7
+ it('evaluates a text against a context, keeping the type of a single expression', () => {
8
+ expect(ExpressionUtil.evaluateText('${a + 1}', { a: 1 })).to.equal(2);
9
+ expect(ExpressionUtil.evaluateText('x-${a}-y', { a: 1 })).to.equal('x-1-y');
10
+ expect(ExpressionUtil.evaluateText('plain', () => { throw new Error('not called'); })).to.equal('plain');
11
+ });
12
+
13
+ it('does not evaluate what an expression returns', () => {
14
+ expect(ExpressionUtil.evaluateText('${v}', { v: '${secret}', secret: 's' })).to.equal('${secret}');
15
+ });
16
+
17
+ it('evaluates a configuration in place: references in any order, env values are text', () => {
18
+ const config: Record<string, any> = {
19
+ env: { _ignoreEl: true, API_URL: '${cell.secret}' },
20
+ cell: { url: '${cell.base}/api', base: 'https://${cell.host}', host: 'example.com', api: '${env.API_URL}', copy: '${cell.api}', secret: 's' },
21
+ };
22
+ ExpressionUtil.evaluateConfiguration(config);
23
+ expect(config.cell).to.deep.equal({
24
+ url: 'https://example.com/api', base: 'https://example.com', host: 'example.com', api: '${cell.secret}', copy: '${cell.secret}', secret: 's',
25
+ });
26
+ expect(config.env.API_URL).to.equal('${cell.secret}');
27
+ });
28
+
29
+ it('reports failures as an ExpressionError naming the key', () => {
30
+ const fail = (config: Record<string, any>) => {
31
+ try {
32
+ ExpressionUtil.evaluateConfiguration(config);
33
+ } catch (error) {
34
+ return error as ExpressionError;
35
+ }
36
+ throw new Error('no error');
37
+ };
38
+ const unknown = fail({ cell: { keys: "${ ['x'] | nothing }" } });
39
+ expect(unknown).to.be.instanceOf(ExpressionError);
40
+ expect(unknown.path).to.equal('cell.keys');
41
+ expect(unknown.message).to.contain('Cannot evaluate cell.keys');
42
+ const circular = fail({ a: '${b}', b: '${a}' });
43
+ expect(circular.message).to.equal('Circular reference in the configuration: a -> b -> a');
44
+ });
45
+ });
@@ -0,0 +1,362 @@
1
+ import { ExpressionCompiler, ExpressionCompilerOptions, ExpressionContext } from './expression-protocol';
2
+ import { Expression, ExpressionEngine } from './expression-engine';
3
+
4
+ interface MiddleExpression {
5
+ expression: string | Expression;
6
+ nextText?: string;
7
+ }
8
+
9
+ /**
10
+ * Splits a text into literal sections and compiled `${...}` expressions. It has no dependency
11
+ * injection, so the build (@celljs/vite) and the runtime share it through `@celljs/core/el`.
12
+ */
13
+ export class ExpressionSectionCompiler implements ExpressionCompiler {
14
+
15
+ protected static defaultEngine?: ExpressionEngine;
16
+
17
+ /** @param engine the runtime passes the ExpressionEngine of its container, which has the transforms */
18
+ constructor(protected readonly engine: () => ExpressionEngine = () => (ExpressionSectionCompiler.defaultEngine ??= new ExpressionEngine())) { }
19
+
20
+ private ESCAPE_CHAR = '\\';
21
+ private SPECIAL_CHAR = '$';
22
+ private BRACKET_BEGIN = '{';
23
+ private BRACKET_END = '}';
24
+
25
+ protected getSpecialChar(opitons: Required<ExpressionCompilerOptions>): string {
26
+ if (opitons.ignoreSpecialChar) {
27
+ return '';
28
+ }
29
+ return opitons.specialChar;
30
+ }
31
+
32
+ protected equalsSpecialChar(opitons: Required<ExpressionCompilerOptions>, char: string): boolean {
33
+ if (opitons.ignoreSpecialChar) {
34
+ return false;
35
+ }
36
+ return char === opitons.specialChar;
37
+ }
38
+
39
+ compileSections(text: string, options: ExpressionCompilerOptions): (string | Expression)[] {
40
+ const merged = {
41
+ ...{ escapeChar: this.ESCAPE_CHAR, specialChar: this.SPECIAL_CHAR, bracketBegin: this.BRACKET_BEGIN, bracketEnd: this.BRACKET_END, ...options }
42
+ } as Required<ExpressionCompilerOptions>;
43
+ if (!text || text.indexOf(`${this.getSpecialChar(merged)}${merged.bracketBegin}`) < 0) {
44
+ return [];
45
+ }
46
+
47
+ const sections: (string | Expression)[] = [];
48
+ let middleText: string | undefined = text;
49
+ while (middleText) {
50
+ const me: MiddleExpression | undefined = this.middleCompile(middleText, merged);
51
+ if (!me) {
52
+ sections.push(middleText);
53
+ middleText = undefined;
54
+ } else {
55
+ sections.push(me.expression);
56
+ middleText = me.nextText;
57
+ }
58
+ }
59
+
60
+ return sections;
61
+ }
62
+
63
+ protected middleCompile(text: string, options: Required<ExpressionCompilerOptions>): MiddleExpression | undefined {
64
+ let me: MiddleExpression | undefined;
65
+ const prefix = `${this.getSpecialChar(options)}${options.bracketBegin}`;
66
+ const prefix2 = `${prefix}${options.bracketBegin}`;
67
+ if (text.startsWith(prefix2)) {
68
+ me = this.nextMiddleExpression(text.substring(prefix2.length), 2, options);
69
+ } else if (text.startsWith(prefix)) {
70
+ me = this.nextMiddleExpression(text.substring(prefix.length), undefined, options);
71
+ } else {
72
+ me = this.nextString(text, options);
73
+ }
74
+ return me;
75
+ }
76
+
77
+ protected nextMiddleExpression(text: string, bracketBeginCharNum = 1, options: Required<ExpressionCompilerOptions>): MiddleExpression | undefined {
78
+ let stringed = false;
79
+ let escaped = false;
80
+ let bracketBeginCharFound = 0;
81
+
82
+ const section: string[] = [];
83
+ for (let i = 0; i < text.length; i++) {
84
+ const c = text[i];
85
+ if (!escaped) {
86
+ if ('\'' === c || '"' === c) {
87
+ stringed = !stringed;
88
+ section.push(c);
89
+ continue;
90
+ } else
91
+ if (c === options.escapeChar) {
92
+ escaped = true;
93
+ continue;
94
+ }
95
+ }
96
+
97
+ if (stringed) {
98
+ section.push(c);
99
+ escaped = false;
100
+ } else if (escaped) {
101
+ if (this.equalsSpecialChar(options, c) || options.bracketBegin === c || options.bracketEnd === c) {
102
+ section.push(c);
103
+ } else {
104
+ section.push(options.escapeChar);
105
+ section.push(c);
106
+ }
107
+ escaped = false;
108
+ } else if (options.bracketBegin === c) {
109
+ bracketBeginCharFound++;
110
+ section.push(c);
111
+ } else if (options.bracketEnd === c) {
112
+ if (bracketBeginCharFound === 0 && bracketBeginCharNum === 1) {
113
+ const expression = this.engine().compile(section.join(''));
114
+ let nextText;
115
+ if (i !== text.length - 1) {
116
+ nextText = text.substring(i + 1);
117
+ }
118
+ return { expression, nextText };
119
+ } else if (bracketBeginCharFound > 0) {
120
+ bracketBeginCharFound--;
121
+ section.push(c);
122
+ } else {
123
+ bracketBeginCharNum--;
124
+ }
125
+ } else {
126
+ section.push(c);
127
+ }
128
+ }
129
+ }
130
+
131
+ protected nextString(text: string, options: Required<ExpressionCompilerOptions>): MiddleExpression {
132
+ let escaped = false;
133
+ let specialCharFound = false;
134
+
135
+ const section: string[] = [];
136
+ for (let i = 0; i < text.length; i++) {
137
+ const c = text[i];
138
+ if (!escaped) {
139
+ if ('\'' === c || '"' === c) {
140
+ section.push(c);
141
+ continue;
142
+ } else
143
+ if (c === options.escapeChar) {
144
+ escaped = true;
145
+ continue;
146
+ }
147
+ }
148
+
149
+ if (escaped) {
150
+ if (this.equalsSpecialChar(options, c) || options.bracketBegin === c || options.bracketEnd === c) {
151
+ section.push(c);
152
+ } else {
153
+ section.push(options.escapeChar);
154
+ section.push(c);
155
+ }
156
+ escaped = false;
157
+ } else
158
+ if (specialCharFound || options.ignoreSpecialChar) {
159
+ if (options.bracketBegin === c) {
160
+ const expression = section.join('');
161
+ const nextText = options.ignoreSpecialChar ? text.substring(i) : text.substring(i - 1);
162
+ return { expression, nextText };
163
+ } else {
164
+ if (!options.ignoreSpecialChar) {
165
+ specialCharFound = false;
166
+ section.push(options.specialChar);
167
+ }
168
+ section.push(c);
169
+ }
170
+ } else {
171
+ if (this.equalsSpecialChar(options, c)) {
172
+ specialCharFound = true;
173
+ } else {
174
+ section.push(c);
175
+ }
176
+ }
177
+ }
178
+
179
+ return { expression: section.join('') };
180
+ }
181
+
182
+ }
183
+
184
+ /** An expression of the configuration that cannot be evaluated; `path` is its key, e.g. `cell.db.url`. */
185
+ export class ExpressionError extends Error {
186
+
187
+ override readonly name = 'ExpressionError';
188
+
189
+ constructor(readonly path: string, readonly template: string, message: string, override readonly cause?: unknown) {
190
+ super(message);
191
+ }
192
+ }
193
+
194
+ /**
195
+ * Evaluation of `${...}` expressions, shared by the runtime (ExpressionHandler) and the build
196
+ * (@celljs/vite) through `@celljs/core/el`. The result of an expression is never evaluated again: a value
197
+ * that comes from the environment (`${env.X}`), from a template variable or from another expression is
198
+ * text, whatever it contains. References between configuration keys still resolve: a key that refers to
199
+ * another one evaluates that key's own template (see {@link ExpressionUtil.evaluateConfiguration}).
200
+ */
201
+ export namespace ExpressionUtil {
202
+
203
+ export interface Options {
204
+ /** Defaults to an {@link ExpressionSectionCompiler} on a plain {@link ExpressionEngine} (no transforms). */
205
+ compiler?: ExpressionCompiler;
206
+ compilerOptions?: ExpressionCompilerOptions;
207
+ }
208
+
209
+ let defaultCompiler: ExpressionCompiler | undefined;
210
+
211
+ function compilerOf(options: Options): ExpressionCompiler {
212
+ return options.compiler ?? (defaultCompiler ??= new ExpressionSectionCompiler());
213
+ }
214
+
215
+ /**
216
+ * Evaluates the expressions of `text`: a text with a single expression keeps the type of its value,
217
+ * mixed text is joined into a string. `context` may be a function, then it is only called when the text
218
+ * has an expression.
219
+ */
220
+ export function evaluateText(text: string, context: ExpressionContext | (() => ExpressionContext), options: Options = {}): any {
221
+ const sections = compilerOf(options).compileSections(text, options.compilerOptions);
222
+ if (!sections.some(section => typeof section !== 'string')) {
223
+ return text;
224
+ }
225
+ const c = typeof context === 'function' ? context() : context;
226
+ if (sections.length === 1) {
227
+ return (sections[0] as Expression).evaluate(c);
228
+ }
229
+ return sections.map(section => (typeof section === 'string' ? section : section.evaluate(c))).join('');
230
+ }
231
+
232
+ /**
233
+ * Replaces the templates (strings) of `node` by `evaluate`'s values, in place, depth first. Objects
234
+ * marked `_ignoreEl` are left alone, circular references are not followed, and values are not walked
235
+ * into: what an expression returns is not a template.
236
+ */
237
+ export function walk(node: any, evaluate: (text: string, owner: any, key: string) => any,
238
+ enter?: (child: object, owner: object, key: string) => void): void {
239
+ doWalk(node, [], evaluate, enter);
240
+ }
241
+
242
+ function doWalk(node: any, ancestors: object[], evaluate: (text: string, owner: any, key: string) => any,
243
+ enter?: (child: object, owner: object, key: string) => void): void {
244
+ if (typeof node !== 'object' || node === null || node._ignoreEl === true || ancestors.includes(node)) {
245
+ return;
246
+ }
247
+ ancestors.push(node);
248
+ for (const key of Object.keys(node)) {
249
+ const child = node[key];
250
+ if (typeof child === 'string') {
251
+ const value = evaluate(child, node, key);
252
+ if (value !== child) {
253
+ node[key] = value;
254
+ }
255
+ } else {
256
+ if (enter && typeof child === 'object' && child !== null) {
257
+ enter(child, node, key);
258
+ }
259
+ doWalk(child, ancestors, evaluate, enter);
260
+ }
261
+ }
262
+ ancestors.pop();
263
+ }
264
+
265
+ /**
266
+ * Evaluates the configuration `root` in place. An expression sees the configuration through a view in
267
+ * which every template that it reaches is evaluated first (once, cached), so keys refer to each other in
268
+ * any order; a value an expression returns is never evaluated again. Objects marked `_ignoreEl` (such
269
+ * as `env`) are read as they are. Failures, including a circular reference, are {@link ExpressionError}s
270
+ * naming the key.
271
+ */
272
+ export function evaluateConfiguration(root: ExpressionContext, options: Options = {}): void {
273
+ const values = new Map<object, Map<string, unknown>>();
274
+ const resolving: string[] = [];
275
+ const paths = new WeakMap<object, string>([[root, '']]);
276
+ const views = new WeakMap<object, object>();
277
+ const targets = new WeakMap<object, object>();
278
+
279
+ const pathOf = (owner: object, key: string) => {
280
+ const base = paths.get(owner);
281
+ return base ? `${base}.${key}` : key;
282
+ };
283
+ const unwrap = (value: any): any => {
284
+ if (typeof value !== 'object' || value === null) {
285
+ return value;
286
+ }
287
+ const target = targets.get(value);
288
+ if (target) {
289
+ return target;
290
+ }
291
+ // Arrays and objects an expression builds may hold views of the configuration.
292
+ if (Array.isArray(value)) {
293
+ return value.map(unwrap);
294
+ }
295
+ if (Object.getPrototypeOf(value) === Object.prototype) {
296
+ return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, unwrap(v)]));
297
+ }
298
+ return value;
299
+ };
300
+ const valueOf = (owner: any, key: string): unknown => {
301
+ const cached = values.get(owner);
302
+ if (cached?.has(key)) {
303
+ return cached.get(key);
304
+ }
305
+ const template = owner[key];
306
+ const path = pathOf(owner, key);
307
+ if (resolving.includes(path)) {
308
+ throw new ExpressionError(path, template, `Circular reference in the configuration: ${[...resolving, path].join(' -> ')}`);
309
+ }
310
+ resolving.push(path);
311
+ let value: unknown;
312
+ try {
313
+ value = unwrap(evaluateText(template, () => view(root), options));
314
+ } catch (error) {
315
+ if (error instanceof ExpressionError) {
316
+ throw error;
317
+ }
318
+ throw new ExpressionError(path, template, `Cannot evaluate ${path}: ${template} (${(error as Error)?.message ?? error})`, error);
319
+ } finally {
320
+ resolving.pop();
321
+ }
322
+ if (!values.has(owner)) {
323
+ values.set(owner, new Map());
324
+ }
325
+ values.get(owner)!.set(key, value);
326
+ return value;
327
+ };
328
+ const view = (target: any): any => {
329
+ if (typeof target !== 'object' || target === null || target._ignoreEl === true) {
330
+ return target;
331
+ }
332
+ let proxy = views.get(target);
333
+ if (!proxy) {
334
+ const created: object = new Proxy(target, {
335
+ get: (t, key, receiver) => {
336
+ const value = Reflect.get(t, key, receiver);
337
+ if (typeof key !== 'string' || !Object.prototype.hasOwnProperty.call(t, key)) {
338
+ return value;
339
+ }
340
+ if (typeof value === 'string') {
341
+ return valueOf(t, key);
342
+ }
343
+ if (typeof value === 'object' && value !== null && !paths.has(value)) {
344
+ paths.set(value, pathOf(t, key));
345
+ }
346
+ return view(value);
347
+ }
348
+ });
349
+ views.set(target, created);
350
+ targets.set(created, target);
351
+ proxy = created;
352
+ }
353
+ return proxy;
354
+ };
355
+
356
+ walk(root, (text, owner, key) => valueOf(owner, key), (child, owner, key) => {
357
+ if (!paths.has(child)) {
358
+ paths.set(child, pathOf(owner, key));
359
+ }
360
+ });
361
+ }
362
+ }
@@ -1,6 +1,8 @@
1
1
  export * from './expression-protocol';
2
+ export * from './expression-engine';
3
+ export * from './application-expression-engine';
2
4
  export * from './expression-compiler';
3
5
  export * from './expression-context-provider';
4
6
  export * from './expression-handler';
5
- export * from './jexl-engine-provider';
7
+ export * from './expression-util';
6
8
  export * from './core-context-initializer';