@contember/engine-content-api 1.2.0-alpha.9 → 1.2.0-beta.1

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 (378) hide show
  1. package/dist/src/acl/EvaluatedPredicateReplacer.d.ts +2 -3
  2. package/dist/src/acl/EvaluatedPredicateReplacer.d.ts.map +1 -1
  3. package/dist/src/acl/EvaluatedPredicateReplacer.js +5 -14
  4. package/dist/src/acl/EvaluatedPredicateReplacer.js.map +1 -1
  5. package/dist/src/acl/PredicateFactory.d.ts +9 -3
  6. package/dist/src/acl/PredicateFactory.d.ts.map +1 -1
  7. package/dist/src/acl/PredicateFactory.js +47 -36
  8. package/dist/src/acl/PredicateFactory.js.map +1 -1
  9. package/dist/src/acl/PredicatesInjector.d.ts +1 -1
  10. package/dist/src/acl/PredicatesInjector.d.ts.map +1 -1
  11. package/dist/src/acl/PredicatesInjector.js +13 -18
  12. package/dist/src/acl/PredicatesInjector.js.map +1 -1
  13. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.d.ts +0 -1
  14. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.d.ts.map +1 -1
  15. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js +26 -23
  16. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js.map +1 -1
  17. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.d.ts +1 -1
  18. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.d.ts.map +1 -1
  19. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.js +1 -1
  20. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.js.map +1 -1
  21. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.d.ts +5 -4
  22. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.d.ts.map +1 -1
  23. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.js +11 -14
  24. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.js.map +1 -1
  25. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.d.ts.map +1 -1
  26. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.js +18 -14
  27. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.js.map +1 -1
  28. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.d.ts +3 -3
  29. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.d.ts.map +1 -1
  30. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js +3 -3
  31. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js.map +1 -1
  32. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.d.ts +5 -4
  33. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.d.ts.map +1 -1
  34. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.js +11 -15
  35. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.js.map +1 -1
  36. package/dist/src/input-validation/ColumnValueResolver.d.ts +4 -3
  37. package/dist/src/input-validation/ColumnValueResolver.d.ts.map +1 -1
  38. package/dist/src/input-validation/ColumnValueResolver.js.map +1 -1
  39. package/dist/src/input-validation/EntityRulesResolver.js +4 -4
  40. package/dist/src/input-validation/EntityRulesResolver.js.map +1 -1
  41. package/dist/src/input-validation/QueryAstFactory.js +1 -1
  42. package/dist/src/input-validation/QueryAstFactory.js.map +1 -1
  43. package/dist/src/input-validation/ValidationDataSelector.js +1 -1
  44. package/dist/src/input-validation/ValidationDataSelector.js.map +1 -1
  45. package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.d.ts +7 -8
  46. package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.d.ts.map +1 -1
  47. package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.js.map +1 -1
  48. package/dist/src/input-validation/preValidation/InputPreValidator.js +4 -4
  49. package/dist/src/input-validation/preValidation/InputPreValidator.js.map +1 -1
  50. package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.d.ts +7 -8
  51. package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.d.ts.map +1 -1
  52. package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.js.map +1 -1
  53. package/dist/src/inputProcessing/CreateInputProcessor.d.ts +8 -9
  54. package/dist/src/inputProcessing/CreateInputProcessor.d.ts.map +1 -1
  55. package/dist/src/inputProcessing/CreateInputVisitor.d.ts +7 -7
  56. package/dist/src/inputProcessing/CreateInputVisitor.d.ts.map +1 -1
  57. package/dist/src/inputProcessing/CreateInputVisitor.js +15 -46
  58. package/dist/src/inputProcessing/CreateInputVisitor.js.map +1 -1
  59. package/dist/src/inputProcessing/UpdateInputProcessor.d.ts +8 -9
  60. package/dist/src/inputProcessing/UpdateInputProcessor.d.ts.map +1 -1
  61. package/dist/src/inputProcessing/UpdateInputVisitor.d.ts +7 -7
  62. package/dist/src/inputProcessing/UpdateInputVisitor.d.ts.map +1 -1
  63. package/dist/src/inputProcessing/UpdateInputVisitor.js +13 -28
  64. package/dist/src/inputProcessing/UpdateInputVisitor.js.map +1 -1
  65. package/dist/src/inputProcessing/index.d.ts +0 -1
  66. package/dist/src/inputProcessing/index.d.ts.map +1 -1
  67. package/dist/src/inputProcessing/index.js +0 -1
  68. package/dist/src/inputProcessing/index.js.map +1 -1
  69. package/dist/src/introspection/IntrospectionSchemaFactory.js +7 -7
  70. package/dist/src/introspection/IntrospectionSchemaFactory.js.map +1 -1
  71. package/dist/src/mapper/ErrorUtils.d.ts.map +1 -1
  72. package/dist/src/mapper/ErrorUtils.js +2 -2
  73. package/dist/src/mapper/ErrorUtils.js.map +1 -1
  74. package/dist/src/mapper/JunctionTableManager.js.map +1 -1
  75. package/dist/src/mapper/Mapper.d.ts +6 -6
  76. package/dist/src/mapper/Mapper.d.ts.map +1 -1
  77. package/dist/src/mapper/Mapper.js +26 -21
  78. package/dist/src/mapper/Mapper.js.map +1 -1
  79. package/dist/src/mapper/MapperContainer.d.ts.map +1 -1
  80. package/dist/src/mapper/MapperContainer.js +4 -4
  81. package/dist/src/mapper/MapperContainer.js.map +1 -1
  82. package/dist/src/mapper/Result.d.ts.map +1 -1
  83. package/dist/src/mapper/Result.js +2 -4
  84. package/dist/src/mapper/Result.js.map +1 -1
  85. package/dist/src/mapper/delete/DeleteExecutor.js +6 -6
  86. package/dist/src/mapper/delete/DeleteExecutor.js.map +1 -1
  87. package/dist/src/mapper/insert/InsertBuilder.d.ts +1 -1
  88. package/dist/src/mapper/insert/InsertBuilder.d.ts.map +1 -1
  89. package/dist/src/mapper/insert/InsertBuilder.js.map +1 -1
  90. package/dist/src/mapper/insert/SqlCreateInputProcessor.d.ts +4 -2
  91. package/dist/src/mapper/insert/SqlCreateInputProcessor.d.ts.map +1 -1
  92. package/dist/src/mapper/insert/SqlCreateInputProcessor.js.map +1 -1
  93. package/dist/src/mapper/select/JoinVisitor.d.ts +6 -6
  94. package/dist/src/mapper/select/JoinVisitor.d.ts.map +1 -1
  95. package/dist/src/mapper/select/JoinVisitor.js +6 -6
  96. package/dist/src/mapper/select/JoinVisitor.js.map +1 -1
  97. package/dist/src/mapper/select/Path.d.ts +1 -0
  98. package/dist/src/mapper/select/Path.d.ts.map +1 -1
  99. package/dist/src/mapper/select/Path.js +4 -1
  100. package/dist/src/mapper/select/Path.js.map +1 -1
  101. package/dist/src/mapper/select/RelationFetcher.d.ts +11 -19
  102. package/dist/src/mapper/select/RelationFetcher.d.ts.map +1 -1
  103. package/dist/src/mapper/select/RelationFetcher.js +34 -25
  104. package/dist/src/mapper/select/RelationFetcher.js.map +1 -1
  105. package/dist/src/mapper/select/SelectBuilder.d.ts +4 -1
  106. package/dist/src/mapper/select/SelectBuilder.d.ts.map +1 -1
  107. package/dist/src/mapper/select/SelectBuilder.js +52 -12
  108. package/dist/src/mapper/select/SelectBuilder.js.map +1 -1
  109. package/dist/src/mapper/select/SelectBuilderFactory.d.ts +2 -1
  110. package/dist/src/mapper/select/SelectBuilderFactory.d.ts.map +1 -1
  111. package/dist/src/mapper/select/SelectExecutionHandler.d.ts +16 -4
  112. package/dist/src/mapper/select/SelectExecutionHandler.d.ts.map +1 -1
  113. package/dist/src/mapper/select/SelectHydrator.d.ts +3 -2
  114. package/dist/src/mapper/select/SelectHydrator.d.ts.map +1 -1
  115. package/dist/src/mapper/select/SelectHydrator.js +6 -9
  116. package/dist/src/mapper/select/SelectHydrator.js.map +1 -1
  117. package/dist/src/mapper/select/WhereBuilder.d.ts +8 -4
  118. package/dist/src/mapper/select/WhereBuilder.d.ts.map +1 -1
  119. package/dist/src/mapper/select/WhereBuilder.js +137 -35
  120. package/dist/src/mapper/select/WhereBuilder.js.map +1 -1
  121. package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts +10 -8
  122. package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts.map +1 -1
  123. package/dist/src/mapper/select/handlers/FieldsVisitor.js +129 -94
  124. package/dist/src/mapper/select/handlers/FieldsVisitor.js.map +1 -1
  125. package/dist/src/mapper/select/handlers/FieldsVisitorFactory.d.ts.map +1 -1
  126. package/dist/src/mapper/select/handlers/FieldsVisitorFactory.js +1 -1
  127. package/dist/src/mapper/select/handlers/FieldsVisitorFactory.js.map +1 -1
  128. package/dist/src/mapper/select/handlers/MetaHandler.d.ts.map +1 -1
  129. package/dist/src/mapper/select/handlers/MetaHandler.js +6 -11
  130. package/dist/src/mapper/select/handlers/MetaHandler.js.map +1 -1
  131. package/dist/src/mapper/select/optimizer/ConditionOptimizer.d.ts.map +1 -1
  132. package/dist/src/mapper/select/optimizer/ConditionOptimizer.js +6 -0
  133. package/dist/src/mapper/select/optimizer/ConditionOptimizer.js.map +1 -1
  134. package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts +9 -1
  135. package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts.map +1 -1
  136. package/dist/src/mapper/select/optimizer/WhereOptimizer.js +127 -13
  137. package/dist/src/mapper/select/optimizer/WhereOptimizer.js.map +1 -1
  138. package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts +3 -0
  139. package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts.map +1 -0
  140. package/dist/src/mapper/select/optimizer/WhereReplacer.js +46 -0
  141. package/dist/src/mapper/select/optimizer/WhereReplacer.js.map +1 -0
  142. package/dist/src/mapper/select/optimizer/helpers.d.ts +1 -1
  143. package/dist/src/mapper/select/optimizer/helpers.js +1 -1
  144. package/dist/src/mapper/select/optimizer/helpers.js.map +1 -1
  145. package/dist/src/mapper/update/SqlUpdateInputProcessor.d.ts +2 -3
  146. package/dist/src/mapper/update/SqlUpdateInputProcessor.d.ts.map +1 -1
  147. package/dist/src/mapper/update/SqlUpdateInputProcessor.js +3 -4
  148. package/dist/src/mapper/update/SqlUpdateInputProcessor.js.map +1 -1
  149. package/dist/src/mapper/update/UpdateBuilder.js +3 -3
  150. package/dist/src/mapper/update/UpdateBuilder.js.map +1 -1
  151. package/dist/src/resolvers/ExecutionContainerFactory.d.ts +1 -1
  152. package/dist/src/resolvers/ExecutionContainerFactory.d.ts.map +1 -1
  153. package/dist/src/resolvers/GraphQlQueryAstFactory.d.ts +1 -2
  154. package/dist/src/resolvers/GraphQlQueryAstFactory.d.ts.map +1 -1
  155. package/dist/src/resolvers/GraphQlQueryAstFactory.js +2 -2
  156. package/dist/src/resolvers/GraphQlQueryAstFactory.js.map +1 -1
  157. package/dist/src/resolvers/MutationResolver.d.ts.map +1 -1
  158. package/dist/src/resolvers/MutationResolver.js +13 -2
  159. package/dist/src/resolvers/MutationResolver.js.map +1 -1
  160. package/dist/src/resolvers/ReadHelpers.js +3 -3
  161. package/dist/src/resolvers/ReadHelpers.js.map +1 -1
  162. package/dist/src/resolvers/ReadResolver.js +2 -2
  163. package/dist/src/resolvers/ReadResolver.js.map +1 -1
  164. package/dist/src/schema/EnumsProvider.d.ts.map +1 -1
  165. package/dist/src/schema/EnumsProvider.js +1 -2
  166. package/dist/src/schema/EnumsProvider.js.map +1 -1
  167. package/dist/src/schema/FieldAccessVisitor.d.ts +2 -2
  168. package/dist/src/schema/FieldAccessVisitor.d.ts.map +1 -1
  169. package/dist/src/schema/FieldAccessVisitor.js +2 -2
  170. package/dist/src/schema/FieldAccessVisitor.js.map +1 -1
  171. package/dist/src/schema/OrderByTypeProvider.d.ts +1 -1
  172. package/dist/src/schema/OrderByTypeProvider.d.ts.map +1 -1
  173. package/dist/src/schema/OrderByTypeProvider.js +2 -2
  174. package/dist/src/schema/OrderByTypeProvider.js.map +1 -1
  175. package/dist/src/schema/WhereTypeProvider.d.ts +1 -2
  176. package/dist/src/schema/WhereTypeProvider.d.ts.map +1 -1
  177. package/dist/src/schema/WhereTypeProvider.js +4 -4
  178. package/dist/src/schema/WhereTypeProvider.js.map +1 -1
  179. package/dist/src/schema/entities/FieldArgsVisitor.d.ts +4 -5
  180. package/dist/src/schema/entities/FieldArgsVisitor.d.ts.map +1 -1
  181. package/dist/src/schema/entities/FieldArgsVisitor.js +3 -3
  182. package/dist/src/schema/entities/FieldArgsVisitor.js.map +1 -1
  183. package/dist/src/schema/entities/FieldTypeVisitor.d.ts +3 -3
  184. package/dist/src/schema/entities/FieldTypeVisitor.d.ts.map +1 -1
  185. package/dist/src/schema/entities/FieldTypeVisitor.js +3 -3
  186. package/dist/src/schema/entities/FieldTypeVisitor.js.map +1 -1
  187. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.d.ts +3 -3
  188. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.d.ts.map +1 -1
  189. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.js +3 -3
  190. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.js.map +1 -1
  191. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.d.ts +6 -6
  192. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.d.ts.map +1 -1
  193. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.js +6 -6
  194. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.js.map +1 -1
  195. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.d.ts +3 -3
  196. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.d.ts.map +1 -1
  197. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.js +5 -5
  198. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.js.map +1 -1
  199. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.d.ts +10 -4
  200. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.d.ts.map +1 -1
  201. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.js +3 -3
  202. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.js.map +1 -1
  203. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.d.ts +6 -6
  204. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.d.ts.map +1 -1
  205. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.js +6 -6
  206. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.js.map +1 -1
  207. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.d.ts +2 -2
  208. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.d.ts.map +1 -1
  209. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.js +2 -2
  210. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.js.map +1 -1
  211. package/dist/src/schema/utils.d.ts +1 -1
  212. package/dist/src/schema/utils.d.ts.map +1 -1
  213. package/dist/src/tsconfig.tsbuildinfo +1 -1
  214. package/dist/src/utils/uniqueWhereFields.js +3 -3
  215. package/dist/src/utils/uniqueWhereFields.js.map +1 -1
  216. package/dist/tests/cases/bugs/bug102.test.js +6 -6
  217. package/dist/tests/cases/bugs/bug102.test.js.map +1 -1
  218. package/dist/tests/cases/integration/graphQlRequests/delete/aclDelete.test.js +5 -5
  219. package/dist/tests/cases/integration/graphQlRequests/delete/aclDelete.test.js.map +1 -1
  220. package/dist/tests/cases/integration/graphQlRequests/delete/additionalDeleteFilter.test.js +5 -5
  221. package/dist/tests/cases/integration/graphQlRequests/delete/additionalDeleteFilter.test.js.map +1 -1
  222. package/dist/tests/cases/integration/graphQlRequests/delete/cascadeDelete.test.js +5 -5
  223. package/dist/tests/cases/integration/graphQlRequests/delete/cascadeDelete.test.js.map +1 -1
  224. package/dist/tests/cases/integration/graphQlRequests/delete/deleteById.test.js +5 -5
  225. package/dist/tests/cases/integration/graphQlRequests/delete/deleteById.test.js.map +1 -1
  226. package/dist/tests/cases/integration/graphQlRequests/delete/orphanRemoval.test.js +5 -5
  227. package/dist/tests/cases/integration/graphQlRequests/delete/orphanRemoval.test.js.map +1 -1
  228. package/dist/tests/cases/integration/graphQlRequests/delete/setNullOnDelete.test.js +5 -5
  229. package/dist/tests/cases/integration/graphQlRequests/delete/setNullOnDelete.test.js.map +1 -1
  230. package/dist/tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.js +51 -4
  231. package/dist/tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.js.map +1 -1
  232. package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js +26 -25
  233. package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js.map +1 -1
  234. package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js +9 -6
  235. package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js.map +1 -1
  236. package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.d.ts +2 -0
  237. package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.d.ts.map +1 -0
  238. package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.js +109 -0
  239. package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.js.map +1 -0
  240. package/dist/tests/cases/integration/graphQlRequests/query/filter/manyHasManyOwnerRelation.test.js +17 -15
  241. package/dist/tests/cases/integration/graphQlRequests/query/filter/manyHasManyOwnerRelation.test.js.map +1 -1
  242. package/dist/tests/cases/integration/graphQlRequests/query/filter/oneHasManyRelation.test.js +4 -5
  243. package/dist/tests/cases/integration/graphQlRequests/query/filter/oneHasManyRelation.test.js.map +1 -1
  244. package/dist/tests/cases/integration/graphQlRequests/query/graphqlFeatures/alias.test.js +9 -13
  245. package/dist/tests/cases/integration/graphQlRequests/query/graphqlFeatures/alias.test.js.map +1 -1
  246. package/dist/tests/cases/integration/graphQlRequests/query/unique/oneHasManyUnique.test.js +5 -3
  247. package/dist/tests/cases/integration/graphQlRequests/query/unique/oneHasManyUnique.test.js.map +1 -1
  248. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/delete.test.js +5 -5
  249. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/delete.test.js.map +1 -1
  250. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/delete.test.js +5 -5
  251. package/dist/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/delete.test.js.map +1 -1
  252. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/delete.test.js +10 -10
  253. package/dist/tests/cases/integration/graphQlRequests/update/manyHasOne/delete.test.js.map +1 -1
  254. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/combination.test.js +5 -5
  255. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/combination.test.js.map +1 -1
  256. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/delete.test.js +5 -5
  257. package/dist/tests/cases/integration/graphQlRequests/update/oneHasMany/delete.test.js.map +1 -1
  258. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/delete.test.js +5 -5
  259. package/dist/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/delete.test.js.map +1 -1
  260. package/dist/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.js +4 -4
  261. package/dist/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.js.map +1 -1
  262. package/dist/tests/cases/unit/predicatesFactory.test.js +7 -1
  263. package/dist/tests/cases/unit/predicatesFactory.test.js.map +1 -1
  264. package/dist/tests/cases/unit/predicatesInjector.test.js +105 -0
  265. package/dist/tests/cases/unit/predicatesInjector.test.js.map +1 -1
  266. package/dist/tests/cases/unit/whereBuilder.test.d.ts +2 -0
  267. package/dist/tests/cases/unit/whereBuilder.test.d.ts.map +1 -0
  268. package/dist/tests/cases/unit/whereBuilder.test.js +131 -0
  269. package/dist/tests/cases/unit/whereBuilder.test.js.map +1 -0
  270. package/dist/tests/cases/unit/whereOptimizer.test.js +173 -0
  271. package/dist/tests/cases/unit/whereOptimizer.test.js.map +1 -1
  272. package/dist/tests/src/test.js +2 -2
  273. package/dist/tests/src/test.js.map +1 -1
  274. package/dist/tests/src/testGraphql.d.ts.map +1 -1
  275. package/dist/tests/src/testGraphql.js +9 -5
  276. package/dist/tests/src/testGraphql.js.map +1 -1
  277. package/dist/tests/tsconfig.tsbuildinfo +1 -1
  278. package/package.json +12 -10
  279. package/src/acl/EvaluatedPredicateReplacer.ts +9 -15
  280. package/src/acl/PredicateFactory.ts +64 -40
  281. package/src/acl/PredicatesInjector.ts +18 -17
  282. package/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts +21 -28
  283. package/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts +1 -6
  284. package/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts +10 -28
  285. package/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts +11 -8
  286. package/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts +4 -22
  287. package/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts +10 -29
  288. package/src/input-validation/ColumnValueResolver.ts +2 -3
  289. package/src/input-validation/EntityRulesResolver.ts +4 -4
  290. package/src/input-validation/QueryAstFactory.ts +1 -1
  291. package/src/input-validation/ValidationDataSelector.ts +1 -1
  292. package/src/input-validation/preValidation/CreateInputPreValidationProcessor.ts +7 -8
  293. package/src/input-validation/preValidation/InputPreValidator.ts +4 -4
  294. package/src/input-validation/preValidation/UpdateInputPreValidationProcessor.ts +7 -8
  295. package/src/inputProcessing/CreateInputProcessor.ts +8 -9
  296. package/src/inputProcessing/CreateInputVisitor.ts +27 -89
  297. package/src/inputProcessing/UpdateInputProcessor.ts +8 -9
  298. package/src/inputProcessing/UpdateInputVisitor.ts +25 -71
  299. package/src/inputProcessing/index.ts +0 -1
  300. package/src/introspection/IntrospectionSchemaFactory.ts +7 -7
  301. package/src/mapper/ErrorUtils.ts +2 -2
  302. package/src/mapper/JunctionTableManager.ts +3 -3
  303. package/src/mapper/Mapper.ts +34 -31
  304. package/src/mapper/MapperContainer.ts +7 -5
  305. package/src/mapper/Result.ts +2 -4
  306. package/src/mapper/delete/DeleteExecutor.ts +6 -6
  307. package/src/mapper/insert/InsertBuilder.ts +2 -2
  308. package/src/mapper/insert/SqlCreateInputProcessor.ts +3 -3
  309. package/src/mapper/select/JoinVisitor.ts +6 -33
  310. package/src/mapper/select/Path.ts +4 -1
  311. package/src/mapper/select/RelationFetcher.ts +49 -50
  312. package/src/mapper/select/SelectBuilder.ts +71 -13
  313. package/src/mapper/select/SelectBuilderFactory.ts +2 -1
  314. package/src/mapper/select/SelectExecutionHandler.ts +16 -8
  315. package/src/mapper/select/SelectHydrator.ts +15 -11
  316. package/src/mapper/select/WhereBuilder.ts +168 -61
  317. package/src/mapper/select/handlers/FieldsVisitor.ts +80 -111
  318. package/src/mapper/select/handlers/FieldsVisitorFactory.ts +1 -0
  319. package/src/mapper/select/handlers/MetaHandler.ts +6 -17
  320. package/src/mapper/select/optimizer/ConditionOptimizer.ts +6 -0
  321. package/src/mapper/select/optimizer/WhereOptimizer.ts +148 -21
  322. package/src/mapper/select/optimizer/WhereReplacer.ts +39 -0
  323. package/src/mapper/select/optimizer/helpers.ts +2 -2
  324. package/src/mapper/update/SqlUpdateInputProcessor.ts +4 -10
  325. package/src/mapper/update/UpdateBuilder.ts +3 -3
  326. package/src/resolvers/ExecutionContainerFactory.ts +1 -1
  327. package/src/resolvers/GraphQlQueryAstFactory.ts +5 -4
  328. package/src/resolvers/MutationResolver.ts +14 -4
  329. package/src/resolvers/ReadHelpers.ts +3 -3
  330. package/src/resolvers/ReadResolver.ts +2 -2
  331. package/src/schema/EnumsProvider.ts +2 -4
  332. package/src/schema/FieldAccessVisitor.ts +2 -2
  333. package/src/schema/OrderByTypeProvider.ts +10 -3
  334. package/src/schema/WhereTypeProvider.ts +5 -6
  335. package/src/schema/entities/FieldArgsVisitor.ts +4 -5
  336. package/src/schema/entities/FieldTypeVisitor.ts +3 -3
  337. package/src/schema/mutations/CreateEntityInputFieldVisitor.ts +3 -6
  338. package/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.ts +6 -20
  339. package/src/schema/mutations/CreateEntityRelationInputFieldVisitor.ts +6 -20
  340. package/src/schema/mutations/UpdateEntityInputFieldVisitor.ts +3 -6
  341. package/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.ts +6 -20
  342. package/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.ts +9 -14
  343. package/src/schema/utils.ts +1 -1
  344. package/src/tsconfig.json +6 -6
  345. package/src/utils/uniqueWhereFields.ts +3 -3
  346. package/tests/cases/bugs/bug102.test.ts +6 -6
  347. package/tests/cases/integration/graphQlRequests/delete/aclDelete.test.ts +5 -5
  348. package/tests/cases/integration/graphQlRequests/delete/additionalDeleteFilter.test.ts +5 -5
  349. package/tests/cases/integration/graphQlRequests/delete/cascadeDelete.test.ts +5 -5
  350. package/tests/cases/integration/graphQlRequests/delete/deleteById.test.ts +5 -5
  351. package/tests/cases/integration/graphQlRequests/delete/orphanRemoval.test.ts +5 -5
  352. package/tests/cases/integration/graphQlRequests/delete/setNullOnDelete.test.ts +5 -5
  353. package/tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.ts +54 -4
  354. package/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.ts +26 -25
  355. package/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.ts +9 -6
  356. package/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.ts +104 -0
  357. package/tests/cases/integration/graphQlRequests/query/filter/manyHasManyOwnerRelation.test.ts +17 -15
  358. package/tests/cases/integration/graphQlRequests/query/filter/oneHasManyRelation.test.ts +4 -5
  359. package/tests/cases/integration/graphQlRequests/query/graphqlFeatures/alias.test.ts +9 -13
  360. package/tests/cases/integration/graphQlRequests/query/unique/oneHasManyUnique.test.ts +5 -3
  361. package/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/delete.test.ts +5 -5
  362. package/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/delete.test.ts +5 -5
  363. package/tests/cases/integration/graphQlRequests/update/manyHasOne/delete.test.ts +10 -10
  364. package/tests/cases/integration/graphQlRequests/update/oneHasMany/combination.test.ts +5 -5
  365. package/tests/cases/integration/graphQlRequests/update/oneHasMany/delete.test.ts +5 -5
  366. package/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/delete.test.ts +5 -5
  367. package/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.ts +2 -3
  368. package/tests/cases/unit/predicatesFactory.test.ts +8 -2
  369. package/tests/cases/unit/predicatesInjector.test.ts +97 -2
  370. package/tests/cases/unit/whereBuilder.test.ts +148 -0
  371. package/tests/cases/unit/whereOptimizer.test.ts +199 -0
  372. package/tests/src/test.ts +2 -2
  373. package/tests/src/testGraphql.ts +9 -5
  374. package/dist/src/inputProcessing/InputContext.d.ts +0 -43
  375. package/dist/src/inputProcessing/InputContext.d.ts.map +0 -1
  376. package/dist/src/inputProcessing/InputContext.js +0 -3
  377. package/dist/src/inputProcessing/InputContext.js.map +0 -1
  378. package/src/inputProcessing/InputContext.ts +0 -49
@@ -22,12 +22,12 @@ test('delete', async () => {
22
22
  parameters: [testUuid(2)],
23
23
  response: { rows: [{ id: testUuid(2) }] },
24
24
  },
25
+ {
26
+ sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."setting_id" = ?`,
27
+ parameters: [testUuid(2)],
28
+ response: { rows: [{ id: testUuid(1) }] },
29
+ },
25
30
  ...sqlDeferred([
26
- {
27
- sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."setting_id" = ?`,
28
- parameters: [testUuid(2)],
29
- response: { rows: [{ id: testUuid(1) }] },
30
- },
31
31
  {
32
32
  sql: SQL`delete from "public"."site"
33
33
  where "id" in (select "root_"."id"
@@ -1,7 +1,7 @@
1
1
  import { graphql, printSchema } from 'graphql'
2
2
  import { Acl, Model } from '@contember/schema'
3
- import * as path from 'path'
4
-
3
+ import * as fs from 'node:fs/promises'
4
+ import * as path from 'node:path'
5
5
  import {
6
6
  AllowAllPermissionFactory,
7
7
  SchemaBuilder,
@@ -10,7 +10,6 @@ import {
10
10
  } from '@contember/schema-definition'
11
11
  import { Authorizator, GraphQlSchemaBuilderFactory } from '../../../../src'
12
12
  import * as model from './model'
13
- import { promises as fs } from 'fs'
14
13
  import { assert, describe, it } from 'vitest'
15
14
 
16
15
  interface Test {
@@ -76,8 +76,14 @@ describe('Predicates factory', () => {
76
76
  it('eliminates a predicate', () => {
77
77
  const predicateFactory = new PredicateFactory(permissions, schema, new VariableInjector(schema, {}))
78
78
  const image = schema.entities['Image']
79
- const authorRelation = image.fields['authors'] as Model.AnyRelation
80
- const predicate = predicateFactory.create(image, Acl.Operation.read, undefined, authorRelation)
79
+ const authorRelation = image.fields['authors'] as Model.OneHasManyRelation
80
+ const predicate = predicateFactory.create(image, Acl.Operation.read, undefined, {
81
+ type: 'manyHasOne',
82
+ entity: schema.entities.Author,
83
+ relation: schema.entities.Author.fields.image as Model.ManyHasOneRelation,
84
+ targetEntity: image,
85
+ targetRelation: authorRelation,
86
+ })
81
87
  assert.deepStrictEqual(predicate, {
82
88
  or: [
83
89
  {
@@ -1,7 +1,12 @@
1
- import { PredicateFactory, PredicatesInjector, VariableInjector } from '../../../src/acl'
2
- import { SchemaBuilder } from '@contember/schema-definition'
1
+ import { PermissionFactory, PredicateFactory, PredicatesInjector, VariableInjector } from '../../../src/acl'
2
+ import { SchemaBuilder, SchemaDefinition as def, AclDefinition as acl, createSchema } from '@contember/schema-definition'
3
3
  import { Acl, Model } from '@contember/schema'
4
4
  import { describe, it, assert } from 'vitest'
5
+ import { PermissionsFactory } from '@contember/engine-system-api/dist/src/model'
6
+ import { WhereOptimizer } from '../../../src/mapper/select/optimizer/WhereOptimizer'
7
+ import { ConditionOptimizer } from '../../../src/mapper/select/optimizer/ConditionOptimizer'
8
+ import { acceptFieldVisitor } from '@contember/schema-utils'
9
+ import { testUuid } from '@contember/engine-api-tester'
5
10
 
6
11
 
7
12
 
@@ -45,6 +50,7 @@ const permissions: Acl.Permissions = {
45
50
  },
46
51
  }
47
52
 
53
+
48
54
  describe('Predicates injector', () => {
49
55
 
50
56
  const variables: Acl.VariablesMap = {
@@ -107,5 +113,94 @@ describe('Predicates injector', () => {
107
113
  ],
108
114
  })
109
115
  })
116
+
117
+
110
118
  })
111
119
 
120
+ namespace DeepFilterModel {
121
+ export const readerRole = acl.createRole('reader')
122
+
123
+ @acl.allow(readerRole, {
124
+ when: { isPublished: { eq: true } },
125
+ read: ['coverPhoto'],
126
+ })
127
+ export class Article {
128
+ isPublished = def.boolColumn()
129
+ title = def.stringColumn()
130
+ coverPhoto = def.manyHasOne(ImageUse, 'articles')
131
+ }
132
+
133
+ @acl.allow(readerRole, {
134
+ when: { articles: acl.canRead('coverPhoto') },
135
+ read: true,
136
+ })
137
+ export class ImageUse {
138
+ articles = def.oneHasMany(Article, 'coverPhoto')
139
+ image = def.manyHasOne(Image, 'uses')
140
+ }
141
+
142
+ @acl.allow(readerRole, {
143
+ when: { uses: acl.canRead('image') },
144
+ read: true,
145
+ })
146
+ export class Image {
147
+ uses = def.oneHasMany(ImageUse, 'image')
148
+ url = def.stringColumn()
149
+ tags = def.manyHasMany(Tag)
150
+ }
151
+
152
+ @acl.allow(readerRole, {
153
+ read: true,
154
+ })
155
+ export class Tag {
156
+ label = def.stringColumn()
157
+ }
158
+ }
159
+
160
+
161
+ describe('predicates injector elimination', () => {
162
+ const schema = createSchema(DeepFilterModel)
163
+ const permissions = new PermissionFactory(schema.model).create(schema.acl, ['reader'])
164
+
165
+ const injector = new PredicatesInjector(
166
+ schema.model,
167
+ new PredicateFactory(permissions, schema.model, new VariableInjector(schema.model, {})),
168
+ )
169
+ it('eliminates predicates in where', () => {
170
+ const injected = injector.inject(schema.model.entities.Article, {
171
+ coverPhoto: { image: { tags: { label: { eq: 'foo' } } } },
172
+ })
173
+ const optimizer = new WhereOptimizer(schema.model, new ConditionOptimizer())
174
+ const result = optimizer.optimize(injected, schema.model.entities.Article)
175
+
176
+ assert.deepStrictEqual(result, { and: [{ coverPhoto: { image: { tags: { label: { eq: 'foo' } } } } }, { isPublished: { eq: true } }] })
177
+ })
178
+
179
+ it('eliminate back referencing predicate', () => {
180
+ const relation = acceptFieldVisitor(schema.model, schema.model.entities.Article, 'coverPhoto', {
181
+ visitColumn: () => {
182
+ throw new Error()
183
+ },
184
+ visitRelation: ctx => ctx,
185
+ })
186
+ const injected = injector.inject(schema.model.entities.ImageUse, {
187
+ articles: { id: { in: [testUuid(1)] } },
188
+ }, relation)
189
+
190
+ assert.deepStrictEqual(injected, {
191
+ and: [
192
+ {
193
+ articles: {
194
+ and: [
195
+ { id: { in: [testUuid(1)] } },
196
+ { id: { always: true } },
197
+ ],
198
+ },
199
+ },
200
+ {
201
+ articles: { id: { always: true } },
202
+ },
203
+ ],
204
+ })
205
+ })
206
+ })
@@ -0,0 +1,148 @@
1
+ import { describe, it, assert } from 'vitest'
2
+ import { ConditionOptimizer } from '../../../src/mapper/select/optimizer/ConditionOptimizer'
3
+ import { createSchema, SchemaDefinition as def } from '@contember/schema-definition'
4
+ import { WhereOptimizer } from '../../../src/mapper/select/optimizer/WhereOptimizer'
5
+ import { ConditionBuilder, JoinBuilder, PathFactory, WhereBuilder } from '../../../src/mapper'
6
+ import { Compiler, SelectBuilder } from '@contember/database'
7
+ import { Input, Schema } from '@contember/schema'
8
+
9
+ namespace WhereBuilderModel {
10
+ export class Author {
11
+ name = def.stringColumn()
12
+ isPublic = def.boolColumn().notNull()
13
+ articles = def.oneHasMany(Article, 'author')
14
+ }
15
+
16
+ export class Article {
17
+ title = def.stringColumn()
18
+ isPublic = def.boolColumn().notNull()
19
+ author = def.manyHasOne(Author, 'articles')
20
+ tags = def.manyHasMany(Tag)
21
+ }
22
+
23
+ export class Tag {
24
+ name = def.stringColumn()
25
+ }
26
+ }
27
+
28
+ const createWhere = (schema: Schema, where: Input.Where) => {
29
+ const pathFactory = new PathFactory()
30
+ const joinBuilder = new JoinBuilder(schema.model)
31
+ const conditionBuilder = new ConditionBuilder()
32
+ const whereOptimizer = new WhereOptimizer(schema.model, new ConditionOptimizer())
33
+ const whereBuilder = new WhereBuilder(schema.model, joinBuilder, conditionBuilder, pathFactory, whereOptimizer, schema.settings.useExistsInHasManyFilter === true)
34
+
35
+ const qb = SelectBuilder.create()
36
+ .from('author', 'root_')
37
+
38
+ return whereBuilder.build(qb, schema.model.entities.Author, pathFactory.create([]), where).options.where.compile().sql
39
+ }
40
+
41
+ describe('where builder', () => {
42
+ it('where on has-many relation with AND outside', () => {
43
+ const schema = createSchema(WhereBuilderModel)
44
+ const where = createWhere(schema, {
45
+ and: [
46
+ {
47
+ articles: { isPublic: { eq: true } },
48
+ },
49
+ {
50
+ articles: { title: { eq: 'Hello' } },
51
+ },
52
+ ],
53
+ })
54
+ assert.equal(
55
+ where,
56
+ ' where exists (select 1 from "__SCHEMA__"."article" as "root_articles" where "root_"."id" = "root_articles"."author_id" and "root_articles"."is_public" = ?) and exists (select 1 from "__SCHEMA__"."article" as "root_articles" where "root_"."id" = "root_articles"."author_id" and "root_articles"."title" = ?)',
57
+ )
58
+ })
59
+
60
+ it('where on has-many relation with AND inside', () => {
61
+ const schema = createSchema(WhereBuilderModel)
62
+ const where = createWhere(schema, {
63
+ articles: {
64
+ and: [
65
+ { isPublic: { eq: true } },
66
+ { title: { eq: 'Hello' } },
67
+ ],
68
+ },
69
+ })
70
+ assert.equal(
71
+ where,
72
+ ' where exists (select 1 from "__SCHEMA__"."article" as "root_articles" where "root_"."id" = "root_articles"."author_id" and "root_articles"."is_public" = ? and "root_articles"."title" = ?)',
73
+ )
74
+ })
75
+
76
+
77
+ it('where on has-many relation with isNull', () => {
78
+ const schema = createSchema(WhereBuilderModel)
79
+ const where = createWhere(schema, {
80
+ articles: {
81
+ id: { isNull: true },
82
+ },
83
+ })
84
+ assert.equal(
85
+ where,
86
+ ' where exists (select 1 from (select "root_"."id") as "root_articles_tmp_" left join "__SCHEMA__"."article" as "root_articles" on "root_articles_tmp_"."id" = "root_articles"."author_id" where "root_articles"."id" is null)',
87
+ )
88
+ })
89
+
90
+ it('where with nested has-many', () => {
91
+ const schema: Schema = { ...createSchema(WhereBuilderModel), settings: { useExistsInHasManyFilter: true } }
92
+ const where = createWhere(schema, {
93
+ articles: {
94
+ and: [
95
+ { tags: { name: { eq: 'Hello' } } },
96
+ { tags: { name: { eq: 'World' } } },
97
+ ],
98
+ },
99
+ })
100
+ compareWhere(
101
+ where,
102
+ `where exists (select 1
103
+ from "__SCHEMA__"."article" as "root_articles"
104
+ where "root_"."id" = "root_articles"."author_id"
105
+ and exists (select 1
106
+ from "__SCHEMA__"."article_tags" as "root_articles_tags_junction_"
107
+ inner join "__SCHEMA__"."tag" as "root_articles_tags" on "root_articles_tags_junction_"."tag_id" = "root_articles_tags"."id"
108
+ where "root_articles"."id" = "root_articles_tags_junction_"."article_id" and "root_articles_tags"."name" = ?)
109
+ and exists (select 1
110
+ from "__SCHEMA__"."article_tags" as "root_articles_tags_junction_"
111
+ inner join "__SCHEMA__"."tag" as "root_articles_tags" on "root_articles_tags_junction_"."tag_id" = "root_articles_tags"."id"
112
+ where "root_articles"."id" = "root_articles_tags_junction_"."article_id" and "root_articles_tags"."name" = ?))`,
113
+ )
114
+ })
115
+
116
+
117
+ it('where without nested has-many', () => {
118
+ const schema: Schema = { ...createSchema(WhereBuilderModel) }
119
+ const where = createWhere(schema, {
120
+ articles: {
121
+ and: [
122
+ { tags: { name: { eq: 'Hello' } } },
123
+ { tags: { name: { eq: 'World' } } },
124
+ ],
125
+ },
126
+ })
127
+ compareWhere(
128
+ where,
129
+ `where exists (select 1
130
+ from "__SCHEMA__"."article" as "root_articles"
131
+ left join "__SCHEMA__"."article_tags" as "root_articles_x_root_articles_tags" on "root_articles"."id" = "root_articles_x_root_articles_tags"."article_id"
132
+ left join "__SCHEMA__"."tag" as "root_articles_tags" on "root_articles_x_root_articles_tags"."tag_id" = "root_articles_tags"."id"
133
+ where "root_"."id" = "root_articles"."author_id" and "root_articles_tags"."name" = ? and "root_articles_tags"."name" = ?)`,
134
+ )
135
+ })
136
+ })
137
+
138
+
139
+ const compareWhere = (actual: string, expected: string) => {
140
+ const normalize = (s: string) => s.replaceAll(/\s+/g, ' ').trim()
141
+ try {
142
+ assert.equal(normalize(actual), normalize(expected))
143
+ } catch (e) {
144
+ console.log(normalize(actual))
145
+ console.log(normalize(expected))
146
+ throw e
147
+ }
148
+ }
@@ -2,18 +2,21 @@ import { describe, it, assert } from 'vitest'
2
2
  import { ConditionOptimizer } from '../../../src/mapper/select/optimizer/ConditionOptimizer'
3
3
  import { SchemaDefinition as def } from '@contember/schema-definition'
4
4
  import { WhereOptimizer } from '../../../src/mapper/select/optimizer/WhereOptimizer'
5
+ import { acceptFieldVisitor } from '@contember/schema-utils'
5
6
 
6
7
  namespace TestModel {
7
8
  export class Author {
8
9
  name = def.stringColumn()
9
10
  isPublic = def.boolColumn().notNull()
10
11
  image = def.manyHasOne(Image, 'authors')
12
+ articles = def.oneHasMany(Article, 'author')
11
13
  }
12
14
 
13
15
  export class Article {
14
16
  title = def.stringColumn()
15
17
  isPublic = def.boolColumn().notNull()
16
18
  image = def.manyHasOne(Image, 'articles')
19
+ author = def.manyHasOne(Author, 'articles')
17
20
  }
18
21
 
19
22
  export class Image {
@@ -90,4 +93,200 @@ describe('where optimized', () => {
90
93
  },
91
94
  )
92
95
  })
96
+
97
+
98
+ const A = { authors: { isPublic: { eq: true } } }
99
+ const B = { authors: { name: { eq: 'John' } } }
100
+ const C = { authors: { name: { eq: 'Jack' } } }
101
+
102
+ it('minimize: A || (A && B) => A', () => {
103
+ assert.deepStrictEqual(whereOptimizer.optimize({
104
+ or: [
105
+ A,
106
+ { and: [A, B] },
107
+ ],
108
+ }, model.entities.Image), A)
109
+ })
110
+
111
+ it('minimize: (A && B) || A => A', () => {
112
+ assert.deepStrictEqual(whereOptimizer.optimize({
113
+ or: [
114
+ { and: [A, B] },
115
+ A,
116
+ ],
117
+ }, model.entities.Image), A)
118
+ })
119
+
120
+ it('minimize: A && (A || B) => A', () => {
121
+ assert.deepStrictEqual(whereOptimizer.optimize({
122
+ and: [
123
+ A,
124
+ { or: [A, B] },
125
+ ],
126
+ }, model.entities.Image), A)
127
+ })
128
+
129
+ it('minimize: (A || B) && A => A', () => {
130
+ assert.deepStrictEqual(whereOptimizer.optimize({
131
+ and: [
132
+ { or: [A, B] },
133
+ A,
134
+ ],
135
+ }, model.entities.Image), A)
136
+ })
137
+
138
+ it('minimize: A && (!A || B) => A && B', () => {
139
+ assert.deepStrictEqual(whereOptimizer.optimize({
140
+ and: [
141
+ A,
142
+ { or: [{ not: A }, B] },
143
+ ],
144
+ }, model.entities.Image), { and: [A, B] })
145
+ })
146
+
147
+ it('minimize: A || (!A && B) => A || B', () => {
148
+ assert.deepStrictEqual(whereOptimizer.optimize({
149
+ or: [
150
+ A,
151
+ { and: [{ not: A }, B] },
152
+ ],
153
+ }, model.entities.Image), { or: [A, B] })
154
+ })
155
+
156
+
157
+ it('minimize: A || !A => 1', () => {
158
+ assert.deepStrictEqual(whereOptimizer.optimize({
159
+ or: [
160
+ A,
161
+ { not: A },
162
+ ],
163
+ }, model.entities.Image), { id: { always: true } })
164
+ })
165
+
166
+ it('minimize: A && !A => 0', () => {
167
+ assert.deepStrictEqual(whereOptimizer.optimize({
168
+ and: [
169
+ A,
170
+ { not: A },
171
+ ],
172
+ }, model.entities.Image), { id: { never: true } })
173
+ })
174
+
175
+ it('minimize: !A && !A => !A', () => {
176
+ assert.deepStrictEqual(whereOptimizer.optimize({
177
+ and: [
178
+ { not: A },
179
+ { not: A },
180
+ ],
181
+ }, model.entities.Image), { not: A })
182
+ })
183
+
184
+
185
+ it('not minimize: (A && B) || (A && C)', () => {
186
+ assert.deepStrictEqual(whereOptimizer.optimize({
187
+ or: [
188
+ { and: [A, B] },
189
+ { and: [A, C] },
190
+ ],
191
+ }, model.entities.Image), {
192
+ or: [
193
+ { and: [A, B] },
194
+ { and: [A, C] },
195
+ ],
196
+ })
197
+ })
198
+
199
+
200
+ describe('remove id predicates', () => {
201
+
202
+ it('remove ID predicate when traversing from a relation - always', () => {
203
+ const relationPath = [acceptFieldVisitor(model, 'Image', 'authors', {
204
+ visitColumn: () => {
205
+ throw new Error()
206
+ },
207
+ visitRelation: context => context,
208
+ })]
209
+ assert.deepStrictEqual(whereOptimizer.optimize({
210
+ image: { id: { isNull: false } },
211
+ }, model.entities.Author, { relationPath }), {
212
+ id: { always: true },
213
+ })
214
+ })
215
+
216
+
217
+ it('remove ID predicate when traversing from a relation - never', () => {
218
+ assert.deepStrictEqual(whereOptimizer.optimize({
219
+ image: { id: { isNull: true } },
220
+ }, model.entities.Author, { relationPath: [acceptFieldVisitor(model, 'Image', 'authors', {
221
+ visitColumn: () => {
222
+ throw new Error()
223
+ },
224
+ visitRelation: context => context,
225
+ })] }), {
226
+ id: { never: true },
227
+ })
228
+ })
229
+
230
+ it('remove ID predicate when traversing in where', () => {
231
+ assert.deepStrictEqual(whereOptimizer.optimize({
232
+ authors: { image: { id: { isNull: false } } },
233
+ }, model.entities.Image), {
234
+ id: { always: true },
235
+ })
236
+ })
237
+
238
+ it('do not remove ID predicate when traversing from a has-many relation', () => {
239
+ const relationPath = [acceptFieldVisitor(model, 'Author', 'image', {
240
+ visitColumn: () => {
241
+ throw new Error()
242
+ },
243
+ visitRelation: context => context,
244
+ })]
245
+ assert.deepStrictEqual(whereOptimizer.optimize({
246
+ authors: { id: { isNull: false } },
247
+ }, model.entities.Image, { relationPath }), {
248
+ authors: { id: { isNull: false } },
249
+ })
250
+ })
251
+
252
+ it('do not remove ID predicate when traversing from a nested has-many relation', () => {
253
+ const relationPath = [
254
+ acceptFieldVisitor(model, 'Author', 'articles', {
255
+ visitColumn: () => {
256
+ throw new Error()
257
+ },
258
+ visitRelation: context => context,
259
+ }),
260
+ acceptFieldVisitor(model, 'Article', 'image', {
261
+ visitColumn: () => {
262
+ throw new Error()
263
+ },
264
+ visitRelation: context => context,
265
+ }),
266
+ ]
267
+ assert.deepStrictEqual(whereOptimizer.optimize({
268
+ articles: { author: { id: { isNull: false } } },
269
+ }, model.entities.Image, { relationPath }), {
270
+ articles: { author: { id: { isNull: false } } },
271
+ })
272
+ })
273
+
274
+ it('do not remove ID predicate when traversing in where over has-many relation', () => {
275
+ assert.deepStrictEqual(whereOptimizer.optimize({
276
+ image: { authors: { id: { isNull: false } } },
277
+ }, model.entities.Author), {
278
+ image: { authors: { id: { isNull: false } } },
279
+ })
280
+ })
281
+
282
+
283
+ it('do not remove ID predicate when traversing in where over has-many relation - nested', () => {
284
+ assert.deepStrictEqual(whereOptimizer.optimize({
285
+ image: { authors: { image: { id: { isNull: false } } } },
286
+ }, model.entities.Author), {
287
+ image: { authors: { image: { id: { isNull: false } } } },
288
+ })
289
+ })
290
+ })
93
291
  })
292
+
package/tests/src/test.ts CHANGED
@@ -1,11 +1,11 @@
1
1
  import { Acl, Model, Schema, Validation } from '@contember/schema'
2
- import { ExecutionContainerFactory, GraphQlSchemaBuilderFactory, Authorizator } from '../../src'
2
+ import { Authorizator, ExecutionContainerFactory, GraphQlSchemaBuilderFactory } from '../../src'
3
3
  import { AllowAllPermissionFactory, emptySchema } from '@contember/schema-utils'
4
4
  import { executeGraphQlTest } from './testGraphql'
5
5
  import { Client } from '@contember/database'
6
6
  import { createConnectionMock } from '@contember/database-tester'
7
7
  import { createUuidGenerator } from '@contember/engine-api-tester'
8
- import { getArgumentValues } from 'graphql/execution/values'
8
+ import { getArgumentValues } from 'graphql'
9
9
  import { SQL } from './tags'
10
10
 
11
11
  export interface SqlQuery {
@@ -1,3 +1,4 @@
1
+ import { NullLoggerHandler, withLogger, createLogger } from '@contember/logger'
1
2
  import { graphql, GraphQLSchema } from 'graphql'
2
3
  import { assert } from 'vitest'
3
4
 
@@ -10,11 +11,14 @@ export interface Test {
10
11
  }
11
12
 
12
13
  export const executeGraphQlTest = async (test: Test) => {
13
- const rawResponse = await graphql({
14
- schema: test.schema,
15
- source: test.query,
16
- contextValue: test.context,
17
- variableValues: test.queryVariables,
14
+ const logger = createLogger(new NullLoggerHandler())
15
+ const rawResponse = await withLogger(logger, () => {
16
+ return graphql({
17
+ schema: test.schema,
18
+ source: test.query,
19
+ contextValue: test.context,
20
+ variableValues: test.queryVariables,
21
+ })
18
22
  })
19
23
  const response = JSON.parse(JSON.stringify(rawResponse))
20
24
  if ('errors' in rawResponse) {
@@ -1,43 +0,0 @@
1
- import { Input, Model } from '@contember/schema';
2
- export interface ColumnContext {
3
- entity: Model.Entity;
4
- column: Model.AnyColumn;
5
- input: Input.ColumnValue | undefined;
6
- }
7
- export interface ManyHasManyInverseContext {
8
- entity: Model.Entity;
9
- relation: Model.ManyHasManyInverseRelation;
10
- targetEntity: Model.Entity;
11
- targetRelation: Model.ManyHasManyOwningRelation;
12
- }
13
- export interface ManyHasManyOwningContext {
14
- entity: Model.Entity;
15
- relation: Model.ManyHasManyOwningRelation;
16
- targetEntity: Model.Entity;
17
- targetRelation: Model.ManyHasManyInverseRelation | null;
18
- }
19
- export interface ManyHasOneContext {
20
- entity: Model.Entity;
21
- relation: Model.ManyHasOneRelation;
22
- targetEntity: Model.Entity;
23
- targetRelation: Model.OneHasManyRelation | null;
24
- }
25
- export interface OneHasManyContext {
26
- entity: Model.Entity;
27
- relation: Model.OneHasManyRelation;
28
- targetEntity: Model.Entity;
29
- targetRelation: Model.ManyHasOneRelation;
30
- }
31
- export interface OneHasOneInverseContext {
32
- entity: Model.Entity;
33
- relation: Model.OneHasOneInverseRelation;
34
- targetEntity: Model.Entity;
35
- targetRelation: Model.OneHasOneOwningRelation;
36
- }
37
- export interface OneHasOneOwningContext {
38
- entity: Model.Entity;
39
- relation: Model.OneHasOneOwningRelation;
40
- targetEntity: Model.Entity;
41
- targetRelation: Model.OneHasOneInverseRelation | null;
42
- }
43
- //# sourceMappingURL=InputContext.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"InputContext.d.ts","sourceRoot":"","sources":["../../../src/inputProcessing/InputContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEhD,MAAM,WAAW,aAAa;IAC7B,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,MAAM,EAAE,KAAK,CAAC,SAAS,CAAA;IACvB,KAAK,EAAE,KAAK,CAAC,WAAW,GAAG,SAAS,CAAA;CACpC;AAED,MAAM,WAAW,yBAAyB;IACzC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,CAAA;IAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,CAAA;CAC/C;AAED,MAAM,WAAW,wBAAwB;IACxC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,CAAA;IACzC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,CAAA;CACvD;AAED,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,CAAA;IAClC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAA;CAC/C;AAED,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,CAAA;IAClC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,CAAA;CACxC;AAED,MAAM,WAAW,uBAAuB;IACvC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,wBAAwB,CAAA;IACxC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,uBAAuB,CAAA;CAC7C;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,uBAAuB,CAAA;IACvC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,wBAAwB,GAAG,IAAI,CAAA;CACrD"}
@@ -1,3 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=InputContext.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"InputContext.js","sourceRoot":"","sources":["../../../src/inputProcessing/InputContext.ts"],"names":[],"mappings":""}
@@ -1,49 +0,0 @@
1
- import { Input, Model } from '@contember/schema'
2
-
3
- export interface ColumnContext {
4
- entity: Model.Entity
5
- column: Model.AnyColumn
6
- input: Input.ColumnValue | undefined
7
- }
8
-
9
- export interface ManyHasManyInverseContext {
10
- entity: Model.Entity
11
- relation: Model.ManyHasManyInverseRelation
12
- targetEntity: Model.Entity
13
- targetRelation: Model.ManyHasManyOwningRelation
14
- }
15
-
16
- export interface ManyHasManyOwningContext {
17
- entity: Model.Entity
18
- relation: Model.ManyHasManyOwningRelation
19
- targetEntity: Model.Entity
20
- targetRelation: Model.ManyHasManyInverseRelation | null
21
- }
22
-
23
- export interface ManyHasOneContext {
24
- entity: Model.Entity
25
- relation: Model.ManyHasOneRelation
26
- targetEntity: Model.Entity
27
- targetRelation: Model.OneHasManyRelation | null
28
- }
29
-
30
- export interface OneHasManyContext {
31
- entity: Model.Entity
32
- relation: Model.OneHasManyRelation
33
- targetEntity: Model.Entity
34
- targetRelation: Model.ManyHasOneRelation
35
- }
36
-
37
- export interface OneHasOneInverseContext {
38
- entity: Model.Entity
39
- relation: Model.OneHasOneInverseRelation
40
- targetEntity: Model.Entity
41
- targetRelation: Model.OneHasOneOwningRelation
42
- }
43
-
44
- export interface OneHasOneOwningContext {
45
- entity: Model.Entity
46
- relation: Model.OneHasOneOwningRelation
47
- targetEntity: Model.Entity
48
- targetRelation: Model.OneHasOneInverseRelation | null
49
- }