@contember/engine-content-api 1.1.2 → 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 (352) hide show
  1. package/dist/src/acl/EvaluatedPredicateReplacer.d.ts +9 -0
  2. package/dist/src/acl/EvaluatedPredicateReplacer.d.ts.map +1 -0
  3. package/dist/src/acl/EvaluatedPredicateReplacer.js +31 -0
  4. package/dist/src/acl/EvaluatedPredicateReplacer.js.map +1 -0
  5. package/dist/src/acl/PermissionFactory.d.ts.map +1 -1
  6. package/dist/src/acl/PermissionFactory.js +15 -11
  7. package/dist/src/acl/PermissionFactory.js.map +1 -1
  8. package/dist/src/acl/PredicateFactory.d.ts +4 -2
  9. package/dist/src/acl/PredicateFactory.d.ts.map +1 -1
  10. package/dist/src/acl/PredicateFactory.js +17 -6
  11. package/dist/src/acl/PredicateFactory.js.map +1 -1
  12. package/dist/src/acl/PredicatesInjector.d.ts +1 -1
  13. package/dist/src/acl/PredicatesInjector.d.ts.map +1 -1
  14. package/dist/src/acl/PredicatesInjector.js +16 -19
  15. package/dist/src/acl/PredicatesInjector.js.map +1 -1
  16. package/dist/src/acl/VariableInjector.d.ts +0 -1
  17. package/dist/src/acl/VariableInjector.d.ts.map +1 -1
  18. package/dist/src/acl/VariableInjector.js +4 -14
  19. package/dist/src/acl/VariableInjector.js.map +1 -1
  20. package/dist/src/acl/VariableUtils.d.ts +2 -13
  21. package/dist/src/acl/VariableUtils.d.ts.map +1 -1
  22. package/dist/src/acl/VariableUtils.js +5 -16
  23. package/dist/src/acl/VariableUtils.js.map +1 -1
  24. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.d.ts +0 -1
  25. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.d.ts.map +1 -1
  26. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js +14 -15
  27. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js.map +1 -1
  28. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.d.ts +1 -1
  29. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.d.ts.map +1 -1
  30. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.js +1 -1
  31. package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.js.map +1 -1
  32. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.d.ts +5 -4
  33. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.d.ts.map +1 -1
  34. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.js +29 -20
  35. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.js.map +1 -1
  36. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.d.ts.map +1 -1
  37. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.js +2 -2
  38. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.js.map +1 -1
  39. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.d.ts +3 -3
  40. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.d.ts.map +1 -1
  41. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js +3 -3
  42. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js.map +1 -1
  43. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.d.ts +5 -4
  44. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.d.ts.map +1 -1
  45. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.js +29 -20
  46. package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.js.map +1 -1
  47. package/dist/src/input-validation/ColumnValueResolver.d.ts +4 -3
  48. package/dist/src/input-validation/ColumnValueResolver.d.ts.map +1 -1
  49. package/dist/src/input-validation/ColumnValueResolver.js.map +1 -1
  50. package/dist/src/input-validation/EntityRulesResolver.js +4 -4
  51. package/dist/src/input-validation/EntityRulesResolver.js.map +1 -1
  52. package/dist/src/input-validation/QueryAstFactory.js +1 -1
  53. package/dist/src/input-validation/QueryAstFactory.js.map +1 -1
  54. package/dist/src/input-validation/ValidationContext.d.ts +2 -2
  55. package/dist/src/input-validation/ValidationContext.d.ts.map +1 -1
  56. package/dist/src/input-validation/ValidationContext.js.map +1 -1
  57. package/dist/src/input-validation/ValidationDataSelector.d.ts.map +1 -1
  58. package/dist/src/input-validation/ValidationDataSelector.js +1 -1
  59. package/dist/src/input-validation/ValidationDataSelector.js.map +1 -1
  60. package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.d.ts +7 -8
  61. package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.d.ts.map +1 -1
  62. package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.js.map +1 -1
  63. package/dist/src/input-validation/preValidation/InputPreValidator.js +4 -4
  64. package/dist/src/input-validation/preValidation/InputPreValidator.js.map +1 -1
  65. package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.d.ts +7 -8
  66. package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.d.ts.map +1 -1
  67. package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.js.map +1 -1
  68. package/dist/src/inputProcessing/CreateInputProcessor.d.ts +8 -9
  69. package/dist/src/inputProcessing/CreateInputProcessor.d.ts.map +1 -1
  70. package/dist/src/inputProcessing/CreateInputVisitor.d.ts +7 -7
  71. package/dist/src/inputProcessing/CreateInputVisitor.d.ts.map +1 -1
  72. package/dist/src/inputProcessing/CreateInputVisitor.js +15 -46
  73. package/dist/src/inputProcessing/CreateInputVisitor.js.map +1 -1
  74. package/dist/src/inputProcessing/UpdateInputProcessor.d.ts +8 -9
  75. package/dist/src/inputProcessing/UpdateInputProcessor.d.ts.map +1 -1
  76. package/dist/src/inputProcessing/UpdateInputVisitor.d.ts +7 -7
  77. package/dist/src/inputProcessing/UpdateInputVisitor.d.ts.map +1 -1
  78. package/dist/src/inputProcessing/UpdateInputVisitor.js +13 -28
  79. package/dist/src/inputProcessing/UpdateInputVisitor.js.map +1 -1
  80. package/dist/src/inputProcessing/index.d.ts +0 -1
  81. package/dist/src/inputProcessing/index.d.ts.map +1 -1
  82. package/dist/src/inputProcessing/index.js +0 -1
  83. package/dist/src/inputProcessing/index.js.map +1 -1
  84. package/dist/src/introspection/IntrospectionSchemaFactory.js +7 -7
  85. package/dist/src/introspection/IntrospectionSchemaFactory.js.map +1 -1
  86. package/dist/src/introspection/content-schema.types.d.ts +19 -223
  87. package/dist/src/introspection/content-schema.types.d.ts.map +1 -1
  88. package/dist/src/introspection/content-schema.types.js +2 -2
  89. package/dist/src/introspection/content-schema.types.js.map +1 -1
  90. package/dist/src/mapper/Mapper.d.ts +6 -6
  91. package/dist/src/mapper/Mapper.d.ts.map +1 -1
  92. package/dist/src/mapper/Mapper.js +28 -23
  93. package/dist/src/mapper/Mapper.js.map +1 -1
  94. package/dist/src/mapper/MapperContainer.d.ts.map +1 -1
  95. package/dist/src/mapper/MapperContainer.js +7 -4
  96. package/dist/src/mapper/MapperContainer.js.map +1 -1
  97. package/dist/src/mapper/delete/DeleteExecutor.js +3 -3
  98. package/dist/src/mapper/delete/DeleteExecutor.js.map +1 -1
  99. package/dist/src/mapper/insert/SqlCreateInputProcessor.d.ts +4 -2
  100. package/dist/src/mapper/insert/SqlCreateInputProcessor.d.ts.map +1 -1
  101. package/dist/src/mapper/insert/SqlCreateInputProcessor.js.map +1 -1
  102. package/dist/src/mapper/select/JoinVisitor.d.ts +6 -6
  103. package/dist/src/mapper/select/JoinVisitor.d.ts.map +1 -1
  104. package/dist/src/mapper/select/JoinVisitor.js +6 -6
  105. package/dist/src/mapper/select/JoinVisitor.js.map +1 -1
  106. package/dist/src/mapper/select/RelationFetcher.d.ts +32 -5
  107. package/dist/src/mapper/select/RelationFetcher.d.ts.map +1 -1
  108. package/dist/src/mapper/select/RelationFetcher.js +37 -15
  109. package/dist/src/mapper/select/RelationFetcher.js.map +1 -1
  110. package/dist/src/mapper/select/SelectBuilder.d.ts +2 -1
  111. package/dist/src/mapper/select/SelectBuilder.d.ts.map +1 -1
  112. package/dist/src/mapper/select/SelectBuilder.js +4 -2
  113. package/dist/src/mapper/select/SelectBuilder.js.map +1 -1
  114. package/dist/src/mapper/select/SelectBuilderFactory.d.ts +2 -1
  115. package/dist/src/mapper/select/SelectBuilderFactory.d.ts.map +1 -1
  116. package/dist/src/mapper/select/SelectExecutionHandler.d.ts +1 -0
  117. package/dist/src/mapper/select/SelectExecutionHandler.d.ts.map +1 -1
  118. package/dist/src/mapper/select/WhereBuilder.d.ts +6 -3
  119. package/dist/src/mapper/select/WhereBuilder.d.ts.map +1 -1
  120. package/dist/src/mapper/select/WhereBuilder.js +31 -24
  121. package/dist/src/mapper/select/WhereBuilder.js.map +1 -1
  122. package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts +9 -8
  123. package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts.map +1 -1
  124. package/dist/src/mapper/select/handlers/FieldsVisitor.js +45 -24
  125. package/dist/src/mapper/select/handlers/FieldsVisitor.js.map +1 -1
  126. package/dist/src/mapper/select/handlers/FieldsVisitorFactory.d.ts.map +1 -1
  127. package/dist/src/mapper/select/handlers/FieldsVisitorFactory.js +1 -1
  128. package/dist/src/mapper/select/handlers/FieldsVisitorFactory.js.map +1 -1
  129. package/dist/src/mapper/select/optimizer/ConditionOptimizer.d.ts +5 -0
  130. package/dist/src/mapper/select/optimizer/ConditionOptimizer.d.ts.map +1 -0
  131. package/dist/src/mapper/select/optimizer/ConditionOptimizer.js +39 -0
  132. package/dist/src/mapper/select/optimizer/ConditionOptimizer.js.map +1 -0
  133. package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts +15 -0
  134. package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts.map +1 -0
  135. package/dist/src/mapper/select/optimizer/WhereOptimizer.js +118 -0
  136. package/dist/src/mapper/select/optimizer/WhereOptimizer.js.map +1 -0
  137. package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts +6 -0
  138. package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts.map +1 -0
  139. package/dist/src/mapper/select/optimizer/WhereReplacer.js +28 -0
  140. package/dist/src/mapper/select/optimizer/WhereReplacer.js.map +1 -0
  141. package/dist/src/mapper/select/optimizer/helpers.d.ts +10 -0
  142. package/dist/src/mapper/select/optimizer/helpers.d.ts.map +1 -0
  143. package/dist/src/mapper/select/optimizer/helpers.js +72 -0
  144. package/dist/src/mapper/select/optimizer/helpers.js.map +1 -0
  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.map +1 -1
  148. package/dist/src/mapper/update/UpdateBuilder.js +3 -3
  149. package/dist/src/mapper/update/UpdateBuilder.js.map +1 -1
  150. package/dist/src/resolvers/GraphQlQueryAstFactory.js +2 -2
  151. package/dist/src/resolvers/GraphQlQueryAstFactory.js.map +1 -1
  152. package/dist/src/resolvers/MutationResolver.js +15 -15
  153. package/dist/src/resolvers/MutationResolver.js.map +1 -1
  154. package/dist/src/resolvers/ReadHelpers.js +10 -10
  155. package/dist/src/resolvers/ReadHelpers.js.map +1 -1
  156. package/dist/src/resolvers/ReadResolver.js +2 -2
  157. package/dist/src/resolvers/ReadResolver.js.map +1 -1
  158. package/dist/src/schema/FieldAccessVisitor.d.ts +2 -2
  159. package/dist/src/schema/FieldAccessVisitor.d.ts.map +1 -1
  160. package/dist/src/schema/FieldAccessVisitor.js +2 -2
  161. package/dist/src/schema/FieldAccessVisitor.js.map +1 -1
  162. package/dist/src/schema/MutationProvider.js +4 -4
  163. package/dist/src/schema/MutationProvider.js.map +1 -1
  164. package/dist/src/schema/OrderByTypeProvider.js +1 -1
  165. package/dist/src/schema/OrderByTypeProvider.js.map +1 -1
  166. package/dist/src/schema/QueryProvider.js +3 -3
  167. package/dist/src/schema/QueryProvider.js.map +1 -1
  168. package/dist/src/schema/ResultSchemaTypeProvider.d.ts +2 -2
  169. package/dist/src/schema/ResultSchemaTypeProvider.d.ts.map +1 -1
  170. package/dist/src/schema/WhereTypeProvider.js +4 -4
  171. package/dist/src/schema/WhereTypeProvider.js.map +1 -1
  172. package/dist/src/schema/entities/FieldArgsVisitor.d.ts +7 -7
  173. package/dist/src/schema/entities/FieldArgsVisitor.d.ts.map +1 -1
  174. package/dist/src/schema/entities/FieldArgsVisitor.js +3 -3
  175. package/dist/src/schema/entities/FieldArgsVisitor.js.map +1 -1
  176. package/dist/src/schema/entities/FieldTypeVisitor.d.ts +3 -3
  177. package/dist/src/schema/entities/FieldTypeVisitor.d.ts.map +1 -1
  178. package/dist/src/schema/entities/FieldTypeVisitor.js +3 -3
  179. package/dist/src/schema/entities/FieldTypeVisitor.js.map +1 -1
  180. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.d.ts +3 -3
  181. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.d.ts.map +1 -1
  182. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.js +3 -3
  183. package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.js.map +1 -1
  184. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.d.ts +6 -6
  185. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.d.ts.map +1 -1
  186. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.js +6 -6
  187. package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.js.map +1 -1
  188. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.d.ts +3 -3
  189. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.d.ts.map +1 -1
  190. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.js +5 -5
  191. package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.js.map +1 -1
  192. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.d.ts +10 -4
  193. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.d.ts.map +1 -1
  194. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.js +3 -3
  195. package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.js.map +1 -1
  196. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.d.ts +6 -6
  197. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.d.ts.map +1 -1
  198. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.js +6 -6
  199. package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.js.map +1 -1
  200. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.d.ts +2 -2
  201. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.d.ts.map +1 -1
  202. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.js +2 -2
  203. package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.js.map +1 -1
  204. package/dist/src/tsconfig.tsbuildinfo +1 -1
  205. package/dist/src/utils/object.d.ts.map +1 -1
  206. package/dist/src/utils/object.js +3 -4
  207. package/dist/src/utils/object.js.map +1 -1
  208. package/dist/src/utils/uniqueWhereFields.js +3 -3
  209. package/dist/src/utils/uniqueWhereFields.js.map +1 -1
  210. package/dist/tests/cases/integration/graphQlRequests/delete/aclDelete.test.js +1 -1
  211. package/dist/tests/cases/integration/graphQlRequests/delete/aclDelete.test.js.map +1 -1
  212. package/dist/tests/cases/integration/graphQlRequests/insert/acl/setField.test.js +2 -2
  213. package/dist/tests/cases/integration/graphQlRequests/insert/acl/setField.test.js.map +1 -1
  214. package/dist/tests/cases/integration/graphQlRequests/insert/aclInsert.test.js +1 -1
  215. package/dist/tests/cases/integration/graphQlRequests/insert/aclInsert.test.js.map +1 -1
  216. package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js +7 -6
  217. package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js.map +1 -1
  218. package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js +1 -1
  219. package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js.map +1 -1
  220. package/dist/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.d.ts +2 -0
  221. package/dist/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.d.ts.map +1 -0
  222. package/dist/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.js +137 -0
  223. package/dist/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.js.map +1 -0
  224. package/dist/tests/cases/integration/graphQlRequests/query/filter/complexCondition.test.js +1 -1
  225. package/dist/tests/cases/integration/graphQlRequests/query/filter/composedFilter.test.js +1 -1
  226. package/dist/tests/cases/integration/graphQlRequests/query/filter/composedFilter.test.js.map +1 -1
  227. package/dist/tests/cases/integration/graphQlRequests/query/relations/manyHasManyInverse.test.js +73 -0
  228. package/dist/tests/cases/integration/graphQlRequests/query/relations/manyHasManyInverse.test.js.map +1 -1
  229. package/dist/tests/cases/integration/graphQlRequests/query/relations/manyHasManyOwning.test.js +73 -0
  230. package/dist/tests/cases/integration/graphQlRequests/query/relations/manyHasManyOwning.test.js.map +1 -1
  231. package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js +6 -6
  232. package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js.map +1 -1
  233. package/dist/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.js +6 -3
  234. package/dist/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.js.map +1 -1
  235. package/dist/tests/cases/integration/graphQlSchema/model.js.map +1 -1
  236. package/dist/tests/cases/unit/aclVariablesFactory.test.js +7 -33
  237. package/dist/tests/cases/unit/aclVariablesFactory.test.js.map +1 -1
  238. package/dist/tests/cases/unit/conditionOptimizer.test.d.ts +2 -0
  239. package/dist/tests/cases/unit/conditionOptimizer.test.d.ts.map +1 -0
  240. package/dist/tests/cases/unit/conditionOptimizer.test.js +118 -0
  241. package/dist/tests/cases/unit/conditionOptimizer.test.js.map +1 -0
  242. package/dist/tests/cases/unit/orderbyHelper.test.js +1 -0
  243. package/dist/tests/cases/unit/orderbyHelper.test.js.map +1 -1
  244. package/dist/tests/cases/unit/permissionMerger.test.js +2 -0
  245. package/dist/tests/cases/unit/permissionMerger.test.js.map +1 -1
  246. package/dist/tests/cases/unit/predicatesFactory.test.d.ts +2 -0
  247. package/dist/tests/cases/unit/predicatesFactory.test.d.ts.map +1 -0
  248. package/dist/tests/cases/unit/predicatesFactory.test.js +109 -0
  249. package/dist/tests/cases/unit/predicatesFactory.test.js.map +1 -0
  250. package/dist/tests/cases/unit/predicatesInjector.test.js +88 -14
  251. package/dist/tests/cases/unit/predicatesInjector.test.js.map +1 -1
  252. package/dist/tests/cases/unit/variableInjector.test.js +4 -3
  253. package/dist/tests/cases/unit/variableInjector.test.js.map +1 -1
  254. package/dist/tests/cases/unit/whereOptimizer.test.d.ts +2 -0
  255. package/dist/tests/cases/unit/whereOptimizer.test.d.ts.map +1 -0
  256. package/dist/tests/cases/unit/whereOptimizer.test.js +265 -0
  257. package/dist/tests/cases/unit/whereOptimizer.test.js.map +1 -0
  258. package/dist/tests/src/testGraphql.d.ts.map +1 -1
  259. package/dist/tests/src/testGraphql.js +10 -2
  260. package/dist/tests/src/testGraphql.js.map +1 -1
  261. package/dist/tests/tsconfig.tsbuildinfo +1 -1
  262. package/graphql.codegen.yml +0 -3
  263. package/package.json +16 -16
  264. package/src/acl/EvaluatedPredicateReplacer.ts +32 -0
  265. package/src/acl/PermissionFactory.ts +18 -13
  266. package/src/acl/PredicateFactory.ts +32 -8
  267. package/src/acl/PredicatesInjector.ts +25 -17
  268. package/src/acl/VariableInjector.ts +2 -15
  269. package/src/acl/VariableUtils.ts +7 -23
  270. package/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts +17 -24
  271. package/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts +1 -6
  272. package/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts +26 -46
  273. package/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts +6 -3
  274. package/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts +4 -22
  275. package/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts +26 -49
  276. package/src/input-validation/ColumnValueResolver.ts +2 -3
  277. package/src/input-validation/EntityRulesResolver.ts +4 -4
  278. package/src/input-validation/QueryAstFactory.ts +1 -1
  279. package/src/input-validation/ValidationContext.ts +2 -2
  280. package/src/input-validation/ValidationDataSelector.ts +2 -2
  281. package/src/input-validation/preValidation/CreateInputPreValidationProcessor.ts +7 -8
  282. package/src/input-validation/preValidation/InputPreValidator.ts +4 -4
  283. package/src/input-validation/preValidation/UpdateInputPreValidationProcessor.ts +7 -8
  284. package/src/inputProcessing/CreateInputProcessor.ts +8 -9
  285. package/src/inputProcessing/CreateInputVisitor.ts +27 -89
  286. package/src/inputProcessing/UpdateInputProcessor.ts +8 -9
  287. package/src/inputProcessing/UpdateInputVisitor.ts +25 -71
  288. package/src/inputProcessing/index.ts +0 -1
  289. package/src/introspection/IntrospectionSchemaFactory.ts +7 -7
  290. package/src/introspection/content-schema.types.ts +19 -286
  291. package/src/mapper/Mapper.ts +37 -30
  292. package/src/mapper/MapperContainer.ts +10 -5
  293. package/src/mapper/delete/DeleteExecutor.ts +3 -3
  294. package/src/mapper/insert/SqlCreateInputProcessor.ts +3 -3
  295. package/src/mapper/select/JoinVisitor.ts +6 -33
  296. package/src/mapper/select/RelationFetcher.ts +101 -41
  297. package/src/mapper/select/SelectBuilder.ts +3 -1
  298. package/src/mapper/select/SelectBuilderFactory.ts +2 -1
  299. package/src/mapper/select/SelectExecutionHandler.ts +1 -0
  300. package/src/mapper/select/WhereBuilder.ts +46 -32
  301. package/src/mapper/select/handlers/FieldsVisitor.ts +47 -57
  302. package/src/mapper/select/handlers/FieldsVisitorFactory.ts +1 -0
  303. package/src/mapper/select/optimizer/ConditionOptimizer.ts +41 -0
  304. package/src/mapper/select/optimizer/WhereOptimizer.ts +138 -0
  305. package/src/mapper/select/optimizer/WhereReplacer.ts +27 -0
  306. package/src/mapper/select/optimizer/helpers.ts +58 -0
  307. package/src/mapper/update/SqlUpdateInputProcessor.ts +1 -1
  308. package/src/mapper/update/UpdateBuilder.ts +3 -3
  309. package/src/resolvers/GraphQlQueryAstFactory.ts +3 -3
  310. package/src/resolvers/MutationResolver.ts +1 -1
  311. package/src/resolvers/ReadHelpers.ts +3 -3
  312. package/src/resolvers/ReadResolver.ts +2 -2
  313. package/src/schema/FieldAccessVisitor.ts +2 -2
  314. package/src/schema/OrderByTypeProvider.ts +1 -1
  315. package/src/schema/WhereTypeProvider.ts +4 -4
  316. package/src/schema/entities/FieldArgsVisitor.ts +3 -3
  317. package/src/schema/entities/FieldTypeVisitor.ts +3 -3
  318. package/src/schema/mutations/CreateEntityInputFieldVisitor.ts +3 -6
  319. package/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.ts +6 -20
  320. package/src/schema/mutations/CreateEntityRelationInputFieldVisitor.ts +5 -18
  321. package/src/schema/mutations/UpdateEntityInputFieldVisitor.ts +3 -6
  322. package/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.ts +6 -20
  323. package/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.ts +2 -12
  324. package/src/utils/object.ts +6 -6
  325. package/src/utils/uniqueWhereFields.ts +3 -3
  326. package/tests/cases/integration/graphQlRequests/delete/aclDelete.test.ts +2 -2
  327. package/tests/cases/integration/graphQlRequests/insert/acl/setField.test.ts +3 -3
  328. package/tests/cases/integration/graphQlRequests/insert/aclInsert.test.ts +2 -2
  329. package/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.ts +7 -6
  330. package/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.ts +1 -1
  331. package/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.ts +130 -0
  332. package/tests/cases/integration/graphQlRequests/query/filter/complexCondition.test.ts +1 -1
  333. package/tests/cases/integration/graphQlRequests/query/filter/composedFilter.test.ts +1 -1
  334. package/tests/cases/integration/graphQlRequests/query/relations/manyHasManyInverse.test.ts +74 -0
  335. package/tests/cases/integration/graphQlRequests/query/relations/manyHasManyOwning.test.ts +77 -0
  336. package/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.ts +7 -7
  337. package/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.ts +5 -5
  338. package/tests/cases/unit/aclVariablesFactory.test.ts +8 -35
  339. package/tests/cases/unit/conditionOptimizer.test.ts +135 -0
  340. package/tests/cases/unit/orderbyHelper.test.ts +1 -0
  341. package/tests/cases/unit/permissionMerger.test.ts +2 -0
  342. package/tests/cases/unit/predicatesFactory.test.ts +103 -0
  343. package/tests/cases/unit/predicatesInjector.test.ts +78 -16
  344. package/tests/cases/unit/variableInjector.test.ts +6 -5
  345. package/tests/cases/unit/whereOptimizer.test.ts +289 -0
  346. package/tests/src/testGraphql.ts +9 -2
  347. package/dist/src/inputProcessing/InputContext.d.ts +0 -43
  348. package/dist/src/inputProcessing/InputContext.d.ts.map +0 -1
  349. package/dist/src/inputProcessing/InputContext.js +0 -3
  350. package/dist/src/inputProcessing/InputContext.js.map +0 -1
  351. package/jasmine.json +0 -7
  352. package/src/inputProcessing/InputContext.ts +0 -49
@@ -0,0 +1,103 @@
1
+ import { PredicateFactory, VariableInjector } from '../../../src/acl'
2
+ import { SchemaDefinition as def } from '@contember/schema-definition'
3
+ import { Acl, Model } from '@contember/schema'
4
+ import { assert, describe, it } from 'vitest'
5
+
6
+ namespace TestModel {
7
+ export class Author {
8
+ name = def.stringColumn()
9
+ isPublic = def.boolColumn().notNull()
10
+ image = def.manyHasOne(Image, 'authors')
11
+ }
12
+
13
+ export class Article {
14
+ title = def.stringColumn()
15
+ isPublic = def.boolColumn().notNull()
16
+ image = def.manyHasOne(Image, 'articles')
17
+ }
18
+
19
+ export class Image {
20
+ url = def.stringColumn().notNull()
21
+
22
+ articles = def.oneHasMany(Article, 'image')
23
+ authors = def.oneHasMany(Author, 'image')
24
+ }
25
+ }
26
+ const permissions: Acl.Permissions = {
27
+ Author: {
28
+ predicates: {
29
+ authorPredicate: {
30
+ isPublic: { eq: true },
31
+ },
32
+ },
33
+ operations: {
34
+ read: {
35
+ id: 'authorPredicate',
36
+ name: 'authorPredicate',
37
+ image: 'authorPredicate',
38
+ },
39
+ },
40
+ },
41
+ Article: {
42
+ predicates: {
43
+ articlePredicate: {
44
+ isPublic: { eq: true },
45
+ },
46
+ },
47
+ operations: {
48
+ read: {
49
+ id: 'articlePredicate',
50
+ title: 'articlePredicate',
51
+ image: 'articlePredicate',
52
+ },
53
+ },
54
+ },
55
+ Image: {
56
+ predicates: {
57
+ imagePredicate: {
58
+ or: [
59
+ { authors: { isPublic: { eq: true } } },
60
+ { articles: { isPublic: { eq: true } } },
61
+ ],
62
+ },
63
+ },
64
+ operations: {
65
+ read: {
66
+ id: 'imagePredicate',
67
+ url: 'imagePredicate',
68
+ },
69
+ },
70
+ },
71
+ }
72
+
73
+ describe('Predicates factory', () => {
74
+ const schema = def.createModel(TestModel)
75
+
76
+ it('eliminates a predicate', () => {
77
+ const predicateFactory = new PredicateFactory(permissions, schema, new VariableInjector(schema, {}))
78
+ const image = schema.entities['Image']
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
+ })
87
+ assert.deepStrictEqual(predicate, {
88
+ or: [
89
+ {
90
+ authors: {
91
+ id: { always: true },
92
+ },
93
+ },
94
+ {
95
+ articles: {
96
+ isPublic: { eq: true },
97
+ },
98
+ },
99
+ ],
100
+ })
101
+ })
102
+ })
103
+
@@ -1,7 +1,10 @@
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'
5
8
 
6
9
 
7
10
 
@@ -31,23 +34,30 @@ const permissions: Acl.Permissions = {
31
34
  localePredicate: {
32
35
  locale: 'localeVariable',
33
36
  },
37
+ localePredicate2: {
38
+ locale: 'localeVariable',
39
+ },
34
40
  },
35
41
  operations: {
36
42
  read: {
37
43
  id: 'localePredicate',
38
- title: 'localePredicate',
44
+ title: 'localePredicate2',
39
45
  content: 'localePredicate',
40
46
  },
41
47
  },
42
48
  },
43
49
  }
44
50
 
51
+
45
52
  describe('Predicates injector', () => {
46
53
 
54
+ const variables: Acl.VariablesMap = {
55
+ localeVariable: { in: ['cs'] },
56
+ }
47
57
  it('injects predicate', () => {
48
58
  const injector = new PredicatesInjector(
49
59
  schema,
50
- new PredicateFactory(permissions, new VariableInjector(schema, { localeVariable: ['cs'] })),
60
+ new PredicateFactory(permissions, schema, new VariableInjector(schema, variables)),
51
61
  )
52
62
  const result = injector.inject(schema.entities['PostLocale'], {})
53
63
 
@@ -59,23 +69,14 @@ describe('Predicates injector', () => {
59
69
  it('merges predicate with explicit where', () => {
60
70
  const injector = new PredicatesInjector(
61
71
  schema,
62
- new PredicateFactory(permissions, new VariableInjector(schema, { localeVariable: ['cs'] })),
72
+ new PredicateFactory(permissions, schema, new VariableInjector(schema, variables)),
63
73
  )
64
74
  const result = injector.inject(schema.entities['PostLocale'], { id: { in: [1, 2] } })
65
75
 
66
76
  assert.deepStrictEqual(result, {
67
77
  and: [
68
78
  {
69
- and: [
70
- {
71
- id: { in: [1, 2] },
72
- },
73
- {
74
- locale: {
75
- in: ['cs'],
76
- },
77
- },
78
- ],
79
+ id: { in: [1, 2] },
79
80
  },
80
81
  {
81
82
  locale: { in: ['cs'] },
@@ -87,7 +88,7 @@ describe('Predicates injector', () => {
87
88
  it('injects predicate to where', () => {
88
89
  const injector = new PredicatesInjector(
89
90
  schema,
90
- new PredicateFactory(permissions, new VariableInjector(schema, { localeVariable: ['cs'] })),
91
+ new PredicateFactory(permissions, schema, new VariableInjector(schema, variables)),
91
92
  )
92
93
 
93
94
  const result = injector.inject(schema.entities['PostLocale'], { title: { eq: 'abc' } })
@@ -110,5 +111,66 @@ describe('Predicates injector', () => {
110
111
  ],
111
112
  })
112
113
  })
114
+
115
+
113
116
  })
114
117
 
118
+ namespace DeepFilterModel {
119
+ export const readerRole = acl.createRole('reader')
120
+
121
+ @acl.allow(readerRole, {
122
+ when: { isPublished: { eq: true } },
123
+ read: ['coverPhoto'],
124
+ })
125
+ export class Article {
126
+ isPublished = def.boolColumn()
127
+ title = def.stringColumn()
128
+ coverPhoto = def.manyHasOne(ImageUse, 'articles')
129
+ }
130
+
131
+ @acl.allow(readerRole, {
132
+ when: { articles: acl.canRead('coverPhoto') },
133
+ read: true,
134
+ })
135
+ export class ImageUse {
136
+ articles = def.oneHasMany(Article, 'coverPhoto')
137
+ image = def.manyHasOne(Image, 'uses')
138
+ }
139
+
140
+ @acl.allow(readerRole, {
141
+ when: { uses: acl.canRead('image') },
142
+ read: true,
143
+ })
144
+ export class Image {
145
+ uses = def.oneHasMany(ImageUse, 'image')
146
+ url = def.stringColumn()
147
+ tags = def.manyHasMany(Tag)
148
+ }
149
+
150
+ @acl.allow(readerRole, {
151
+ read: true,
152
+ })
153
+ export class Tag {
154
+ label = def.stringColumn()
155
+ }
156
+ }
157
+
158
+
159
+ describe('predicates injector elimination', () => {
160
+ it('eliminates predicates in where', () => {
161
+ const schema = createSchema(DeepFilterModel)
162
+ const permissions = new PermissionFactory(schema.model).create(schema.acl, ['reader'])
163
+
164
+ const injector = new PredicatesInjector(
165
+ schema.model,
166
+ new PredicateFactory(permissions, schema.model, new VariableInjector(schema.model, {})),
167
+ )
168
+ const injected = injector.inject(schema.model.entities.Article, {
169
+ coverPhoto: { image: { tags: { label: { eq: 'foo' } } } },
170
+ })
171
+ const optimizer = new WhereOptimizer(schema.model, new ConditionOptimizer())
172
+ const result = optimizer.optimize(injected, schema.model.entities.Article)
173
+
174
+ assert.deepStrictEqual(result, { and: [{ coverPhoto: { image: { tags: { label: { eq: 'foo' } } } } }, { isPublished: { eq: true } }] })
175
+ })
176
+ })
@@ -1,7 +1,7 @@
1
1
  import { VariableInjector } from '../../../src/acl'
2
2
  import { SchemaBuilder } from '@contember/schema-definition'
3
- import { Model } from '@contember/schema'
4
- import { describe, it, assert } from 'vitest'
3
+ import { Acl, Model } from '@contember/schema'
4
+ import { assert, describe, it } from 'vitest'
5
5
 
6
6
  describe('Variable injector', () => {
7
7
 
@@ -17,9 +17,10 @@ describe('Variable injector', () => {
17
17
  )
18
18
  .buildSchema()
19
19
 
20
+ const ids = ['91528a5c-839b-4114-9952-d661914a607f', '1e2f3937-a0b1-4105-8aae-6da8ac9fc146']
20
21
  const injector = new VariableInjector(schema, {
21
- site: [1, 2],
22
- locale: 'cs',
22
+ site: { in: ids },
23
+ locale: { eq: 'cs' },
23
24
  })
24
25
  const result = injector.inject(schema.entities['PostLocale'], {
25
26
  or: [
@@ -53,7 +54,7 @@ describe('Variable injector', () => {
53
54
  and: [
54
55
  {
55
56
  post: {
56
- site: { id: { in: [1, 2] } },
57
+ site: { id: { in: ids } },
57
58
  },
58
59
  },
59
60
  {
@@ -0,0 +1,289 @@
1
+ import { describe, it, assert } from 'vitest'
2
+ import { ConditionOptimizer } from '../../../src/mapper/select/optimizer/ConditionOptimizer'
3
+ import { SchemaDefinition as def } from '@contember/schema-definition'
4
+ import { WhereOptimizer } from '../../../src/mapper/select/optimizer/WhereOptimizer'
5
+ import { acceptFieldVisitor } from '@contember/schema-utils'
6
+
7
+ namespace TestModel {
8
+ export class Author {
9
+ name = def.stringColumn()
10
+ isPublic = def.boolColumn().notNull()
11
+ image = def.manyHasOne(Image, 'authors')
12
+ articles = def.oneHasMany(Article, 'author')
13
+ }
14
+
15
+ export class Article {
16
+ title = def.stringColumn()
17
+ isPublic = def.boolColumn().notNull()
18
+ image = def.manyHasOne(Image, 'articles')
19
+ author = def.manyHasOne(Author, 'articles')
20
+ }
21
+
22
+ export class Image {
23
+ url = def.stringColumn().notNull()
24
+
25
+ articles = def.oneHasMany(Article, 'image')
26
+ authors = def.oneHasMany(Author, 'image')
27
+ }
28
+ }
29
+
30
+ describe('where optimized', () => {
31
+ const conditionOptimizer = new ConditionOptimizer()
32
+ const model = def.createModel(TestModel)
33
+ const whereOptimizer = new WhereOptimizer(model, conditionOptimizer)
34
+
35
+
36
+ it('removes unnecessary condition', () => {
37
+ assert.deepStrictEqual(whereOptimizer.optimize({
38
+ or: [
39
+ {
40
+ authors: { isPublic: { eq: true } },
41
+ },
42
+ {
43
+ articles: { isPublic: { always: true } },
44
+ },
45
+ ],
46
+ }, model.entities.Image), {
47
+ id: { always: true },
48
+ })
49
+ })
50
+
51
+ it('keep condition', () => {
52
+ assert.deepStrictEqual(whereOptimizer.optimize({
53
+ or: [
54
+ {
55
+ authors: { isPublic: { eq: true } },
56
+ },
57
+ ],
58
+ }, model.entities.Image), {
59
+ authors: { isPublic: { eq: true } },
60
+ })
61
+ })
62
+
63
+ it('do not swap AND and a field', () => {
64
+ assert.deepStrictEqual(whereOptimizer.optimize({
65
+ authors: {
66
+ and: [
67
+ { isPublic: { eq: true } },
68
+ { name: { eq: 'bar' } },
69
+ ],
70
+ },
71
+ }, model.entities.Image), {
72
+ authors: {
73
+ and: [
74
+ { isPublic: { eq: true } },
75
+ { name: { eq: 'bar' } },
76
+ ],
77
+ },
78
+ })
79
+ })
80
+
81
+ it('keep never', () => {
82
+ assert.deepStrictEqual(whereOptimizer.optimize({
83
+ and: [
84
+ {
85
+ or: [
86
+ { url: { never: true } },
87
+ { url: { never: true } },
88
+ ],
89
+ },
90
+ ],
91
+ }, model.entities.Image), {
92
+ id: { never: true },
93
+ },
94
+ )
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
+ assert.deepStrictEqual(whereOptimizer.optimize({
204
+ image: { id: { isNull: false } },
205
+ }, model.entities.Author, [acceptFieldVisitor(model, 'Image', 'authors', {
206
+ visitColumn: () => {
207
+ throw new Error()
208
+ },
209
+ visitRelation: context => context,
210
+ })]), {
211
+ id: { always: true },
212
+ })
213
+ })
214
+
215
+
216
+ it('remove ID predicate when traversing from a relation - never', () => {
217
+ assert.deepStrictEqual(whereOptimizer.optimize({
218
+ image: { id: { isNull: true } },
219
+ }, model.entities.Author, [acceptFieldVisitor(model, 'Image', 'authors', {
220
+ visitColumn: () => {
221
+ throw new Error()
222
+ },
223
+ visitRelation: context => context,
224
+ })]), {
225
+ id: { never: true },
226
+ })
227
+ })
228
+
229
+ it('remove ID predicate when traversing in where', () => {
230
+ assert.deepStrictEqual(whereOptimizer.optimize({
231
+ authors: { image: { id: { isNull: false } } },
232
+ }, model.entities.Image, []), {
233
+ id: { always: true },
234
+ })
235
+ })
236
+
237
+ it('do not remove ID predicate when traversing from a has-many relation', () => {
238
+ assert.deepStrictEqual(whereOptimizer.optimize({
239
+ authors: { id: { isNull: false } },
240
+ }, model.entities.Image, [acceptFieldVisitor(model, 'Author', 'image', {
241
+ visitColumn: () => {
242
+ throw new Error()
243
+ },
244
+ visitRelation: context => context,
245
+ })]), {
246
+ authors: { id: { isNull: false } },
247
+ })
248
+ })
249
+
250
+ it('do not remove ID predicate when traversing from a nested has-many relation', () => {
251
+ assert.deepStrictEqual(whereOptimizer.optimize({
252
+ articles: { author: { id: { isNull: false } } },
253
+ }, model.entities.Image, [
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
+ articles: { author: { id: { isNull: false } } },
268
+ })
269
+ })
270
+
271
+ it('do not remove ID predicate when traversing in where over has-many relation', () => {
272
+ assert.deepStrictEqual(whereOptimizer.optimize({
273
+ image: { authors: { id: { isNull: false } } },
274
+ }, model.entities.Author, []), {
275
+ image: { authors: { id: { isNull: false } } },
276
+ })
277
+ })
278
+
279
+
280
+ it('do not remove ID predicate when traversing in where over has-many relation - nested', () => {
281
+ assert.deepStrictEqual(whereOptimizer.optimize({
282
+ image: { authors: { image: { id: { isNull: false } } } },
283
+ }, model.entities.Author, []), {
284
+ image: { authors: { image: { id: { isNull: false } } } },
285
+ })
286
+ })
287
+ })
288
+ })
289
+
@@ -10,10 +10,17 @@ export interface Test {
10
10
  }
11
11
 
12
12
  export const executeGraphQlTest = async (test: Test) => {
13
- const rawResponse = await graphql(test.schema, test.query, null, test.context, test.queryVariables)
13
+ const rawResponse = await graphql({
14
+ schema: test.schema,
15
+ source: test.query,
16
+ contextValue: test.context,
17
+ variableValues: test.queryVariables,
18
+ })
14
19
  const response = JSON.parse(JSON.stringify(rawResponse))
15
20
  if ('errors' in rawResponse) {
16
- console.error((rawResponse.errors as any)[0])
21
+ if (rawResponse.errors?.length === 1 && 'originalError' in (rawResponse.errors as any)[0]) {
22
+ throw (rawResponse.errors as any)[0].originalError
23
+ }
17
24
  rawResponse.errors = (rawResponse.errors as any).map(({ message }: any) => ({ message }))
18
25
  }
19
26
  assert.deepStrictEqual(response, test.return)
@@ -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":""}
package/jasmine.json DELETED
@@ -1,7 +0,0 @@
1
- {
2
- "spec_files": [
3
- "dist/tests/cases/**/*.js"
4
- ],
5
- "stopSpecOnExpectationFailure": false,
6
- "random": false
7
- }
@@ -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
- }