@contember/engine-content-api 1.3.0-alpha.1 → 1.3.0-alpha.13

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 (328) hide show
  1. package/dist/src/ExecutionContainer.d.ts +144 -0
  2. package/dist/src/ExecutionContainer.d.ts.map +1 -0
  3. package/dist/src/ExecutionContainer.js +85 -0
  4. package/dist/src/ExecutionContainer.js.map +1 -0
  5. package/dist/src/acl/PermissionFactory.d.ts +5 -4
  6. package/dist/src/acl/PermissionFactory.d.ts.map +1 -1
  7. package/dist/src/acl/PermissionFactory.js +10 -13
  8. package/dist/src/acl/PermissionFactory.js.map +1 -1
  9. package/dist/src/acl/index.d.ts +0 -1
  10. package/dist/src/acl/index.d.ts.map +1 -1
  11. package/dist/src/acl/index.js +0 -1
  12. package/dist/src/acl/index.js.map +1 -1
  13. package/dist/src/index.d.ts +2 -1
  14. package/dist/src/index.d.ts.map +1 -1
  15. package/dist/src/index.js +18 -2
  16. package/dist/src/index.js.map +1 -1
  17. package/dist/src/mapper/ColumnValue.d.ts +2 -2
  18. package/dist/src/mapper/ColumnValue.d.ts.map +1 -1
  19. package/dist/src/mapper/ErrorUtils.d.ts +3 -2
  20. package/dist/src/mapper/ErrorUtils.d.ts.map +1 -1
  21. package/dist/src/mapper/ErrorUtils.js +55 -35
  22. package/dist/src/mapper/ErrorUtils.js.map +1 -1
  23. package/dist/src/mapper/EventManager.d.ts +86 -0
  24. package/dist/src/mapper/EventManager.d.ts.map +1 -0
  25. package/dist/src/mapper/EventManager.js +118 -0
  26. package/dist/src/mapper/EventManager.js.map +1 -0
  27. package/dist/src/mapper/JunctionTableManager.d.ts +12 -11
  28. package/dist/src/mapper/JunctionTableManager.d.ts.map +1 -1
  29. package/dist/src/mapper/JunctionTableManager.js +20 -8
  30. package/dist/src/mapper/JunctionTableManager.js.map +1 -1
  31. package/dist/src/mapper/Mapper.d.ts +13 -6
  32. package/dist/src/mapper/Mapper.d.ts.map +1 -1
  33. package/dist/src/mapper/Mapper.js +41 -21
  34. package/dist/src/mapper/Mapper.js.map +1 -1
  35. package/dist/src/mapper/MapperFactory.d.ts +34 -0
  36. package/dist/src/mapper/MapperFactory.d.ts.map +1 -0
  37. package/dist/src/mapper/MapperFactory.js +41 -0
  38. package/dist/src/mapper/MapperFactory.js.map +1 -0
  39. package/dist/src/mapper/Result.d.ts +5 -3
  40. package/dist/src/mapper/Result.d.ts.map +1 -1
  41. package/dist/src/mapper/Result.js +4 -3
  42. package/dist/src/mapper/Result.js.map +1 -1
  43. package/dist/src/mapper/delete/DeleteExecutor.d.ts.map +1 -1
  44. package/dist/src/mapper/delete/DeleteExecutor.js +41 -1
  45. package/dist/src/mapper/delete/DeleteExecutor.js.map +1 -1
  46. package/dist/src/mapper/index.d.ts +3 -1
  47. package/dist/src/mapper/index.d.ts.map +1 -1
  48. package/dist/src/mapper/index.js +3 -1
  49. package/dist/src/mapper/index.js.map +1 -1
  50. package/dist/src/mapper/insert/InsertBuilder.d.ts +2 -2
  51. package/dist/src/mapper/insert/InsertBuilder.d.ts.map +1 -1
  52. package/dist/src/mapper/insert/InsertBuilder.js +8 -2
  53. package/dist/src/mapper/insert/InsertBuilder.js.map +1 -1
  54. package/dist/src/mapper/insert/Inserter.d.ts +3 -2
  55. package/dist/src/mapper/insert/Inserter.d.ts.map +1 -1
  56. package/dist/src/mapper/insert/Inserter.js +7 -6
  57. package/dist/src/mapper/insert/Inserter.js.map +1 -1
  58. package/dist/src/mapper/select/OrderByHelper.d.ts +1 -1
  59. package/dist/src/mapper/select/OrderByHelper.d.ts.map +1 -1
  60. package/dist/src/mapper/select/OrderByHelper.js +3 -1
  61. package/dist/src/mapper/select/OrderByHelper.js.map +1 -1
  62. package/dist/src/mapper/select/RelationFetcher.js +2 -2
  63. package/dist/src/mapper/select/RelationFetcher.js.map +1 -1
  64. package/dist/src/mapper/update/UpdateBuilder.d.ts +4 -4
  65. package/dist/src/mapper/update/UpdateBuilder.d.ts.map +1 -1
  66. package/dist/src/mapper/update/UpdateBuilder.js +26 -8
  67. package/dist/src/mapper/update/UpdateBuilder.js.map +1 -1
  68. package/dist/src/mapper/update/UpdateBuilderFactory.d.ts +1 -1
  69. package/dist/src/mapper/update/UpdateBuilderFactory.d.ts.map +1 -1
  70. package/dist/src/mapper/update/UpdateBuilderFactory.js +2 -2
  71. package/dist/src/mapper/update/UpdateBuilderFactory.js.map +1 -1
  72. package/dist/src/mapper/update/Updater.d.ts +3 -1
  73. package/dist/src/mapper/update/Updater.d.ts.map +1 -1
  74. package/dist/src/mapper/update/Updater.js +9 -12
  75. package/dist/src/mapper/update/Updater.js.map +1 -1
  76. package/dist/src/resolvers/GraphQlQueryAstFactory.d.ts +1 -3
  77. package/dist/src/resolvers/GraphQlQueryAstFactory.d.ts.map +1 -1
  78. package/dist/src/resolvers/GraphQlQueryAstFactory.js +1 -4
  79. package/dist/src/resolvers/GraphQlQueryAstFactory.js.map +1 -1
  80. package/dist/src/resolvers/MutationResolver.d.ts +3 -4
  81. package/dist/src/resolvers/MutationResolver.d.ts.map +1 -1
  82. package/dist/src/resolvers/MutationResolver.js +11 -12
  83. package/dist/src/resolvers/MutationResolver.js.map +1 -1
  84. package/dist/src/resolvers/ReadResolver.d.ts +1 -3
  85. package/dist/src/resolvers/ReadResolver.d.ts.map +1 -1
  86. package/dist/src/resolvers/ReadResolver.js +6 -10
  87. package/dist/src/resolvers/ReadResolver.js.map +1 -1
  88. package/dist/src/resolvers/ValidationResolver.d.ts +1 -3
  89. package/dist/src/resolvers/ValidationResolver.d.ts.map +1 -1
  90. package/dist/src/resolvers/ValidationResolver.js +3 -4
  91. package/dist/src/resolvers/ValidationResolver.js.map +1 -1
  92. package/dist/src/resolvers/index.d.ts +0 -1
  93. package/dist/src/resolvers/index.d.ts.map +1 -1
  94. package/dist/src/resolvers/index.js +0 -1
  95. package/dist/src/resolvers/index.js.map +1 -1
  96. package/dist/src/schema/CustomTypesProvider.d.ts.map +1 -1
  97. package/dist/src/schema/CustomTypesProvider.js +1 -23
  98. package/dist/src/schema/CustomTypesProvider.js.map +1 -1
  99. package/dist/src/schema/MutationProvider.js +4 -4
  100. package/dist/src/schema/MutationProvider.js.map +1 -1
  101. package/dist/src/schema/QueryProvider.js +3 -3
  102. package/dist/src/schema/QueryProvider.js.map +1 -1
  103. package/dist/src/tsconfig.tsbuildinfo +1 -1
  104. package/dist/src/types.d.ts +3 -4
  105. package/dist/src/types.d.ts.map +1 -1
  106. package/dist/src/utils/index.d.ts +0 -1
  107. package/dist/src/utils/index.d.ts.map +1 -1
  108. package/dist/src/utils/index.js +0 -1
  109. package/dist/src/utils/index.js.map +1 -1
  110. package/dist/src/utils/uniqueWhereFields.js +1 -1
  111. package/dist/src/utils/uniqueWhereFields.js.map +1 -1
  112. package/dist/tests/cases/bugs/bug-update-by-nested-unique.test.js +3 -5
  113. package/dist/tests/cases/bugs/bug-update-by-nested-unique.test.js.map +1 -1
  114. package/dist/tests/cases/integration/graphQlDb/insert/insertSequence.test.js +2 -2
  115. package/dist/tests/cases/integration/graphQlDb/insert/insertSequence.test.js.map +1 -1
  116. package/dist/tests/cases/integration/graphQlDb/update/bug-freeze-connect-missing-one.test.js +1 -1
  117. package/dist/tests/cases/integration/graphQlDb/update/bug-freeze-connect-missing-one.test.js.map +1 -1
  118. package/dist/tests/cases/integration/graphQlDb/update/deferedConstraints.test.js +45 -45
  119. package/dist/tests/cases/integration/graphQlDb/update/deferedConstraints.test.js.map +1 -1
  120. package/dist/tests/cases/integration/graphQlDb/update/failedDelete.test.js +5 -5
  121. package/dist/tests/cases/integration/graphQlDb/update/failedDelete.test.js.map +1 -1
  122. package/dist/tests/cases/integration/graphQlDb/update/invalidInput.test.js +2 -2
  123. package/dist/tests/cases/integration/graphQlDb/update/invalidInput.test.js.map +1 -1
  124. package/dist/tests/cases/integration/graphQlDb/update/nullChecksNotNull.test.js +7 -7
  125. package/dist/tests/cases/integration/graphQlDb/update/nullChecksNotNull.test.js.map +1 -1
  126. package/dist/tests/cases/integration/graphQlDb/update/nullChecksNullable.test.js +7 -7
  127. package/dist/tests/cases/integration/graphQlDb/update/nullChecksNullable.test.js.map +1 -1
  128. package/dist/tests/cases/integration/graphQlDb/update/uniqueConstraint.test.js +2 -2
  129. package/dist/tests/cases/integration/graphQlDb/update/uniqueConstraint.test.js.map +1 -1
  130. package/dist/tests/cases/integration/graphQlRequests/insert/oneHasMany/connect.test.js +3 -3
  131. package/dist/tests/cases/integration/graphQlRequests/insert/oneHasMany/connect.test.js.map +1 -1
  132. package/dist/tests/cases/integration/graphQlRequests/query/acl/isNullAcl.test.d.ts +2 -0
  133. package/dist/tests/cases/integration/graphQlRequests/query/acl/isNullAcl.test.d.ts.map +1 -0
  134. package/dist/tests/cases/integration/graphQlRequests/query/acl/isNullAcl.test.js +91 -0
  135. package/dist/tests/cases/integration/graphQlRequests/query/acl/isNullAcl.test.js.map +1 -0
  136. package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.js +1 -1
  137. package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.js.map +1 -1
  138. package/dist/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.d.ts +2 -0
  139. package/dist/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.d.ts.map +1 -0
  140. package/dist/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.js +67 -0
  141. package/dist/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.js.map +1 -0
  142. package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js +6 -18
  143. package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js.map +1 -1
  144. package/dist/tests/cases/integration/graphQlRequests/update/additionalFilter.test.js +3 -4
  145. package/dist/tests/cases/integration/graphQlRequests/update/additionalFilter.test.js.map +1 -1
  146. package/dist/tests/cases/integration/graphQlRequests/update/basic/columnUpdate.test.js +3 -8
  147. package/dist/tests/cases/integration/graphQlRequests/update/basic/columnUpdate.test.js.map +1 -1
  148. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/update.test.js +3 -9
  149. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/update.test.js.map +1 -1
  150. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/upsert.test.js +3 -9
  151. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/upsert.test.js.map +1 -1
  152. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/update.test.js +3 -9
  153. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/update.test.js.map +1 -1
  154. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/upsert.test.js +3 -9
  155. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/upsert.test.js.map +1 -1
  156. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/connect.test.js +3 -10
  157. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/connect.test.js.map +1 -1
  158. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/create.test.js +3 -10
  159. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/create.test.js.map +1 -1
  160. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/disconnect.test.js +3 -9
  161. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/disconnect.test.js.map +1 -1
  162. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/update.test.js +3 -9
  163. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/update.test.js.map +1 -1
  164. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/upsert.test.js +6 -18
  165. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/upsert.test.js.map +1 -1
  166. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/connect.test.js +3 -11
  167. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/connect.test.js.map +1 -1
  168. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/disconnect.test.js +3 -8
  169. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/disconnect.test.js.map +1 -1
  170. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/update.test.js +3 -6
  171. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/update.test.js.map +1 -1
  172. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/upsert.test.js +3 -6
  173. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/upsert.test.js.map +1 -1
  174. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/connect.test.js +15 -50
  175. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/connect.test.js.map +1 -1
  176. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/create.test.js +3 -10
  177. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/create.test.js.map +1 -1
  178. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/disconnect.test.js +3 -10
  179. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/disconnect.test.js.map +1 -1
  180. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/update.test.js +3 -6
  181. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/update.test.js.map +1 -1
  182. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/upsert.test.js +3 -7
  183. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/upsert.test.js.map +1 -1
  184. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/connect.test.js +12 -32
  185. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/connect.test.js.map +1 -1
  186. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/connectOrCreate.test.js +3 -3
  187. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/connectOrCreate.test.js.map +1 -1
  188. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/create.test.js +6 -20
  189. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/create.test.js.map +1 -1
  190. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/disconnect.test.js +3 -10
  191. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/disconnect.test.js.map +1 -1
  192. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/update.test.js +3 -9
  193. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/update.test.js.map +1 -1
  194. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/upsert.test.js +6 -19
  195. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/upsert.test.js.map +1 -1
  196. package/dist/tests/cases/integration/graphQlRequests/update/queryPortal.test.js +6 -8
  197. package/dist/tests/cases/integration/graphQlRequests/update/queryPortal.test.js.map +1 -1
  198. package/dist/tests/cases/integration/graphQlRequests/update/transaction.test.js +9 -24
  199. package/dist/tests/cases/integration/graphQlRequests/update/transaction.test.js.map +1 -1
  200. package/dist/tests/cases/integration/graphQlRequests/upsert/basicUpsert.test.js +3 -7
  201. package/dist/tests/cases/integration/graphQlRequests/upsert/basicUpsert.test.js.map +1 -1
  202. package/dist/tests/cases/unit/orderbyHelper.test.js +13 -2
  203. package/dist/tests/cases/unit/orderbyHelper.test.js.map +1 -1
  204. package/dist/tests/cases/unit/permissionMerger.test.js +8 -3
  205. package/dist/tests/cases/unit/permissionMerger.test.js.map +1 -1
  206. package/dist/tests/cases/unit/predicatesInjector.test.js +1 -1
  207. package/dist/tests/cases/unit/predicatesInjector.test.js.map +1 -1
  208. package/dist/tests/src/test.d.ts +1 -0
  209. package/dist/tests/src/test.d.ts.map +1 -1
  210. package/dist/tests/src/test.js +35 -6
  211. package/dist/tests/src/test.js.map +1 -1
  212. package/dist/tests/tsconfig.tsbuildinfo +1 -1
  213. package/package.json +16 -13
  214. package/src/ExecutionContainer.ts +208 -0
  215. package/src/acl/PermissionFactory.ts +15 -13
  216. package/src/acl/index.ts +0 -1
  217. package/src/index.ts +24 -1
  218. package/src/mapper/ColumnValue.ts +2 -2
  219. package/src/mapper/ErrorUtils.ts +66 -41
  220. package/src/mapper/EventManager.ts +158 -0
  221. package/src/mapper/JunctionTableManager.ts +50 -32
  222. package/src/mapper/Mapper.ts +48 -27
  223. package/src/mapper/MapperFactory.ts +69 -0
  224. package/src/mapper/Result.ts +5 -2
  225. package/src/mapper/delete/DeleteExecutor.ts +42 -1
  226. package/src/mapper/index.ts +3 -1
  227. package/src/mapper/insert/InsertBuilder.ts +12 -2
  228. package/src/mapper/insert/Inserter.ts +7 -7
  229. package/src/mapper/select/OrderByHelper.ts +2 -1
  230. package/src/mapper/select/RelationFetcher.ts +2 -2
  231. package/src/mapper/update/UpdateBuilder.ts +30 -7
  232. package/src/mapper/update/UpdateBuilderFactory.ts +2 -2
  233. package/src/mapper/update/Updater.ts +9 -13
  234. package/src/resolvers/GraphQlQueryAstFactory.ts +1 -2
  235. package/src/resolvers/MutationResolver.ts +15 -14
  236. package/src/resolvers/ReadResolver.ts +5 -9
  237. package/src/resolvers/ValidationResolver.ts +2 -4
  238. package/src/resolvers/index.ts +0 -1
  239. package/src/schema/CustomTypesProvider.ts +2 -27
  240. package/src/schema/MutationProvider.ts +4 -4
  241. package/src/schema/QueryProvider.ts +3 -3
  242. package/src/tsconfig.json +7 -21
  243. package/src/types.ts +3 -4
  244. package/src/utils/index.ts +0 -1
  245. package/src/utils/uniqueWhereFields.ts +1 -1
  246. package/tests/cases/bugs/bug-update-by-nested-unique.test.ts +3 -5
  247. package/tests/cases/integration/graphQlDb/insert/insertSequence.test.ts +2 -2
  248. package/tests/cases/integration/graphQlDb/update/bug-freeze-connect-missing-one.test.ts +1 -1
  249. package/tests/cases/integration/graphQlDb/update/deferedConstraints.test.ts +9 -9
  250. package/tests/cases/integration/graphQlDb/update/failedDelete.test.ts +3 -3
  251. package/tests/cases/integration/graphQlDb/update/invalidInput.test.ts +2 -2
  252. package/tests/cases/integration/graphQlDb/update/nullChecksNotNull.test.ts +7 -7
  253. package/tests/cases/integration/graphQlDb/update/nullChecksNullable.test.ts +7 -7
  254. package/tests/cases/integration/graphQlDb/update/uniqueConstraint.test.ts +2 -2
  255. package/tests/cases/integration/graphQlRequests/insert/oneHasMany/connect.test.ts +3 -3
  256. package/tests/cases/integration/graphQlRequests/query/acl/isNullAcl.test.ts +77 -0
  257. package/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.ts +1 -1
  258. package/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.ts +67 -0
  259. package/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.ts +6 -18
  260. package/tests/cases/integration/graphQlRequests/update/additionalFilter.test.ts +3 -4
  261. package/tests/cases/integration/graphQlRequests/update/basic/columnUpdate.test.ts +3 -8
  262. package/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/update.test.ts +3 -9
  263. package/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/upsert.test.ts +3 -9
  264. package/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/update.test.ts +3 -9
  265. package/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/upsert.test.ts +3 -9
  266. package/tests/cases/integration/graphQlRequests/update/manyHasOne/connect.test.ts +3 -10
  267. package/tests/cases/integration/graphQlRequests/update/manyHasOne/create.test.ts +3 -10
  268. package/tests/cases/integration/graphQlRequests/update/manyHasOne/disconnect.test.ts +3 -9
  269. package/tests/cases/integration/graphQlRequests/update/manyHasOne/update.test.ts +3 -9
  270. package/tests/cases/integration/graphQlRequests/update/manyHasOne/upsert.test.ts +6 -18
  271. package/tests/cases/integration/graphQlRequests/update/oneHasMany/connect.test.ts +3 -11
  272. package/tests/cases/integration/graphQlRequests/update/oneHasMany/disconnect.test.ts +3 -8
  273. package/tests/cases/integration/graphQlRequests/update/oneHasMany/update.test.ts +3 -6
  274. package/tests/cases/integration/graphQlRequests/update/oneHasMany/upsert.test.ts +3 -6
  275. package/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/connect.test.ts +15 -50
  276. package/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/create.test.ts +3 -10
  277. package/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/disconnect.test.ts +3 -10
  278. package/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/update.test.ts +3 -6
  279. package/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/upsert.test.ts +3 -7
  280. package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/connect.test.ts +12 -32
  281. package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/connectOrCreate.test.ts +3 -3
  282. package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/create.test.ts +6 -20
  283. package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/disconnect.test.ts +3 -10
  284. package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/update.test.ts +3 -9
  285. package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/upsert.test.ts +6 -19
  286. package/tests/cases/integration/graphQlRequests/update/queryPortal.test.ts +6 -8
  287. package/tests/cases/integration/graphQlRequests/update/transaction.test.ts +9 -24
  288. package/tests/cases/integration/graphQlRequests/upsert/basicUpsert.test.ts +3 -7
  289. package/tests/cases/unit/orderbyHelper.test.ts +15 -2
  290. package/tests/cases/unit/permissionMerger.test.ts +9 -4
  291. package/tests/cases/unit/predicatesInjector.test.ts +1 -1
  292. package/tests/src/test.ts +40 -16
  293. package/tests/tsconfig.json +3 -9
  294. package/dist/src/acl/PermissionsByIdentityFactory.d.ts +0 -12
  295. package/dist/src/acl/PermissionsByIdentityFactory.d.ts.map +0 -1
  296. package/dist/src/acl/PermissionsByIdentityFactory.js +0 -15
  297. package/dist/src/acl/PermissionsByIdentityFactory.js.map +0 -1
  298. package/dist/src/mapper/MapperContainer.d.ts +0 -18
  299. package/dist/src/mapper/MapperContainer.d.ts.map +0 -1
  300. package/dist/src/mapper/MapperContainer.js +0 -55
  301. package/dist/src/mapper/MapperContainer.js.map +0 -1
  302. package/dist/src/resolvers/ExecutionContainerFactory.d.ts +0 -24
  303. package/dist/src/resolvers/ExecutionContainerFactory.d.ts.map +0 -1
  304. package/dist/src/resolvers/ExecutionContainerFactory.js +0 -45
  305. package/dist/src/resolvers/ExecutionContainerFactory.js.map +0 -1
  306. package/dist/src/utils/arrays.d.ts +0 -3
  307. package/dist/src/utils/arrays.d.ts.map +0 -1
  308. package/dist/src/utils/arrays.js +0 -22
  309. package/dist/src/utils/arrays.js.map +0 -1
  310. package/dist/tests/cases/integration/graphQlSchema/schema-acl-allowed.gql +0 -420
  311. package/dist/tests/cases/integration/graphQlSchema/schema-acl-create-only.gql +0 -229
  312. package/dist/tests/cases/integration/graphQlSchema/schema-acl-predicate.gql +0 -112
  313. package/dist/tests/cases/integration/graphQlSchema/schema-acl-predicate2.gql +0 -112
  314. package/dist/tests/cases/integration/graphQlSchema/schema-acl-restricted-create.gql +0 -309
  315. package/dist/tests/cases/integration/graphQlSchema/schema-acl-restricted-delete.gql +0 -402
  316. package/dist/tests/cases/integration/graphQlSchema/schema-acl-restricted-update.gql +0 -338
  317. package/dist/tests/cases/integration/graphQlSchema/schema-acl.gql +0 -221
  318. package/dist/tests/cases/integration/graphQlSchema/schema-aliased-type.gql +0 -226
  319. package/dist/tests/cases/integration/graphQlSchema/schema-basic.gql +0 -841
  320. package/dist/tests/cases/integration/graphQlSchema/schema-bug-66.gql +0 -540
  321. package/dist/tests/cases/integration/graphQlSchema/schema-custom-primary.gql +0 -851
  322. package/dist/tests/cases/integration/graphQlSchema/schema-has-many-reduction.gql +0 -453
  323. package/dist/tests/cases/integration/graphQlSchema/schema-new-builder.gql +0 -912
  324. package/dist/tests/cases/integration/graphQlSchema/schema-view-entity.gql +0 -112
  325. package/src/acl/PermissionsByIdentityFactory.ts +0 -21
  326. package/src/mapper/MapperContainer.ts +0 -142
  327. package/src/resolvers/ExecutionContainerFactory.ts +0 -74
  328. package/src/utils/arrays.ts +0 -19
@@ -7,6 +7,7 @@ const schema_utils_1 = require("@contember/schema-utils");
7
7
  const ColumnValue_1 = require("../ColumnValue");
8
8
  const exception_1 = require("../../exception");
9
9
  const DataManipulationBuilder_1 = require("../DataManipulationBuilder");
10
+ const EventManager_1 = require("../EventManager");
10
11
  class InsertBuilder {
11
12
  constructor(schema, entity, whereBuilder, pathFactory, predicateFactory) {
12
13
  this.schema = schema;
@@ -38,7 +39,7 @@ class InsertBuilder {
38
39
  async getResolvedData() {
39
40
  return (0, ColumnValue_1.resolveRowData)([...this.rowData.values()]);
40
41
  }
41
- async execute(db) {
42
+ async execute(mapper) {
42
43
  try {
43
44
  const resolvedData = await this.getResolvedData();
44
45
  if (resolvedData.find(it => it.resolvedValue === DataManipulationBuilder_1.AbortDataManipulation)) {
@@ -57,8 +58,13 @@ class InsertBuilder {
57
58
  return this.whereBuilder.build(qb, this.entity, this.pathFactory.create([]), this.where);
58
59
  })
59
60
  .returning(this.entity.primaryColumn);
60
- const returning = (await qb.execute(db)).map(it => it[this.entity.primaryColumn]);
61
+ const beforeInsertEvent = new EventManager_1.BeforeInsertEvent(this.entity, resolvedData);
62
+ await mapper.eventManager.fire(beforeInsertEvent);
63
+ const returning = (await qb.execute(mapper.db)).map(it => it[this.entity.primaryColumn]);
61
64
  const result = returning.length === 1 ? returning[0] : null;
65
+ const afterInsertEvent = new EventManager_1.AfterInsertEvent(this.entity, resolvedData, result);
66
+ beforeInsertEvent.afterEvent = afterInsertEvent;
67
+ await mapper.eventManager.fire(afterInsertEvent);
62
68
  this.resolver(result);
63
69
  return { values: resolvedData, executed: true, primaryValue: result, aborted: false };
64
70
  }
@@ -1 +1 @@
1
- {"version":3,"file":"InsertBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/insert/InsertBuilder.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAC5D,kDAA8G;AAE9G,0DAAsE;AACtE,gDAAsG;AACtG,+CAAyD;AAEzD,wEAA2F;AAS3F,MAAa,aAAa;IASzB,YACkB,MAAoB,EACpB,MAAoB,EACpB,YAA0B,EAC1B,WAAwB,EACxB,gBAAkC;QAJlC,WAAM,GAAN,MAAM,CAAc;QACpB,WAAM,GAAN,MAAM,CAAc;QACpB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAb5C,aAAQ,GAA+C,GAAG,EAAE;YACnE,MAAM,IAAI,mCAAuB,CAAC,yCAAyC,CAAC,CAAA;QAC7E,CAAC,CAAA;QACe,WAAM,GAAuC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAA;QAEtG,YAAO,GAAgE,IAAI,GAAG,EAAE,CAAA;QAChF,UAAK,GAAmC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAA;IAQxD,CAAC;IAEG,aAAa,CACnB,SAAiB,EACjB,KAAmF;QAEnF,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QACrE,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QACrE,MAAM,aAAa,GAAG,IAAA,iCAAmB,EAAC,KAAK,CAAC,CAAA;QAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAA;QACzF,OAAO,aAAa,CAAA;IACrB,CAAC;IAEM,aAAa,CAAC,MAAgB;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,YAAG,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACrF,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACrB,CAAC;IAEM,QAAQ,CAAC,KAA0B;QACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,eAAe;QAC3B,OAAO,IAAA,4BAAc,EAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAClD,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,EAAU;QAC9B,IAAI;YACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAA;YACjD,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,KAAK,+CAAqB,CAAC,EAAE;gBACxE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;gBACnB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;aACzE;YAED,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CACrC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EACrG,EAAE,CACF,CAAA;YACD,MAAM,EAAE,GAAG,wBAAe,CAAC,MAAM,EAAE;iBACjC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE;gBACnB,OAAO,YAAY,CAAC,MAAM,CACzB,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CACb,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,aAAwB,EAAE,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,EACxG,EAAE,CACF,CAAA;YACF,CAAC,CAAC;iBACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;iBAC3B,MAAM,CAAC,UAAU,CAAC;iBAClB,IAAI,CAAC,EAAE,CAAC,EAAE;gBACV,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBACrB,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;YACzF,CAAC,CAAC;iBACD,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;YAEtC,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAA;YACjF,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAC3D,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACrB,OAAO,EAAE,MAAM,EAAE,YAAqC,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;SAC9G;QAAC,OAAO,CAAC,EAAE;YACX,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACnB,MAAM,CAAC,CAAA;SACP;IACF,CAAC;CACD;AA9ED,sCA8EC"}
1
+ {"version":3,"file":"InsertBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/insert/InsertBuilder.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,15 @@
1
1
  import { MutationResultList } from '../Result';
2
2
  import { Mapper } from '../Mapper';
3
3
  import { Input, Model } from '@contember/schema';
4
- import { Providers } from '@contember/schema-utils';
4
+ import { Providers, SchemaDatabaseMetadata } from '@contember/schema-utils';
5
5
  import { InsertBuilderFactory } from './InsertBuilderFactory';
6
6
  import { InsertBuilder } from './InsertBuilder';
7
7
  export declare class Inserter {
8
8
  private readonly schema;
9
+ private readonly schemaDatabaseMetadata;
9
10
  private readonly insertBuilderFactory;
10
11
  private readonly providers;
11
- constructor(schema: Model.Schema, insertBuilderFactory: InsertBuilderFactory, providers: Providers);
12
+ constructor(schema: Model.Schema, schemaDatabaseMetadata: SchemaDatabaseMetadata, insertBuilderFactory: InsertBuilderFactory, providers: Providers);
12
13
  insert(mapper: Mapper, entity: Model.Entity, data: Input.CreateDataInput, insertIdCallback: (id: string) => void, builderCb: (builder: InsertBuilder) => void): Promise<MutationResultList>;
13
14
  private executeInsert;
14
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Inserter.d.ts","sourceRoot":"","sources":["../../../../src/mapper/insert/Inserter.ts"],"names":[],"mappings":"AAAA,OAAO,EAKN,kBAAkB,EAGlB,MAAM,WAAW,CAAA;AAGlB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAS,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAA2B,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAI/C,qBAAa,QAAQ;IAEnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,SAAS;IAGzB,MAAM,CAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,KAAK,CAAC,eAAe,EAC3B,gBAAgB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,EACtC,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,GACzC,OAAO,CAAC,kBAAkB,CAAC;YAyBhB,aAAa;CAiB3B"}
1
+ {"version":3,"file":"Inserter.d.ts","sourceRoot":"","sources":["../../../../src/mapper/insert/Inserter.ts"],"names":[],"mappings":"AAAA,OAAO,EAKN,kBAAkB,EAGlB,MAAM,WAAW,CAAA;AAGlB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAS,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAA2B,SAAS,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAI/C,qBAAa,QAAQ;IAEnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAHT,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,sBAAsB,EAAE,sBAAsB,EAC9C,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,SAAS;IAGzB,MAAM,CAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,KAAK,CAAC,eAAe,EAC3B,gBAAgB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,EACtC,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,GACzC,OAAO,CAAC,kBAAkB,CAAC;YAyBhB,aAAa;CAiB3B"}
@@ -8,8 +8,9 @@ const schema_utils_1 = require("@contember/schema-utils");
8
8
  const ErrorUtils_1 = require("../ErrorUtils");
9
9
  const ColumnValue_1 = require("../ColumnValue");
10
10
  class Inserter {
11
- constructor(schema, insertBuilderFactory, providers) {
11
+ constructor(schema, schemaDatabaseMetadata, insertBuilderFactory, providers) {
12
12
  this.schema = schema;
13
+ this.schemaDatabaseMetadata = schemaDatabaseMetadata;
13
14
  this.insertBuilderFactory = insertBuilderFactory;
14
15
  this.providers = providers;
15
16
  }
@@ -22,12 +23,12 @@ class Inserter {
22
23
  const promises = (0, schema_utils_1.acceptEveryFieldVisitor)(this.schema, entity, visitor);
23
24
  builderCb(insertBuilder);
24
25
  const okResultFactory = (primary, values) => new Result_1.MutationCreateOk([], entity, primary, data, values);
25
- const insertPromise = this.executeInsert(insertBuilder, mapper.db, okResultFactory);
26
- return await (0, Result_1.collectResults)(this.schema, insertPromise, Object.values(promises));
26
+ const insertPromise = this.executeInsert(insertBuilder, mapper, okResultFactory);
27
+ return await (0, Result_1.collectResults)(this.schema, this.schemaDatabaseMetadata, insertPromise, Object.values(promises));
27
28
  }
28
- async executeInsert(insertBuilder, db, okResultFactory) {
29
- return (0, ErrorUtils_1.tryMutation)(this.schema, async () => {
30
- const result = await insertBuilder.execute(db);
29
+ async executeInsert(insertBuilder, mapper, okResultFactory) {
30
+ return (0, ErrorUtils_1.tryMutation)(this.schema, this.schemaDatabaseMetadata, async () => {
31
+ const result = await insertBuilder.execute(mapper);
31
32
  if (result.aborted) {
32
33
  return [new Result_1.MutationNothingToDo([], Result_1.NothingToDoReason.aborted)];
33
34
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Inserter.js","sourceRoot":"","sources":["../../../../src/mapper/insert/Inserter.ts"],"names":[],"mappings":";;;AAAA,sCAQkB;AAClB,2DAA0D;AAC1D,uEAAmE;AAGnE,0DAA4E;AAI5E,8CAA2C;AAC3C,gDAAqD;AAErD,MAAa,QAAQ;IACpB,YACkB,MAAoB,EACpB,oBAA0C,EAC1C,SAAoB;QAFpB,WAAM,GAAN,MAAM,CAAc;QACpB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,cAAS,GAAT,SAAS,CAAW;IACnC,CAAC;IAEG,KAAK,CAAC,MAAM,CAClB,MAAc,EACd,MAAoB,EACpB,IAA2B,EAC3B,gBAAsC,EACtC,SAA2C;QAE3C,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC9D,mDAAmD;QACnD,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAEnE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAC9C,MAAM,OAAO,GAAG,IAAI,oCAAkB,CACrC,IAAI,iDAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,EAClE,IAAI,CAAC,MAAM,EACX,IAAI,CACJ,CAAA;QACD,MAAM,QAAQ,GAAG,IAAA,sCAAuB,EACvC,IAAI,CAAC,MAAM,EACX,MAAM,EACN,OAAO,CACP,CAAA;QACD,SAAS,CAAC,aAAa,CAAC,CAAA;QAExB,MAAM,eAAe,GAAG,CAAC,OAA2B,EAAE,MAAiB,EAAE,EAAE,CAC1E,IAAI,yBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QACxD,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,EAAE,eAAe,CAAC,CAAA;QAEnF,OAAO,MAAM,IAAA,uBAAc,EAAC,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjF,CAAC;IAEO,KAAK,CAAC,aAAa,CAC1B,aAA4B,EAC5B,EAAU,EACV,eAAqF;QAErF,OAAO,IAAA,wBAAW,EAAC,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;YAC1C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YAC9C,IAAI,MAAM,CAAC,OAAO,EAAE;gBACnB,OAAO,CAAC,IAAI,4BAAmB,CAAC,EAAE,EAAE,0BAAiB,CAAC,OAAO,CAAC,CAAC,CAAA;aAC/D;YAED,IAAI,MAAM,CAAC,YAAY,KAAK,IAAI,EAAE;gBACjC,OAAO,CAAC,IAAI,8BAAqB,CAAC,EAAE,CAAC,CAAC,CAAA;aACtC;YACD,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,EAAE,IAAA,kCAAoB,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QACnF,CAAC,CAAC,CAAA;IACH,CAAC;CACD;AAvDD,4BAuDC"}
1
+ {"version":3,"file":"Inserter.js","sourceRoot":"","sources":["../../../../src/mapper/insert/Inserter.ts"],"names":[],"mappings":";;;AAAA,sCAQkB;AAClB,2DAA0D;AAC1D,uEAAmE;AAGnE,0DAAoG;AAGpG,8CAA2C;AAC3C,gDAAqD;AAErD,MAAa,QAAQ;IACpB,YACkB,MAAoB,EACpB,sBAA8C,EAC9C,oBAA0C,EAC1C,SAAoB;QAHpB,WAAM,GAAN,MAAM,CAAc;QACpB,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,cAAS,GAAT,SAAS,CAAW;IACnC,CAAC;IAEG,KAAK,CAAC,MAAM,CAClB,MAAc,EACd,MAAoB,EACpB,IAA2B,EAC3B,gBAAsC,EACtC,SAA2C;QAE3C,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC9D,mDAAmD;QACnD,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAEnE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAC9C,MAAM,OAAO,GAAG,IAAI,oCAAkB,CACrC,IAAI,iDAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,EAClE,IAAI,CAAC,MAAM,EACX,IAAI,CACJ,CAAA;QACD,MAAM,QAAQ,GAAG,IAAA,sCAAuB,EACvC,IAAI,CAAC,MAAM,EACX,MAAM,EACN,OAAO,CACP,CAAA;QACD,SAAS,CAAC,aAAa,CAAC,CAAA;QAExB,MAAM,eAAe,GAAG,CAAC,OAA2B,EAAE,MAAiB,EAAE,EAAE,CAC1E,IAAI,yBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QACxD,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,eAAe,CAAC,CAAA;QAEhF,OAAO,MAAM,IAAA,uBAAc,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,sBAAsB,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC9G,CAAC;IAEO,KAAK,CAAC,aAAa,CAC1B,aAA4B,EAC5B,MAAc,EACd,eAAqF;QAErF,OAAO,IAAA,wBAAW,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACvE,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAClD,IAAI,MAAM,CAAC,OAAO,EAAE;gBACnB,OAAO,CAAC,IAAI,4BAAmB,CAAC,EAAE,EAAE,0BAAiB,CAAC,OAAO,CAAC,CAAC,CAAA;aAC/D;YAED,IAAI,MAAM,CAAC,YAAY,KAAK,IAAI,EAAE;gBACjC,OAAO,CAAC,IAAI,8BAAqB,CAAC,EAAE,CAAC,CAAC,CAAA;aACtC;YACD,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,EAAE,IAAA,kCAAoB,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QACnF,CAAC,CAAC,CAAA;IACH,CAAC;CACD;AAxDD,4BAwDC"}
@@ -1,7 +1,7 @@
1
1
  import { Input, Model } from '@contember/schema';
2
2
  import { ObjectNode } from '../../inputProcessing';
3
3
  export declare class OrderByHelper {
4
- static appendDefaultOrderBy(entity: Model.Entity, objectNode: ObjectNode<Input.ListQueryInput>, defaultOrderBy: readonly Model.OrderBy[]): ObjectNode<Input.ListQueryInput>;
4
+ static appendDefaultOrderBy(entity: Model.Entity, objectNode: ObjectNode<Input.ListQueryInput>, relationOrderBy: readonly Model.OrderBy[] | undefined): ObjectNode<Input.ListQueryInput>;
5
5
  private static buildOrderBy;
6
6
  private static getPrimaryOrderBy;
7
7
  }
@@ -1 +1 @@
1
- {"version":3,"file":"OrderByHelper.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,qBAAa,aAAa;WACX,oBAAoB,CACjC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EAC5C,cAAc,EAAE,SAAS,KAAK,CAAC,OAAO,EAAE,GACtC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC;IAoBnC,OAAO,CAAC,MAAM,CAAC,YAAY;IAc3B,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAKhC"}
1
+ {"version":3,"file":"OrderByHelper.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,qBAAa,aAAa;WACX,oBAAoB,CACjC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EAC5C,eAAe,EAAE,SAAS,KAAK,CAAC,OAAO,EAAE,GAAG,SAAS,GACnD,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC;IAqBnC,OAAO,CAAC,MAAM,CAAC,YAAY;IAc3B,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAKhC"}
@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.OrderByHelper = void 0;
4
4
  const schema_1 = require("@contember/schema");
5
5
  class OrderByHelper {
6
- static appendDefaultOrderBy(entity, objectNode, defaultOrderBy) {
6
+ static appendDefaultOrderBy(entity, objectNode, relationOrderBy) {
7
+ var _a;
7
8
  const inputOrder = objectNode.args.orderBy || [];
8
9
  const hasOrderBy = inputOrder.length > 0;
10
+ const defaultOrderBy = (_a = relationOrderBy !== null && relationOrderBy !== void 0 ? relationOrderBy : entity.orderBy) !== null && _a !== void 0 ? _a : [];
9
11
  if (!hasOrderBy && defaultOrderBy.length > 0) {
10
12
  const defaultOrderByWithPrimary = [...defaultOrderBy, ...this.getPrimaryOrderBy(inputOrder, entity)];
11
13
  return objectNode.withArg('orderBy', this.buildOrderBy(defaultOrderByWithPrimary));
@@ -1 +1 @@
1
- {"version":3,"file":"OrderByHelper.js","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByHelper.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAGhD,MAAa,aAAa;IAClB,MAAM,CAAC,oBAAoB,CACjC,MAAoB,EACpB,UAA4C,EAC5C,cAAwC;QAExC,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAA;QAChD,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAA;QACxC,IAAI,CAAC,UAAU,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7C,MAAM,yBAAyB,GAAG,CAAC,GAAG,cAAc,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAA;YACpG,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAC,CAAA;SAClF;QACD,MAAM,QAAQ,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAA;QAC1D,MAAM,SAAS,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAA;QAC5D,IACC,CAAC,CAAC,QAAQ,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,CAAC;YACxC,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,EACnF;YACD,OAAO,UAAU,CAAA;SACjB;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAA;QAC7E,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAA;IAC1E,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,cAAwC;QACnE,OAAO,cAAc;aACnB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAA8B,EAAE;YACxD,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;YAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;YAClC,IAAI,CAAC,QAAQ,EAAE;gBACd,OAAO,IAAI,CAAA;aACX;YACD,MAAM,aAAa,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAA;YAC/C,OAAO,WAAW,CAAC,OAAO,EAAE,CAAC,MAAM,CAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,aAAa,CAAC,CAAA;QAChH,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,EAAE,EAA6B,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAClD,CAAC;IAEO,MAAM,CAAC,iBAAiB,CAAC,UAA2B,EAAE,MAAoB;QACjF,OAAO,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACjD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,cAAK,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,CAAA;IACrE,CAAC;CACD;AA5CD,sCA4CC"}
1
+ {"version":3,"file":"OrderByHelper.js","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByHelper.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAGhD,MAAa,aAAa;IAClB,MAAM,CAAC,oBAAoB,CACjC,MAAoB,EACpB,UAA4C,EAC5C,eAAqD;;QAErD,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAA;QAChD,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAA;QACxC,MAAM,cAAc,GAAG,MAAA,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAA;QAC9D,IAAI,CAAC,UAAU,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7C,MAAM,yBAAyB,GAAG,CAAC,GAAG,cAAc,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAA;YACpG,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAC,CAAA;SAClF;QACD,MAAM,QAAQ,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAA;QAC1D,MAAM,SAAS,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAA;QAC5D,IACC,CAAC,CAAC,QAAQ,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,CAAC;YACxC,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,EACnF;YACD,OAAO,UAAU,CAAA;SACjB;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAA;QAC7E,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAA;IAC1E,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,cAAwC;QACnE,OAAO,cAAc;aACnB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAA8B,EAAE;YACxD,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;YAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;YAClC,IAAI,CAAC,QAAQ,EAAE;gBACd,OAAO,IAAI,CAAA;aACX;YACD,MAAM,aAAa,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAA;YAC/C,OAAO,WAAW,CAAC,OAAO,EAAE,CAAC,MAAM,CAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,aAAa,CAAC,CAAA;QAChH,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,EAAE,EAA6B,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAClD,CAAC;IAEO,MAAM,CAAC,iBAAiB,CAAC,UAA2B,EAAE,MAAoB;QACjF,OAAO,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACjD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,cAAK,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,CAAA;IACrE,CAAC;CACD;AA7CD,sCA6CC"}
@@ -23,7 +23,7 @@ class RelationFetcher {
23
23
  const { relation, targetEntity, targetRelation } = relationContext;
24
24
  const filter = this.createOneHasManyFilter(targetEntity, targetRelation, ids, objectNode.args.filter);
25
25
  const objectNodeWithWhere = objectNode.withArg('filter', filter);
26
- const objectNodeWithOrder = OrderByHelper_1.OrderByHelper.appendDefaultOrderBy(targetEntity, objectNodeWithWhere, relation.orderBy || []);
26
+ const objectNodeWithOrder = OrderByHelper_1.OrderByHelper.appendDefaultOrderBy(targetEntity, objectNodeWithWhere, relation.orderBy);
27
27
  return mapper.selectGrouped(targetEntity, objectNodeWithOrder, targetRelation, [
28
28
  ...relationPath,
29
29
  relationContext,
@@ -58,7 +58,7 @@ class RelationFetcher {
58
58
  async fetchManyHasManyGroups({ mapper, field, relationContext, relationPath, ids, }) {
59
59
  const owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation;
60
60
  const joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable });
61
- const defaultOrderBy = relationContext.relation.orderBy || [];
61
+ const defaultOrderBy = relationContext.relation.orderBy;
62
62
  const objectNode = OrderByHelper_1.OrderByHelper.appendDefaultOrderBy(relationContext.targetEntity, field, defaultOrderBy);
63
63
  const { targetEntity } = relationContext;
64
64
  const junctionValues = await this.fetchJunction(mapper.db, owningRelation, ids, joiningColumns, targetEntity, objectNode, [...relationPath, relationContext]);
@@ -1 +1 @@
1
- {"version":3,"file":"RelationFetcher.js","sourceRoot":"","sources":["../../../../src/mapper/select/RelationFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RelationFetcher.js","sourceRoot":"","sources":["../../../../src/mapper/select/RelationFetcher.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,9 @@
1
1
  import { Input, Model, Value } from '@contember/schema';
2
- import { Client } from '@contember/database';
3
2
  import { PathFactory, WhereBuilder } from '../select';
4
3
  import { ResolvedColumnValue } from '../ColumnValue';
5
4
  import { PredicateFactory } from '../../acl';
6
5
  import { AbortDataManipulation, DataManipulationBuilder } from '../DataManipulationBuilder';
6
+ import { Mapper } from '../Mapper';
7
7
  export interface UpdateResult {
8
8
  values: ResolvedColumnValue[];
9
9
  executed: boolean;
@@ -14,7 +14,7 @@ export declare class UpdateBuilder implements DataManipulationBuilder {
14
14
  private readonly schema;
15
15
  private readonly entity;
16
16
  private readonly whereBuilder;
17
- private readonly uniqueWhere;
17
+ private readonly primary;
18
18
  private readonly pathFactory;
19
19
  private readonly predicateFactory;
20
20
  private resolver;
@@ -22,11 +22,11 @@ export declare class UpdateBuilder implements DataManipulationBuilder {
22
22
  private rowData;
23
23
  private newWhere;
24
24
  private oldWhere;
25
- constructor(schema: Model.Schema, entity: Model.Entity, whereBuilder: WhereBuilder, uniqueWhere: Input.Where, pathFactory: PathFactory, predicateFactory: PredicateFactory);
25
+ constructor(schema: Model.Schema, entity: Model.Entity, whereBuilder: WhereBuilder, primary: Input.PrimaryValue, pathFactory: PathFactory, predicateFactory: PredicateFactory);
26
26
  addFieldValue(fieldName: string, value: Value.GenericValueLike<Value.AtomicValue<AbortDataManipulation | undefined>>): Promise<Value.AtomicValue<AbortDataManipulation | undefined>>;
27
27
  addNewWhere(where: Input.OptionalWhere): void;
28
28
  addOldWhere(where: Input.OptionalWhere): void;
29
29
  addPredicates(fields: string[]): void;
30
- execute(db: Client): Promise<UpdateResult>;
30
+ execute(mapper: Mapper): Promise<UpdateResult>;
31
31
  }
32
32
  //# sourceMappingURL=UpdateBuilder.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"UpdateBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/update/UpdateBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAE5D,OAAO,EAAE,MAAM,EAA8E,MAAM,qBAAqB,CAAA;AACxH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACrD,OAAO,EAAe,mBAAmB,EAAuC,MAAM,gBAAgB,CAAA;AACtG,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAA;AAE3F,MAAM,WAAW,YAAY;IAC5B,MAAM,EAAE,mBAAmB,EAAE,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3B;AAED,qBAAa,aAAc,YAAW,uBAAuB;IAY3D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAhBlC,OAAO,CAAC,QAAQ,CAEf;IACD,SAAgB,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAoD;IAElG,OAAO,CAAC,OAAO,CAA6D;IAE5E,OAAO,CAAC,QAAQ,CAA8C;IAC9D,OAAO,CAAC,QAAQ,CAA8C;gBAG5C,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,KAAK,CAAC,KAAK,EACxB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB;IAG7C,aAAa,CACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAC,GACjF,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAC;IAQzD,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,GAAG,IAAI;IAI7C,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,GAAG,IAAI;IAI7C,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAM/B,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAsEvD"}
1
+ {"version":3,"file":"UpdateBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/update/UpdateBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAG5D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACrD,OAAO,EAAe,mBAAmB,EAAuC,MAAM,gBAAgB,CAAA;AACtG,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAA;AAE3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAElC,MAAM,WAAW,YAAY;IAC5B,MAAM,EAAE,mBAAmB,EAAE,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3B;AAED,qBAAa,aAAc,YAAW,uBAAuB;IAY3D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAhBlC,OAAO,CAAC,QAAQ,CAEf;IACD,SAAgB,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAoD;IAElG,OAAO,CAAC,OAAO,CAA6D;IAE5E,OAAO,CAAC,QAAQ,CAA8C;IAC9D,OAAO,CAAC,QAAQ,CAA8C;gBAG5C,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,KAAK,CAAC,YAAY,EAC3B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB;IAG7C,aAAa,CACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAC,GACjF,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAC;IAQzD,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,GAAG,IAAI;IAI7C,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,GAAG,IAAI;IAI7C,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAM/B,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CA2F3D"}
@@ -7,12 +7,13 @@ const schema_utils_1 = require("@contember/schema-utils");
7
7
  const database_1 = require("@contember/database");
8
8
  const ColumnValue_1 = require("../ColumnValue");
9
9
  const DataManipulationBuilder_1 = require("../DataManipulationBuilder");
10
+ const EventManager_1 = require("../EventManager");
10
11
  class UpdateBuilder {
11
- constructor(schema, entity, whereBuilder, uniqueWhere, pathFactory, predicateFactory) {
12
+ constructor(schema, entity, whereBuilder, primary, pathFactory, predicateFactory) {
12
13
  this.schema = schema;
13
14
  this.entity = entity;
14
15
  this.whereBuilder = whereBuilder;
15
- this.uniqueWhere = uniqueWhere;
16
+ this.primary = primary;
16
17
  this.pathFactory = pathFactory;
17
18
  this.predicateFactory = predicateFactory;
18
19
  this.resolver = () => {
@@ -41,7 +42,7 @@ class UpdateBuilder {
41
42
  this.addNewWhere(predicate);
42
43
  this.addOldWhere(predicate);
43
44
  }
44
- async execute(db) {
45
+ async execute(mapper) {
45
46
  try {
46
47
  const resolvedData = await (0, ColumnValue_1.resolveRowData)([...this.rowData.values()]);
47
48
  if (Object.keys(resolvedData).length === 0) {
@@ -52,9 +53,12 @@ class UpdateBuilder {
52
53
  this.resolver(null);
53
54
  return { values: [], affectedRows: null, executed: false, aborted: true };
54
55
  }
56
+ const oldColSuffix = '_old__';
55
57
  const qb = database_1.UpdateBuilder.create()
56
58
  .with('newData_', qb => {
57
- qb = resolvedData.reduce((qb, value) => qb.select(expr => expr.selectValue(value.resolvedValue, value.columnType), value.columnName), qb);
59
+ qb = resolvedData.reduce((qb, value) => qb
60
+ .select(expr => expr.selectValue(value.resolvedValue, value.columnType), value.columnName)
61
+ .select(['root_', value.columnName], value.columnName + oldColSuffix), qb);
58
62
  const columns = new Set(resolvedData.map(it => it.columnName));
59
63
  const allColumns = Object.values((0, schema_utils_1.acceptEveryFieldVisitor)(this.schema, this.entity, {
60
64
  visitColumn: ({ column }) => column.columnName,
@@ -69,7 +73,9 @@ class UpdateBuilder {
69
73
  qb = qb.from(this.entity.tableName, 'root_');
70
74
  qb = remainingColumns.reduce((qb, columnName) => qb.select(['root_', columnName]), qb);
71
75
  qb = this.whereBuilder.build(qb, this.entity, this.pathFactory.create([]), {
72
- and: [this.uniqueWhere, this.oldWhere],
76
+ and: [{
77
+ [this.entity.primary]: { eq: this.primary },
78
+ }, this.oldWhere],
73
79
  });
74
80
  return qb;
75
81
  })
@@ -78,6 +84,7 @@ class UpdateBuilder {
78
84
  ...result,
79
85
  [item.columnName]: expr => expr.select(['newData_', item.columnName]),
80
86
  }), {}))
87
+ .returning(...resolvedData.map(it => it.columnName + oldColSuffix))
81
88
  .from(qb => {
82
89
  qb = qb.from('newData_');
83
90
  const col1 = (0, utils_1.tuple)(this.entity.tableName, this.entity.primaryColumn);
@@ -86,9 +93,20 @@ class UpdateBuilder {
86
93
  qb = this.whereBuilder.build(qb, this.entity, this.pathFactory.create([], 'newData_'), this.newWhere);
87
94
  return qb;
88
95
  });
89
- const result = await qb.execute(db);
90
- this.resolver(result);
91
- return { values: resolvedData, affectedRows: result, executed: true, aborted: false };
96
+ const beforeEvent = new EventManager_1.BeforeUpdateEvent(this.entity, resolvedData, this.primary);
97
+ await mapper.eventManager.fire(beforeEvent);
98
+ const result = await qb.execute(mapper.db);
99
+ this.resolver(result.length);
100
+ if (result.length === 1) {
101
+ const eventData = resolvedData.map(it => ({
102
+ ...it,
103
+ old: result[0][it.columnName + oldColSuffix],
104
+ }));
105
+ const afterUpdateEvent = new EventManager_1.AfterUpdateEvent(this.entity, eventData, this.primary);
106
+ beforeEvent.afterEvent = afterUpdateEvent;
107
+ await mapper.eventManager.fire(afterUpdateEvent);
108
+ }
109
+ return { values: resolvedData, affectedRows: result.length, executed: true, aborted: false };
92
110
  }
93
111
  catch (e) {
94
112
  this.resolver(null);
@@ -1 +1 @@
1
- {"version":3,"file":"UpdateBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/update/UpdateBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UpdateBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/update/UpdateBuilder.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,6 @@ export declare class UpdateBuilderFactory {
8
8
  private readonly pathFactory;
9
9
  private readonly predicateFactory;
10
10
  constructor(schema: Model.Schema, whereBuilder: WhereBuilder, pathFactory: PathFactory, predicateFactory: PredicateFactory);
11
- create(entity: Model.Entity, uniqueWhere: Input.Where): UpdateBuilder;
11
+ create(entity: Model.Entity, primary: Input.PrimaryValue): UpdateBuilder;
12
12
  }
13
13
  //# sourceMappingURL=UpdateBuilderFactory.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"UpdateBuilderFactory.d.ts","sourceRoot":"","sources":["../../../../src/mapper/update/UpdateBuilderFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACrD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAE5C,qBAAa,oBAAoB;IAE/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAHhB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB;IAG7C,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,GAAG,aAAa;CAU5E"}
1
+ {"version":3,"file":"UpdateBuilderFactory.d.ts","sourceRoot":"","sources":["../../../../src/mapper/update/UpdateBuilderFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACrD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAE5C,qBAAa,oBAAoB;IAE/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAHhB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB;IAG7C,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,GAAG,aAAa;CAU/E"}
@@ -9,8 +9,8 @@ class UpdateBuilderFactory {
9
9
  this.pathFactory = pathFactory;
10
10
  this.predicateFactory = predicateFactory;
11
11
  }
12
- create(entity, uniqueWhere) {
13
- return new UpdateBuilder_1.UpdateBuilder(this.schema, entity, this.whereBuilder, uniqueWhere, this.pathFactory, this.predicateFactory);
12
+ create(entity, primary) {
13
+ return new UpdateBuilder_1.UpdateBuilder(this.schema, entity, this.whereBuilder, primary, this.pathFactory, this.predicateFactory);
14
14
  }
15
15
  }
16
16
  exports.UpdateBuilderFactory = UpdateBuilderFactory;
@@ -1 +1 @@
1
- {"version":3,"file":"UpdateBuilderFactory.js","sourceRoot":"","sources":["../../../../src/mapper/update/UpdateBuilderFactory.ts"],"names":[],"mappings":";;;AAEA,mDAA+C;AAG/C,MAAa,oBAAoB;IAChC,YACkB,MAAoB,EACpB,YAA0B,EAC1B,WAAwB,EACxB,gBAAkC;QAHlC,WAAM,GAAN,MAAM,CAAc;QACpB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;IACjD,CAAC;IAEG,MAAM,CAAC,MAAoB,EAAE,WAAwB;QAC3D,OAAO,IAAI,6BAAa,CACvB,IAAI,CAAC,MAAM,EACX,MAAM,EACN,IAAI,CAAC,YAAY,EACjB,WAAW,EACX,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,gBAAgB,CACrB,CAAA;IACF,CAAC;CACD;AAlBD,oDAkBC"}
1
+ {"version":3,"file":"UpdateBuilderFactory.js","sourceRoot":"","sources":["../../../../src/mapper/update/UpdateBuilderFactory.ts"],"names":[],"mappings":";;;AAEA,mDAA+C;AAG/C,MAAa,oBAAoB;IAChC,YACkB,MAAoB,EACpB,YAA0B,EAC1B,WAAwB,EACxB,gBAAkC;QAHlC,WAAM,GAAN,MAAM,CAAc;QACpB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;IACjD,CAAC;IAEG,MAAM,CAAC,MAAoB,EAAE,OAA2B;QAC9D,OAAO,IAAI,6BAAa,CACvB,IAAI,CAAC,MAAM,EACX,MAAM,EACN,IAAI,CAAC,YAAY,EACjB,OAAO,EACP,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,gBAAgB,CACrB,CAAA;IACF,CAAC;CACD;AAlBD,oDAkBC"}
@@ -2,13 +2,15 @@ import { Input, Model } from '@contember/schema';
2
2
  import { PredicateFactory } from '../../acl';
3
3
  import { UpdateBuilderFactory } from './UpdateBuilderFactory';
4
4
  import { Mapper } from '../Mapper';
5
+ import { SchemaDatabaseMetadata } from '@contember/schema-utils';
5
6
  import { MutationResultList } from '../Result';
6
7
  import { UpdateBuilder } from './UpdateBuilder';
7
8
  export declare class Updater {
8
9
  private readonly schema;
10
+ private readonly schemaDatabaseMetadata;
9
11
  private readonly predicateFactory;
10
12
  private readonly updateBuilderFactory;
11
- constructor(schema: Model.Schema, predicateFactory: PredicateFactory, updateBuilderFactory: UpdateBuilderFactory);
13
+ constructor(schema: Model.Schema, schemaDatabaseMetadata: SchemaDatabaseMetadata, predicateFactory: PredicateFactory, updateBuilderFactory: UpdateBuilderFactory);
12
14
  update(mapper: Mapper, entity: Model.Entity, primaryValue: Input.PrimaryValue, data: Input.UpdateDataInput, filter?: Input.OptionalWhere): Promise<MutationResultList>;
13
15
  updateCb(mapper: Mapper, entity: Model.Entity, primaryValue: Input.PrimaryValue, builderCb: (builder: UpdateBuilder) => void): Promise<MutationResultList>;
14
16
  private static executeUpdate;
@@ -1 +1 @@
1
- {"version":3,"file":"Updater.d.ts","sourceRoot":"","sources":["../../../../src/mapper/update/Updater.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAGlC,OAAO,EAIN,kBAAkB,EAKlB,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/C,qBAAa,OAAO;IAElB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBAFpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,oBAAoB;IAG/C,MAAM,CAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,KAAK,CAAC,YAAY,EAChC,IAAI,EAAE,KAAK,CAAC,eAAe,EAC3B,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,GAC1B,OAAO,CAAC,kBAAkB,CAAC;IAyBjB,QAAQ,CACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,KAAK,CAAC,YAAY,EAChC,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,GACzC,OAAO,CAAC,kBAAkB,CAAC;mBAWT,aAAa;CAiBlC"}
1
+ {"version":3,"file":"Updater.d.ts","sourceRoot":"","sources":["../../../../src/mapper/update/Updater.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAA2B,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACzF,OAAO,EAIN,kBAAkB,EAKlB,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/C,qBAAa,OAAO;IAElB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBAHpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,sBAAsB,EAAE,sBAAsB,EAC9C,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,oBAAoB;IAG/C,MAAM,CAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,KAAK,CAAC,YAAY,EAChC,IAAI,EAAE,KAAK,CAAC,eAAe,EAC3B,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,GAC1B,OAAO,CAAC,kBAAkB,CAAC;IAuBjB,QAAQ,CACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,KAAK,CAAC,YAAY,EAChC,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,GACzC,OAAO,CAAC,kBAAkB,CAAC;mBAST,aAAa;CAiBlC"}
@@ -7,15 +7,14 @@ const schema_utils_1 = require("@contember/schema-utils");
7
7
  const Result_1 = require("../Result");
8
8
  const ColumnValue_1 = require("../ColumnValue");
9
9
  class Updater {
10
- constructor(schema, predicateFactory, updateBuilderFactory) {
10
+ constructor(schema, schemaDatabaseMetadata, predicateFactory, updateBuilderFactory) {
11
11
  this.schema = schema;
12
+ this.schemaDatabaseMetadata = schemaDatabaseMetadata;
12
13
  this.predicateFactory = predicateFactory;
13
14
  this.updateBuilderFactory = updateBuilderFactory;
14
15
  }
15
16
  async update(mapper, entity, primaryValue, data, filter) {
16
- const updateBuilder = this.updateBuilderFactory.create(entity, {
17
- [entity.primary]: { eq: primaryValue },
18
- });
17
+ const updateBuilder = this.updateBuilderFactory.create(entity, primaryValue);
19
18
  const predicateFields = Object.keys(data);
20
19
  updateBuilder.addPredicates(predicateFields);
21
20
  if (filter && Object.keys(filter).length > 0) {
@@ -25,25 +24,23 @@ class Updater {
25
24
  const visitor = new inputProcessing_1.UpdateInputVisitor(updateVisitor, this.schema, data);
26
25
  const promises = (0, schema_utils_1.acceptEveryFieldVisitor)(this.schema, entity, visitor);
27
26
  const okResultFactory = (values) => new Result_1.MutationUpdateOk([], entity, primaryValue, data, values);
28
- const mutationResultPromise = Updater.executeUpdate(updateBuilder, mapper.db, okResultFactory);
27
+ const mutationResultPromise = Updater.executeUpdate(updateBuilder, mapper, okResultFactory);
29
28
  const otherPromises = Object.values(promises);
30
29
  if (otherPromises.length === 0) {
31
30
  return await mutationResultPromise;
32
31
  }
33
32
  else {
34
- return await (0, Result_1.collectResults)(this.schema, mutationResultPromise, otherPromises);
33
+ return await (0, Result_1.collectResults)(this.schema, this.schemaDatabaseMetadata, mutationResultPromise, otherPromises);
35
34
  }
36
35
  }
37
36
  async updateCb(mapper, entity, primaryValue, builderCb) {
38
- const updateBuilder = this.updateBuilderFactory.create(entity, {
39
- [entity.primary]: { eq: primaryValue },
40
- });
37
+ const updateBuilder = this.updateBuilderFactory.create(entity, primaryValue);
41
38
  const okResultFactory = (values) => new Result_1.MutationUpdateOk([], entity, primaryValue, {}, values);
42
39
  builderCb(updateBuilder);
43
- return Updater.executeUpdate(updateBuilder, mapper.db, okResultFactory);
40
+ return Updater.executeUpdate(updateBuilder, mapper, okResultFactory);
44
41
  }
45
- static async executeUpdate(updateBuilder, db, okResultFactory) {
46
- const result = await updateBuilder.execute(db);
42
+ static async executeUpdate(updateBuilder, mapper, okResultFactory) {
43
+ const result = await updateBuilder.execute(mapper);
47
44
  if (result.aborted) {
48
45
  return [new Result_1.MutationNothingToDo([], Result_1.NothingToDoReason.aborted)];
49
46
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Updater.js","sourceRoot":"","sources":["../../../../src/mapper/update/Updater.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Updater.js","sourceRoot":"","sources":["../../../../src/mapper/update/Updater.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,7 @@
1
- import { FieldNode as GraphQlFieldNode, getArgumentValues, GraphQLObjectType, GraphQLOutputType, GraphQLResolveInfo } from 'graphql';
1
+ import { FieldNode as GraphQlFieldNode, GraphQLObjectType, GraphQLOutputType, GraphQLResolveInfo } from 'graphql';
2
2
  import { ObjectNode } from '../inputProcessing';
3
3
  declare type NodeFilter = (node: GraphQlFieldNode, path: string[]) => boolean;
4
4
  export declare class GraphQlQueryAstFactory {
5
- private readonly argumentValuesResolver;
6
- constructor(argumentValuesResolver: typeof getArgumentValues);
7
5
  create<Args = any>(info: GraphQLResolveInfo, filter?: NodeFilter): ObjectNode<Args>;
8
6
  private createFromNode;
9
7
  private processSelectionSet;
@@ -1 +1 @@
1
- {"version":3,"file":"GraphQlQueryAstFactory.d.ts","sourceRoot":"","sources":["../../../src/resolvers/GraphQlQueryAstFactory.ts"],"names":[],"mappings":"AACA,OAAO,EACN,SAAS,IAAI,gBAAgB,EAE7B,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAMlB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAa,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAG1D,aAAK,UAAU,GAAG,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAA;AAGrE,qBAAa,sBAAsB;IACtB,OAAO,CAAC,QAAQ,CAAC,sBAAsB;gBAAtB,sBAAsB,EAAE,OAAO,iBAAiB;IAEtE,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;IAO1F,OAAO,CAAC,cAAc;IA+BtB,OAAO,CAAC,mBAAmB;WAwCb,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,GAAG,iBAAiB;IAa3E,OAAO,CAAC,MAAM,CAAC,YAAY;IAO3B,OAAO,CAAC,MAAM,CAAC,cAAc;IAQ7B,OAAO,CAAC,MAAM,CAAC,WAAW;CAgB1B"}
1
+ {"version":3,"file":"GraphQlQueryAstFactory.d.ts","sourceRoot":"","sources":["../../../src/resolvers/GraphQlQueryAstFactory.ts"],"names":[],"mappings":"AACA,OAAO,EACN,SAAS,IAAI,gBAAgB,EAG7B,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAMlB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAa,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAG1D,aAAK,UAAU,GAAG,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAA;AAGrE,qBAAa,sBAAsB;IAE3B,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;IAO1F,OAAO,CAAC,cAAc;IA+BtB,OAAO,CAAC,mBAAmB;WAwCb,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,GAAG,iBAAiB;IAa3E,OAAO,CAAC,MAAM,CAAC,YAAY;IAO3B,OAAO,CAAC,MAAM,CAAC,cAAc;IAQ7B,OAAO,CAAC,MAAM,CAAC,WAAW;CAgB1B"}
@@ -6,9 +6,6 @@ const graphql_1 = require("graphql");
6
6
  const inputProcessing_1 = require("../inputProcessing");
7
7
  const node_util_1 = require("node:util");
8
8
  class GraphQlQueryAstFactory {
9
- constructor(argumentValuesResolver) {
10
- this.argumentValuesResolver = argumentValuesResolver;
11
- }
12
9
  create(info, filter) {
13
10
  const node = utils_1.ResolveInfoUtils.extractFieldNode(info);
14
11
  const parentType = info.parentType;
@@ -27,7 +24,7 @@ class GraphQlQueryAstFactory {
27
24
  const type = field.type;
28
25
  const resolvedType = GraphQlQueryAstFactory.resolveObjectType(type);
29
26
  const fields = this.processSelectionSet(info, resolvedType, node.selectionSet, [...path, alias], filter);
30
- return new inputProcessing_1.ObjectNode(name, alias, fields, this.argumentValuesResolver(field, node, info.variableValues), field.extensions || {}, path);
27
+ return new inputProcessing_1.ObjectNode(name, alias, fields, (0, graphql_1.getArgumentValues)(field, node, info.variableValues), field.extensions || {}, path);
31
28
  }
32
29
  processSelectionSet(info, parentType, selectionSet, path, filter) {
33
30
  const fields = [];
@@ -1 +1 @@
1
- {"version":3,"file":"GraphQlQueryAstFactory.js","sourceRoot":"","sources":["../../../src/resolvers/GraphQlQueryAstFactory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GraphQlQueryAstFactory.js","sourceRoot":"","sources":["../../../src/resolvers/GraphQlQueryAstFactory.ts"],"names":[],"mappings":"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"}
@@ -2,8 +2,8 @@ import { Model, Result } from '@contember/schema';
2
2
  import { MapperFactory } from '../mapper';
3
3
  import { GraphQLResolveInfo } from 'graphql';
4
4
  import { GraphQlQueryAstFactory } from './GraphQlQueryAstFactory';
5
- import { Client } from '@contember/database';
6
5
  import { InputPreValidator } from '../input-validation';
6
+ import { SchemaDatabaseMetadata } from '@contember/schema-utils';
7
7
  declare type WithoutNode<T extends {
8
8
  node: any;
9
9
  }> = Pick<T, Exclude<keyof T, 'node'>>;
@@ -12,12 +12,11 @@ declare type TransactionOptions = {
12
12
  };
13
13
  export declare class MutationResolver {
14
14
  private readonly schema;
15
- private readonly db;
16
15
  private readonly mapperFactory;
17
- private readonly systemVariablesSetup;
18
16
  private readonly inputValidator;
19
17
  private readonly graphqlQueryAstFactory;
20
- constructor(schema: Model.Schema, db: Client, mapperFactory: MapperFactory, systemVariablesSetup: (db: Client) => Promise<void>, inputValidator: InputPreValidator, graphqlQueryAstFactory: GraphQlQueryAstFactory);
18
+ private readonly schemaDatabaseMetadata;
19
+ constructor(schema: Model.Schema, mapperFactory: MapperFactory, inputValidator: InputPreValidator, graphqlQueryAstFactory: GraphQlQueryAstFactory, schemaDatabaseMetadata: SchemaDatabaseMetadata);
21
20
  resolveTransaction(info: GraphQLResolveInfo, options: TransactionOptions): Promise<Result.TransactionResult>;
22
21
  resolveUpdate(entity: Model.Entity, info: GraphQLResolveInfo): Promise<WithoutNode<Result.UpdateResult>>;
23
22
  private validateUpdate;