@contember/engine-content-api 1.2.0-alpha.10 → 1.2.0-alpha.11

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 (236) hide show
  1. package/dist/src/acl/PredicateFactory.d.ts +1 -1
  2. package/dist/src/acl/PredicateFactory.d.ts.map +1 -1
  3. package/dist/src/acl/PredicateFactory.js +6 -13
  4. package/dist/src/acl/PredicateFactory.js.map +1 -1
  5. package/dist/src/acl/PredicatesInjector.d.ts +1 -1
  6. package/dist/src/acl/PredicatesInjector.d.ts.map +1 -1
  7. package/dist/src/acl/PredicatesInjector.js +13 -20
  8. package/dist/src/acl/PredicatesInjector.js.map +1 -1
  9. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.d.ts +0 -1
  10. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.d.ts.map +1 -1
  11. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js +14 -15
  12. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js.map +1 -1
  13. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.d.ts +1 -1
  14. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.d.ts.map +1 -1
  15. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.js +1 -1
  16. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.js.map +1 -1
  17. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.d.ts +5 -4
  18. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.d.ts.map +1 -1
  19. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.js +11 -14
  20. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.js.map +1 -1
  21. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.d.ts.map +1 -1
  22. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.js +2 -2
  23. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.js.map +1 -1
  24. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.d.ts +3 -3
  25. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.d.ts.map +1 -1
  26. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js +3 -3
  27. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js.map +1 -1
  28. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.d.ts +5 -4
  29. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.d.ts.map +1 -1
  30. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.js +11 -15
  31. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.js.map +1 -1
  32. package/dist/src/input-validation/ColumnValueResolver.d.ts +4 -3
  33. package/dist/src/input-validation/ColumnValueResolver.d.ts.map +1 -1
  34. package/dist/src/input-validation/ColumnValueResolver.js.map +1 -1
  35. package/dist/src/input-validation/EntityRulesResolver.js +4 -4
  36. package/dist/src/input-validation/EntityRulesResolver.js.map +1 -1
  37. package/dist/src/input-validation/QueryAstFactory.js +1 -1
  38. package/dist/src/input-validation/QueryAstFactory.js.map +1 -1
  39. package/dist/src/input-validation/ValidationDataSelector.js +1 -1
  40. package/dist/src/input-validation/ValidationDataSelector.js.map +1 -1
  41. package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.d.ts +7 -8
  42. package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.d.ts.map +1 -1
  43. package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.js.map +1 -1
  44. package/dist/src/input-validation/preValidation/InputPreValidator.js +4 -4
  45. package/dist/src/input-validation/preValidation/InputPreValidator.js.map +1 -1
  46. package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.d.ts +7 -8
  47. package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.d.ts.map +1 -1
  48. package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.js.map +1 -1
  49. package/dist/src/inputProcessing/CreateInputProcessor.d.ts +8 -9
  50. package/dist/src/inputProcessing/CreateInputProcessor.d.ts.map +1 -1
  51. package/dist/src/inputProcessing/CreateInputVisitor.d.ts +7 -7
  52. package/dist/src/inputProcessing/CreateInputVisitor.d.ts.map +1 -1
  53. package/dist/src/inputProcessing/CreateInputVisitor.js +15 -46
  54. package/dist/src/inputProcessing/CreateInputVisitor.js.map +1 -1
  55. package/dist/src/inputProcessing/UpdateInputProcessor.d.ts +8 -9
  56. package/dist/src/inputProcessing/UpdateInputProcessor.d.ts.map +1 -1
  57. package/dist/src/inputProcessing/UpdateInputVisitor.d.ts +7 -7
  58. package/dist/src/inputProcessing/UpdateInputVisitor.d.ts.map +1 -1
  59. package/dist/src/inputProcessing/UpdateInputVisitor.js +13 -28
  60. package/dist/src/inputProcessing/UpdateInputVisitor.js.map +1 -1
  61. package/dist/src/inputProcessing/index.d.ts +0 -1
  62. package/dist/src/inputProcessing/index.d.ts.map +1 -1
  63. package/dist/src/inputProcessing/index.js +0 -1
  64. package/dist/src/inputProcessing/index.js.map +1 -1
  65. package/dist/src/introspection/IntrospectionSchemaFactory.js +7 -7
  66. package/dist/src/introspection/IntrospectionSchemaFactory.js.map +1 -1
  67. package/dist/src/mapper/Mapper.d.ts +6 -6
  68. package/dist/src/mapper/Mapper.d.ts.map +1 -1
  69. package/dist/src/mapper/Mapper.js +28 -23
  70. package/dist/src/mapper/Mapper.js.map +1 -1
  71. package/dist/src/mapper/MapperContainer.d.ts.map +1 -1
  72. package/dist/src/mapper/MapperContainer.js +2 -2
  73. package/dist/src/mapper/MapperContainer.js.map +1 -1
  74. package/dist/src/mapper/delete/DeleteExecutor.js +3 -3
  75. package/dist/src/mapper/delete/DeleteExecutor.js.map +1 -1
  76. package/dist/src/mapper/insert/SqlCreateInputProcessor.d.ts +4 -2
  77. package/dist/src/mapper/insert/SqlCreateInputProcessor.d.ts.map +1 -1
  78. package/dist/src/mapper/insert/SqlCreateInputProcessor.js.map +1 -1
  79. package/dist/src/mapper/select/JoinVisitor.d.ts +6 -6
  80. package/dist/src/mapper/select/JoinVisitor.d.ts.map +1 -1
  81. package/dist/src/mapper/select/JoinVisitor.js +6 -6
  82. package/dist/src/mapper/select/JoinVisitor.js.map +1 -1
  83. package/dist/src/mapper/select/RelationFetcher.d.ts +11 -19
  84. package/dist/src/mapper/select/RelationFetcher.d.ts.map +1 -1
  85. package/dist/src/mapper/select/RelationFetcher.js +34 -25
  86. package/dist/src/mapper/select/RelationFetcher.js.map +1 -1
  87. package/dist/src/mapper/select/SelectBuilder.d.ts +2 -1
  88. package/dist/src/mapper/select/SelectBuilder.d.ts.map +1 -1
  89. package/dist/src/mapper/select/SelectBuilder.js +4 -2
  90. package/dist/src/mapper/select/SelectBuilder.js.map +1 -1
  91. package/dist/src/mapper/select/SelectBuilderFactory.d.ts +2 -1
  92. package/dist/src/mapper/select/SelectBuilderFactory.d.ts.map +1 -1
  93. package/dist/src/mapper/select/SelectExecutionHandler.d.ts +1 -0
  94. package/dist/src/mapper/select/SelectExecutionHandler.d.ts.map +1 -1
  95. package/dist/src/mapper/select/WhereBuilder.d.ts +3 -2
  96. package/dist/src/mapper/select/WhereBuilder.d.ts.map +1 -1
  97. package/dist/src/mapper/select/WhereBuilder.js +29 -24
  98. package/dist/src/mapper/select/WhereBuilder.js.map +1 -1
  99. package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts +9 -8
  100. package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts.map +1 -1
  101. package/dist/src/mapper/select/handlers/FieldsVisitor.js +33 -25
  102. package/dist/src/mapper/select/handlers/FieldsVisitor.js.map +1 -1
  103. package/dist/src/mapper/select/handlers/FieldsVisitorFactory.d.ts.map +1 -1
  104. package/dist/src/mapper/select/handlers/FieldsVisitorFactory.js +1 -1
  105. package/dist/src/mapper/select/handlers/FieldsVisitorFactory.js.map +1 -1
  106. package/dist/src/mapper/select/optimizer/ConditionOptimizer.d.ts.map +1 -1
  107. package/dist/src/mapper/select/optimizer/ConditionOptimizer.js +6 -0
  108. package/dist/src/mapper/select/optimizer/ConditionOptimizer.js.map +1 -1
  109. package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts +2 -1
  110. package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts.map +1 -1
  111. package/dist/src/mapper/select/optimizer/WhereOptimizer.js +52 -20
  112. package/dist/src/mapper/select/optimizer/WhereOptimizer.js.map +1 -1
  113. package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts +4 -1
  114. package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts.map +1 -1
  115. package/dist/src/mapper/select/optimizer/WhereReplacer.js +4 -3
  116. package/dist/src/mapper/select/optimizer/WhereReplacer.js.map +1 -1
  117. package/dist/src/mapper/update/SqlUpdateInputProcessor.d.ts +2 -3
  118. package/dist/src/mapper/update/SqlUpdateInputProcessor.d.ts.map +1 -1
  119. package/dist/src/mapper/update/SqlUpdateInputProcessor.js.map +1 -1
  120. package/dist/src/mapper/update/UpdateBuilder.js +3 -3
  121. package/dist/src/mapper/update/UpdateBuilder.js.map +1 -1
  122. package/dist/src/resolvers/MutationResolver.js +1 -1
  123. package/dist/src/resolvers/MutationResolver.js.map +1 -1
  124. package/dist/src/resolvers/ReadHelpers.js +3 -3
  125. package/dist/src/resolvers/ReadHelpers.js.map +1 -1
  126. package/dist/src/resolvers/ReadResolver.js +2 -2
  127. package/dist/src/resolvers/ReadResolver.js.map +1 -1
  128. package/dist/src/schema/FieldAccessVisitor.d.ts +2 -2
  129. package/dist/src/schema/FieldAccessVisitor.d.ts.map +1 -1
  130. package/dist/src/schema/FieldAccessVisitor.js +2 -2
  131. package/dist/src/schema/FieldAccessVisitor.js.map +1 -1
  132. package/dist/src/schema/OrderByTypeProvider.js +1 -1
  133. package/dist/src/schema/OrderByTypeProvider.js.map +1 -1
  134. package/dist/src/schema/WhereTypeProvider.js +4 -4
  135. package/dist/src/schema/WhereTypeProvider.js.map +1 -1
  136. package/dist/src/schema/entities/FieldArgsVisitor.d.ts +3 -3
  137. package/dist/src/schema/entities/FieldArgsVisitor.d.ts.map +1 -1
  138. package/dist/src/schema/entities/FieldArgsVisitor.js +3 -3
  139. package/dist/src/schema/entities/FieldArgsVisitor.js.map +1 -1
  140. package/dist/src/schema/entities/FieldTypeVisitor.d.ts +3 -3
  141. package/dist/src/schema/entities/FieldTypeVisitor.d.ts.map +1 -1
  142. package/dist/src/schema/entities/FieldTypeVisitor.js +3 -3
  143. package/dist/src/schema/entities/FieldTypeVisitor.js.map +1 -1
  144. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.d.ts +3 -3
  145. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.d.ts.map +1 -1
  146. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.js +3 -3
  147. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.js.map +1 -1
  148. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.d.ts +6 -6
  149. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.d.ts.map +1 -1
  150. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.js +6 -6
  151. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.js.map +1 -1
  152. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.d.ts +3 -3
  153. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.d.ts.map +1 -1
  154. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.js +5 -5
  155. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.js.map +1 -1
  156. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.d.ts +10 -4
  157. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.d.ts.map +1 -1
  158. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.js +3 -3
  159. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.js.map +1 -1
  160. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.d.ts +6 -6
  161. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.d.ts.map +1 -1
  162. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.js +6 -6
  163. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.js.map +1 -1
  164. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.d.ts +2 -2
  165. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.d.ts.map +1 -1
  166. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.js +2 -2
  167. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.js.map +1 -1
  168. package/dist/src/tsconfig.tsbuildinfo +1 -1
  169. package/dist/src/utils/uniqueWhereFields.js +3 -3
  170. package/dist/src/utils/uniqueWhereFields.js.map +1 -1
  171. package/dist/tests/cases/unit/predicatesFactory.test.js +7 -1
  172. package/dist/tests/cases/unit/predicatesFactory.test.js.map +1 -1
  173. package/dist/tests/cases/unit/whereOptimizer.test.js +82 -0
  174. package/dist/tests/cases/unit/whereOptimizer.test.js.map +1 -1
  175. package/dist/tests/tsconfig.tsbuildinfo +1 -1
  176. package/package.json +10 -10
  177. package/src/acl/PredicateFactory.ts +7 -14
  178. package/src/acl/PredicatesInjector.ts +13 -18
  179. package/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts +17 -24
  180. package/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts +1 -6
  181. package/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts +10 -28
  182. package/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts +6 -3
  183. package/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts +4 -22
  184. package/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts +10 -29
  185. package/src/input-validation/ColumnValueResolver.ts +2 -3
  186. package/src/input-validation/EntityRulesResolver.ts +4 -4
  187. package/src/input-validation/QueryAstFactory.ts +1 -1
  188. package/src/input-validation/ValidationDataSelector.ts +1 -1
  189. package/src/input-validation/preValidation/CreateInputPreValidationProcessor.ts +7 -8
  190. package/src/input-validation/preValidation/InputPreValidator.ts +4 -4
  191. package/src/input-validation/preValidation/UpdateInputPreValidationProcessor.ts +7 -8
  192. package/src/inputProcessing/CreateInputProcessor.ts +8 -9
  193. package/src/inputProcessing/CreateInputVisitor.ts +27 -89
  194. package/src/inputProcessing/UpdateInputProcessor.ts +8 -9
  195. package/src/inputProcessing/UpdateInputVisitor.ts +25 -71
  196. package/src/inputProcessing/index.ts +0 -1
  197. package/src/introspection/IntrospectionSchemaFactory.ts +7 -7
  198. package/src/mapper/Mapper.ts +36 -33
  199. package/src/mapper/MapperContainer.ts +3 -2
  200. package/src/mapper/delete/DeleteExecutor.ts +3 -3
  201. package/src/mapper/insert/SqlCreateInputProcessor.ts +3 -3
  202. package/src/mapper/select/JoinVisitor.ts +6 -33
  203. package/src/mapper/select/RelationFetcher.ts +49 -50
  204. package/src/mapper/select/SelectBuilder.ts +3 -1
  205. package/src/mapper/select/SelectBuilderFactory.ts +2 -1
  206. package/src/mapper/select/SelectExecutionHandler.ts +1 -0
  207. package/src/mapper/select/WhereBuilder.ts +45 -34
  208. package/src/mapper/select/handlers/FieldsVisitor.ts +32 -49
  209. package/src/mapper/select/handlers/FieldsVisitorFactory.ts +1 -0
  210. package/src/mapper/select/optimizer/ConditionOptimizer.ts +6 -0
  211. package/src/mapper/select/optimizer/WhereOptimizer.ts +58 -20
  212. package/src/mapper/select/optimizer/WhereReplacer.ts +8 -3
  213. package/src/mapper/update/SqlUpdateInputProcessor.ts +1 -1
  214. package/src/mapper/update/UpdateBuilder.ts +3 -3
  215. package/src/resolvers/MutationResolver.ts +1 -1
  216. package/src/resolvers/ReadHelpers.ts +3 -3
  217. package/src/resolvers/ReadResolver.ts +2 -2
  218. package/src/schema/FieldAccessVisitor.ts +2 -2
  219. package/src/schema/OrderByTypeProvider.ts +1 -1
  220. package/src/schema/WhereTypeProvider.ts +4 -4
  221. package/src/schema/entities/FieldArgsVisitor.ts +3 -3
  222. package/src/schema/entities/FieldTypeVisitor.ts +3 -3
  223. package/src/schema/mutations/CreateEntityInputFieldVisitor.ts +3 -6
  224. package/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.ts +6 -20
  225. package/src/schema/mutations/CreateEntityRelationInputFieldVisitor.ts +5 -18
  226. package/src/schema/mutations/UpdateEntityInputFieldVisitor.ts +3 -6
  227. package/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.ts +6 -20
  228. package/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.ts +2 -12
  229. package/src/utils/uniqueWhereFields.ts +3 -3
  230. package/tests/cases/unit/predicatesFactory.test.ts +8 -2
  231. package/tests/cases/unit/whereOptimizer.test.ts +94 -0
  232. package/dist/src/inputProcessing/InputContext.d.ts +0 -43
  233. package/dist/src/inputProcessing/InputContext.d.ts.map +0 -1
  234. package/dist/src/inputProcessing/InputContext.js +0 -3
  235. package/dist/src/inputProcessing/InputContext.js.map +0 -1
  236. package/src/inputProcessing/InputContext.ts +0 -49
@@ -7,7 +7,7 @@ export declare class PredicateFactory {
7
7
  constructor(permissions: Acl.Permissions, model: Model.Schema, variableInjector: VariableInjector);
8
8
  shouldApplyCellLevelPredicate(entity: Model.Entity, operation: Acl.Operation.read, fieldName: string): boolean;
9
9
  create(entity: Model.Entity, operation: Acl.Operation.delete): Input.Where;
10
- create(entity: Model.Entity, operation: Acl.Operation.update | Acl.Operation.read | Acl.Operation.create, fieldNames?: string[], overRelation?: Model.AnyRelation): Input.Where;
10
+ create(entity: Model.Entity, operation: Acl.Operation.update | Acl.Operation.read | Acl.Operation.create, fieldNames?: string[], relationContext?: Model.AnyRelationContext): Input.Where;
11
11
  private getRequiredPredicates;
12
12
  private optimizePredicates;
13
13
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PredicateFactory.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAOrD,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAFhB,WAAW,EAAE,GAAG,CAAC,WAAW,EAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,gBAAgB,EAAE,gBAAgB;IAG7C,6BAA6B,CACnC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,EAC7B,SAAS,EAAE,MAAM,GACf,OAAO;IAMH,MAAM,CACZ,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAC7B,KAAK,CAAC,KAAK;IACP,MAAM,CACZ,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAC3E,UAAU,CAAC,EAAE,MAAM,EAAE,EACrB,YAAY,CAAC,EAAE,KAAK,CAAC,WAAW,GAC9B,KAAK,CAAC,KAAK;IAwDd,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,kBAAkB;CAiB1B"}
1
+ {"version":3,"file":"PredicateFactory.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAKrD,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAFhB,WAAW,EAAE,GAAG,CAAC,WAAW,EAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,gBAAgB,EAAE,gBAAgB;IAG7C,6BAA6B,CACnC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,EAC7B,SAAS,EAAE,MAAM,GACf,OAAO;IAMH,MAAM,CACZ,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAC7B,KAAK,CAAC,KAAK;IACP,MAAM,CACZ,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAC3E,UAAU,CAAC,EAAE,MAAM,EAAE,EACrB,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB,GACxC,KAAK,CAAC,KAAK;IAwDd,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,kBAAkB;CAY1B"}
@@ -2,8 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PredicateFactory = void 0;
4
4
  const schema_1 = require("@contember/schema");
5
- const schema_utils_1 = require("@contember/schema-utils");
6
- const exception_1 = require("../exception");
7
5
  const EvaluatedPredicateReplacer_1 = require("./EvaluatedPredicateReplacer");
8
6
  const getRowLevelPredicatePseudoField = (entity) => entity.primary;
9
7
  class PredicateFactory {
@@ -18,7 +16,7 @@ class PredicateFactory {
18
16
  const permissions = (_b = (_a = this.permissions[entity.name]) === null || _a === void 0 ? void 0 : _a.operations) === null || _b === void 0 ? void 0 : _b[operation];
19
17
  return (permissions === null || permissions === void 0 ? void 0 : permissions[fieldName]) !== (permissions === null || permissions === void 0 ? void 0 : permissions[rowLevelField]);
20
18
  }
21
- create(entity, operation, fieldNames, overRelation) {
19
+ create(entity, operation, fieldNames, relationContext) {
22
20
  const entityPermissions = this.permissions[entity.name];
23
21
  const neverCondition = { [entity.primary]: { never: true } };
24
22
  if (!entityPermissions) {
@@ -60,7 +58,7 @@ class PredicateFactory {
60
58
  return {};
61
59
  }
62
60
  const where = predicatesWhere.length === 1 ? predicatesWhere[0] : { and: predicatesWhere };
63
- return this.optimizePredicates(where, overRelation);
61
+ return this.optimizePredicates(where, relationContext);
64
62
  }
65
63
  getRequiredPredicates(fieldNames, fieldPermissions) {
66
64
  const predicates = [];
@@ -78,20 +76,15 @@ class PredicateFactory {
78
76
  }
79
77
  return predicates;
80
78
  }
81
- optimizePredicates(where, overRelation) {
82
- if (!overRelation) {
79
+ optimizePredicates(where, relationContext) {
80
+ if (!relationContext || !relationContext.targetRelation) {
83
81
  return where;
84
82
  }
85
- const otherSide = (0, schema_utils_1.isOwningRelation)(overRelation) ? overRelation.inversedBy : overRelation.ownedBy;
86
- if (!otherSide) {
87
- throw new exception_1.ImplementationException();
88
- }
89
- const sourceEntity = this.model.entities[overRelation.target];
90
- const sourcePredicate = this.create(sourceEntity, schema_1.Acl.Operation.read, [otherSide]);
83
+ const sourcePredicate = this.create(relationContext.entity, schema_1.Acl.Operation.read, [relationContext.relation.name]);
91
84
  if (Object.keys(sourcePredicate).length === 0) {
92
85
  return where;
93
86
  }
94
- const replacer = new EvaluatedPredicateReplacer_1.EvaluatedPredicateReplacer(sourcePredicate, sourceEntity, overRelation);
87
+ const replacer = new EvaluatedPredicateReplacer_1.EvaluatedPredicateReplacer(sourcePredicate, relationContext.entity, relationContext.targetRelation);
95
88
  return replacer.replace(where);
96
89
  }
97
90
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PredicateFactory.js","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PredicateFactory.js","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ export declare class PredicatesInjector {
4
4
  private readonly schema;
5
5
  private readonly predicateFactory;
6
6
  constructor(schema: Model.Schema, predicateFactory: PredicateFactory);
7
- inject(entity: Model.Entity, where: Input.OptionalWhere, overRelation?: Model.AnyRelation): Input.OptionalWhere;
7
+ inject(entity: Model.Entity, where: Input.OptionalWhere, relationContext?: Model.AnyRelationContext): Input.OptionalWhere;
8
8
  private createWhere;
9
9
  private injectToWhere;
10
10
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PredicatesInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,qBAAa,kBAAkB;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAvD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,gBAAgB,EAAE,gBAAgB;IAE/F,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,YAAY,CAAC,EAAE,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,aAAa;IAKtH,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,aAAa;CAwCrB"}
1
+ {"version":3,"file":"PredicatesInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,qBAAa,kBAAkB;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAvD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,gBAAgB,EAAE,gBAAgB;IAE/F,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC,aAAa;IAKhI,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,aAAa;CAmCrB"}
@@ -8,12 +8,12 @@ class PredicatesInjector {
8
8
  this.schema = schema;
9
9
  this.predicateFactory = predicateFactory;
10
10
  }
11
- inject(entity, where, overRelation) {
11
+ inject(entity, where, relationContext) {
12
12
  const restrictedWhere = this.injectToWhere(where, entity, true);
13
- return this.createWhere(entity, undefined, restrictedWhere, overRelation);
13
+ return this.createWhere(entity, undefined, restrictedWhere, relationContext);
14
14
  }
15
- createWhere(entity, fieldNames, where, overRelation) {
16
- const predicatesWhere = this.predicateFactory.create(entity, schema_1.Acl.Operation.read, fieldNames, overRelation);
15
+ createWhere(entity, fieldNames, where, relationContext) {
16
+ const predicatesWhere = this.predicateFactory.create(entity, schema_1.Acl.Operation.read, fieldNames, relationContext);
17
17
  const and = [where, predicatesWhere].filter(it => Object.keys(it).length > 0);
18
18
  if (and.length === 0) {
19
19
  return {};
@@ -23,38 +23,31 @@ class PredicatesInjector {
23
23
  }
24
24
  return { and: and };
25
25
  }
26
- injectToWhere(where, entity, isRoot, overRelation) {
27
- var _c;
26
+ injectToWhere(where, entity, isRoot, relationContext) {
28
27
  const resultWhere = {};
29
28
  if (where.and) {
30
- resultWhere.and = where.and.filter((it) => !!it).map(it => this.injectToWhere(it, entity, isRoot, overRelation));
29
+ resultWhere.and = where.and.filter((it) => !!it).map(it => this.injectToWhere(it, entity, isRoot, relationContext));
31
30
  }
32
31
  if (where.or) {
33
- resultWhere.or = where.or.filter((it) => !!it).map(it => this.injectToWhere(it, entity, isRoot, overRelation));
32
+ resultWhere.or = where.or.filter((it) => !!it).map(it => this.injectToWhere(it, entity, isRoot, relationContext));
34
33
  }
35
34
  if (where.not) {
36
- resultWhere.not = this.injectToWhere(where.not, entity, isRoot, overRelation);
35
+ resultWhere.not = this.injectToWhere(where.not, entity, isRoot, relationContext);
37
36
  }
38
37
  const fields = Object.keys(where).filter(it => !['and', 'or', 'not'].includes(it));
39
38
  if (fields.length === 0) {
40
39
  return resultWhere;
41
40
  }
42
41
  for (let field of fields) {
43
- const [targetEntity, targetRelation] = (_c = (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, field, {
44
- visitColumn: () => null,
45
- visitRelation: (_a, _b, targetEntity, targetRelation) => [targetEntity, targetRelation !== null && targetRelation !== void 0 ? targetRelation : undefined],
46
- })) !== null && _c !== void 0 ? _c : [];
47
- if (targetEntity) {
48
- resultWhere[field] = this.injectToWhere(where[field], targetEntity, false, targetRelation);
49
- }
50
- else {
51
- resultWhere[field] = where[field];
52
- }
42
+ resultWhere[field] = (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, field, {
43
+ visitColumn: () => where[field],
44
+ visitRelation: context => this.injectToWhere(where[field], context.targetEntity, false, context),
45
+ });
53
46
  }
54
47
  const fieldsForPredicate = !isRoot
55
48
  ? fields
56
49
  : fields.filter(it => this.predicateFactory.shouldApplyCellLevelPredicate(entity, schema_1.Acl.Operation.read, it));
57
- return this.createWhere(entity, fieldsForPredicate, resultWhere, overRelation);
50
+ return this.createWhere(entity, fieldsForPredicate, resultWhere, relationContext);
58
51
  }
59
52
  }
60
53
  exports.PredicatesInjector = PredicatesInjector;
@@ -1 +1 @@
1
- {"version":3,"file":"PredicatesInjector.js","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":";;;AAAA,8CAA+D;AAC/D,0DAA4D;AAG5D,MAAa,kBAAkB;IAC9B,YAA6B,MAAoB,EAAmB,gBAAkC;QAAzE,WAAM,GAAN,MAAM,CAAc;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAEnG,MAAM,CAAC,MAAoB,EAAE,KAA0B,EAAE,YAAgC;QAC/F,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC/D,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,YAAY,CAAC,CAAA;IAC1E,CAAC;IAEO,WAAW,CAClB,MAAoB,EACpB,UAAgC,EAChC,KAA0B,EAC1B,YAAgC;QAEhC,MAAM,eAAe,GAAgB,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,YAAG,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;QAEvH,MAAM,GAAG,GAAG,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAC7E,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,EAAE,CAAA;SACT;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,GAAG,CAAC,CAAC,CAAC,CAAA;SACb;QACD,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;IACpB,CAAC;IAEO,aAAa,CACpB,KAA0B,EAC1B,MAAoB,EACpB,MAAe,EACf,YAAgC;;QAEhC,MAAM,WAAW,GAAkC,EAAE,CAAA;QACrD,IAAI,KAAK,CAAC,GAAG,EAAE;YACd,WAAW,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;SACnI;QACD,IAAI,KAAK,CAAC,EAAE,EAAE;YACb,WAAW,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;SACjI;QACD,IAAI,KAAK,CAAC,GAAG,EAAE;YACd,WAAW,CAAC,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;SAC7E;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA;QAElF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,OAAO,WAAW,CAAA;SAClB;QACD,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;YACzB,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,GAAG,MAAA,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;gBACrF,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;gBACvB,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,YAAY,EAAE,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,SAAS,CAAC;aACpG,CAAC,mCAAI,EAAE,CAAA;YACR,IAAI,YAAY,EAAE;gBACjB,WAAW,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAgB,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;aACzG;iBAAM;gBACN,WAAW,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;aACjC;SACD;QACD,MAAM,kBAAkB,GAAG,CAAC,MAAM;YACjC,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,MAAM,EAAE,YAAG,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;QAE3G,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,CAAC,CAAA;IAC/E,CAAC;CAED;AAlED,gDAkEC"}
1
+ {"version":3,"file":"PredicatesInjector.js","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,5 @@ export declare class HasManyToHasOneReducerExecutionHandler implements SelectExe
7
7
  private readonly uniqueWhereExpander;
8
8
  constructor(schema: Model.Schema, uniqueWhereExpander: UniqueWhereExpander);
9
9
  process(context: SelectExecutionHandlerContext<Input.UniqueQueryInput, HasManyToHasOneReducerExtension>): void;
10
- private getRelationTarget;
11
10
  }
12
11
  //# sourceMappingURL=HasManyToHasOneReducerExecutionHandler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"HasManyToHasOneReducerExecutionHandler.d.ts","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGhD,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAA;AAEpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAA;AAE1E,qBAAa,sCAAuC,YAAW,sBAAsB,CAAC,KAAK,CAAC,gBAAgB,EAAE,+BAA+B,CAAC;IAEjI,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBAA1D,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,mBAAmB,EAAE,mBAAmB;IAE5G,OAAO,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,gBAAgB,EAAE,+BAA+B,CAAC,GAAG,IAAI;IA2B9G,OAAO,CAAC,iBAAiB;CAqBzB"}
1
+ {"version":3,"file":"HasManyToHasOneReducerExecutionHandler.d.ts","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGhD,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAA;AAEpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAA;AAE1E,qBAAa,sCAAuC,YAAW,sBAAsB,CAAC,KAAK,CAAC,gBAAgB,EAAE,+BAA+B,CAAC;IAEjI,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBAA1D,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,mBAAmB,EAAE,mBAAmB;IAE5G,OAAO,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,gBAAgB,EAAE,+BAA+B,CAAC,GAAG,IAAI;CAyC9G"}
@@ -15,7 +15,16 @@ class HasManyToHasOneReducerExecutionHandler {
15
15
  throw new Error();
16
16
  }
17
17
  addData(entity.primary, async (ids) => {
18
- const [targetEntity, targetRelation] = this.getRelationTarget(entity, objectNode.extensions.relationName);
18
+ const relationContext = (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, objectNode.extensions.relationName, {
19
+ visitRelation: context => context,
20
+ visitColumn: () => {
21
+ throw new exception_1.ImplementationException('HasManyToHasOneReducerExecutionHandler: Not applicable for a column');
22
+ },
23
+ });
24
+ const { targetEntity, targetRelation } = relationContext;
25
+ if (!targetRelation || !(0, utils_1.isIt)(targetRelation, 'joiningColumn')) {
26
+ throw new Error('HasManyToHasOneReducerExecutionHandler: only applicable for relations with joiningColumn');
27
+ }
19
28
  const uniqueWhere = this.uniqueWhereExpander.expand(targetEntity, {
20
29
  ...objectNode.args.by,
21
30
  [targetRelation.name]: { [entity.primary]: ids },
@@ -27,22 +36,12 @@ class HasManyToHasOneReducerExecutionHandler {
27
36
  and: [objectNode.args.filter || {}, uniqueWhere],
28
37
  };
29
38
  const newObjectNode = objectNode.withArgs({ filter: whereWithParentId });
30
- return context.mapper.select(targetEntity, newObjectNode, targetRelation, targetRelation.name);
39
+ return context.mapper.selectAssoc(targetEntity, newObjectNode, [
40
+ ...context.relationPath,
41
+ relationContext,
42
+ ], targetRelation.name);
31
43
  }, null);
32
44
  }
33
- getRelationTarget(entity, relationName) {
34
- return (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, relationName, {
35
- visitColumn: () => {
36
- throw new exception_1.ImplementationException('HasManyToHasOneReducerExecutionHandler: Not applicable for a column');
37
- },
38
- visitRelation: (entity, relation, targetEntity, targetRelation) => {
39
- if (!targetRelation || !(0, utils_1.isIt)(targetRelation, 'joiningColumn')) {
40
- throw new Error('HasManyToHasOneReducerExecutionHandler: only applicable for relations with joiningColumn');
41
- }
42
- return [targetEntity, targetRelation];
43
- },
44
- });
45
- }
46
45
  }
47
46
  exports.HasManyToHasOneReducerExecutionHandler = HasManyToHasOneReducerExecutionHandler;
48
47
  //# sourceMappingURL=HasManyToHasOneReducerExecutionHandler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"HasManyToHasOneReducerExecutionHandler.js","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts"],"names":[],"mappings":";;;AACA,uCAAkC;AAClC,0DAA4D;AAE5D,+CAAyD;AAIzD,MAAa,sCAAsC;IAElD,YAA6B,MAAoB,EAAmB,mBAAwC;QAA/E,WAAM,GAAN,MAAM,CAAc;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;IAEhH,OAAO,CAAC,OAA+F;QACtG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;QAC/C,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,OAAO,CACN,MAAM,CAAC,OAAO,EACd,KAAK,EAAE,GAAyB,EAAE,EAAE;YACnC,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,CAAA;YACzG,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE;gBACjE,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE;gBACrB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE;aAChD,CAAC,CAAA;YACF,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1C,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAA;aAC7F;YACD,MAAM,iBAAiB,GAAG;gBACzB,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,WAAW,CAAC;aAChD,CAAA;YACD,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAuB,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAA;YAE9F,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,CAAC,IAAI,CAAC,CAAA;QAC/F,CAAC,EACD,IAAI,CACJ,CAAA;IACF,CAAC;IAEO,iBAAiB,CACxB,MAAoB,EACpB,YAAoB;QAEpB,OAAO,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE;YAC5D,WAAW,EAAE,GAAU,EAAE;gBACxB,MAAM,IAAI,mCAAuB,CAAC,qEAAqE,CAAC,CAAA;YACzG,CAAC;YACD,aAAa,EAAE,CACd,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,cAAc,EACoD,EAAE;gBACpE,IAAI,CAAC,cAAc,IAAI,CAAC,IAAA,YAAI,EAA8B,cAAc,EAAE,eAAe,CAAC,EAAE;oBAC3F,MAAM,IAAI,KAAK,CAAC,0FAA0F,CAAC,CAAA;iBAC3G;gBACD,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;YACtC,CAAC;SACD,CAAC,CAAA;IACH,CAAC;CACD;AApDD,wFAoDC"}
1
+ {"version":3,"file":"HasManyToHasOneReducerExecutionHandler.js","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts"],"names":[],"mappings":";;;AACA,uCAAkC;AAClC,0DAA4D;AAE5D,+CAAyD;AAIzD,MAAa,sCAAsC;IAElD,YAA6B,MAAoB,EAAmB,mBAAwC;QAA/E,WAAM,GAAN,MAAM,CAAc;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;IAEhH,OAAO,CAAC,OAA+F;QACtG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;QAC/C,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,OAAO,CACN,MAAM,CAAC,OAAO,EACd,KAAK,EAAE,GAAyB,EAAE,EAAE;YAEnC,MAAM,eAAe,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,YAAY,EAAE;gBACnG,aAAa,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO;gBACjC,WAAW,EAAE,GAAU,EAAE;oBACxB,MAAM,IAAI,mCAAuB,CAAC,qEAAqE,CAAC,CAAA;gBACzG,CAAC;aACD,CAAC,CAAA;YAEF,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,eAAe,CAAA;YACxD,IAAI,CAAC,cAAc,IAAI,CAAC,IAAA,YAAI,EAA8B,cAAc,EAAE,eAAe,CAAC,EAAE;gBAC3F,MAAM,IAAI,KAAK,CAAC,0FAA0F,CAAC,CAAA;aAC3G;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE;gBACjE,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE;gBACrB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE;aAChD,CAAC,CAAA;YACF,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1C,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAA;aAC7F;YACD,MAAM,iBAAiB,GAAG;gBACzB,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,WAAW,CAAC;aAChD,CAAA;YACD,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAuB,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAA;YAE9F,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,aAAa,EAAE;gBAC9D,GAAG,OAAO,CAAC,YAAY;gBACvB,eAAe;aACf,EAAE,cAAc,CAAC,IAAI,CAAC,CAAA;QACxB,CAAC,EACD,IAAI,CACJ,CAAA;IACF,CAAC;CACD;AA7CD,wFA6CC"}
@@ -15,6 +15,6 @@ export declare class HasManyToHasOneRelationReducerFieldVisitor implements Model
15
15
  visitManyHasOne(): {};
16
16
  visitManyHasManyInverse(): {};
17
17
  visitManyHasManyOwning(): {};
18
- visitOneHasMany(entity: Model.Entity, relation: Model.AnyRelation, targetEntity: Model.Entity, targetRelation: Model.AnyRelation | null): FieldMap<HasManyToHasOneReducerExtension>;
18
+ visitOneHasMany({ entity, targetEntity, targetRelation, relation }: Model.OneHasManyContext): FieldMap<HasManyToHasOneReducerExtension>;
19
19
  }
20
20
  //# sourceMappingURL=HasManyToHasOneRelationReducerVisitor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"HasManyToHasOneRelationReducerVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAEN,kBAAkB,EAGlB,iBAAiB,EACjB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,qBAAa,0CAA2C,YACvD,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC,EAC9D,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;IAGrE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAHjB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB;IAG/C,WAAW;IAIX,oBAAoB;IAIpB,qBAAqB;IAIrB,eAAe;IAIf,uBAAuB;IAIvB,sBAAsB;IAItB,eAAe,CACrB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,WAAW,EAC3B,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,WAAW,GAAG,IAAI;CAqDzC"}
1
+ {"version":3,"file":"HasManyToHasOneRelationReducerVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAEN,kBAAkB,EAGlB,iBAAiB,EACjB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,qBAAa,0CAA2C,YACvD,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC,EAC9D,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;IAGrE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAHjB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB;IAG/C,WAAW;IAIX,oBAAoB;IAIpB,qBAAqB;IAIrB,eAAe;IAIf,uBAAuB;IAIvB,sBAAsB;IAItB,eAAe,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,iBAAiB;CAoDlG"}
@@ -31,7 +31,7 @@ class HasManyToHasOneRelationReducerFieldVisitor {
31
31
  visitManyHasManyOwning() {
32
32
  return {};
33
33
  }
34
- visitOneHasMany(entity, relation, targetEntity, targetRelation) {
34
+ visitOneHasMany({ entity, targetEntity, targetRelation, relation }) {
35
35
  if (!targetRelation) {
36
36
  return {};
37
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"HasManyToHasOneRelationReducerVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HasManyToHasOneRelationReducerVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts"],"names":[],"mappings":"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"}
@@ -6,10 +6,11 @@ export declare class PaginatedHasManyCountVisitor implements Model.ColumnVisitor
6
6
  private readonly objectNode;
7
7
  private readonly relationFetcher;
8
8
  private readonly mapper;
9
- constructor(ids: Input.PrimaryValue[], objectNode: ObjectNode<Input.PaginationQueryInput>, relationFetcher: RelationFetcher, mapper: Mapper);
10
- visitOneHasMany(entity: Model.Entity, relation: Model.OneHasManyRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasOneRelation): Promise<GroupedCounts>;
11
- visitManyHasManyOwning(entity: Model.Entity, relation: Model.ManyHasManyOwningRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyInverseRelation | null): Promise<GroupedCounts>;
12
- visitManyHasManyInverse(entity: Model.Entity, relation: Model.ManyHasManyInverseRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyOwningRelation): Promise<GroupedCounts>;
9
+ private readonly relationPath;
10
+ constructor(ids: Input.PrimaryValue[], objectNode: ObjectNode<Input.PaginationQueryInput>, relationFetcher: RelationFetcher, mapper: Mapper, relationPath: Model.AnyRelationContext[]);
11
+ visitOneHasMany(relationContext: Model.OneHasManyContext): Promise<GroupedCounts>;
12
+ visitManyHasManyOwning(relationContext: Model.ManyHasManyOwningContext): Promise<GroupedCounts>;
13
+ visitManyHasManyInverse(relationContext: Model.ManyHasManyInverseContext): Promise<GroupedCounts>;
13
14
  visitColumn(): never;
14
15
  visitManyHasOne(): never;
15
16
  visitOneHasOneInverse(): never;
@@ -1 +1 @@
1
- {"version":3,"file":"PaginatedHasManyCountVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,qBAAa,4BAA6B,YACzC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAC3C,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAGlD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,EACzB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAClD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM;IAG1B,eAAe,CACpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GACtC,OAAO,CAAC,aAAa,CAAC;IAYnB,sBAAsB,CAC3B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,GACrD,OAAO,CAAC,aAAa,CAAC;IAcnB,uBAAuB,CAC5B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,EAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,GAC7C,OAAO,CAAC,aAAa,CAAC;IAczB,WAAW,IAAI,KAAK;IAIpB,eAAe,IAAI,KAAK;IAIxB,qBAAqB,IAAI,KAAK;IAI9B,oBAAoB,IAAI,KAAK;CAG7B"}
1
+ {"version":3,"file":"PaginatedHasManyCountVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,qBAAa,4BAA6B,YACzC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAC3C,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAGlD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,EACzB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAClD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,KAAK,CAAC,kBAAkB,EAAE;IAGpD,eAAe,CAAC,eAAe,EAAE,KAAK,CAAC,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;IAYjF,sBAAsB,CAAC,eAAe,EAAE,KAAK,CAAC,wBAAwB,GAAG,OAAO,CAAC,aAAa,CAAC;IAY/F,uBAAuB,CAAC,eAAe,EAAE,KAAK,CAAC,yBAAyB,GAAG,OAAO,CAAC,aAAa,CAAC;IAYvG,WAAW,IAAI,KAAK;IAIpB,eAAe,IAAI,KAAK;IAIxB,qBAAqB,IAAI,KAAK;IAI9B,oBAAoB,IAAI,KAAK;CAG7B"}
@@ -2,40 +2,37 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PaginatedHasManyCountVisitor = void 0;
4
4
  class PaginatedHasManyCountVisitor {
5
- constructor(ids, objectNode, relationFetcher, mapper) {
5
+ constructor(ids, objectNode, relationFetcher, mapper, relationPath) {
6
6
  this.ids = ids;
7
7
  this.objectNode = objectNode;
8
8
  this.relationFetcher = relationFetcher;
9
9
  this.mapper = mapper;
10
+ this.relationPath = relationPath;
10
11
  }
11
- async visitOneHasMany(entity, relation, targetEntity, targetRelation) {
12
+ async visitOneHasMany(relationContext) {
12
13
  return await this.relationFetcher.countOneHasManyGroups({
13
14
  mapper: this.mapper,
14
15
  filter: this.objectNode.args.filter,
15
- targetEntity: targetEntity,
16
- targetRelation: targetRelation,
16
+ relationContext,
17
+ relationPath: this.relationPath,
17
18
  ids: this.ids,
18
19
  });
19
20
  }
20
- async visitManyHasManyOwning(entity, relation, targetEntity, targetRelation) {
21
+ async visitManyHasManyOwning(relationContext) {
21
22
  return await this.relationFetcher.countManyHasManyGroups({
22
23
  mapper: this.mapper,
23
24
  filter: this.objectNode.args.filter,
24
- targetEntity: targetEntity,
25
- sourceRelation: relation,
26
- targetRelation,
27
- directionFrom: 'owning',
25
+ relationContext,
26
+ relationPath: this.relationPath,
28
27
  ids: this.ids,
29
28
  });
30
29
  }
31
- async visitManyHasManyInverse(entity, relation, targetEntity, targetRelation) {
30
+ async visitManyHasManyInverse(relationContext) {
32
31
  return await this.relationFetcher.countManyHasManyGroups({
33
32
  mapper: this.mapper,
34
33
  filter: this.objectNode.args.filter,
35
- targetEntity: targetEntity,
36
- sourceRelation: relation,
37
- targetRelation,
38
- directionFrom: 'inverse',
34
+ relationContext,
35
+ relationPath: this.relationPath,
39
36
  ids: this.ids,
40
37
  });
41
38
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PaginatedHasManyCountVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;IAIxC,YACkB,GAAyB,EACzB,UAAkD,EAClD,eAAgC,EAChC,MAAc;QAHd,QAAG,GAAH,GAAG,CAAsB;QACzB,eAAU,GAAV,UAAU,CAAwC;QAClD,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEJ,KAAK,CAAC,eAAe,CACpB,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CACtD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM;YACnC,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,cAAc;YAC9B,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC3B,MAAoB,EACpB,QAAyC,EACzC,YAA0B,EAC1B,cAAuD;QAEvD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM;YACnC,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,QAAQ;YACxB,cAAc;YACd,aAAa,EAAE,QAAQ;YACvB,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC5B,MAAoB,EACpB,QAA0C,EAC1C,YAA0B,EAC1B,cAA+C;QAE/C,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM;YACnC,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,QAAQ;YACxB,cAAc;YACd,aAAa,EAAE,SAAS;YACxB,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,WAAW;QACV,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,eAAe;QACd,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,qBAAqB;QACpB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,oBAAoB;QACnB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;CACD;AAjFD,oEAiFC"}
1
+ {"version":3,"file":"PaginatedHasManyCountVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;IAIxC,YACkB,GAAyB,EACzB,UAAkD,EAClD,eAAgC,EAChC,MAAc,EACd,YAAwC;QAJxC,QAAG,GAAH,GAAG,CAAsB;QACzB,eAAU,GAAV,UAAU,CAAwC;QAClD,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAA4B;IACvD,CAAC;IAEJ,KAAK,CAAC,eAAe,CAAC,eAAwC;QAC7D,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CACtD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM;YACnC,eAAe;YACf,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,eAA+C;QAC3E,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM;YACnC,eAAe;YACf,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,eAAgD;QAC7E,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM;YACnC,eAAe;YACf,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,WAAW;QACV,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,eAAe;QACd,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,qBAAqB;QACpB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,oBAAoB;QACnB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;CACD;AA/DD,oEA+DC"}
@@ -1 +1 @@
1
- {"version":3,"file":"PaginatedHasManyExecutionHandler.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAA;AACrG,OAAO,EAAE,sCAAsC,EAAE,MAAM,iCAAiC,CAAA;AAMxF,qBAAa,gCAAiC,YAAW,sBAAsB,CAAC,KAAK,CAAC,oBAAoB,EAAE,sCAAsC,CAAC;IACtI,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAtD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,eAAe,EAAE,eAAe;IAEpG,OAAO,CACN,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,oBAAoB,EAAE,sCAAsC,CAAC,GACxG,IAAI;CAmCP"}
1
+ {"version":3,"file":"PaginatedHasManyExecutionHandler.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAA;AACrG,OAAO,EAAE,sCAAsC,EAAE,MAAM,iCAAiC,CAAA;AAMxF,qBAAa,gCAAiC,YAAW,sBAAsB,CAAC,KAAK,CAAC,oBAAoB,EAAE,sCAAsC,CAAC;IAEjJ,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,eAAe,EAAE,eAAe;IAGlD,OAAO,CACN,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,oBAAoB,EAAE,sCAAsC,CAAC,GACxG,IAAI;CAmCP"}
@@ -19,10 +19,10 @@ class PaginatedHasManyExecutionHandler {
19
19
  addData(context.entity.primary, async (ids) => {
20
20
  var _a, _b;
21
21
  const counts = pagination.requiresTotalCount
22
- ? await (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, objectNode.extensions.relationName, new PaginatedHasManyCountVisitor_1.PaginatedHasManyCountVisitor(ids, objectNode, this.relationFetcher, mapper))
22
+ ? await (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, objectNode.extensions.relationName, new PaginatedHasManyCountVisitor_1.PaginatedHasManyCountVisitor(ids, objectNode, this.relationFetcher, mapper, context.relationPath))
23
23
  : {};
24
24
  const nodes = pagination.nodeField
25
- ? await (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, objectNode.extensions.relationName, new PaginatedHasManyNodesVisitor_1.PaginatedHasManyNodesVisitor(ids, pagination.nodeField, this.relationFetcher, mapper))
25
+ ? await (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, objectNode.extensions.relationName, new PaginatedHasManyNodesVisitor_1.PaginatedHasManyNodesVisitor(ids, pagination.nodeField, this.relationFetcher, mapper, context.relationPath))
26
26
  : undefined;
27
27
  const result = new Map();
28
28
  for (const id of ids) {
@@ -1 +1 @@
1
- {"version":3,"file":"PaginatedHasManyExecutionHandler.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts"],"names":[],"mappings":";;;AAGA,0DAA4D;AAC5D,uCAAoD;AACpD,iFAA6E;AAC7E,iFAA6E;AAE7E,MAAa,gCAAgC;IAC5C,YAA6B,MAAoB,EAAmB,eAAgC;QAAvE,WAAM,GAAN,MAAM,CAAc;QAAmB,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAExG,OAAO,CACN,OAA0G;QAE1G,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QACvD,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,MAAM,UAAU,GAAG,IAAA,8BAAsB,EAAC,UAAU,CAAC,CAAA;QACrD,OAAO,CACN,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,KAAK,EAAC,GAAG,EAAC,EAAE;;YACX,MAAM,MAAM,GAAG,UAAU,CAAC,kBAAkB;gBAC3C,CAAC,CAAC,MAAM,IAAA,iCAAkB,EACzB,IAAI,CAAC,MAAM,EACX,MAAM,EACN,UAAU,CAAC,UAAU,CAAC,YAAY,EAClC,IAAI,2DAA4B,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAC7E;gBACH,CAAC,CAAC,EAAE,CAAA;YAEL,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS;gBACjC,CAAC,CAAC,MAAM,IAAA,iCAAkB,EACzB,IAAI,CAAC,MAAM,EACX,MAAM,EACN,UAAU,CAAC,UAAU,CAAC,YAAY,EAClC,IAAI,2DAA4B,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CACvF;gBACH,CAAC,CAAC,SAAS,CAAA;YACZ,MAAM,MAAM,GAAG,IAAI,GAAG,EAA2B,CAAA;YACjD,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE;gBACrB,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,cAAc,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,EAAE,CAAC,mCAAI,CAAC,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,EAAE,CAAC,mCAAI,EAAE,CAAC,CAAC,CAAA;aAC/E;YACD,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAClC,CAAC,EACD,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,EAAE,CAAC,CAChC,CAAA;IACF,CAAC;CACD;AAxCD,4EAwCC"}
1
+ {"version":3,"file":"PaginatedHasManyExecutionHandler.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts"],"names":[],"mappings":";;;AAGA,0DAA4D;AAC5D,uCAAoD;AACpD,iFAA6E;AAC7E,iFAA6E;AAE7E,MAAa,gCAAgC;IAC5C,YACkB,MAAoB,EACpB,eAAgC;QADhC,WAAM,GAAN,MAAM,CAAc;QACpB,oBAAe,GAAf,eAAe,CAAiB;IAC/C,CAAC;IAEJ,OAAO,CACN,OAA0G;QAE1G,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QACvD,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,MAAM,UAAU,GAAG,IAAA,8BAAsB,EAAC,UAAU,CAAC,CAAA;QACrD,OAAO,CACN,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,KAAK,EAAC,GAAG,EAAC,EAAE;;YACX,MAAM,MAAM,GAAG,UAAU,CAAC,kBAAkB;gBAC3C,CAAC,CAAC,MAAM,IAAA,iCAAkB,EACzB,IAAI,CAAC,MAAM,EACX,MAAM,EACN,UAAU,CAAC,UAAU,CAAC,YAAY,EAClC,IAAI,2DAA4B,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CACnG;gBACH,CAAC,CAAC,EAAE,CAAA;YAEL,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS;gBACjC,CAAC,CAAC,MAAM,IAAA,iCAAkB,EACzB,IAAI,CAAC,MAAM,EACX,MAAM,EACN,UAAU,CAAC,UAAU,CAAC,YAAY,EAClC,IAAI,2DAA4B,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAC7G;gBACH,CAAC,CAAC,SAAS,CAAA;YACZ,MAAM,MAAM,GAAG,IAAI,GAAG,EAA2B,CAAA;YACjD,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE;gBACrB,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,cAAc,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,EAAE,CAAC,mCAAI,CAAC,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,EAAE,CAAC,mCAAI,EAAE,CAAC,CAAC,CAAA;aAC/E;YACD,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAClC,CAAC,EACD,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,EAAE,CAAC,CAChC,CAAA;IACF,CAAC;CACD;AA3CD,4EA2CC"}
@@ -5,9 +5,9 @@ import { PaginatedFieldConfigFactory } from '../../schema/PaginatedFieldConfigFa
5
5
  export declare class PaginatedHasManyFieldProviderVisitor implements Model.ColumnVisitor<FieldMap<PaginatedHasManyFieldProviderExtension>>, Model.RelationByTypeVisitor<FieldMap<PaginatedHasManyFieldProviderExtension>> {
6
6
  private readonly paginatedFieldFactory;
7
7
  constructor(paginatedFieldFactory: PaginatedFieldConfigFactory);
8
- visitOneHasMany(entity: Model.Entity, relation: Model.OneHasManyRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasOneRelation): FieldMap<PaginatedHasManyFieldProviderExtension>;
9
- visitManyHasManyOwning(entity: Model.Entity, relation: Model.ManyHasManyOwningRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyInverseRelation | null): FieldMap<PaginatedHasManyFieldProviderExtension>;
10
- visitManyHasManyInverse(entity: Model.Entity, relation: Model.ManyHasManyInverseRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyOwningRelation): FieldMap<PaginatedHasManyFieldProviderExtension>;
8
+ visitOneHasMany({ targetEntity, relation }: Model.OneHasManyContext): FieldMap<PaginatedHasManyFieldProviderExtension>;
9
+ visitManyHasManyOwning({ targetEntity, relation }: Model.ManyHasManyOwningContext): FieldMap<PaginatedHasManyFieldProviderExtension>;
10
+ visitManyHasManyInverse({ targetEntity, relation }: Model.ManyHasManyInverseContext): FieldMap<PaginatedHasManyFieldProviderExtension>;
11
11
  private createField;
12
12
  visitColumn(): {};
13
13
  visitManyHasOne(): {};
@@ -1 +1 @@
1
- {"version":3,"file":"PaginatedHasManyFieldProviderVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,sCAAsC,EAAE,MAAM,iCAAiC,CAAA;AAExF,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAA;AAGtF,qBAAa,oCAAqC,YACjD,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAC,EACrE,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAC;IAEjE,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,2BAA2B;IAE/E,eAAe,CACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GACtC,QAAQ,CAAC,sCAAsC,CAAC;IAInD,sBAAsB,CACrB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,GACrD,QAAQ,CAAC,sCAAsC,CAAC;IAInD,uBAAuB,CACtB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,EAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,GAC7C,QAAQ,CAAC,sCAAsC,CAAC;IAInD,OAAO,CAAC,WAAW;IAenB,WAAW;IAIX,eAAe;IAIf,qBAAqB;IAIrB,oBAAoB;CAGpB"}
1
+ {"version":3,"file":"PaginatedHasManyFieldProviderVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,sCAAsC,EAAE,MAAM,iCAAiC,CAAA;AAExF,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAA;AAGtF,qBAAa,oCAAqC,YACjD,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAC,EACrE,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAC;IAEjE,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,2BAA2B;IAE/E,eAAe,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,iBAAiB;IAInE,sBAAsB,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,wBAAwB;IAIjF,uBAAuB,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,yBAAyB;IAInF,OAAO,CAAC,WAAW;IAYnB,WAAW;IAIX,eAAe;IAIf,qBAAqB;IAIrB,oBAAoB;CAGpB"}
@@ -7,13 +7,13 @@ class PaginatedHasManyFieldProviderVisitor {
7
7
  constructor(paginatedFieldFactory) {
8
8
  this.paginatedFieldFactory = paginatedFieldFactory;
9
9
  }
10
- visitOneHasMany(entity, relation, targetEntity, targetRelation) {
10
+ visitOneHasMany({ targetEntity, relation }) {
11
11
  return this.createField(targetEntity, relation);
12
12
  }
13
- visitManyHasManyOwning(entity, relation, targetEntity, targetRelation) {
13
+ visitManyHasManyOwning({ targetEntity, relation }) {
14
14
  return this.createField(targetEntity, relation);
15
15
  }
16
- visitManyHasManyInverse(entity, relation, targetEntity, targetRelation) {
16
+ visitManyHasManyInverse({ targetEntity, relation }) {
17
17
  return this.createField(targetEntity, relation);
18
18
  }
19
19
  createField(entity, relation) {
@@ -1 +1 @@
1
- {"version":3,"file":"PaginatedHasManyFieldProviderVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":";;;AAGA,uCAAmD;AAEnD,yCAAiD;AAEjD,MAAa,oCAAoC;IAIhD,YAA6B,qBAAkD;QAAlD,0BAAqB,GAArB,qBAAqB,CAA6B;IAAG,CAAC;IAEnF,eAAe,CACd,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAED,sBAAsB,CACrB,MAAoB,EACpB,QAAyC,EACzC,YAA0B,EAC1B,cAAuD;QAEvD,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAED,uBAAuB,CACtB,MAAoB,EACpB,QAA0C,EAC1C,YAA0B,EAC1B,cAA+C;QAE/C,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAEO,WAAW,CAClB,MAAoB,EACpB,QAAwB;QAExB,OAAO;YACN,CAAC,WAAW,IAAA,6BAAqB,EAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBACpD,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBACvD,UAAU,EAAE;oBACX,YAAY,EAAE,QAAQ,CAAC,IAAI;iBAC3B;gBACD,OAAO,EAAE,2BAAkB;aAC3B;SACD,CAAA;IACF,CAAC;IAED,WAAW;QACV,OAAO,EAAE,CAAA;IACV,CAAC;IAED,eAAe;QACd,OAAO,EAAE,CAAA;IACV,CAAC;IAED,qBAAqB;QACpB,OAAO,EAAE,CAAA;IACV,CAAC;IAED,oBAAoB;QACnB,OAAO,EAAE,CAAA;IACV,CAAC;CACD;AA/DD,oFA+DC"}
1
+ {"version":3,"file":"PaginatedHasManyFieldProviderVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":";;;AAGA,uCAAmD;AAEnD,yCAAiD;AAEjD,MAAa,oCAAoC;IAIhD,YAA6B,qBAAkD;QAAlD,0BAAqB,GAArB,qBAAqB,CAA6B;IAAG,CAAC;IAEnF,eAAe,CAAC,EAAE,YAAY,EAAE,QAAQ,EAA2B;QAClE,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAED,sBAAsB,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAkC;QAChF,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAED,uBAAuB,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAmC;QAClF,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAEO,WAAW,CAAC,MAAoB,EAAE,QAAwB;QACjE,OAAO;YACN,CAAC,WAAW,IAAA,6BAAqB,EAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBACpD,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBACvD,UAAU,EAAE;oBACX,YAAY,EAAE,QAAQ,CAAC,IAAI;iBAC3B;gBACD,OAAO,EAAE,2BAAkB;aAC3B;SACD,CAAA;IACF,CAAC;IAED,WAAW;QACV,OAAO,EAAE,CAAA;IACV,CAAC;IAED,eAAe;QACd,OAAO,EAAE,CAAA;IACV,CAAC;IAED,qBAAqB;QACpB,OAAO,EAAE,CAAA;IACV,CAAC;IAED,oBAAoB;QACnB,OAAO,EAAE,CAAA;IACV,CAAC;CACD;AA7CD,oFA6CC"}
@@ -6,10 +6,11 @@ export declare class PaginatedHasManyNodesVisitor implements Model.ColumnVisitor
6
6
  private readonly objectNode;
7
7
  private readonly relationFetcher;
8
8
  private readonly mapper;
9
- constructor(ids: Input.PrimaryValue[], objectNode: ObjectNode<Input.PaginationQueryInput>, relationFetcher: RelationFetcher, mapper: Mapper);
10
- visitOneHasMany(entity: Model.Entity, relation: Model.OneHasManyRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasOneRelation): Promise<SelectGroupedObjects>;
11
- visitManyHasManyOwning(entity: Model.Entity, relation: Model.ManyHasManyOwningRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyInverseRelation | null): Promise<SelectGroupedObjects>;
12
- visitManyHasManyInverse(entity: Model.Entity, relation: Model.ManyHasManyInverseRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyOwningRelation): Promise<SelectGroupedObjects>;
9
+ private readonly relationPath;
10
+ constructor(ids: Input.PrimaryValue[], objectNode: ObjectNode<Input.PaginationQueryInput>, relationFetcher: RelationFetcher, mapper: Mapper, relationPath: Model.AnyRelationContext[]);
11
+ visitOneHasMany(relationContext: Model.OneHasManyContext): Promise<SelectGroupedObjects>;
12
+ visitManyHasManyOwning(relationContext: Model.ManyHasManyOwningContext): Promise<SelectGroupedObjects>;
13
+ visitManyHasManyInverse(relationContext: Model.ManyHasManyInverseContext): Promise<SelectGroupedObjects>;
13
14
  visitColumn(): never;
14
15
  visitManyHasOne(): never;
15
16
  visitOneHasOneInverse(): never;
@@ -1 +1 @@
1
- {"version":3,"file":"PaginatedHasManyNodesVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,qBAAa,4BAA6B,YACzC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,EAClD,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAGzD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,EACzB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAClD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM;IAG1B,eAAe,CACpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GACtC,OAAO,CAAC,oBAAoB,CAAC;IAa1B,sBAAsB,CAC3B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,GACrD,OAAO,CAAC,oBAAoB,CAAC;IAc1B,uBAAuB,CAC5B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,EAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,GAC7C,OAAO,CAAC,oBAAoB,CAAC;IAchC,WAAW,IAAI,KAAK;IAIpB,eAAe,IAAI,KAAK;IAIxB,qBAAqB,IAAI,KAAK;IAI9B,oBAAoB,IAAI,KAAK;CAG7B"}
1
+ {"version":3,"file":"PaginatedHasManyNodesVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,qBAAa,4BAA6B,YACzC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,EAClD,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAGzD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,EACzB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAClD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,KAAK,CAAC,kBAAkB,EAAE;IAGpD,eAAe,CAAC,eAAe,EAAE,KAAK,CAAC,iBAAiB;IAYxD,sBAAsB,CAAC,eAAe,EAAE,KAAK,CAAC,wBAAwB;IAYtE,uBAAuB,CAAC,eAAe,EAAE,KAAK,CAAC,yBAAyB;IAY9E,WAAW,IAAI,KAAK;IAIpB,eAAe,IAAI,KAAK;IAIxB,qBAAqB,IAAI,KAAK;IAI9B,oBAAoB,IAAI,KAAK;CAG7B"}
@@ -2,41 +2,37 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PaginatedHasManyNodesVisitor = void 0;
4
4
  class PaginatedHasManyNodesVisitor {
5
- constructor(ids, objectNode, relationFetcher, mapper) {
5
+ constructor(ids, objectNode, relationFetcher, mapper, relationPath) {
6
6
  this.ids = ids;
7
7
  this.objectNode = objectNode;
8
8
  this.relationFetcher = relationFetcher;
9
9
  this.mapper = mapper;
10
+ this.relationPath = relationPath;
10
11
  }
11
- async visitOneHasMany(entity, relation, targetEntity, targetRelation) {
12
+ async visitOneHasMany(relationContext) {
12
13
  return await this.relationFetcher.fetchOneHasManyGroups({
13
14
  mapper: this.mapper,
14
15
  objectNode: this.objectNode,
15
- targetEntity: targetEntity,
16
- relation: relation,
17
- targetRelation: targetRelation,
16
+ relationContext,
17
+ relationPath: this.relationPath,
18
18
  ids: this.ids,
19
19
  });
20
20
  }
21
- async visitManyHasManyOwning(entity, relation, targetEntity, targetRelation) {
21
+ async visitManyHasManyOwning(relationContext) {
22
22
  return await this.relationFetcher.fetchManyHasManyGroups({
23
23
  mapper: this.mapper,
24
24
  field: this.objectNode,
25
- targetEntity: targetEntity,
26
- sourceRelation: relation,
27
- targetRelation,
28
- directionFrom: 'owning',
25
+ relationContext,
26
+ relationPath: this.relationPath,
29
27
  ids: this.ids,
30
28
  });
31
29
  }
32
- async visitManyHasManyInverse(entity, relation, targetEntity, targetRelation) {
30
+ async visitManyHasManyInverse(relationContext) {
33
31
  return await this.relationFetcher.fetchManyHasManyGroups({
34
32
  mapper: this.mapper,
35
33
  field: this.objectNode,
36
- targetEntity: targetEntity,
37
- sourceRelation: relation,
38
- targetRelation,
39
- directionFrom: 'inverse',
34
+ relationContext,
35
+ relationPath: this.relationPath,
40
36
  ids: this.ids,
41
37
  });
42
38
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PaginatedHasManyNodesVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;IAIxC,YACkB,GAAyB,EACzB,UAAkD,EAClD,eAAgC,EAChC,MAAc;QAHd,QAAG,GAAH,GAAG,CAAsB;QACzB,eAAU,GAAV,UAAU,CAAwC;QAClD,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEJ,KAAK,CAAC,eAAe,CACpB,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CACtD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,YAAY,EAAE,YAAY;YAC1B,QAAQ,EAAE,QAAQ;YAClB,cAAc,EAAE,cAAc;YAC9B,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC3B,MAAoB,EACpB,QAAyC,EACzC,YAA0B,EAC1B,cAAuD;QAEvD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,QAAQ;YACxB,cAAc;YACd,aAAa,EAAE,QAAQ;YACvB,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC5B,MAAoB,EACpB,QAA0C,EAC1C,YAA0B,EAC1B,cAA+C;QAE/C,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,QAAQ;YACxB,cAAc;YACd,aAAa,EAAE,SAAS;YACxB,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,WAAW;QACV,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,eAAe;QACd,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,qBAAqB;QACpB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,oBAAoB;QACnB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;CACD;AAlFD,oEAkFC"}
1
+ {"version":3,"file":"PaginatedHasManyNodesVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;IAIxC,YACkB,GAAyB,EACzB,UAAkD,EAClD,eAAgC,EAChC,MAAc,EACd,YAAwC;QAJxC,QAAG,GAAH,GAAG,CAAsB;QACzB,eAAU,GAAV,UAAU,CAAwC;QAClD,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAA4B;IACvD,CAAC;IAEJ,KAAK,CAAC,eAAe,CAAC,eAAwC;QAC7D,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CACtD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,eAAe;YACf,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,eAA+C;QAC3E,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,eAAe;YACf,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,eAAgD;QAC7E,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,eAAe;YACf,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,WAAW;QACV,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,eAAe;QACd,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,qBAAqB;QACpB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,oBAAoB;QACnB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;CACD;AA/DD,oEA+DC"}
@@ -1,9 +1,10 @@
1
1
  import { Providers } from '@contember/schema-utils';
2
- import * as Context from '../inputProcessing';
3
- import { Value } from '@contember/schema';
2
+ import { Model, Value } from '@contember/schema';
4
3
  export declare class ColumnValueResolver {
5
4
  private readonly providers;
6
5
  constructor(providers: Providers);
7
- getDefaultValidationValue(context: Context.ColumnContext): Value.AtomicValue | undefined;
6
+ getDefaultValidationValue(context: Model.ColumnContext & {
7
+ input: Value.FieldValue | undefined;
8
+ }): Value.AtomicValue | undefined;
8
9
  }
9
10
  //# sourceMappingURL=ColumnValueResolver.d.ts.map