@effect-app/infra 4.0.0-beta.32 → 4.0.0-beta.321

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 (480) hide show
  1. package/CHANGELOG.md +2469 -0
  2. package/_check.sh +1 -1
  3. package/dist/CUPS.d.ts +29 -10
  4. package/dist/CUPS.d.ts.map +1 -1
  5. package/dist/CUPS.js +36 -15
  6. package/dist/ClusterCosmos.d.ts +70 -0
  7. package/dist/ClusterCosmos.d.ts.map +1 -0
  8. package/dist/ClusterCosmos.js +576 -0
  9. package/dist/ClusterServiceBus.d.ts +67 -0
  10. package/dist/ClusterServiceBus.d.ts.map +1 -0
  11. package/dist/ClusterServiceBus.js +84 -0
  12. package/dist/ContextProvider.d.ts +34 -0
  13. package/dist/ContextProvider.d.ts.map +1 -0
  14. package/dist/ContextProvider.js +40 -0
  15. package/dist/Emailer/Sendgrid.d.ts +110 -146
  16. package/dist/Emailer/Sendgrid.d.ts.map +1 -1
  17. package/dist/Emailer/Sendgrid.js +24 -19
  18. package/dist/Emailer/fake.d.ts +1 -1
  19. package/dist/Emailer/fake.d.ts.map +1 -1
  20. package/dist/Emailer/fake.js +4 -4
  21. package/dist/MainFiberSet.d.ts +12 -8
  22. package/dist/MainFiberSet.d.ts.map +1 -1
  23. package/dist/MainFiberSet.js +23 -7
  24. package/dist/QueueMaker/errors.d.ts +4 -2
  25. package/dist/QueueMaker/errors.d.ts.map +1 -1
  26. package/dist/QueueMaker/errors.js +4 -2
  27. package/dist/{adapters/SQL → SQL}/Model.d.ts +31 -42
  28. package/dist/SQL/Model.d.ts.map +1 -0
  29. package/dist/SQL/Model.js +469 -0
  30. package/dist/SQL.d.ts.map +1 -0
  31. package/dist/{adapters/SQL.js → SQL.js} +1 -1
  32. package/dist/Store/Cosmos/query.d.ts +16 -4
  33. package/dist/Store/Cosmos/query.d.ts.map +1 -1
  34. package/dist/Store/Cosmos/query.js +238 -42
  35. package/dist/Store/Cosmos.d.ts +2 -2
  36. package/dist/Store/Cosmos.d.ts.map +1 -1
  37. package/dist/Store/Cosmos.js +392 -256
  38. package/dist/Store/Disk.d.ts +4 -4
  39. package/dist/Store/Disk.d.ts.map +1 -1
  40. package/dist/Store/Disk.js +87 -42
  41. package/dist/Store/Memory.d.ts +7 -10
  42. package/dist/Store/Memory.d.ts.map +1 -1
  43. package/dist/Store/Memory.js +346 -76
  44. package/dist/Store/SQL/Pg.d.ts +4 -0
  45. package/dist/Store/SQL/Pg.d.ts.map +1 -0
  46. package/dist/Store/SQL/Pg.js +257 -0
  47. package/dist/Store/SQL/query.d.ts +53 -0
  48. package/dist/Store/SQL/query.d.ts.map +1 -0
  49. package/dist/Store/SQL/query.js +656 -0
  50. package/dist/Store/SQL.d.ts +21 -0
  51. package/dist/Store/SQL.d.ts.map +1 -0
  52. package/dist/Store/SQL.js +478 -0
  53. package/dist/Store/codeFilter.d.ts +4 -4
  54. package/dist/Store/codeFilter.d.ts.map +1 -1
  55. package/dist/Store/codeFilter.js +71 -22
  56. package/dist/Store/index.d.ts +6 -4
  57. package/dist/Store/index.d.ts.map +1 -1
  58. package/dist/Store/index.js +18 -5
  59. package/dist/Store/jsonDocument.d.ts +13 -0
  60. package/dist/Store/jsonDocument.d.ts.map +1 -0
  61. package/dist/Store/jsonDocument.js +31 -0
  62. package/dist/Store/utils.d.ts +21 -2
  63. package/dist/Store/utils.d.ts.map +1 -1
  64. package/dist/Store/utils.js +253 -10
  65. package/dist/WorkflowEngineCosmos.d.ts +29 -0
  66. package/dist/WorkflowEngineCosmos.d.ts.map +1 -0
  67. package/dist/WorkflowEngineCosmos.js +542 -0
  68. package/dist/WorkflowEngineSqlite.d.ts +24 -0
  69. package/dist/WorkflowEngineSqlite.d.ts.map +1 -0
  70. package/dist/WorkflowEngineSqlite.js +550 -0
  71. package/dist/arbs.d.ts +6 -3
  72. package/dist/arbs.d.ts.map +1 -1
  73. package/dist/arbs.js +16 -4
  74. package/dist/codec.d.ts.map +1 -0
  75. package/dist/codec.js +5 -0
  76. package/dist/{adapters/cosmos-client.d.ts → cosmos-client.d.ts} +4 -2
  77. package/dist/cosmos-client.d.ts.map +1 -0
  78. package/dist/cosmos-client.js +11 -0
  79. package/dist/errorReporter.d.ts +6 -4
  80. package/dist/errorReporter.d.ts.map +1 -1
  81. package/dist/errorReporter.js +23 -27
  82. package/dist/fileUtil.d.ts +1 -1
  83. package/dist/fileUtil.d.ts.map +1 -1
  84. package/dist/fileUtil.js +2 -2
  85. package/dist/index.d.ts +2 -1
  86. package/dist/index.d.ts.map +1 -1
  87. package/dist/index.js +3 -2
  88. package/dist/internal/RequestContextMiddleware.d.ts +5 -0
  89. package/dist/internal/RequestContextMiddleware.d.ts.map +1 -0
  90. package/dist/internal/RequestContextMiddleware.js +45 -0
  91. package/dist/internal/auth.d.ts +53 -0
  92. package/dist/internal/auth.d.ts.map +1 -0
  93. package/dist/internal/auth.js +180 -0
  94. package/dist/internal/events.d.ts +11 -0
  95. package/dist/internal/events.d.ts.map +1 -0
  96. package/dist/internal/events.js +49 -0
  97. package/dist/internal/health.d.ts.map +1 -0
  98. package/dist/internal/health.js +5 -0
  99. package/dist/{api/layerUtils.d.ts → layerUtils.d.ts} +14 -6
  100. package/dist/layerUtils.d.ts.map +1 -0
  101. package/dist/layerUtils.js +17 -0
  102. package/dist/logger/jsonLogger.d.ts +1 -1
  103. package/dist/logger/jsonLogger.d.ts.map +1 -1
  104. package/dist/logger/jsonLogger.js +5 -3
  105. package/dist/logger/logFmtLogger.d.ts +1 -1
  106. package/dist/logger/logFmtLogger.d.ts.map +1 -1
  107. package/dist/logger/logFmtLogger.js +3 -3
  108. package/dist/logger/shared.d.ts +2 -2
  109. package/dist/logger/shared.d.ts.map +1 -1
  110. package/dist/logger/shared.js +6 -6
  111. package/dist/logger.d.ts +4 -4
  112. package/dist/logger.d.ts.map +1 -1
  113. package/dist/middlewares.d.ts.map +1 -0
  114. package/dist/{api/middlewares.js → middlewares.js} +1 -1
  115. package/dist/{adapters/mongo-client.d.ts → mongo-client.d.ts} +3 -2
  116. package/dist/mongo-client.d.ts.map +1 -0
  117. package/dist/mongo-client.js +15 -0
  118. package/dist/otel.d.ts +75 -0
  119. package/dist/otel.d.ts.map +1 -0
  120. package/dist/otel.js +84 -0
  121. package/dist/rateLimit.d.ts +11 -3
  122. package/dist/rateLimit.d.ts.map +1 -1
  123. package/dist/rateLimit.js +7 -12
  124. package/dist/{adapters/redis-client.d.ts → redis-client.d.ts} +5 -2
  125. package/dist/redis-client.d.ts.map +1 -0
  126. package/dist/redis-client.js +98 -0
  127. package/dist/{api/reportError.d.ts → reportError.d.ts} +1 -1
  128. package/dist/reportError.d.ts.map +1 -0
  129. package/dist/reportError.js +28 -0
  130. package/dist/{api/routing → routing}/middleware/RouterMiddleware.d.ts +4 -3
  131. package/dist/routing/middleware/RouterMiddleware.d.ts.map +1 -0
  132. package/dist/{api/routing → routing}/middleware/RouterMiddleware.js +1 -1
  133. package/dist/routing/middleware/middleware.d.ts +48 -0
  134. package/dist/routing/middleware/middleware.d.ts.map +1 -0
  135. package/dist/routing/middleware/middleware.js +152 -0
  136. package/dist/{api/routing → routing}/middleware.d.ts +0 -1
  137. package/dist/routing/middleware.d.ts.map +1 -0
  138. package/dist/{api/routing → routing}/middleware.js +1 -2
  139. package/dist/routing/schema/jwt.d.ts.map +1 -0
  140. package/dist/routing/schema/jwt.js +12 -0
  141. package/dist/routing/tsort.d.ts.map +1 -0
  142. package/dist/routing/tsort.js +51 -0
  143. package/dist/{api/routing → routing}/utils.d.ts +3 -3
  144. package/dist/routing/utils.d.ts.map +1 -0
  145. package/dist/routing/utils.js +45 -0
  146. package/dist/routing.d.ts +182 -0
  147. package/dist/routing.d.ts.map +1 -0
  148. package/dist/routing.js +256 -0
  149. package/dist/test.d.ts +2 -2
  150. package/dist/test.d.ts.map +1 -1
  151. package/dist/test.js +5 -5
  152. package/dist/util.d.ts.map +1 -0
  153. package/dist/util.js +14 -0
  154. package/docs/cluster-storage.md +26 -0
  155. package/docs/workflow-engine.md +262 -0
  156. package/examples/query.ts +49 -41
  157. package/package.json +38 -352
  158. package/src/CUPS.ts +54 -15
  159. package/src/ClusterCosmos.ts +1154 -0
  160. package/src/ClusterServiceBus.ts +244 -0
  161. package/src/{api/ContextProvider.ts → ContextProvider.ts} +20 -17
  162. package/src/Emailer/Sendgrid.ts +83 -60
  163. package/src/Emailer/fake.ts +4 -4
  164. package/src/MainFiberSet.ts +32 -13
  165. package/src/QueueMaker/errors.ts +3 -1
  166. package/src/{adapters/SQL → SQL}/Model.ts +42 -41
  167. package/src/SQL.ts +1 -0
  168. package/src/Store/Cosmos/query.ts +275 -55
  169. package/src/Store/Cosmos.ts +537 -367
  170. package/src/Store/Disk.ts +137 -74
  171. package/src/Store/Memory.ts +402 -113
  172. package/src/Store/SQL/Pg.ts +402 -0
  173. package/src/Store/SQL/query.ts +748 -0
  174. package/src/Store/SQL.ts +786 -0
  175. package/src/Store/codeFilter.ts +78 -28
  176. package/src/Store/index.ts +25 -10
  177. package/src/Store/jsonDocument.ts +43 -0
  178. package/src/Store/utils.ts +307 -30
  179. package/src/WorkflowEngineCosmos.ts +749 -0
  180. package/src/WorkflowEngineSqlite.ts +813 -0
  181. package/src/arbs.ts +20 -5
  182. package/src/{adapters/cosmos-client.ts → cosmos-client.ts} +5 -3
  183. package/src/errorReporter.ts +68 -78
  184. package/src/fileUtil.ts +1 -1
  185. package/src/index.ts +2 -1
  186. package/src/{api/internal → internal}/RequestContextMiddleware.ts +23 -6
  187. package/src/internal/auth.ts +272 -0
  188. package/src/{api/internal → internal}/events.ts +22 -13
  189. package/src/{api/layerUtils.ts → layerUtils.ts} +14 -10
  190. package/src/logger/jsonLogger.ts +5 -3
  191. package/src/logger/logFmtLogger.ts +3 -3
  192. package/src/logger/shared.ts +6 -5
  193. package/src/middlewares.ts +10 -0
  194. package/src/{adapters/mongo-client.ts → mongo-client.ts} +4 -2
  195. package/src/otel.ts +177 -0
  196. package/src/rateLimit.ts +35 -24
  197. package/src/{adapters/redis-client.ts → redis-client.ts} +7 -3
  198. package/src/{api/reportError.ts → reportError.ts} +3 -2
  199. package/src/{api/routing → routing}/middleware/RouterMiddleware.ts +5 -4
  200. package/src/routing/middleware/middleware.ts +196 -0
  201. package/src/routing/middleware.ts +4 -0
  202. package/src/{api/routing → routing}/schema/jwt.ts +2 -2
  203. package/src/{api/routing → routing}/utils.ts +2 -1
  204. package/src/routing.ts +823 -0
  205. package/src/test.ts +6 -6
  206. package/src/vitest.ts +1 -1
  207. package/test/auth.test.ts +101 -0
  208. package/test/cluster-cosmos.test.ts +612 -0
  209. package/test/cluster-servicebus.test.ts +180 -0
  210. package/test/cluster-sqlite.test.ts +207 -0
  211. package/test/contextProvider.test.ts +15 -12
  212. package/test/controller.test.ts +28 -32
  213. package/test/cosmos-query.test.ts +323 -0
  214. package/test/dist/auth.test.d.ts.map +1 -0
  215. package/test/dist/cluster-cosmos.test.d.ts.map +1 -0
  216. package/test/dist/cluster-servicebus.test.d.ts.map +1 -0
  217. package/test/dist/cluster-sqlite.test.d.ts.map +1 -0
  218. package/test/dist/contextProvider.test.d.ts.map +1 -1
  219. package/test/dist/controller.test.d.ts.map +1 -1
  220. package/test/dist/cosmos-query.test.d.ts.map +1 -0
  221. package/test/dist/fixtures.d.ts +29 -11
  222. package/test/dist/fixtures.d.ts.map +1 -1
  223. package/test/dist/fixtures.js +17 -10
  224. package/test/dist/json-lower.test.d.ts.map +1 -0
  225. package/test/dist/query.test.d.ts.map +1 -1
  226. package/test/dist/rawQuery.test.d.ts.map +1 -1
  227. package/test/dist/repository-ext.test.d.ts.map +1 -0
  228. package/test/dist/requires.test.d.ts.map +1 -1
  229. package/test/dist/router-generator.test.d.ts.map +1 -0
  230. package/test/dist/routing-interruptibility.test.d.ts.map +1 -0
  231. package/test/dist/rpc-context-map-streaming.test.d.ts.map +1 -0
  232. package/test/dist/rpc-e2e-invalidation.test.d.ts.map +1 -0
  233. package/test/dist/rpc-multi-middleware.test.d.ts.map +1 -1
  234. package/test/dist/rpc-stream-fullstack.test.d.ts.map +1 -0
  235. package/test/dist/sql-store.test.d.ts.map +1 -0
  236. package/test/dist/workflow-engine-cosmos.test.d.ts.map +1 -0
  237. package/test/dist/workflow-engine-sqlite.test.d.ts.map +1 -0
  238. package/test/fixtures.ts +16 -9
  239. package/test/json-lower.test.ts +115 -0
  240. package/test/layerUtils.test.ts +2 -2
  241. package/test/query.test.ts +1384 -46
  242. package/test/rawQuery.test.ts +340 -22
  243. package/test/repository-ext.test.ts +456 -0
  244. package/test/requires.test.ts +10 -5
  245. package/test/router-generator.test.ts +187 -0
  246. package/test/routing-interruptibility.test.ts +66 -0
  247. package/test/rpc-context-map-streaming.test.ts +265 -0
  248. package/test/rpc-e2e-invalidation.test.ts +421 -0
  249. package/test/rpc-multi-middleware.test.ts +85 -10
  250. package/test/rpc-stream-fullstack.test.ts +307 -0
  251. package/test/sql-store.test.ts +1905 -0
  252. package/test/validateSample.test.ts +26 -14
  253. package/test/workflow-engine-cosmos.test.ts +345 -0
  254. package/test/workflow-engine-sqlite.test.ts +297 -0
  255. package/tsconfig.examples.json +1 -1
  256. package/tsconfig.json +9 -2
  257. package/tsconfig.src.json +35 -35
  258. package/tsconfig.test.json +2 -2
  259. package/dist/Emailer/service.d.ts +0 -55
  260. package/dist/Emailer/service.d.ts.map +0 -1
  261. package/dist/Emailer/service.js +0 -6
  262. package/dist/Emailer.d.ts +0 -2
  263. package/dist/Emailer.d.ts.map +0 -1
  264. package/dist/Emailer.js +0 -2
  265. package/dist/Model/Repository/ext.d.ts +0 -41
  266. package/dist/Model/Repository/ext.d.ts.map +0 -1
  267. package/dist/Model/Repository/ext.js +0 -65
  268. package/dist/Model/Repository/internal/internal.d.ts +0 -59
  269. package/dist/Model/Repository/internal/internal.d.ts.map +0 -1
  270. package/dist/Model/Repository/internal/internal.js +0 -316
  271. package/dist/Model/Repository/legacy.d.ts +0 -19
  272. package/dist/Model/Repository/legacy.d.ts.map +0 -1
  273. package/dist/Model/Repository/legacy.js +0 -2
  274. package/dist/Model/Repository/makeRepo.d.ts +0 -49
  275. package/dist/Model/Repository/makeRepo.d.ts.map +0 -1
  276. package/dist/Model/Repository/makeRepo.js +0 -24
  277. package/dist/Model/Repository/service.d.ts +0 -89
  278. package/dist/Model/Repository/service.d.ts.map +0 -1
  279. package/dist/Model/Repository/service.js +0 -2
  280. package/dist/Model/Repository/validation.d.ts +0 -42
  281. package/dist/Model/Repository/validation.d.ts.map +0 -1
  282. package/dist/Model/Repository/validation.js +0 -32
  283. package/dist/Model/Repository.d.ts +0 -6
  284. package/dist/Model/Repository.d.ts.map +0 -1
  285. package/dist/Model/Repository.js +0 -6
  286. package/dist/Model/dsl.d.ts +0 -32
  287. package/dist/Model/dsl.d.ts.map +0 -1
  288. package/dist/Model/dsl.js +0 -44
  289. package/dist/Model/filter/filterApi.d.ts +0 -30
  290. package/dist/Model/filter/filterApi.d.ts.map +0 -1
  291. package/dist/Model/filter/filterApi.js +0 -2
  292. package/dist/Model/filter/types/errors.d.ts +0 -29
  293. package/dist/Model/filter/types/errors.d.ts.map +0 -1
  294. package/dist/Model/filter/types/errors.js +0 -2
  295. package/dist/Model/filter/types/fields.d.ts +0 -15
  296. package/dist/Model/filter/types/fields.d.ts.map +0 -1
  297. package/dist/Model/filter/types/fields.js +0 -2
  298. package/dist/Model/filter/types/path/common.d.ts +0 -316
  299. package/dist/Model/filter/types/path/common.d.ts.map +0 -1
  300. package/dist/Model/filter/types/path/common.js +0 -2
  301. package/dist/Model/filter/types/path/eager.d.ts +0 -95
  302. package/dist/Model/filter/types/path/eager.d.ts.map +0 -1
  303. package/dist/Model/filter/types/path/eager.js +0 -31
  304. package/dist/Model/filter/types/path/index.d.ts +0 -4
  305. package/dist/Model/filter/types/path/index.d.ts.map +0 -1
  306. package/dist/Model/filter/types/path/index.js +0 -3
  307. package/dist/Model/filter/types/utils.d.ts +0 -79
  308. package/dist/Model/filter/types/utils.d.ts.map +0 -1
  309. package/dist/Model/filter/types/utils.js +0 -2
  310. package/dist/Model/filter/types/validator.d.ts +0 -30
  311. package/dist/Model/filter/types/validator.d.ts.map +0 -1
  312. package/dist/Model/filter/types/validator.js +0 -2
  313. package/dist/Model/filter/types.d.ts +0 -5
  314. package/dist/Model/filter/types.d.ts.map +0 -1
  315. package/dist/Model/filter/types.js +0 -7
  316. package/dist/Model/query/dsl.d.ts +0 -248
  317. package/dist/Model/query/dsl.d.ts.map +0 -1
  318. package/dist/Model/query/dsl.js +0 -104
  319. package/dist/Model/query/new-kid-interpreter.d.ts +0 -28
  320. package/dist/Model/query/new-kid-interpreter.d.ts.map +0 -1
  321. package/dist/Model/query/new-kid-interpreter.js +0 -165
  322. package/dist/Model/query.d.ts +0 -15
  323. package/dist/Model/query.d.ts.map +0 -1
  324. package/dist/Model/query.js +0 -3
  325. package/dist/Model.d.ts +0 -4
  326. package/dist/Model.d.ts.map +0 -1
  327. package/dist/Model.js +0 -4
  328. package/dist/Operations.d.ts +0 -55
  329. package/dist/Operations.d.ts.map +0 -1
  330. package/dist/Operations.js +0 -102
  331. package/dist/OperationsRepo.d.ts +0 -41
  332. package/dist/OperationsRepo.d.ts.map +0 -1
  333. package/dist/OperationsRepo.js +0 -14
  334. package/dist/QueueMaker/SQLQueue.d.ts +0 -16
  335. package/dist/QueueMaker/SQLQueue.d.ts.map +0 -1
  336. package/dist/QueueMaker/SQLQueue.js +0 -130
  337. package/dist/QueueMaker/memQueue.d.ts +0 -11
  338. package/dist/QueueMaker/memQueue.d.ts.map +0 -1
  339. package/dist/QueueMaker/memQueue.js +0 -76
  340. package/dist/QueueMaker/sbqueue.d.ts +0 -12
  341. package/dist/QueueMaker/sbqueue.d.ts.map +0 -1
  342. package/dist/QueueMaker/sbqueue.js +0 -91
  343. package/dist/QueueMaker/service.d.ts +0 -11
  344. package/dist/QueueMaker/service.d.ts.map +0 -1
  345. package/dist/QueueMaker/service.js +0 -4
  346. package/dist/RequestContext.d.ts +0 -63
  347. package/dist/RequestContext.d.ts.map +0 -1
  348. package/dist/RequestContext.js +0 -49
  349. package/dist/RequestFiberSet.d.ts +0 -36
  350. package/dist/RequestFiberSet.d.ts.map +0 -1
  351. package/dist/RequestFiberSet.js +0 -78
  352. package/dist/Store/ContextMapContainer.d.ts +0 -14
  353. package/dist/Store/ContextMapContainer.d.ts.map +0 -1
  354. package/dist/Store/ContextMapContainer.js +0 -16
  355. package/dist/Store/service.d.ts +0 -108
  356. package/dist/Store/service.d.ts.map +0 -1
  357. package/dist/Store/service.js +0 -71
  358. package/dist/Store.d.ts +0 -2
  359. package/dist/Store.d.ts.map +0 -1
  360. package/dist/Store.js +0 -2
  361. package/dist/adapters/SQL/Model.d.ts.map +0 -1
  362. package/dist/adapters/SQL/Model.js +0 -478
  363. package/dist/adapters/SQL.d.ts.map +0 -1
  364. package/dist/adapters/ServiceBus.d.ts +0 -58
  365. package/dist/adapters/ServiceBus.d.ts.map +0 -1
  366. package/dist/adapters/ServiceBus.js +0 -99
  367. package/dist/adapters/cosmos-client.d.ts.map +0 -1
  368. package/dist/adapters/cosmos-client.js +0 -9
  369. package/dist/adapters/index.d.ts +0 -2
  370. package/dist/adapters/index.d.ts.map +0 -1
  371. package/dist/adapters/index.js +0 -2
  372. package/dist/adapters/logger.d.ts +0 -9
  373. package/dist/adapters/logger.d.ts.map +0 -1
  374. package/dist/adapters/logger.js +0 -3
  375. package/dist/adapters/memQueue.d.ts +0 -13
  376. package/dist/adapters/memQueue.d.ts.map +0 -1
  377. package/dist/adapters/memQueue.js +0 -20
  378. package/dist/adapters/mongo-client.d.ts.map +0 -1
  379. package/dist/adapters/mongo-client.js +0 -13
  380. package/dist/adapters/redis-client.d.ts.map +0 -1
  381. package/dist/adapters/redis-client.js +0 -94
  382. package/dist/api/ContextProvider.d.ts +0 -31
  383. package/dist/api/ContextProvider.d.ts.map +0 -1
  384. package/dist/api/ContextProvider.js +0 -38
  385. package/dist/api/codec.d.ts.map +0 -1
  386. package/dist/api/codec.js +0 -5
  387. package/dist/api/internal/RequestContextMiddleware.d.ts +0 -5
  388. package/dist/api/internal/RequestContextMiddleware.d.ts.map +0 -1
  389. package/dist/api/internal/RequestContextMiddleware.js +0 -35
  390. package/dist/api/internal/auth.d.ts +0 -15
  391. package/dist/api/internal/auth.d.ts.map +0 -1
  392. package/dist/api/internal/auth.js +0 -47
  393. package/dist/api/internal/events.d.ts +0 -9
  394. package/dist/api/internal/events.d.ts.map +0 -1
  395. package/dist/api/internal/events.js +0 -42
  396. package/dist/api/internal/health.d.ts.map +0 -1
  397. package/dist/api/internal/health.js +0 -5
  398. package/dist/api/layerUtils.d.ts.map +0 -1
  399. package/dist/api/layerUtils.js +0 -16
  400. package/dist/api/middlewares.d.ts.map +0 -1
  401. package/dist/api/reportError.d.ts.map +0 -1
  402. package/dist/api/reportError.js +0 -27
  403. package/dist/api/routing/middleware/RouterMiddleware.d.ts.map +0 -1
  404. package/dist/api/routing/middleware/middleware.d.ts +0 -9
  405. package/dist/api/routing/middleware/middleware.d.ts.map +0 -1
  406. package/dist/api/routing/middleware/middleware.js +0 -92
  407. package/dist/api/routing/middleware.d.ts.map +0 -1
  408. package/dist/api/routing/schema/jwt.d.ts.map +0 -1
  409. package/dist/api/routing/schema/jwt.js +0 -12
  410. package/dist/api/routing/tsort.d.ts.map +0 -1
  411. package/dist/api/routing/tsort.js +0 -51
  412. package/dist/api/routing/utils.d.ts.map +0 -1
  413. package/dist/api/routing/utils.js +0 -44
  414. package/dist/api/routing.d.ts +0 -138
  415. package/dist/api/routing.d.ts.map +0 -1
  416. package/dist/api/routing.js +0 -166
  417. package/dist/api/setupRequest.d.ts +0 -12
  418. package/dist/api/setupRequest.d.ts.map +0 -1
  419. package/dist/api/setupRequest.js +0 -44
  420. package/dist/api/util.d.ts.map +0 -1
  421. package/dist/api/util.js +0 -14
  422. package/eslint.config.mjs +0 -24
  423. package/src/Emailer/service.ts +0 -52
  424. package/src/Emailer.ts +0 -1
  425. package/src/Model/Repository/ext.ts +0 -283
  426. package/src/Model/Repository/internal/internal.ts +0 -577
  427. package/src/Model/Repository/legacy.ts +0 -27
  428. package/src/Model/Repository/makeRepo.ts +0 -139
  429. package/src/Model/Repository/service.ts +0 -627
  430. package/src/Model/Repository/validation.ts +0 -31
  431. package/src/Model/Repository.ts +0 -5
  432. package/src/Model/dsl.ts +0 -128
  433. package/src/Model/filter/filterApi.ts +0 -60
  434. package/src/Model/filter/types/errors.ts +0 -47
  435. package/src/Model/filter/types/fields.ts +0 -50
  436. package/src/Model/filter/types/path/common.ts +0 -404
  437. package/src/Model/filter/types/path/eager.ts +0 -298
  438. package/src/Model/filter/types/path/index.ts +0 -4
  439. package/src/Model/filter/types/utils.ts +0 -128
  440. package/src/Model/filter/types/validator.ts +0 -46
  441. package/src/Model/filter/types.ts +0 -6
  442. package/src/Model/query/dsl.ts +0 -2110
  443. package/src/Model/query/new-kid-interpreter.ts +0 -210
  444. package/src/Model/query.ts +0 -13
  445. package/src/Model.ts +0 -3
  446. package/src/Operations.ts +0 -235
  447. package/src/OperationsRepo.ts +0 -16
  448. package/src/QueueMaker/SQLQueue.ts +0 -189
  449. package/src/QueueMaker/memQueue.ts +0 -130
  450. package/src/QueueMaker/sbqueue.ts +0 -137
  451. package/src/QueueMaker/service.ts +0 -17
  452. package/src/RequestContext.ts +0 -63
  453. package/src/RequestFiberSet.ts +0 -105
  454. package/src/Store/ContextMapContainer.ts +0 -20
  455. package/src/Store/index.test.ts.bak +0 -112
  456. package/src/Store/service.ts +0 -184
  457. package/src/Store.ts +0 -1
  458. package/src/adapters/SQL.ts +0 -1
  459. package/src/adapters/ServiceBus.ts +0 -209
  460. package/src/adapters/index.ts +0 -0
  461. package/src/adapters/logger.ts +0 -3
  462. package/src/adapters/memQueue.ts +0 -21
  463. package/src/api/internal/auth.ts +0 -68
  464. package/src/api/middlewares.ts +0 -10
  465. package/src/api/routing/middleware/middleware.ts +0 -128
  466. package/src/api/routing/middleware.ts +0 -6
  467. package/src/api/routing.ts +0 -598
  468. package/src/api/setupRequest.ts +0 -84
  469. package/tsconfig.json.bak +0 -12
  470. /package/dist/{adapters/SQL.d.ts → SQL.d.ts} +0 -0
  471. /package/dist/{api/codec.d.ts → codec.d.ts} +0 -0
  472. /package/dist/{api/internal → internal}/health.d.ts +0 -0
  473. /package/dist/{api/middlewares.d.ts → middlewares.d.ts} +0 -0
  474. /package/dist/{api/routing → routing}/schema/jwt.d.ts +0 -0
  475. /package/dist/{api/routing → routing}/tsort.d.ts +0 -0
  476. /package/dist/{api/util.d.ts → util.d.ts} +0 -0
  477. /package/src/{api/codec.ts → codec.ts} +0 -0
  478. /package/src/{api/internal → internal}/health.ts +0 -0
  479. /package/src/{api/routing → routing}/tsort.ts +0 -0
  480. /package/src/{api/util.ts → util.ts} +0 -0
@@ -0,0 +1,21 @@
1
+ import * as Effect from "effect-app/Effect";
2
+ import type { FieldValues } from "effect-app/Model/filter/types";
3
+ import { type PersistenceModelType, type StorageConfig, StoreMaker } from "effect-app/Store";
4
+ import * as Context from "effect/Context";
5
+ import * as Layer from "effect/Layer";
6
+ import { SqlClient } from "effect/unstable/sql";
7
+ export type WithNsTransactionFn = <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
8
+ declare const WithNsTransaction_base: Context.ServiceClass<WithNsTransaction, "effect-app/WithNsTransaction", WithNsTransactionFn>;
9
+ export declare class WithNsTransaction extends WithNsTransaction_base {
10
+ }
11
+ /** @internal */
12
+ export declare const parseRow: <Encoded extends FieldValues>(row: {
13
+ id: string;
14
+ _etag: string | null;
15
+ data: string;
16
+ }, idKey: PropertyKey, defaultValues: Partial<Encoded>, decode?: (doc: PersistenceModelType<Encoded>) => PersistenceModelType<Encoded>) => PersistenceModelType<Encoded>;
17
+ export declare function SQLiteStoreLayer(cfg: StorageConfig, options?: {
18
+ makeSqlClientLayer?: (namespace: string) => Layer.Layer<SqlClient.SqlClient>;
19
+ }): Layer.Layer<StoreMaker, never, SqlClient.SqlClient>;
20
+ export {};
21
+ //# sourceMappingURL=SQL.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SQL.d.ts","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAGhE,OAAO,EAAmB,KAAK,oBAAoB,EAAE,KAAK,aAAa,EAAyC,UAAU,EAAE,MAAM,kBAAkB,CAAA;AACpJ,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AA0B/C,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;;AAErG,qBAAa,iBACX,SAAQ,sBAAyF;CACjG;AAEF,gBAAgB;AAChB,eAAO,MAAM,QAAQ,GAAI,OAAO,SAAS,WAAW,OAC7C;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,SAChD,WAAW,iBACH,OAAO,CAAC,OAAO,CAAC,WACvB,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,KAAK,oBAAoB,CAAC,OAAO,CAAC,KAC5E,oBAAoB,CAAC,OAAO,CAM9B,CAAA;AA2rBD,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,aAAa,EAClB,OAAO,CAAC,EAAE;IAAE,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,uDA2B3F"}
@@ -0,0 +1,478 @@
1
+ /* eslint-disable @typescript-eslint/no-explicit-any */
2
+ import { toNonEmptyArray } from "effect-app/Array";
3
+ import * as Effect from "effect-app/Effect";
4
+ import * as Option from "effect-app/Option";
5
+ import { storeId, StoreMaker } from "effect-app/Store";
6
+ import * as Context from "effect/Context";
7
+ import * as Layer from "effect/Layer";
8
+ import * as LayerMap from "effect/LayerMap";
9
+ import * as Struct from "effect/Struct";
10
+ import { SqlClient } from "effect/unstable/sql";
11
+ import { DatabaseError, OptimisticConcurrencyException } from "../errors.js";
12
+ import { InfraLogger } from "../logger.js";
13
+ import { annotateDb } from "../otel.js";
14
+ import { makeJsonDocumentCodec } from "./jsonDocument.js";
15
+ import { buildWhereSQLQuery, logQuery, sqliteDialect } from "./SQL/query.js";
16
+ import { makeETag, makeJsonLower, toJsonQueryValue } from "./utils.js";
17
+ const sqlErrorMessage = (e) => e?.message ? String(e.message) : String(e);
18
+ const sqlIsTransient = (e) => /timeout|ETIMEDOUT|ECONNRESET|ECONNREFUSED|connection|deadlock|too many connections/i.test(sqlErrorMessage(e));
19
+ // Map a SqlError into a typed, serializable DatabaseError (instead of `.orDie`,
20
+ // which would turn it into an opaque, non-serializable defect).
21
+ const toDatabaseError = (e) => new DatabaseError({ message: `SQL request failed: ${sqlErrorMessage(e)}`, transient: sqlIsTransient(e), cause: e });
22
+ // withTransaction may re-raise setInternal's typed errors or add SqlError on begin/commit.
23
+ // Preserve DatabaseError / OCC by `_tag` (not instanceof — dual package instances break it);
24
+ // map residual SQL failures to DatabaseError.
25
+ const preserveStoreError = (e) => {
26
+ if (e !== null && typeof e === "object" && "_tag" in e) {
27
+ if (e._tag === "DatabaseError")
28
+ return e;
29
+ if (e._tag === "OptimisticConcurrencyException")
30
+ return e;
31
+ }
32
+ return toDatabaseError(e);
33
+ };
34
+ export class WithNsTransaction extends Context.Service()("effect-app/WithNsTransaction") {
35
+ }
36
+ /** @internal */
37
+ export const parseRow = (row, idKey, defaultValues, decode = (doc) => doc) => {
38
+ const data = (typeof row.data === "string" ? JSON.parse(row.data) : row.data);
39
+ const jsonDefaults = toJsonQueryValue(defaultValues);
40
+ return decode({ ...jsonDefaults, ...data, [idKey]: row.id, _etag: row._etag ?? undefined });
41
+ };
42
+ const parseSelectRow = (row, idKey) => {
43
+ const result = {};
44
+ for (const [key, value] of Object.entries(row)) {
45
+ if (key === "id") {
46
+ result[idKey] = value;
47
+ result["id"] = value;
48
+ }
49
+ else if (typeof value === "string") {
50
+ try {
51
+ result[key] = JSON.parse(value);
52
+ }
53
+ catch {
54
+ result[key] = value;
55
+ }
56
+ }
57
+ else {
58
+ result[key] = value;
59
+ }
60
+ }
61
+ return result;
62
+ };
63
+ function makeSQLStoreInt(system, dialect, jsonColumnType) {
64
+ return Effect.fnUntraced(function* ({ prefix }) {
65
+ const sql = yield* SqlClient.SqlClient;
66
+ return {
67
+ make: Effect.fnUntraced(function* (name, idKey, seed, config) {
68
+ const tableName = `${prefix}${name}`;
69
+ const json = makeJsonLower(config);
70
+ const defaultValues = json.toJson(config?.defaultValues ?? {});
71
+ const codec = makeJsonDocumentCodec(config?.schema);
72
+ const resolveNamespace = !config?.allowNamespace
73
+ ? Effect.succeed("primary")
74
+ : storeId.pipe(Effect.map((namespace) => {
75
+ if (namespace !== "primary" && !config.allowNamespace(namespace)) {
76
+ throw new Error(`Namespace ${namespace} not allowed!`);
77
+ }
78
+ return namespace;
79
+ }));
80
+ const ensureTable = sql
81
+ .unsafe(`CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL, _namespace TEXT NOT NULL DEFAULT 'primary', _etag TEXT, data ${jsonColumnType} NOT NULL, PRIMARY KEY (id, _namespace))`)
82
+ .pipe(Effect.andThen(sql.unsafe(`CREATE TABLE IF NOT EXISTS "_migrations" (id TEXT NOT NULL, version TEXT NOT NULL, PRIMARY KEY (id, version))`)), Effect.orDie, Effect.asVoid);
83
+ const toRow = (e) => {
84
+ const newE = makeETag(codec.encode(e));
85
+ const id = newE[idKey];
86
+ const { _etag, [idKey]: _id, ...rest } = newE;
87
+ const data = JSON.stringify(rest);
88
+ return { id, _etag: newE._etag, data, item: codec.decode(newE) };
89
+ };
90
+ const exec = (query, params) => sql.unsafe(query, params).pipe(Effect.mapError(toDatabaseError));
91
+ const setInternal = Effect.fnUntraced(function* (e, ns) {
92
+ const row = toRow(e);
93
+ if (e._etag) {
94
+ yield* exec(`UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ? AND _namespace = ?`, [row._etag, row.data, row.id, e._etag, ns]);
95
+ const existing = yield* exec(`SELECT _etag FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [row.id, ns]);
96
+ const current = existing[0];
97
+ if (!current || current._etag !== row._etag) {
98
+ if (current) {
99
+ return yield* new OptimisticConcurrencyException({
100
+ type: name,
101
+ id: row.id,
102
+ current: current._etag,
103
+ found: e._etag,
104
+ code: 412
105
+ });
106
+ }
107
+ return yield* new OptimisticConcurrencyException({
108
+ type: name,
109
+ id: row.id,
110
+ current: "",
111
+ found: e._etag,
112
+ code: 404
113
+ });
114
+ }
115
+ }
116
+ else {
117
+ yield* exec(`INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`, [row.id, ns, row._etag, row.data]);
118
+ }
119
+ return row.item;
120
+ });
121
+ const bulkSetInternal = (items, ns) => sql
122
+ .withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
123
+ .pipe(Effect.mapError(preserveStoreError), Effect.map((_) => _));
124
+ const ctx = yield* Effect.context();
125
+ const seedCache = new Map();
126
+ const makeSeedEffect = Effect.fnUntraced(function* (ns) {
127
+ yield* ensureTable;
128
+ if (!seed)
129
+ return;
130
+ const existing = yield* exec(`SELECT id FROM "_migrations" WHERE id = ? AND version = ?`, [`${tableName}::${ns}`, tableName]);
131
+ if (existing.length > 0)
132
+ return;
133
+ yield* InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`);
134
+ const items = yield* seed.pipe(Effect.provide(ctx), Effect.orDie);
135
+ const ne = toNonEmptyArray([...items]);
136
+ // Seed inserts are not concurrent; OCC here is a programming defect.
137
+ if (Option.isSome(ne)) {
138
+ yield* bulkSetInternal(ne.value, ns).pipe(Effect.catchTag("OptimisticConcurrencyException", Effect.die));
139
+ }
140
+ yield* exec(`INSERT INTO "_migrations" (id, version) VALUES (?, ?)`, [`${tableName}::${ns}`, tableName]);
141
+ });
142
+ const seedNamespace = (ns) => {
143
+ let cached = seedCache.get(ns);
144
+ if (!cached) {
145
+ cached = Effect.cached(Effect.uninterruptible(makeSeedEffect(ns))).pipe(Effect.runSync);
146
+ seedCache.set(ns, cached);
147
+ }
148
+ return cached;
149
+ };
150
+ const s = {
151
+ seedNamespace: (ns) => seedNamespace(ns),
152
+ all: resolveNamespace.pipe(Effect.flatMap((ns) => {
153
+ const sqlText = `SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = ?`;
154
+ return exec(sqlText, [ns])
155
+ .pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues, codec.decode))), annotateDb({
156
+ operation: "all",
157
+ system,
158
+ collection: tableName,
159
+ namespace: ns,
160
+ entity: name,
161
+ query: sqlText
162
+ }));
163
+ })),
164
+ find: (id) => resolveNamespace.pipe(Effect.flatMap((ns) => {
165
+ const sqlText = `SELECT id, _etag, data FROM "${tableName}" WHERE id = ? AND _namespace = ?`;
166
+ return exec(sqlText, [id, ns])
167
+ .pipe(Effect.map((rows) => {
168
+ const row = rows[0];
169
+ return row
170
+ ? Option.some(parseRow(row, idKey, defaultValues, codec.decode))
171
+ : Option.none();
172
+ }), annotateDb({
173
+ operation: "find",
174
+ system,
175
+ collection: tableName,
176
+ namespace: ns,
177
+ entity: name,
178
+ query: sqlText,
179
+ extra: { "app.entity.id": id }
180
+ }));
181
+ })),
182
+ filter: (f) => {
183
+ const filter = f
184
+ .filter;
185
+ return resolveNamespace
186
+ .pipe(Effect
187
+ .flatMap((ns) => Effect
188
+ .sync(() => {
189
+ return buildWhereSQLQuery(dialect, idKey, filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [], tableName, defaultValues, f
190
+ .select, f
191
+ .order, f
192
+ .skip, f
193
+ .limit, ns, json);
194
+ })
195
+ .pipe(Effect
196
+ .tap((q) => logQuery(q)), Effect.tap((q) => Effect.annotateCurrentSpan({ "db.query.text": q.sql })), Effect.flatMap((q) => exec(q.sql, q.params).pipe(Effect.map((rows) => {
197
+ if (f.select) {
198
+ return rows.map((r) => {
199
+ const selected = parseSelectRow(r, idKey);
200
+ return {
201
+ ...Struct.pick(defaultValues, f.select.filter((_) => typeof _ === "string")),
202
+ ...selected
203
+ };
204
+ });
205
+ }
206
+ return rows.map((r) => parseRow(r, idKey, defaultValues, codec.decode));
207
+ }))), annotateDb({
208
+ operation: "filter",
209
+ system,
210
+ collection: tableName,
211
+ namespace: ns,
212
+ entity: name
213
+ }))));
214
+ },
215
+ set: (e) => resolveNamespace.pipe(Effect.flatMap((ns) => setInternal(e, ns).pipe(annotateDb({
216
+ operation: "set",
217
+ system,
218
+ collection: tableName,
219
+ namespace: ns,
220
+ entity: name,
221
+ extra: { "app.entity.id": e[idKey] }
222
+ })))),
223
+ batchSet: (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(annotateDb({
224
+ operation: "batchSet",
225
+ system,
226
+ collection: tableName,
227
+ namespace: ns,
228
+ entity: name
229
+ })))),
230
+ bulkSet: (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(annotateDb({
231
+ operation: "bulkSet",
232
+ system,
233
+ collection: tableName,
234
+ namespace: ns,
235
+ entity: name
236
+ })))),
237
+ batchRemove: (ids) => {
238
+ const placeholders = ids.map(() => "?").join(", ");
239
+ return resolveNamespace.pipe(Effect.flatMap((ns) => {
240
+ const sqlText = `DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ?`;
241
+ return exec(sqlText, [...ids, ns])
242
+ .pipe(Effect.asVoid, annotateDb({
243
+ operation: "batchRemove",
244
+ system,
245
+ collection: tableName,
246
+ namespace: ns,
247
+ entity: name,
248
+ query: sqlText
249
+ }));
250
+ }));
251
+ },
252
+ queryRaw: (query) => s.all.pipe(Effect.map(query.memory), annotateDb({
253
+ operation: "queryRaw",
254
+ system,
255
+ collection: tableName,
256
+ entity: name
257
+ }))
258
+ };
259
+ // Eagerly seed primary namespace on initialization. A seed failure at
260
+ // construction is fatal (orDie); the per-call `seedNamespace` still
261
+ // surfaces DatabaseError to callers.
262
+ yield* seedNamespace("primary").pipe(Effect.orDie);
263
+ return s;
264
+ })
265
+ };
266
+ });
267
+ }
268
+ function makeSQLiteStorePerNs(withNsSql, { prefix }) {
269
+ return {
270
+ make: Effect.fnUntraced(function* (name, idKey, seed, config) {
271
+ const tableName = `${prefix}${name}`;
272
+ const json = makeJsonLower(config);
273
+ const defaultValues = json.toJson(config?.defaultValues ?? {});
274
+ const codec = makeJsonDocumentCodec(config?.schema);
275
+ const resolveNamespace = !config?.allowNamespace
276
+ ? Effect.succeed("primary")
277
+ : storeId.pipe(Effect.map((namespace) => {
278
+ if (namespace !== "primary" && !config.allowNamespace(namespace)) {
279
+ throw new Error(`Namespace ${namespace} not allowed!`);
280
+ }
281
+ return namespace;
282
+ }));
283
+ const toRow = (e) => {
284
+ const newE = makeETag(codec.encode(e));
285
+ const id = newE[idKey];
286
+ const { _etag, [idKey]: _id, ...rest } = newE;
287
+ const data = JSON.stringify(rest);
288
+ return { id, _etag: newE._etag, data, item: codec.decode(newE) };
289
+ };
290
+ const exec = (ns, query, params) => withNsSql(ns, (sql) => sql.unsafe(query, params).pipe(Effect.mapError(toDatabaseError)));
291
+ const ensureTable = (ns) => withNsSql(ns, (sql) => sql
292
+ .unsafe(`CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`)
293
+ .pipe(Effect.andThen(sql.unsafe(`CREATE TABLE IF NOT EXISTS "_migrations" (id TEXT NOT NULL, version TEXT NOT NULL, PRIMARY KEY (id, version))`)), Effect.orDie, Effect.asVoid));
294
+ const setInternal = Effect.fnUntraced(function* (e, ns) {
295
+ const row = toRow(e);
296
+ if (e._etag) {
297
+ yield* exec(ns, `UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ?`, [row._etag, row.data, row.id, e._etag]);
298
+ const existing = yield* exec(ns, `SELECT _etag FROM "${tableName}" WHERE id = ?`, [row.id]);
299
+ const current = existing[0];
300
+ if (!current || current._etag !== row._etag) {
301
+ if (current) {
302
+ return yield* new OptimisticConcurrencyException({
303
+ type: name,
304
+ id: row.id,
305
+ current: current._etag,
306
+ found: e._etag,
307
+ code: 412
308
+ });
309
+ }
310
+ return yield* new OptimisticConcurrencyException({
311
+ type: name,
312
+ id: row.id,
313
+ current: "",
314
+ found: e._etag,
315
+ code: 404
316
+ });
317
+ }
318
+ }
319
+ else {
320
+ yield* exec(ns, `INSERT INTO "${tableName}" (id, _etag, data) VALUES (?, ?, ?)`, [row.id, row._etag, row.data]);
321
+ }
322
+ return row.item;
323
+ });
324
+ const bulkSetInternal = (items, ns) => withNsSql(ns, (sql) => sql
325
+ .withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
326
+ .pipe(Effect.mapError(preserveStoreError), Effect.map((_) => _)));
327
+ const ctx = yield* Effect.context();
328
+ const seedCache = new Map();
329
+ const makeSeedEffect = Effect.fnUntraced(function* (ns) {
330
+ yield* ensureTable(ns);
331
+ if (!seed)
332
+ return;
333
+ const existing = yield* exec(ns, `SELECT id FROM "_migrations" WHERE id = ? AND version = ?`, [tableName, tableName]);
334
+ if (existing.length > 0)
335
+ return;
336
+ yield* InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`);
337
+ const items = yield* seed.pipe(Effect.provide(ctx), Effect.orDie);
338
+ const ne = toNonEmptyArray([...items]);
339
+ // Seed inserts are not concurrent; OCC here is a programming defect.
340
+ if (Option.isSome(ne)) {
341
+ yield* bulkSetInternal(ne.value, ns).pipe(Effect.catchTag("OptimisticConcurrencyException", Effect.die));
342
+ }
343
+ yield* exec(ns, `INSERT INTO "_migrations" (id, version) VALUES (?, ?)`, [tableName, tableName]);
344
+ });
345
+ const seedNamespace = (ns) => {
346
+ let cached = seedCache.get(ns);
347
+ if (!cached) {
348
+ cached = Effect.cached(Effect.uninterruptible(makeSeedEffect(ns))).pipe(Effect.runSync);
349
+ seedCache.set(ns, cached);
350
+ }
351
+ return cached;
352
+ };
353
+ const s = {
354
+ seedNamespace: (ns) => seedNamespace(ns),
355
+ all: resolveNamespace.pipe(Effect.flatMap((ns) => {
356
+ const sqlText = `SELECT id, _etag, data FROM "${tableName}"`;
357
+ return exec(ns, sqlText)
358
+ .pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues, codec.decode))), annotateDb({
359
+ operation: "all",
360
+ system: "sqlite",
361
+ collection: tableName,
362
+ namespace: ns,
363
+ entity: name,
364
+ query: sqlText
365
+ }));
366
+ })),
367
+ find: (id) => resolveNamespace.pipe(Effect.flatMap((ns) => {
368
+ const sqlText = `SELECT id, _etag, data FROM "${tableName}" WHERE id = ?`;
369
+ return exec(ns, sqlText, [id])
370
+ .pipe(Effect.map((rows) => {
371
+ const row = rows[0];
372
+ return row
373
+ ? Option.some(parseRow(row, idKey, defaultValues, codec.decode))
374
+ : Option.none();
375
+ }), annotateDb({
376
+ operation: "find",
377
+ system: "sqlite",
378
+ collection: tableName,
379
+ namespace: ns,
380
+ entity: name,
381
+ query: sqlText,
382
+ extra: { "app.entity.id": id }
383
+ }));
384
+ })),
385
+ filter: (f) => {
386
+ const filter = f
387
+ .filter;
388
+ return resolveNamespace
389
+ .pipe(Effect
390
+ .flatMap((ns) => Effect
391
+ .sync(() => buildWhereSQLQuery(sqliteDialect, idKey, filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [], tableName, defaultValues, f
392
+ .select, f
393
+ .order, f
394
+ .skip, f
395
+ .limit, undefined, json))
396
+ .pipe(Effect
397
+ .tap((q) => logQuery(q)), Effect.tap((q) => Effect.annotateCurrentSpan({ "db.query.text": q.sql })), Effect.flatMap((q) => exec(ns, q.sql, q.params).pipe(Effect.map((rows) => {
398
+ if (f.select) {
399
+ return rows.map((r) => {
400
+ const selected = parseSelectRow(r, idKey);
401
+ return {
402
+ ...Struct.pick(defaultValues, f.select.filter((_) => typeof _ === "string")),
403
+ ...selected
404
+ };
405
+ });
406
+ }
407
+ return rows.map((r) => parseRow(r, idKey, defaultValues, codec.decode));
408
+ }))), annotateDb({
409
+ operation: "filter",
410
+ system: "sqlite",
411
+ collection: tableName,
412
+ namespace: ns,
413
+ entity: name
414
+ }))));
415
+ },
416
+ set: (e) => resolveNamespace.pipe(Effect.flatMap((ns) => setInternal(e, ns).pipe(annotateDb({
417
+ operation: "set",
418
+ system: "sqlite",
419
+ collection: tableName,
420
+ namespace: ns,
421
+ entity: name,
422
+ extra: { "app.entity.id": e[idKey] }
423
+ })))),
424
+ batchSet: (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(annotateDb({
425
+ operation: "batchSet",
426
+ system: "sqlite",
427
+ collection: tableName,
428
+ namespace: ns,
429
+ entity: name
430
+ })))),
431
+ bulkSet: (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(annotateDb({
432
+ operation: "bulkSet",
433
+ system: "sqlite",
434
+ collection: tableName,
435
+ namespace: ns,
436
+ entity: name
437
+ })))),
438
+ batchRemove: (ids) => {
439
+ const placeholders = ids.map(() => "?").join(", ");
440
+ return resolveNamespace.pipe(Effect.flatMap((ns) => {
441
+ const sqlText = `DELETE FROM "${tableName}" WHERE id IN (${placeholders})`;
442
+ return exec(ns, sqlText, [...ids])
443
+ .pipe(Effect.asVoid, annotateDb({
444
+ operation: "batchRemove",
445
+ system: "sqlite",
446
+ collection: tableName,
447
+ namespace: ns,
448
+ entity: name,
449
+ query: sqlText
450
+ }));
451
+ }));
452
+ },
453
+ queryRaw: (query) => s.all.pipe(Effect.map(query.memory), annotateDb({
454
+ operation: "queryRaw",
455
+ system: "sqlite",
456
+ collection: tableName,
457
+ entity: name
458
+ }))
459
+ };
460
+ yield* seedNamespace("primary").pipe(Effect.orDie);
461
+ return s;
462
+ })
463
+ };
464
+ }
465
+ export function SQLiteStoreLayer(cfg, options) {
466
+ if (options?.makeSqlClientLayer) {
467
+ return Layer.effectContext(Effect.gen(function* () {
468
+ const layerMap = yield* LayerMap.make((namespace) => options.makeSqlClientLayer(namespace), { idleTimeToLive: "10 minutes" });
469
+ const withNsSql = (ns, f) => SqlClient.SqlClient.use(f).pipe(Effect.provide(layerMap.get(ns)));
470
+ const storeMaker = makeSQLiteStorePerNs(withNsSql, cfg);
471
+ const withTransaction = (effect) => storeId.pipe(Effect.flatMap((ns) => withNsSql(ns, (sql) => sql.withTransaction(effect).pipe(Effect.orDie))));
472
+ return StoreMaker.context(storeMaker).pipe(Context.add(WithNsTransaction, withTransaction));
473
+ }));
474
+ }
475
+ return StoreMaker
476
+ .toLayer(makeSQLStoreInt("sqlite", sqliteDialect, "JSON")(cfg));
477
+ }
478
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
- import { Option } from "effect-app";
2
- import type { FilterR, FilterResult } from "../Model/filter/filterApi.js";
3
- import type { FieldValues } from "../Model/filter/types.js";
4
- import type { Filter } from "./service.js";
1
+ import type { FilterR, FilterResult } from "effect-app/Model/filter/filterApi";
2
+ import type { FieldValues } from "effect-app/Model/filter/types";
3
+ import * as Option from "effect-app/Option";
4
+ import type { Filter } from "effect-app/Store";
5
5
  export declare const codeFilterStatement: <E>(p: FilterR, x: E) => boolean;
6
6
  export declare const isRelationCheck: (f: readonly FilterResult[], isRelation: string | null) => string | false;
7
7
  export declare const codeFilter3: <E>(state: readonly FilterResult[]) => (sut: E) => boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAuD1C,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,YAA0B,CAAA;AAKjF,eAAO,MAAM,eAAe,GAAI,GAAG,SAAS,YAAY,EAAE,EAAE,YAAY,MAAM,GAAG,IAAI,mBAsBpF,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,MAAM,KAAK,CAAC,YAA6B,CAAA;AA8FtG,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,EAAE,KAAK,CAAC,KAAG,OAKxE,CAAA;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,IACpE,GAAG,CAAC,uCACb"}
1
+ {"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAwG9C,eAAO,MAAM,mBAAmB,GAAI,CAAC,KAAK,OAAO,KAAK,CAAC,YAA0B,CAAA;AAKjF,eAAO,MAAM,eAAe,MAAO,SAAS,YAAY,EAAE,cAAc,MAAM,GAAG,IAAI,mBAsBpF,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,SAAS,YAAY,EAAE,WAAW,CAAC,YAA6B,CAAA;AA8FtG,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,SAAS,YAAY,EAAE,OAAO,CAAC,KAAG,OAMxE,CAAA;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,OACjE,CAAC,uCACb"}