@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.
- package/dist/src/acl/EvaluatedPredicateReplacer.d.ts +9 -0
- package/dist/src/acl/EvaluatedPredicateReplacer.d.ts.map +1 -0
- package/dist/src/acl/EvaluatedPredicateReplacer.js +31 -0
- package/dist/src/acl/EvaluatedPredicateReplacer.js.map +1 -0
- package/dist/src/acl/PermissionFactory.d.ts.map +1 -1
- package/dist/src/acl/PermissionFactory.js +15 -11
- package/dist/src/acl/PermissionFactory.js.map +1 -1
- package/dist/src/acl/PredicateFactory.d.ts +4 -2
- package/dist/src/acl/PredicateFactory.d.ts.map +1 -1
- package/dist/src/acl/PredicateFactory.js +17 -6
- package/dist/src/acl/PredicateFactory.js.map +1 -1
- package/dist/src/acl/PredicatesInjector.d.ts +1 -1
- package/dist/src/acl/PredicatesInjector.d.ts.map +1 -1
- package/dist/src/acl/PredicatesInjector.js +16 -19
- package/dist/src/acl/PredicatesInjector.js.map +1 -1
- package/dist/src/acl/VariableInjector.d.ts +0 -1
- package/dist/src/acl/VariableInjector.d.ts.map +1 -1
- package/dist/src/acl/VariableInjector.js +4 -14
- package/dist/src/acl/VariableInjector.js.map +1 -1
- package/dist/src/acl/VariableUtils.d.ts +2 -13
- package/dist/src/acl/VariableUtils.d.ts.map +1 -1
- package/dist/src/acl/VariableUtils.js +5 -16
- package/dist/src/acl/VariableUtils.js.map +1 -1
- package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.d.ts +0 -1
- package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.d.ts.map +1 -1
- package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js +14 -15
- package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js.map +1 -1
- package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.d.ts +1 -1
- package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.d.ts.map +1 -1
- package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.js +1 -1
- package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.js.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.d.ts +5 -4
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.d.ts.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.js +29 -20
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.js.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.d.ts.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.js +2 -2
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.js.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.d.ts +3 -3
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.d.ts.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js +3 -3
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.d.ts +5 -4
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.d.ts.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.js +29 -20
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.js.map +1 -1
- package/dist/src/input-validation/ColumnValueResolver.d.ts +4 -3
- package/dist/src/input-validation/ColumnValueResolver.d.ts.map +1 -1
- package/dist/src/input-validation/ColumnValueResolver.js.map +1 -1
- package/dist/src/input-validation/EntityRulesResolver.js +4 -4
- package/dist/src/input-validation/EntityRulesResolver.js.map +1 -1
- package/dist/src/input-validation/QueryAstFactory.js +1 -1
- package/dist/src/input-validation/QueryAstFactory.js.map +1 -1
- package/dist/src/input-validation/ValidationContext.d.ts +2 -2
- package/dist/src/input-validation/ValidationContext.d.ts.map +1 -1
- package/dist/src/input-validation/ValidationContext.js.map +1 -1
- package/dist/src/input-validation/ValidationDataSelector.d.ts.map +1 -1
- package/dist/src/input-validation/ValidationDataSelector.js +1 -1
- package/dist/src/input-validation/ValidationDataSelector.js.map +1 -1
- package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.d.ts +7 -8
- package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.d.ts.map +1 -1
- package/dist/src/input-validation/preValidation/CreateInputPreValidationProcessor.js.map +1 -1
- package/dist/src/input-validation/preValidation/InputPreValidator.js +4 -4
- package/dist/src/input-validation/preValidation/InputPreValidator.js.map +1 -1
- package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.d.ts +7 -8
- package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.d.ts.map +1 -1
- package/dist/src/input-validation/preValidation/UpdateInputPreValidationProcessor.js.map +1 -1
- package/dist/src/inputProcessing/CreateInputProcessor.d.ts +8 -9
- package/dist/src/inputProcessing/CreateInputProcessor.d.ts.map +1 -1
- package/dist/src/inputProcessing/CreateInputVisitor.d.ts +7 -7
- package/dist/src/inputProcessing/CreateInputVisitor.d.ts.map +1 -1
- package/dist/src/inputProcessing/CreateInputVisitor.js +15 -46
- package/dist/src/inputProcessing/CreateInputVisitor.js.map +1 -1
- package/dist/src/inputProcessing/UpdateInputProcessor.d.ts +8 -9
- package/dist/src/inputProcessing/UpdateInputProcessor.d.ts.map +1 -1
- package/dist/src/inputProcessing/UpdateInputVisitor.d.ts +7 -7
- package/dist/src/inputProcessing/UpdateInputVisitor.d.ts.map +1 -1
- package/dist/src/inputProcessing/UpdateInputVisitor.js +13 -28
- package/dist/src/inputProcessing/UpdateInputVisitor.js.map +1 -1
- package/dist/src/inputProcessing/index.d.ts +0 -1
- package/dist/src/inputProcessing/index.d.ts.map +1 -1
- package/dist/src/inputProcessing/index.js +0 -1
- package/dist/src/inputProcessing/index.js.map +1 -1
- package/dist/src/introspection/IntrospectionSchemaFactory.js +7 -7
- package/dist/src/introspection/IntrospectionSchemaFactory.js.map +1 -1
- package/dist/src/introspection/content-schema.types.d.ts +19 -223
- package/dist/src/introspection/content-schema.types.d.ts.map +1 -1
- package/dist/src/introspection/content-schema.types.js +2 -2
- package/dist/src/introspection/content-schema.types.js.map +1 -1
- package/dist/src/mapper/Mapper.d.ts +6 -6
- package/dist/src/mapper/Mapper.d.ts.map +1 -1
- package/dist/src/mapper/Mapper.js +28 -23
- package/dist/src/mapper/Mapper.js.map +1 -1
- package/dist/src/mapper/MapperContainer.d.ts.map +1 -1
- package/dist/src/mapper/MapperContainer.js +7 -4
- package/dist/src/mapper/MapperContainer.js.map +1 -1
- package/dist/src/mapper/delete/DeleteExecutor.js +3 -3
- package/dist/src/mapper/delete/DeleteExecutor.js.map +1 -1
- package/dist/src/mapper/insert/SqlCreateInputProcessor.d.ts +4 -2
- package/dist/src/mapper/insert/SqlCreateInputProcessor.d.ts.map +1 -1
- package/dist/src/mapper/insert/SqlCreateInputProcessor.js.map +1 -1
- package/dist/src/mapper/select/JoinVisitor.d.ts +6 -6
- package/dist/src/mapper/select/JoinVisitor.d.ts.map +1 -1
- package/dist/src/mapper/select/JoinVisitor.js +6 -6
- package/dist/src/mapper/select/JoinVisitor.js.map +1 -1
- package/dist/src/mapper/select/RelationFetcher.d.ts +32 -5
- package/dist/src/mapper/select/RelationFetcher.d.ts.map +1 -1
- package/dist/src/mapper/select/RelationFetcher.js +37 -15
- package/dist/src/mapper/select/RelationFetcher.js.map +1 -1
- package/dist/src/mapper/select/SelectBuilder.d.ts +2 -1
- package/dist/src/mapper/select/SelectBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/SelectBuilder.js +4 -2
- package/dist/src/mapper/select/SelectBuilder.js.map +1 -1
- package/dist/src/mapper/select/SelectBuilderFactory.d.ts +2 -1
- package/dist/src/mapper/select/SelectBuilderFactory.d.ts.map +1 -1
- package/dist/src/mapper/select/SelectExecutionHandler.d.ts +1 -0
- package/dist/src/mapper/select/SelectExecutionHandler.d.ts.map +1 -1
- package/dist/src/mapper/select/WhereBuilder.d.ts +6 -3
- package/dist/src/mapper/select/WhereBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/WhereBuilder.js +31 -24
- package/dist/src/mapper/select/WhereBuilder.js.map +1 -1
- package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts +9 -8
- package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts.map +1 -1
- package/dist/src/mapper/select/handlers/FieldsVisitor.js +45 -24
- package/dist/src/mapper/select/handlers/FieldsVisitor.js.map +1 -1
- package/dist/src/mapper/select/handlers/FieldsVisitorFactory.d.ts.map +1 -1
- package/dist/src/mapper/select/handlers/FieldsVisitorFactory.js +1 -1
- package/dist/src/mapper/select/handlers/FieldsVisitorFactory.js.map +1 -1
- package/dist/src/mapper/select/optimizer/ConditionOptimizer.d.ts +5 -0
- package/dist/src/mapper/select/optimizer/ConditionOptimizer.d.ts.map +1 -0
- package/dist/src/mapper/select/optimizer/ConditionOptimizer.js +39 -0
- package/dist/src/mapper/select/optimizer/ConditionOptimizer.js.map +1 -0
- package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts +15 -0
- package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts.map +1 -0
- package/dist/src/mapper/select/optimizer/WhereOptimizer.js +118 -0
- package/dist/src/mapper/select/optimizer/WhereOptimizer.js.map +1 -0
- package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts +6 -0
- package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts.map +1 -0
- package/dist/src/mapper/select/optimizer/WhereReplacer.js +28 -0
- package/dist/src/mapper/select/optimizer/WhereReplacer.js.map +1 -0
- package/dist/src/mapper/select/optimizer/helpers.d.ts +10 -0
- package/dist/src/mapper/select/optimizer/helpers.d.ts.map +1 -0
- package/dist/src/mapper/select/optimizer/helpers.js +72 -0
- package/dist/src/mapper/select/optimizer/helpers.js.map +1 -0
- package/dist/src/mapper/update/SqlUpdateInputProcessor.d.ts +2 -3
- package/dist/src/mapper/update/SqlUpdateInputProcessor.d.ts.map +1 -1
- package/dist/src/mapper/update/SqlUpdateInputProcessor.js.map +1 -1
- package/dist/src/mapper/update/UpdateBuilder.js +3 -3
- package/dist/src/mapper/update/UpdateBuilder.js.map +1 -1
- package/dist/src/resolvers/GraphQlQueryAstFactory.js +2 -2
- package/dist/src/resolvers/GraphQlQueryAstFactory.js.map +1 -1
- package/dist/src/resolvers/MutationResolver.js +15 -15
- package/dist/src/resolvers/MutationResolver.js.map +1 -1
- package/dist/src/resolvers/ReadHelpers.js +10 -10
- package/dist/src/resolvers/ReadHelpers.js.map +1 -1
- package/dist/src/resolvers/ReadResolver.js +2 -2
- package/dist/src/resolvers/ReadResolver.js.map +1 -1
- package/dist/src/schema/FieldAccessVisitor.d.ts +2 -2
- package/dist/src/schema/FieldAccessVisitor.d.ts.map +1 -1
- package/dist/src/schema/FieldAccessVisitor.js +2 -2
- package/dist/src/schema/FieldAccessVisitor.js.map +1 -1
- package/dist/src/schema/MutationProvider.js +4 -4
- package/dist/src/schema/MutationProvider.js.map +1 -1
- package/dist/src/schema/OrderByTypeProvider.js +1 -1
- package/dist/src/schema/OrderByTypeProvider.js.map +1 -1
- package/dist/src/schema/QueryProvider.js +3 -3
- package/dist/src/schema/QueryProvider.js.map +1 -1
- package/dist/src/schema/ResultSchemaTypeProvider.d.ts +2 -2
- package/dist/src/schema/ResultSchemaTypeProvider.d.ts.map +1 -1
- package/dist/src/schema/WhereTypeProvider.js +4 -4
- package/dist/src/schema/WhereTypeProvider.js.map +1 -1
- package/dist/src/schema/entities/FieldArgsVisitor.d.ts +7 -7
- package/dist/src/schema/entities/FieldArgsVisitor.d.ts.map +1 -1
- package/dist/src/schema/entities/FieldArgsVisitor.js +3 -3
- package/dist/src/schema/entities/FieldArgsVisitor.js.map +1 -1
- package/dist/src/schema/entities/FieldTypeVisitor.d.ts +3 -3
- package/dist/src/schema/entities/FieldTypeVisitor.d.ts.map +1 -1
- package/dist/src/schema/entities/FieldTypeVisitor.js +3 -3
- package/dist/src/schema/entities/FieldTypeVisitor.js.map +1 -1
- package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.d.ts +3 -3
- package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.d.ts.map +1 -1
- package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.js +3 -3
- package/dist/src/schema/mutations/CreateEntityInputFieldVisitor.js.map +1 -1
- package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.d.ts +6 -6
- package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.d.ts.map +1 -1
- package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.js +6 -6
- package/dist/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.js.map +1 -1
- package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.d.ts +3 -3
- package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.d.ts.map +1 -1
- package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.js +5 -5
- package/dist/src/schema/mutations/CreateEntityRelationInputFieldVisitor.js.map +1 -1
- package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.d.ts +10 -4
- package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.d.ts.map +1 -1
- package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.js +3 -3
- package/dist/src/schema/mutations/UpdateEntityInputFieldVisitor.js.map +1 -1
- package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.d.ts +6 -6
- package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.d.ts.map +1 -1
- package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.js +6 -6
- package/dist/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.js.map +1 -1
- package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.d.ts +2 -2
- package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.d.ts.map +1 -1
- package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.js +2 -2
- package/dist/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/object.d.ts.map +1 -1
- package/dist/src/utils/object.js +3 -4
- package/dist/src/utils/object.js.map +1 -1
- package/dist/src/utils/uniqueWhereFields.js +3 -3
- package/dist/src/utils/uniqueWhereFields.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/delete/aclDelete.test.js +1 -1
- package/dist/tests/cases/integration/graphQlRequests/delete/aclDelete.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/insert/acl/setField.test.js +2 -2
- package/dist/tests/cases/integration/graphQlRequests/insert/acl/setField.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/insert/aclInsert.test.js +1 -1
- package/dist/tests/cases/integration/graphQlRequests/insert/aclInsert.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js +7 -6
- package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.d.ts +2 -0
- package/dist/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.d.ts.map +1 -0
- package/dist/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.js +137 -0
- package/dist/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.js.map +1 -0
- package/dist/tests/cases/integration/graphQlRequests/query/filter/complexCondition.test.js +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/filter/composedFilter.test.js +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/filter/composedFilter.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/relations/manyHasManyInverse.test.js +73 -0
- package/dist/tests/cases/integration/graphQlRequests/query/relations/manyHasManyInverse.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/relations/manyHasManyOwning.test.js +73 -0
- package/dist/tests/cases/integration/graphQlRequests/query/relations/manyHasManyOwning.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js +6 -6
- package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.js +6 -3
- package/dist/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlSchema/model.js.map +1 -1
- package/dist/tests/cases/unit/aclVariablesFactory.test.js +7 -33
- package/dist/tests/cases/unit/aclVariablesFactory.test.js.map +1 -1
- package/dist/tests/cases/unit/conditionOptimizer.test.d.ts +2 -0
- package/dist/tests/cases/unit/conditionOptimizer.test.d.ts.map +1 -0
- package/dist/tests/cases/unit/conditionOptimizer.test.js +118 -0
- package/dist/tests/cases/unit/conditionOptimizer.test.js.map +1 -0
- package/dist/tests/cases/unit/orderbyHelper.test.js +1 -0
- package/dist/tests/cases/unit/orderbyHelper.test.js.map +1 -1
- package/dist/tests/cases/unit/permissionMerger.test.js +2 -0
- package/dist/tests/cases/unit/permissionMerger.test.js.map +1 -1
- package/dist/tests/cases/unit/predicatesFactory.test.d.ts +2 -0
- package/dist/tests/cases/unit/predicatesFactory.test.d.ts.map +1 -0
- package/dist/tests/cases/unit/predicatesFactory.test.js +109 -0
- package/dist/tests/cases/unit/predicatesFactory.test.js.map +1 -0
- package/dist/tests/cases/unit/predicatesInjector.test.js +88 -14
- package/dist/tests/cases/unit/predicatesInjector.test.js.map +1 -1
- package/dist/tests/cases/unit/variableInjector.test.js +4 -3
- package/dist/tests/cases/unit/variableInjector.test.js.map +1 -1
- package/dist/tests/cases/unit/whereOptimizer.test.d.ts +2 -0
- package/dist/tests/cases/unit/whereOptimizer.test.d.ts.map +1 -0
- package/dist/tests/cases/unit/whereOptimizer.test.js +265 -0
- package/dist/tests/cases/unit/whereOptimizer.test.js.map +1 -0
- package/dist/tests/src/testGraphql.d.ts.map +1 -1
- package/dist/tests/src/testGraphql.js +10 -2
- package/dist/tests/src/testGraphql.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/graphql.codegen.yml +0 -3
- package/package.json +16 -16
- package/src/acl/EvaluatedPredicateReplacer.ts +32 -0
- package/src/acl/PermissionFactory.ts +18 -13
- package/src/acl/PredicateFactory.ts +32 -8
- package/src/acl/PredicatesInjector.ts +25 -17
- package/src/acl/VariableInjector.ts +2 -15
- package/src/acl/VariableUtils.ts +7 -23
- package/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts +17 -24
- package/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts +1 -6
- package/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts +26 -46
- package/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts +6 -3
- package/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts +4 -22
- package/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts +26 -49
- package/src/input-validation/ColumnValueResolver.ts +2 -3
- package/src/input-validation/EntityRulesResolver.ts +4 -4
- package/src/input-validation/QueryAstFactory.ts +1 -1
- package/src/input-validation/ValidationContext.ts +2 -2
- package/src/input-validation/ValidationDataSelector.ts +2 -2
- package/src/input-validation/preValidation/CreateInputPreValidationProcessor.ts +7 -8
- package/src/input-validation/preValidation/InputPreValidator.ts +4 -4
- package/src/input-validation/preValidation/UpdateInputPreValidationProcessor.ts +7 -8
- package/src/inputProcessing/CreateInputProcessor.ts +8 -9
- package/src/inputProcessing/CreateInputVisitor.ts +27 -89
- package/src/inputProcessing/UpdateInputProcessor.ts +8 -9
- package/src/inputProcessing/UpdateInputVisitor.ts +25 -71
- package/src/inputProcessing/index.ts +0 -1
- package/src/introspection/IntrospectionSchemaFactory.ts +7 -7
- package/src/introspection/content-schema.types.ts +19 -286
- package/src/mapper/Mapper.ts +37 -30
- package/src/mapper/MapperContainer.ts +10 -5
- package/src/mapper/delete/DeleteExecutor.ts +3 -3
- package/src/mapper/insert/SqlCreateInputProcessor.ts +3 -3
- package/src/mapper/select/JoinVisitor.ts +6 -33
- package/src/mapper/select/RelationFetcher.ts +101 -41
- package/src/mapper/select/SelectBuilder.ts +3 -1
- package/src/mapper/select/SelectBuilderFactory.ts +2 -1
- package/src/mapper/select/SelectExecutionHandler.ts +1 -0
- package/src/mapper/select/WhereBuilder.ts +46 -32
- package/src/mapper/select/handlers/FieldsVisitor.ts +47 -57
- package/src/mapper/select/handlers/FieldsVisitorFactory.ts +1 -0
- package/src/mapper/select/optimizer/ConditionOptimizer.ts +41 -0
- package/src/mapper/select/optimizer/WhereOptimizer.ts +138 -0
- package/src/mapper/select/optimizer/WhereReplacer.ts +27 -0
- package/src/mapper/select/optimizer/helpers.ts +58 -0
- package/src/mapper/update/SqlUpdateInputProcessor.ts +1 -1
- package/src/mapper/update/UpdateBuilder.ts +3 -3
- package/src/resolvers/GraphQlQueryAstFactory.ts +3 -3
- package/src/resolvers/MutationResolver.ts +1 -1
- package/src/resolvers/ReadHelpers.ts +3 -3
- package/src/resolvers/ReadResolver.ts +2 -2
- package/src/schema/FieldAccessVisitor.ts +2 -2
- package/src/schema/OrderByTypeProvider.ts +1 -1
- package/src/schema/WhereTypeProvider.ts +4 -4
- package/src/schema/entities/FieldArgsVisitor.ts +3 -3
- package/src/schema/entities/FieldTypeVisitor.ts +3 -3
- package/src/schema/mutations/CreateEntityInputFieldVisitor.ts +3 -6
- package/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.ts +6 -20
- package/src/schema/mutations/CreateEntityRelationInputFieldVisitor.ts +5 -18
- package/src/schema/mutations/UpdateEntityInputFieldVisitor.ts +3 -6
- package/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.ts +6 -20
- package/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.ts +2 -12
- package/src/utils/object.ts +6 -6
- package/src/utils/uniqueWhereFields.ts +3 -3
- package/tests/cases/integration/graphQlRequests/delete/aclDelete.test.ts +2 -2
- package/tests/cases/integration/graphQlRequests/insert/acl/setField.test.ts +3 -3
- package/tests/cases/integration/graphQlRequests/insert/aclInsert.test.ts +2 -2
- package/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.ts +7 -6
- package/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.ts +1 -1
- package/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.ts +130 -0
- package/tests/cases/integration/graphQlRequests/query/filter/complexCondition.test.ts +1 -1
- package/tests/cases/integration/graphQlRequests/query/filter/composedFilter.test.ts +1 -1
- package/tests/cases/integration/graphQlRequests/query/relations/manyHasManyInverse.test.ts +74 -0
- package/tests/cases/integration/graphQlRequests/query/relations/manyHasManyOwning.test.ts +77 -0
- package/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.ts +7 -7
- package/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.ts +5 -5
- package/tests/cases/unit/aclVariablesFactory.test.ts +8 -35
- package/tests/cases/unit/conditionOptimizer.test.ts +135 -0
- package/tests/cases/unit/orderbyHelper.test.ts +1 -0
- package/tests/cases/unit/permissionMerger.test.ts +2 -0
- package/tests/cases/unit/predicatesFactory.test.ts +103 -0
- package/tests/cases/unit/predicatesInjector.test.ts +78 -16
- package/tests/cases/unit/variableInjector.test.ts +6 -5
- package/tests/cases/unit/whereOptimizer.test.ts +289 -0
- package/tests/src/testGraphql.ts +9 -2
- package/dist/src/inputProcessing/InputContext.d.ts +0 -43
- package/dist/src/inputProcessing/InputContext.d.ts.map +0 -1
- package/dist/src/inputProcessing/InputContext.js +0 -3
- package/dist/src/inputProcessing/InputContext.js.map +0 -1
- package/jasmine.json +0 -7
- package/src/inputProcessing/InputContext.ts +0 -49
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
2
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
9
|
const acl_1 = require("../../../src/acl");
|
|
4
10
|
const schema_definition_1 = require("@contember/schema-definition");
|
|
5
11
|
const schema_1 = require("@contember/schema");
|
|
6
12
|
const vitest_1 = require("vitest");
|
|
13
|
+
const WhereOptimizer_1 = require("../../../src/mapper/select/optimizer/WhereOptimizer");
|
|
14
|
+
const ConditionOptimizer_1 = require("../../../src/mapper/select/optimizer/ConditionOptimizer");
|
|
7
15
|
const schema = new schema_definition_1.SchemaBuilder()
|
|
8
16
|
.enum('locale', ['cs', 'en'])
|
|
9
17
|
.entity('Post', entityBuilder => entityBuilder.oneHasMany('locales', c => c.target('PostLocale')))
|
|
@@ -27,40 +35,37 @@ const permissions = {
|
|
|
27
35
|
localePredicate: {
|
|
28
36
|
locale: 'localeVariable',
|
|
29
37
|
},
|
|
38
|
+
localePredicate2: {
|
|
39
|
+
locale: 'localeVariable',
|
|
40
|
+
},
|
|
30
41
|
},
|
|
31
42
|
operations: {
|
|
32
43
|
read: {
|
|
33
44
|
id: 'localePredicate',
|
|
34
|
-
title: '
|
|
45
|
+
title: 'localePredicate2',
|
|
35
46
|
content: 'localePredicate',
|
|
36
47
|
},
|
|
37
48
|
},
|
|
38
49
|
},
|
|
39
50
|
};
|
|
40
51
|
(0, vitest_1.describe)('Predicates injector', () => {
|
|
52
|
+
const variables = {
|
|
53
|
+
localeVariable: { in: ['cs'] },
|
|
54
|
+
};
|
|
41
55
|
(0, vitest_1.it)('injects predicate', () => {
|
|
42
|
-
const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, new acl_1.VariableInjector(schema,
|
|
56
|
+
const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, schema, new acl_1.VariableInjector(schema, variables)));
|
|
43
57
|
const result = injector.inject(schema.entities['PostLocale'], {});
|
|
44
58
|
vitest_1.assert.deepStrictEqual(result, {
|
|
45
59
|
locale: { in: ['cs'] },
|
|
46
60
|
});
|
|
47
61
|
});
|
|
48
62
|
(0, vitest_1.it)('merges predicate with explicit where', () => {
|
|
49
|
-
const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, new acl_1.VariableInjector(schema,
|
|
63
|
+
const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, schema, new acl_1.VariableInjector(schema, variables)));
|
|
50
64
|
const result = injector.inject(schema.entities['PostLocale'], { id: { in: [1, 2] } });
|
|
51
65
|
vitest_1.assert.deepStrictEqual(result, {
|
|
52
66
|
and: [
|
|
53
67
|
{
|
|
54
|
-
|
|
55
|
-
{
|
|
56
|
-
id: { in: [1, 2] },
|
|
57
|
-
},
|
|
58
|
-
{
|
|
59
|
-
locale: {
|
|
60
|
-
in: ['cs'],
|
|
61
|
-
},
|
|
62
|
-
},
|
|
63
|
-
],
|
|
68
|
+
id: { in: [1, 2] },
|
|
64
69
|
},
|
|
65
70
|
{
|
|
66
71
|
locale: { in: ['cs'] },
|
|
@@ -69,7 +74,7 @@ const permissions = {
|
|
|
69
74
|
});
|
|
70
75
|
});
|
|
71
76
|
(0, vitest_1.it)('injects predicate to where', () => {
|
|
72
|
-
const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, new acl_1.VariableInjector(schema,
|
|
77
|
+
const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, schema, new acl_1.VariableInjector(schema, variables)));
|
|
73
78
|
const result = injector.inject(schema.entities['PostLocale'], { title: { eq: 'abc' } });
|
|
74
79
|
vitest_1.assert.deepStrictEqual(result, {
|
|
75
80
|
and: [
|
|
@@ -90,4 +95,73 @@ const permissions = {
|
|
|
90
95
|
});
|
|
91
96
|
});
|
|
92
97
|
});
|
|
98
|
+
var DeepFilterModel;
|
|
99
|
+
(function (DeepFilterModel) {
|
|
100
|
+
DeepFilterModel.readerRole = schema_definition_1.AclDefinition.createRole('reader');
|
|
101
|
+
let Article = class Article {
|
|
102
|
+
constructor() {
|
|
103
|
+
this.isPublished = schema_definition_1.SchemaDefinition.boolColumn();
|
|
104
|
+
this.title = schema_definition_1.SchemaDefinition.stringColumn();
|
|
105
|
+
this.coverPhoto = schema_definition_1.SchemaDefinition.manyHasOne(ImageUse, 'articles');
|
|
106
|
+
}
|
|
107
|
+
};
|
|
108
|
+
Article = __decorate([
|
|
109
|
+
schema_definition_1.AclDefinition.allow(DeepFilterModel.readerRole, {
|
|
110
|
+
when: { isPublished: { eq: true } },
|
|
111
|
+
read: ['coverPhoto'],
|
|
112
|
+
})
|
|
113
|
+
], Article);
|
|
114
|
+
DeepFilterModel.Article = Article;
|
|
115
|
+
let ImageUse = class ImageUse {
|
|
116
|
+
constructor() {
|
|
117
|
+
this.articles = schema_definition_1.SchemaDefinition.oneHasMany(Article, 'coverPhoto');
|
|
118
|
+
this.image = schema_definition_1.SchemaDefinition.manyHasOne(Image, 'uses');
|
|
119
|
+
}
|
|
120
|
+
};
|
|
121
|
+
ImageUse = __decorate([
|
|
122
|
+
schema_definition_1.AclDefinition.allow(DeepFilterModel.readerRole, {
|
|
123
|
+
when: { articles: schema_definition_1.AclDefinition.canRead('coverPhoto') },
|
|
124
|
+
read: true,
|
|
125
|
+
})
|
|
126
|
+
], ImageUse);
|
|
127
|
+
DeepFilterModel.ImageUse = ImageUse;
|
|
128
|
+
let Image = class Image {
|
|
129
|
+
constructor() {
|
|
130
|
+
this.uses = schema_definition_1.SchemaDefinition.oneHasMany(ImageUse, 'image');
|
|
131
|
+
this.url = schema_definition_1.SchemaDefinition.stringColumn();
|
|
132
|
+
this.tags = schema_definition_1.SchemaDefinition.manyHasMany(Tag);
|
|
133
|
+
}
|
|
134
|
+
};
|
|
135
|
+
Image = __decorate([
|
|
136
|
+
schema_definition_1.AclDefinition.allow(DeepFilterModel.readerRole, {
|
|
137
|
+
when: { uses: schema_definition_1.AclDefinition.canRead('image') },
|
|
138
|
+
read: true,
|
|
139
|
+
})
|
|
140
|
+
], Image);
|
|
141
|
+
DeepFilterModel.Image = Image;
|
|
142
|
+
let Tag = class Tag {
|
|
143
|
+
constructor() {
|
|
144
|
+
this.label = schema_definition_1.SchemaDefinition.stringColumn();
|
|
145
|
+
}
|
|
146
|
+
};
|
|
147
|
+
Tag = __decorate([
|
|
148
|
+
schema_definition_1.AclDefinition.allow(DeepFilterModel.readerRole, {
|
|
149
|
+
read: true,
|
|
150
|
+
})
|
|
151
|
+
], Tag);
|
|
152
|
+
DeepFilterModel.Tag = Tag;
|
|
153
|
+
})(DeepFilterModel || (DeepFilterModel = {}));
|
|
154
|
+
(0, vitest_1.describe)('predicates injector elimination', () => {
|
|
155
|
+
(0, vitest_1.it)('eliminates predicates in where', () => {
|
|
156
|
+
const schema = (0, schema_definition_1.createSchema)(DeepFilterModel);
|
|
157
|
+
const permissions = new acl_1.PermissionFactory(schema.model).create(schema.acl, ['reader']);
|
|
158
|
+
const injector = new acl_1.PredicatesInjector(schema.model, new acl_1.PredicateFactory(permissions, schema.model, new acl_1.VariableInjector(schema.model, {})));
|
|
159
|
+
const injected = injector.inject(schema.model.entities.Article, {
|
|
160
|
+
coverPhoto: { image: { tags: { label: { eq: 'foo' } } } },
|
|
161
|
+
});
|
|
162
|
+
const optimizer = new WhereOptimizer_1.WhereOptimizer(schema.model, new ConditionOptimizer_1.ConditionOptimizer());
|
|
163
|
+
const result = optimizer.optimize(injected, schema.model.entities.Article);
|
|
164
|
+
vitest_1.assert.deepStrictEqual(result, { and: [{ coverPhoto: { image: { tags: { label: { eq: 'foo' } } } } }, { isPublished: { eq: true } }] });
|
|
165
|
+
});
|
|
166
|
+
});
|
|
93
167
|
//# sourceMappingURL=predicatesInjector.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predicatesInjector.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/predicatesInjector.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"predicatesInjector.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/predicatesInjector.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,10 @@ const vitest_1 = require("vitest");
|
|
|
14
14
|
.column('public', c => c.type(schema_1.Model.ColumnType.Bool))
|
|
15
15
|
.manyHasOne('post', r => r.target('Post', e => e.manyHasOne('site', r => r.target('Site', e => e)))))
|
|
16
16
|
.buildSchema();
|
|
17
|
+
const ids = ['91528a5c-839b-4114-9952-d661914a607f', '1e2f3937-a0b1-4105-8aae-6da8ac9fc146'];
|
|
17
18
|
const injector = new acl_1.VariableInjector(schema, {
|
|
18
|
-
site:
|
|
19
|
-
locale: 'cs',
|
|
19
|
+
site: { in: ids },
|
|
20
|
+
locale: { eq: 'cs' },
|
|
20
21
|
});
|
|
21
22
|
const result = injector.inject(schema.entities['PostLocale'], {
|
|
22
23
|
or: [
|
|
@@ -49,7 +50,7 @@ const vitest_1 = require("vitest");
|
|
|
49
50
|
and: [
|
|
50
51
|
{
|
|
51
52
|
post: {
|
|
52
|
-
site: { id: { in:
|
|
53
|
+
site: { id: { in: ids } },
|
|
53
54
|
},
|
|
54
55
|
},
|
|
55
56
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variableInjector.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/variableInjector.test.ts"],"names":[],"mappings":";;AAAA,0CAAmD;AACnD,oEAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"variableInjector.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/variableInjector.test.ts"],"names":[],"mappings":";;AAAA,0CAAmD;AACnD,oEAA4D;AAC5D,8CAA8C;AAC9C,mCAA6C;AAE7C,IAAA,iBAAQ,EAAC,mBAAmB,EAAE,GAAG,EAAE;IAElC,IAAA,WAAE,EAAC,kBAAkB,EAAE,GAAG,EAAE;QAC3B,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE;aAChC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAC5B,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CACzB,CAAC;aACC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;aAC5E,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aACnD,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACpD,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrG;aACA,WAAW,EAAE,CAAA;QAEf,MAAM,GAAG,GAAG,CAAC,sCAAsC,EAAE,sCAAsC,CAAC,CAAA;QAC5F,MAAM,QAAQ,GAAG,IAAI,sBAAgB,CAAC,MAAM,EAAE;YAC7C,IAAI,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE;YACjB,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACpB,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC7D,EAAE,EAAE;gBACH;oBACC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;iBACpB;gBACD;oBACC,GAAG,EAAE;wBACJ;4BACC,IAAI,EAAE;gCACL,IAAI,EAAE,MAAM;6BACZ;yBACD;wBACD;4BACC,MAAM,EAAE,QAAQ;yBAChB;wBACD;4BACC,GAAG,EAAE,KAAK;yBACV;qBACD;iBACD;aACD;SACD,CAAC,CAAA;QAEF,eAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC9B,EAAE,EAAE;gBACH;oBACC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;iBACpB;gBACD;oBACC,GAAG,EAAE;wBACJ;4BACC,IAAI,EAAE;gCACL,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE;6BACzB;yBACD;wBACD;4BACC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;yBACpB;wBACD;4BACC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;yBACpB;qBACD;iBACD;aACD;SACD,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AAEH,CAAC,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"whereOptimizer.test.d.ts","sourceRoot":"","sources":["../../../../tests/cases/unit/whereOptimizer.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,265 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const vitest_1 = require("vitest");
|
|
4
|
+
const ConditionOptimizer_1 = require("../../../src/mapper/select/optimizer/ConditionOptimizer");
|
|
5
|
+
const schema_definition_1 = require("@contember/schema-definition");
|
|
6
|
+
const WhereOptimizer_1 = require("../../../src/mapper/select/optimizer/WhereOptimizer");
|
|
7
|
+
const schema_utils_1 = require("@contember/schema-utils");
|
|
8
|
+
var TestModel;
|
|
9
|
+
(function (TestModel) {
|
|
10
|
+
class Author {
|
|
11
|
+
constructor() {
|
|
12
|
+
this.name = schema_definition_1.SchemaDefinition.stringColumn();
|
|
13
|
+
this.isPublic = schema_definition_1.SchemaDefinition.boolColumn().notNull();
|
|
14
|
+
this.image = schema_definition_1.SchemaDefinition.manyHasOne(Image, 'authors');
|
|
15
|
+
this.articles = schema_definition_1.SchemaDefinition.oneHasMany(Article, 'author');
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
TestModel.Author = Author;
|
|
19
|
+
class Article {
|
|
20
|
+
constructor() {
|
|
21
|
+
this.title = schema_definition_1.SchemaDefinition.stringColumn();
|
|
22
|
+
this.isPublic = schema_definition_1.SchemaDefinition.boolColumn().notNull();
|
|
23
|
+
this.image = schema_definition_1.SchemaDefinition.manyHasOne(Image, 'articles');
|
|
24
|
+
this.author = schema_definition_1.SchemaDefinition.manyHasOne(Author, 'articles');
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
TestModel.Article = Article;
|
|
28
|
+
class Image {
|
|
29
|
+
constructor() {
|
|
30
|
+
this.url = schema_definition_1.SchemaDefinition.stringColumn().notNull();
|
|
31
|
+
this.articles = schema_definition_1.SchemaDefinition.oneHasMany(Article, 'image');
|
|
32
|
+
this.authors = schema_definition_1.SchemaDefinition.oneHasMany(Author, 'image');
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
TestModel.Image = Image;
|
|
36
|
+
})(TestModel || (TestModel = {}));
|
|
37
|
+
(0, vitest_1.describe)('where optimized', () => {
|
|
38
|
+
const conditionOptimizer = new ConditionOptimizer_1.ConditionOptimizer();
|
|
39
|
+
const model = schema_definition_1.SchemaDefinition.createModel(TestModel);
|
|
40
|
+
const whereOptimizer = new WhereOptimizer_1.WhereOptimizer(model, conditionOptimizer);
|
|
41
|
+
(0, vitest_1.it)('removes unnecessary condition', () => {
|
|
42
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
43
|
+
or: [
|
|
44
|
+
{
|
|
45
|
+
authors: { isPublic: { eq: true } },
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
articles: { isPublic: { always: true } },
|
|
49
|
+
},
|
|
50
|
+
],
|
|
51
|
+
}, model.entities.Image), {
|
|
52
|
+
id: { always: true },
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
(0, vitest_1.it)('keep condition', () => {
|
|
56
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
57
|
+
or: [
|
|
58
|
+
{
|
|
59
|
+
authors: { isPublic: { eq: true } },
|
|
60
|
+
},
|
|
61
|
+
],
|
|
62
|
+
}, model.entities.Image), {
|
|
63
|
+
authors: { isPublic: { eq: true } },
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
(0, vitest_1.it)('do not swap AND and a field', () => {
|
|
67
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
68
|
+
authors: {
|
|
69
|
+
and: [
|
|
70
|
+
{ isPublic: { eq: true } },
|
|
71
|
+
{ name: { eq: 'bar' } },
|
|
72
|
+
],
|
|
73
|
+
},
|
|
74
|
+
}, model.entities.Image), {
|
|
75
|
+
authors: {
|
|
76
|
+
and: [
|
|
77
|
+
{ isPublic: { eq: true } },
|
|
78
|
+
{ name: { eq: 'bar' } },
|
|
79
|
+
],
|
|
80
|
+
},
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
(0, vitest_1.it)('keep never', () => {
|
|
84
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
85
|
+
and: [
|
|
86
|
+
{
|
|
87
|
+
or: [
|
|
88
|
+
{ url: { never: true } },
|
|
89
|
+
{ url: { never: true } },
|
|
90
|
+
],
|
|
91
|
+
},
|
|
92
|
+
],
|
|
93
|
+
}, model.entities.Image), {
|
|
94
|
+
id: { never: true },
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
const A = { authors: { isPublic: { eq: true } } };
|
|
98
|
+
const B = { authors: { name: { eq: 'John' } } };
|
|
99
|
+
const C = { authors: { name: { eq: 'Jack' } } };
|
|
100
|
+
(0, vitest_1.it)('minimize: A || (A && B) => A', () => {
|
|
101
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
102
|
+
or: [
|
|
103
|
+
A,
|
|
104
|
+
{ and: [A, B] },
|
|
105
|
+
],
|
|
106
|
+
}, model.entities.Image), A);
|
|
107
|
+
});
|
|
108
|
+
(0, vitest_1.it)('minimize: (A && B) || A => A', () => {
|
|
109
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
110
|
+
or: [
|
|
111
|
+
{ and: [A, B] },
|
|
112
|
+
A,
|
|
113
|
+
],
|
|
114
|
+
}, model.entities.Image), A);
|
|
115
|
+
});
|
|
116
|
+
(0, vitest_1.it)('minimize: A && (A || B) => A', () => {
|
|
117
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
118
|
+
and: [
|
|
119
|
+
A,
|
|
120
|
+
{ or: [A, B] },
|
|
121
|
+
],
|
|
122
|
+
}, model.entities.Image), A);
|
|
123
|
+
});
|
|
124
|
+
(0, vitest_1.it)('minimize: (A || B) && A => A', () => {
|
|
125
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
126
|
+
and: [
|
|
127
|
+
{ or: [A, B] },
|
|
128
|
+
A,
|
|
129
|
+
],
|
|
130
|
+
}, model.entities.Image), A);
|
|
131
|
+
});
|
|
132
|
+
(0, vitest_1.it)('minimize: A && (!A || B) => A && B', () => {
|
|
133
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
134
|
+
and: [
|
|
135
|
+
A,
|
|
136
|
+
{ or: [{ not: A }, B] },
|
|
137
|
+
],
|
|
138
|
+
}, model.entities.Image), { and: [A, B] });
|
|
139
|
+
});
|
|
140
|
+
(0, vitest_1.it)('minimize: A || (!A && B) => A || B', () => {
|
|
141
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
142
|
+
or: [
|
|
143
|
+
A,
|
|
144
|
+
{ and: [{ not: A }, B] },
|
|
145
|
+
],
|
|
146
|
+
}, model.entities.Image), { or: [A, B] });
|
|
147
|
+
});
|
|
148
|
+
(0, vitest_1.it)('minimize: A || !A => 1', () => {
|
|
149
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
150
|
+
or: [
|
|
151
|
+
A,
|
|
152
|
+
{ not: A },
|
|
153
|
+
],
|
|
154
|
+
}, model.entities.Image), { id: { always: true } });
|
|
155
|
+
});
|
|
156
|
+
(0, vitest_1.it)('minimize: A && !A => 0', () => {
|
|
157
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
158
|
+
and: [
|
|
159
|
+
A,
|
|
160
|
+
{ not: A },
|
|
161
|
+
],
|
|
162
|
+
}, model.entities.Image), { id: { never: true } });
|
|
163
|
+
});
|
|
164
|
+
(0, vitest_1.it)('minimize: !A && !A => !A', () => {
|
|
165
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
166
|
+
and: [
|
|
167
|
+
{ not: A },
|
|
168
|
+
{ not: A },
|
|
169
|
+
],
|
|
170
|
+
}, model.entities.Image), { not: A });
|
|
171
|
+
});
|
|
172
|
+
(0, vitest_1.it)('not minimize: (A && B) || (A && C)', () => {
|
|
173
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
174
|
+
or: [
|
|
175
|
+
{ and: [A, B] },
|
|
176
|
+
{ and: [A, C] },
|
|
177
|
+
],
|
|
178
|
+
}, model.entities.Image), {
|
|
179
|
+
or: [
|
|
180
|
+
{ and: [A, B] },
|
|
181
|
+
{ and: [A, C] },
|
|
182
|
+
],
|
|
183
|
+
});
|
|
184
|
+
});
|
|
185
|
+
(0, vitest_1.describe)('remove id predicates', () => {
|
|
186
|
+
(0, vitest_1.it)('remove ID predicate when traversing from a relation - always', () => {
|
|
187
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
188
|
+
image: { id: { isNull: false } },
|
|
189
|
+
}, model.entities.Author, [(0, schema_utils_1.acceptFieldVisitor)(model, 'Image', 'authors', {
|
|
190
|
+
visitColumn: () => {
|
|
191
|
+
throw new Error();
|
|
192
|
+
},
|
|
193
|
+
visitRelation: context => context,
|
|
194
|
+
})]), {
|
|
195
|
+
id: { always: true },
|
|
196
|
+
});
|
|
197
|
+
});
|
|
198
|
+
(0, vitest_1.it)('remove ID predicate when traversing from a relation - never', () => {
|
|
199
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
200
|
+
image: { id: { isNull: true } },
|
|
201
|
+
}, model.entities.Author, [(0, schema_utils_1.acceptFieldVisitor)(model, 'Image', 'authors', {
|
|
202
|
+
visitColumn: () => {
|
|
203
|
+
throw new Error();
|
|
204
|
+
},
|
|
205
|
+
visitRelation: context => context,
|
|
206
|
+
})]), {
|
|
207
|
+
id: { never: true },
|
|
208
|
+
});
|
|
209
|
+
});
|
|
210
|
+
(0, vitest_1.it)('remove ID predicate when traversing in where', () => {
|
|
211
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
212
|
+
authors: { image: { id: { isNull: false } } },
|
|
213
|
+
}, model.entities.Image, []), {
|
|
214
|
+
id: { always: true },
|
|
215
|
+
});
|
|
216
|
+
});
|
|
217
|
+
(0, vitest_1.it)('do not remove ID predicate when traversing from a has-many relation', () => {
|
|
218
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
219
|
+
authors: { id: { isNull: false } },
|
|
220
|
+
}, model.entities.Image, [(0, schema_utils_1.acceptFieldVisitor)(model, 'Author', 'image', {
|
|
221
|
+
visitColumn: () => {
|
|
222
|
+
throw new Error();
|
|
223
|
+
},
|
|
224
|
+
visitRelation: context => context,
|
|
225
|
+
})]), {
|
|
226
|
+
authors: { id: { isNull: false } },
|
|
227
|
+
});
|
|
228
|
+
});
|
|
229
|
+
(0, vitest_1.it)('do not remove ID predicate when traversing from a nested has-many relation', () => {
|
|
230
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
231
|
+
articles: { author: { id: { isNull: false } } },
|
|
232
|
+
}, model.entities.Image, [
|
|
233
|
+
(0, schema_utils_1.acceptFieldVisitor)(model, 'Author', 'articles', {
|
|
234
|
+
visitColumn: () => {
|
|
235
|
+
throw new Error();
|
|
236
|
+
},
|
|
237
|
+
visitRelation: context => context,
|
|
238
|
+
}),
|
|
239
|
+
(0, schema_utils_1.acceptFieldVisitor)(model, 'Article', 'image', {
|
|
240
|
+
visitColumn: () => {
|
|
241
|
+
throw new Error();
|
|
242
|
+
},
|
|
243
|
+
visitRelation: context => context,
|
|
244
|
+
}),
|
|
245
|
+
]), {
|
|
246
|
+
articles: { author: { id: { isNull: false } } },
|
|
247
|
+
});
|
|
248
|
+
});
|
|
249
|
+
(0, vitest_1.it)('do not remove ID predicate when traversing in where over has-many relation', () => {
|
|
250
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
251
|
+
image: { authors: { id: { isNull: false } } },
|
|
252
|
+
}, model.entities.Author, []), {
|
|
253
|
+
image: { authors: { id: { isNull: false } } },
|
|
254
|
+
});
|
|
255
|
+
});
|
|
256
|
+
(0, vitest_1.it)('do not remove ID predicate when traversing in where over has-many relation - nested', () => {
|
|
257
|
+
vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
|
|
258
|
+
image: { authors: { image: { id: { isNull: false } } } },
|
|
259
|
+
}, model.entities.Author, []), {
|
|
260
|
+
image: { authors: { image: { id: { isNull: false } } } },
|
|
261
|
+
});
|
|
262
|
+
});
|
|
263
|
+
});
|
|
264
|
+
});
|
|
265
|
+
//# sourceMappingURL=whereOptimizer.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"whereOptimizer.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/whereOptimizer.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testGraphql.d.ts","sourceRoot":"","sources":["../../../tests/src/testGraphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,aAAa,EAAE,MAAM,SAAS,CAAA;AAGhD,MAAM,WAAW,IAAI;IACpB,MAAM,EAAE,aAAa,CAAA;IACrB,OAAO,EAAE,GAAG,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,MAAM,EAAE,MAAM,CAAA;CACd;AAED,eAAO,MAAM,kBAAkB,SAAgB,IAAI,
|
|
1
|
+
{"version":3,"file":"testGraphql.d.ts","sourceRoot":"","sources":["../../../tests/src/testGraphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,aAAa,EAAE,MAAM,SAAS,CAAA;AAGhD,MAAM,WAAW,IAAI;IACpB,MAAM,EAAE,aAAa,CAAA;IACrB,OAAO,EAAE,GAAG,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,MAAM,EAAE,MAAM,CAAA;CACd;AAED,eAAO,MAAM,kBAAkB,SAAgB,IAAI,kBAelD,CAAA"}
|
|
@@ -4,10 +4,18 @@ exports.executeGraphQlTest = void 0;
|
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
5
|
const vitest_1 = require("vitest");
|
|
6
6
|
const executeGraphQlTest = async (test) => {
|
|
7
|
-
|
|
7
|
+
var _a;
|
|
8
|
+
const rawResponse = await (0, graphql_1.graphql)({
|
|
9
|
+
schema: test.schema,
|
|
10
|
+
source: test.query,
|
|
11
|
+
contextValue: test.context,
|
|
12
|
+
variableValues: test.queryVariables,
|
|
13
|
+
});
|
|
8
14
|
const response = JSON.parse(JSON.stringify(rawResponse));
|
|
9
15
|
if ('errors' in rawResponse) {
|
|
10
|
-
|
|
16
|
+
if (((_a = rawResponse.errors) === null || _a === void 0 ? void 0 : _a.length) === 1 && 'originalError' in rawResponse.errors[0]) {
|
|
17
|
+
throw rawResponse.errors[0].originalError;
|
|
18
|
+
}
|
|
11
19
|
rawResponse.errors = rawResponse.errors.map(({ message }) => ({ message }));
|
|
12
20
|
}
|
|
13
21
|
vitest_1.assert.deepStrictEqual(response, test.return);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testGraphql.js","sourceRoot":"","sources":["../../../tests/src/testGraphql.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAChD,mCAA+B;AAUxB,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"testGraphql.js","sourceRoot":"","sources":["../../../tests/src/testGraphql.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAChD,mCAA+B;AAUxB,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE;;IACtD,MAAM,WAAW,GAAG,MAAM,IAAA,iBAAO,EAAC;QACjC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,MAAM,EAAE,IAAI,CAAC,KAAK;QAClB,YAAY,EAAE,IAAI,CAAC,OAAO;QAC1B,cAAc,EAAE,IAAI,CAAC,cAAc;KACnC,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;IACxD,IAAI,QAAQ,IAAI,WAAW,EAAE;QAC5B,IAAI,CAAA,MAAA,WAAW,CAAC,MAAM,0CAAE,MAAM,MAAK,CAAC,IAAI,eAAe,IAAK,WAAW,CAAC,MAAc,CAAC,CAAC,CAAC,EAAE;YAC1F,MAAO,WAAW,CAAC,MAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAA;SAClD;QACD,WAAW,CAAC,MAAM,GAAI,WAAW,CAAC,MAAc,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAO,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;KACzF;IACD,eAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;AAC9C,CAAC,CAAA;AAfY,QAAA,kBAAkB,sBAe9B"}
|