@contember/engine-content-api 1.3.0-rc.2 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "1.3.0-rc.2",
+  "version": "1.3.0",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -13,21 +13,21 @@
     "test": "vitest --dir ./tests/cases --no-threads"
   },
   "dependencies": {
-    "@contember/database": "1.3.0-rc.2",
-    "@contember/dic": "1.3.0-rc.2",
-    "@contember/graphql-utils": "1.3.0-rc.2",
-    "@contember/logger": "1.3.0-rc.2",
-    "@contember/schema": "1.3.0-rc.2",
-    "@contember/schema-definition": "1.3.0-rc.2",
-    "@contember/schema-utils": "1.3.0-rc.2",
+    "@contember/database": "1.3.0",
+    "@contember/dic": "1.3.0",
+    "@contember/graphql-utils": "1.3.0",
+    "@contember/logger": "1.3.0",
+    "@contember/schema": "1.3.0",
+    "@contember/schema-definition": "1.3.0",
+    "@contember/schema-utils": "1.3.0",
     "@graphql-tools/schema": "^8.3.5",
     "fast-deep-equal": "^3.1.3",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "1.3.0-rc.2",
-    "@contember/engine-api-tester": "1.3.0-rc.2",
-    "@contember/schema-definition": "1.3.0-rc.2",
+    "@contember/database-tester": "1.3.0",
+    "@contember/engine-api-tester": "1.3.0",
+    "@contember/schema-definition": "1.3.0",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",

package/src/schema/mutations/ConnectOrCreateRelationInputProvider.ts

@@ -1,5 +1,5 @@
 import { Accessor, Interface, singletonFactory } from '../../utils'
-import { GraphQLInputObjectType } from 'graphql'
+import { GraphQLInputObjectType, GraphQLNonNull } from 'graphql'
 import { GqlTypeName } from '../utils'
 import { WhereTypeProvider } from '../WhereTypeProvider'
 import { EntityInputProvider, EntityInputType } from './EntityInputProvider'
@@ -43,8 +43,8 @@ export class ConnectOrCreateRelationInputProvider {
 				return new GraphQLInputObjectType({
 					name: GqlTypeName`${entity.name}ConnectOrCreate${relation.name}RelationInput`,
 					fields: () => ({
-						connect: { type: uniqueWhere },
-						create: { type: createInput },
+						connect: { type: new GraphQLNonNull(uniqueWhere) },
+						create: { type: new GraphQLNonNull(createInput) },
 					}),
 				})
 			},

package/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.ts

@@ -2,7 +2,7 @@ import {
 	GraphQLBoolean,
 	GraphQLInputFieldConfig,
 	GraphQLInputFieldConfigMap,
-	GraphQLInputObjectType,
+	GraphQLInputObjectType, GraphQLNonNull,
 	GraphQLString,
 } from 'graphql'
 import { Acl, Input, Model } from '@contember/schema'
@@ -37,7 +37,8 @@ export class UpdateEntityRelationInputFieldVisitor implements Model.ColumnVisito
 	public visitHasOne({ targetRelation, targetEntity, relation, entity }: Model.AnyHasOneRelationContext) {
 		const withoutRelation = targetRelation ? targetRelation.name : undefined
 
-		const whereInput = this.createWhereInput(targetEntity)
+		const whereInputType = this.createUniqueWhereInput(targetEntity)
+		const whereInput = whereInputType ? { type: whereInputType } : undefined
 
 		const createInputType = this.createEntityInputProvider.getInput(targetEntity.name, withoutRelation)
 		const createInput = createInputType ? { type: createInputType } : undefined
@@ -45,13 +46,13 @@ export class UpdateEntityRelationInputFieldVisitor implements Model.ColumnVisito
 		const updateInputType = this.updateEntityInputProviderAccessor.get().getInput(targetEntity.name, withoutRelation)
 		const updateInput = updateInputType ? {  type: updateInputType } : undefined
 
-		const upsertInput = updateInput && createInput
+		const upsertInput = updateInputType && createInputType
 			? {
 				type: new GraphQLInputObjectType({
 					name: GqlTypeName`${entity.name}Upsert${relation.name}RelationInput`,
 					fields: () => ({
-						update: updateInput,
-						create: createInput,
+						update: { type: new GraphQLNonNull(updateInputType) },
+						create: { type: new GraphQLNonNull(createInputType) },
 					}),
 				}),
 			}
@@ -61,7 +62,7 @@ export class UpdateEntityRelationInputFieldVisitor implements Model.ColumnVisito
 			type: GraphQLBoolean,
 		}
 
-		const connectOrCreateInput = createInput && whereInput
+		const connectOrCreateInput = createInput && whereInputType
 			? { type: this.connectOrCreateRelationInputProvider.getInput(entity.name, relation.name) }
 			: undefined
 
@@ -89,34 +90,34 @@ export class UpdateEntityRelationInputFieldVisitor implements Model.ColumnVisito
 	public visitHasMany({ entity, relation, targetEntity, targetRelation }: Model.AnyHasManyRelationContext) {
 		const withoutRelation = targetRelation ? targetRelation.name : undefined
 
-		const whereInput = this.createWhereInput(targetEntity)
+		const whereInputType = this.createUniqueWhereInput(targetEntity)
+		const whereInput = whereInputType ? { type: whereInputType } : undefined
 
 		const createInputType = this.createEntityInputProvider.getInput(targetEntity.name, withoutRelation)
 		const createInput = createInputType ? { type: createInputType } : undefined
 
 		const updateInputType = this.updateEntityInputProviderAccessor.get().getInput(targetEntity.name, withoutRelation)
-		const updateInput = updateInputType ? { type: updateInputType } : undefined
 
-		const updateSpecifiedInput = updateInput && whereInput
+		const updateSpecifiedInput = updateInputType && whereInputType
 			? {
 				type: new GraphQLInputObjectType({
 					name: GqlTypeName`${entity.name}Update${relation.name}RelationInput`,
 					fields: () => ({
-						by: whereInput,
-						data: updateInput,
+						by: { type: new GraphQLNonNull(whereInputType) },
+						data: { type: new GraphQLNonNull(updateInputType) },
 					}),
 				}),
 			}
 			: undefined
 
-		const upsertInput = updateInput && createInput && whereInput
+		const upsertInput = updateInputType && createInputType && whereInputType
 			? {
 				type: new GraphQLInputObjectType({
 					name: GqlTypeName`${entity.name}Upsert${relation.name}RelationInput`,
 					fields: () => ({
-						by: whereInput,
-						update: updateInput,
-						create: createInput,
+						by: { type: new GraphQLNonNull(whereInputType) },
+						update: { type: new GraphQLNonNull(updateInputType) },
+						create: { type: new GraphQLNonNull(createInputType) },
 					}),
 				}),
 			}
@@ -163,7 +164,7 @@ export class UpdateEntityRelationInputFieldVisitor implements Model.ColumnVisito
 		)
 	}
 
-	private createWhereInput(targetEntity: Model.Entity): GraphQLInputFieldConfig | undefined {
+	private createUniqueWhereInput(targetEntity: Model.Entity): GraphQLInputObjectType | undefined {
 		if (this.authorizator.getEntityPermission(Acl.Operation.read, targetEntity.name) === 'no') {
 			return undefined
 		}
@@ -171,8 +172,6 @@ export class UpdateEntityRelationInputFieldVisitor implements Model.ColumnVisito
 		if (!uniqueWhere) {
 			throw new ImplementationException()
 		}
-		return {
-			type: uniqueWhere,
-		}
+		return uniqueWhere
 	}
 }

package/tests/cases/integration/graphQlSchema/schema-acl-allowed.gql

@@ -190,8 +190,8 @@ input RootWithoutRCreateInput {
 }
 
 input OneHasManyEntityConnectOrCreateR2RelationInput {
-  connect: RootUniqueWhere
-  create: RootWithoutRCreateInput
+  connect: RootUniqueWhere!
+  create: RootWithoutRCreateInput!
 }
 
 input OneHasManyEntityUpdateInput {
@@ -216,8 +216,8 @@ input RootWithoutRUpdateInput {
 }
 
 input OneHasManyEntityUpsertR2RelationInput {
-  update: RootWithoutRUpdateInput
-  create: RootWithoutRCreateInput
+  update: RootWithoutRUpdateInput!
+  create: RootWithoutRCreateInput!
 }
 
 type RootConnection {
@@ -248,8 +248,8 @@ input OneHasManyEntityWithoutR2CreateInput {
 }
 
 input RootConnectOrCreateRRelationInput {
-  connect: OneHasManyEntityUniqueWhere
-  create: OneHasManyEntityWithoutR2CreateInput
+  connect: OneHasManyEntityUniqueWhere!
+  create: OneHasManyEntityWithoutR2CreateInput!
 }
 
 input RootUpdateInput {
@@ -269,8 +269,8 @@ input RootUpdateREntityRelationInput {
 }
 
 input RootUpdateRRelationInput {
-  by: OneHasManyEntityUniqueWhere
-  data: OneHasManyEntityWithoutR2UpdateInput
+  by: OneHasManyEntityUniqueWhere!
+  data: OneHasManyEntityWithoutR2UpdateInput!
 }
 
 input OneHasManyEntityWithoutR2UpdateInput {
@@ -279,9 +279,9 @@ input OneHasManyEntityWithoutR2UpdateInput {
 }
 
 input RootUpsertRRelationInput {
-  by: OneHasManyEntityUniqueWhere
-  update: OneHasManyEntityWithoutR2UpdateInput
-  create: OneHasManyEntityWithoutR2CreateInput
+  by: OneHasManyEntityUniqueWhere!
+  update: OneHasManyEntityWithoutR2UpdateInput!
+  create: OneHasManyEntityWithoutR2CreateInput!
 }
 
 type QueryTransaction {

package/tests/cases/integration/graphQlSchema/schema-acl-restricted-create.gql

@@ -206,8 +206,8 @@ input RootUpdateREntityRelationInput {
 }
 
 input RootUpdateRRelationInput {
-  by: OneHasManyEntityUniqueWhere
-  data: OneHasManyEntityWithoutR2UpdateInput
+  by: OneHasManyEntityUniqueWhere!
+  data: OneHasManyEntityWithoutR2UpdateInput!
 }
 
 input OneHasManyEntityWithoutR2UpdateInput {

package/tests/cases/integration/graphQlSchema/schema-acl-restricted-delete.gql

@@ -185,8 +185,8 @@ input RootWithoutRCreateInput {
 }
 
 input OneHasManyEntityConnectOrCreateR2RelationInput {
-  connect: RootUniqueWhere
-  create: RootWithoutRCreateInput
+  connect: RootUniqueWhere!
+  create: RootWithoutRCreateInput!
 }
 
 input OneHasManyEntityUpdateInput {
@@ -210,8 +210,8 @@ input RootWithoutRUpdateInput {
 }
 
 input OneHasManyEntityUpsertR2RelationInput {
-  update: RootWithoutRUpdateInput
-  create: RootWithoutRCreateInput
+  update: RootWithoutRUpdateInput!
+  create: RootWithoutRCreateInput!
 }
 
 type RootConnection {
@@ -241,8 +241,8 @@ input OneHasManyEntityWithoutR2CreateInput {
 }
 
 input RootConnectOrCreateRRelationInput {
-  connect: OneHasManyEntityUniqueWhere
-  create: OneHasManyEntityWithoutR2CreateInput
+  connect: OneHasManyEntityUniqueWhere!
+  create: OneHasManyEntityWithoutR2CreateInput!
 }
 
 input RootUpdateInput {
@@ -260,8 +260,8 @@ input RootUpdateREntityRelationInput {
 }
 
 input RootUpdateRRelationInput {
-  by: OneHasManyEntityUniqueWhere
-  data: OneHasManyEntityWithoutR2UpdateInput
+  by: OneHasManyEntityUniqueWhere!
+  data: OneHasManyEntityWithoutR2UpdateInput!
 }
 
 input OneHasManyEntityWithoutR2UpdateInput {
@@ -270,9 +270,9 @@ input OneHasManyEntityWithoutR2UpdateInput {
 }
 
 input RootUpsertRRelationInput {
-  by: OneHasManyEntityUniqueWhere
-  update: OneHasManyEntityWithoutR2UpdateInput
-  create: OneHasManyEntityWithoutR2CreateInput
+  by: OneHasManyEntityUniqueWhere!
+  update: OneHasManyEntityWithoutR2UpdateInput!
+  create: OneHasManyEntityWithoutR2CreateInput!
 }
 
 type QueryTransaction {

package/tests/cases/integration/graphQlSchema/schema-acl-restricted-update.gql

@@ -184,8 +184,8 @@ input RootWithoutRCreateInput {
 }
 
 input OneHasManyEntityConnectOrCreateR2RelationInput {
-  connect: RootUniqueWhere
-  create: RootWithoutRCreateInput
+  connect: RootUniqueWhere!
+  create: RootWithoutRCreateInput!
 }
 
 type RootConnection {
@@ -215,8 +215,8 @@ input OneHasManyEntityWithoutR2CreateInput {
 }
 
 input RootConnectOrCreateRRelationInput {
-  connect: OneHasManyEntityUniqueWhere
-  create: OneHasManyEntityWithoutR2CreateInput
+  connect: OneHasManyEntityUniqueWhere!
+  create: OneHasManyEntityWithoutR2CreateInput!
 }
 
 input RootUpdateInput {

package/tests/cases/integration/graphQlSchema/schema-basic.gql

@@ -338,8 +338,8 @@ input PostLocaleWithoutPostCreateInput {
 }
 
 input PostConnectOrCreateLocalesRelationInput {
-  connect: PostLocaleUniqueWhere
-  create: PostLocaleWithoutPostCreateInput
+  connect: PostLocaleUniqueWhere!
+  create: PostLocaleWithoutPostCreateInput!
 }
 
 input PostCreateCategoriesEntityRelationInput {
@@ -359,13 +359,13 @@ input CategoryWithoutPostsCreateInput {
 }
 
 input PostConnectOrCreateCategoriesRelationInput {
-  connect: CategoryUniqueWhere
-  create: CategoryWithoutPostsCreateInput
+  connect: CategoryUniqueWhere!
+  create: CategoryWithoutPostsCreateInput!
 }
 
 input AuthorConnectOrCreatePostsRelationInput {
-  connect: PostUniqueWhere
-  create: PostWithoutAuthorCreateInput
+  connect: PostUniqueWhere!
+  create: PostWithoutAuthorCreateInput!
 }
 
 input AuthorUpdateInput {
@@ -385,8 +385,8 @@ input AuthorUpdatePostsEntityRelationInput {
 }
 
 input AuthorUpdatePostsRelationInput {
-  by: PostUniqueWhere
-  data: PostWithoutAuthorUpdateInput
+  by: PostUniqueWhere!
+  data: PostWithoutAuthorUpdateInput!
 }
 
 input PostWithoutAuthorUpdateInput {
@@ -407,8 +407,8 @@ input PostUpdateLocalesEntityRelationInput {
 }
 
 input PostUpdateLocalesRelationInput {
-  by: PostLocaleUniqueWhere
-  data: PostLocaleWithoutPostUpdateInput
+  by: PostLocaleUniqueWhere!
+  data: PostLocaleWithoutPostUpdateInput!
 }
 
 input PostLocaleWithoutPostUpdateInput {
@@ -417,9 +417,9 @@ input PostLocaleWithoutPostUpdateInput {
 }
 
 input PostUpsertLocalesRelationInput {
-  by: PostLocaleUniqueWhere
-  update: PostLocaleWithoutPostUpdateInput
-  create: PostLocaleWithoutPostCreateInput
+  by: PostLocaleUniqueWhere!
+  update: PostLocaleWithoutPostUpdateInput!
+  create: PostLocaleWithoutPostCreateInput!
 }
 
 input PostUpdateCategoriesEntityRelationInput {
@@ -433,8 +433,8 @@ input PostUpdateCategoriesEntityRelationInput {
 }
 
 input PostUpdateCategoriesRelationInput {
-  by: CategoryUniqueWhere
-  data: CategoryWithoutPostsUpdateInput
+  by: CategoryUniqueWhere!
+  data: CategoryWithoutPostsUpdateInput!
 }
 
 input CategoryWithoutPostsUpdateInput {
@@ -443,15 +443,15 @@ input CategoryWithoutPostsUpdateInput {
 }
 
 input PostUpsertCategoriesRelationInput {
-  by: CategoryUniqueWhere
-  update: CategoryWithoutPostsUpdateInput
-  create: CategoryWithoutPostsCreateInput
+  by: CategoryUniqueWhere!
+  update: CategoryWithoutPostsUpdateInput!
+  create: CategoryWithoutPostsCreateInput!
 }
 
 input AuthorUpsertPostsRelationInput {
-  by: PostUniqueWhere
-  update: PostWithoutAuthorUpdateInput
-  create: PostWithoutAuthorCreateInput
+  by: PostUniqueWhere!
+  update: PostWithoutAuthorUpdateInput!
+  create: PostWithoutAuthorCreateInput!
 }
 
 input CategoryCreateInput {
@@ -486,13 +486,13 @@ input AuthorWithoutPostsCreateInput {
 }
 
 input PostConnectOrCreateAuthorRelationInput {
-  connect: AuthorUniqueWhere
-  create: AuthorWithoutPostsCreateInput
+  connect: AuthorUniqueWhere!
+  create: AuthorWithoutPostsCreateInput!
 }
 
 input CategoryConnectOrCreatePostsRelationInput {
-  connect: PostUniqueWhere
-  create: PostWithoutCategoriesCreateInput
+  connect: PostUniqueWhere!
+  create: PostWithoutCategoriesCreateInput!
 }
 
 input CategoryUpdateInput {
@@ -512,8 +512,8 @@ input CategoryUpdatePostsEntityRelationInput {
 }
 
 input CategoryUpdatePostsRelationInput {
-  by: PostUniqueWhere
-  data: PostWithoutCategoriesUpdateInput
+  by: PostUniqueWhere!
+  data: PostWithoutCategoriesUpdateInput!
 }
 
 input PostWithoutCategoriesUpdateInput {
@@ -539,14 +539,14 @@ input AuthorWithoutPostsUpdateInput {
 }
 
 input PostUpsertAuthorRelationInput {
-  update: AuthorWithoutPostsUpdateInput
-  create: AuthorWithoutPostsCreateInput
+  update: AuthorWithoutPostsUpdateInput!
+  create: AuthorWithoutPostsCreateInput!
 }
 
 input CategoryUpsertPostsRelationInput {
-  by: PostUniqueWhere
-  update: PostWithoutCategoriesUpdateInput
-  create: PostWithoutCategoriesCreateInput
+  by: PostUniqueWhere!
+  update: PostWithoutCategoriesUpdateInput!
+  create: PostWithoutCategoriesCreateInput!
 }
 
 input PostLocaleCreateInput {
@@ -569,8 +569,8 @@ input PostWithoutLocalesCreateInput {
 }
 
 input PostLocaleConnectOrCreatePostRelationInput {
-  connect: PostUniqueWhere
-  create: PostWithoutLocalesCreateInput
+  connect: PostUniqueWhere!
+  create: PostWithoutLocalesCreateInput!
 }
 
 input PostLocaleUpdateInput {
@@ -597,8 +597,8 @@ input PostWithoutLocalesUpdateInput {
 }
 
 input PostLocaleUpsertPostRelationInput {
-  update: PostWithoutLocalesUpdateInput
-  create: PostWithoutLocalesCreateInput
+  update: PostWithoutLocalesUpdateInput!
+  create: PostWithoutLocalesCreateInput!
 }
 
 input PostCreateInput {

package/tests/cases/integration/graphQlSchema/schema-bug-66.gql

@@ -241,13 +241,13 @@ input VideoWithoutFrontPageCreateInput {
 }
 
 input FrontPageConnectOrCreateInHouseVideosRelationInput {
-  connect: VideoUniqueWhere
-  create: VideoWithoutFrontPageCreateInput
+  connect: VideoUniqueWhere!
+  create: VideoWithoutFrontPageCreateInput!
 }
 
 input VideoConnectOrCreateFrontPageForIntroRelationInput {
-  connect: FrontPageUniqueWhere
-  create: FrontPageWithoutIntroVideoCreateInput
+  connect: FrontPageUniqueWhere!
+  create: FrontPageWithoutIntroVideoCreateInput!
 }
 
 input VideoCreateFrontPageEntityRelationInput {
@@ -275,13 +275,13 @@ input VideoWithoutFrontPageForIntroCreateInput {
 }
 
 input FrontPageConnectOrCreateIntroVideoRelationInput {
-  connect: VideoUniqueWhere
-  create: VideoWithoutFrontPageForIntroCreateInput
+  connect: VideoUniqueWhere!
+  create: VideoWithoutFrontPageForIntroCreateInput!
 }
 
 input VideoConnectOrCreateFrontPageRelationInput {
-  connect: FrontPageUniqueWhere
-  create: FrontPageWithoutInHouseVideosCreateInput
+  connect: FrontPageUniqueWhere!
+  create: FrontPageWithoutInHouseVideosCreateInput!
 }
 
 input VideoUpdateInput {
@@ -318,8 +318,8 @@ input FrontPageUpdateInHouseVideosEntityRelationInput {
 }
 
 input FrontPageUpdateInHouseVideosRelationInput {
-  by: VideoUniqueWhere
-  data: VideoWithoutFrontPageUpdateInput
+  by: VideoUniqueWhere!
+  data: VideoWithoutFrontPageUpdateInput!
 }
 
 input VideoWithoutFrontPageUpdateInput {
@@ -329,14 +329,14 @@ input VideoWithoutFrontPageUpdateInput {
 }
 
 input FrontPageUpsertInHouseVideosRelationInput {
-  by: VideoUniqueWhere
-  update: VideoWithoutFrontPageUpdateInput
-  create: VideoWithoutFrontPageCreateInput
+  by: VideoUniqueWhere!
+  update: VideoWithoutFrontPageUpdateInput!
+  create: VideoWithoutFrontPageCreateInput!
 }
 
 input VideoUpsertFrontPageForIntroRelationInput {
-  update: FrontPageWithoutIntroVideoUpdateInput
-  create: FrontPageWithoutIntroVideoCreateInput
+  update: FrontPageWithoutIntroVideoUpdateInput!
+  create: FrontPageWithoutIntroVideoCreateInput!
 }
 
 input VideoUpdateFrontPageEntityRelationInput {
@@ -372,13 +372,13 @@ input VideoWithoutFrontPageForIntroUpdateInput {
 }
 
 input FrontPageUpsertIntroVideoRelationInput {
-  update: VideoWithoutFrontPageForIntroUpdateInput
-  create: VideoWithoutFrontPageForIntroCreateInput
+  update: VideoWithoutFrontPageForIntroUpdateInput!
+  create: VideoWithoutFrontPageForIntroCreateInput!
 }
 
 input VideoUpsertFrontPageRelationInput {
-  update: FrontPageWithoutInHouseVideosUpdateInput
-  create: FrontPageWithoutInHouseVideosCreateInput
+  update: FrontPageWithoutInHouseVideosUpdateInput!
+  create: FrontPageWithoutInHouseVideosCreateInput!
 }
 
 type FrontPageConnection {