@contember/engine-content-api 2.0.0-alpha.8 → 2.0.0-beta.1

package/tests/cases/integration/graphQlRequests/validation/rules/lengthRangeRule.test.ts

@@ -1,6 +1,6 @@
 import { InputValidation as v, SchemaDefinition as d } from '@contember/schema-definition'
 import { createSchema, testCreate } from '../utils'
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 
 class Item {
 	@v.assert(v.rules.lengthRange(5, 6), 'failure')

package/tests/cases/integration/graphQlRequests/validation/rules/maxLengthRule.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 import { InputValidation as v } from '@contember/schema-definition'
 import { SchemaDefinition as d } from '@contember/schema-definition'
 import { createSchema, testCreate } from '../utils'

package/tests/cases/integration/graphQlRequests/validation/rules/minLength.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 import { InputValidation as v, SchemaDefinition as d } from '@contember/schema-definition'
 import { createSchema, testCreate } from '../utils'
 

package/tests/cases/integration/graphQlRequests/validation/rules/notEmptyRule.test.ts

@@ -1,6 +1,6 @@
 import { InputValidation as v, SchemaDefinition as d } from '@contember/schema-definition'
 import { createSchema, testCreate } from '../utils'
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 class Item {
 	@v.assert(v.rules.notEmpty(), 'failure')
 	value = d.stringColumn()

package/tests/cases/integration/graphQlRequests/validation/rules/notRule.test.ts

@@ -1,6 +1,6 @@
 import { InputValidation as v, SchemaDefinition as d } from '@contember/schema-definition'
 import { createSchema, testCreate } from '../utils'
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 
 class Item {
 	@v.assert(v.rules.not(v.rules.pattern(/.+@.+/)), 'failure')

package/tests/cases/integration/graphQlRequests/validation/rules/orRule.test.ts

@@ -1,6 +1,6 @@
 import { InputValidation as v, SchemaDefinition as d } from '@contember/schema-definition'
 import { createSchema, testCreate } from '../utils'
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 class Item {
 	@v.assert(v.rules.or(v.rules.pattern(/.+@.+/), v.rules.minLength(5)), 'failure')
 	value = d.stringColumn()

package/tests/cases/integration/graphQlRequests/validation/rules/patternRule.test.ts

@@ -1,7 +1,6 @@
 import { InputValidation as v, SchemaDefinition as d } from '@contember/schema-definition'
 import { createSchema, testCreate } from '../utils'
-import { suite } from 'vitest'
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 
 class Item {
 	@v.assert(v.rules.pattern(/.+@.+/), 'failure')

package/tests/cases/integration/graphQlRequests/validation/rules/rangeRule.test.ts

@@ -1,6 +1,6 @@
 import { InputValidation as v, SchemaDefinition as d } from '@contember/schema-definition'
 import { createSchema, testCreate } from '../utils'
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 
 class Item {
 	@v.assert(v.rules.range(5, 6), 'failure')

package/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.ts

@@ -10,7 +10,7 @@ import {
 } from '@contember/schema-definition'
 import { Authorizator, GraphQlSchemaBuilderFactory } from '../../../../src'
 import * as model from './model'
-import { assert, describe, it } from 'vitest'
+import { expect, describe, it } from 'bun:test'
 import { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -42,7 +42,7 @@ const testSchema = async (test: Test) => {
 		`,
 	})
 	const errors = (result.errors || []).map(it => it.message)
-	assert.deepEqual(errors, [])
+	expect(errors).toStrictEqual([])
 
 	const textSchema = printSchema(graphQlSchema) + '\n'
 
@@ -55,7 +55,7 @@ const testSchema = async (test: Test) => {
 		throw new Error(`Schema file ${filename} not found, creating with current schema`)
 	}
 	if (expectedSchema) {
-		assert.deepEqual(textSchema, expectedSchema)
+		expect(textSchema).toStrictEqual(expectedSchema)
 	}
 }
 describe('GraphQL schema builder', () => {
@@ -328,7 +328,7 @@ describe('GraphQL schema builder', () => {
 	it('basic schema with new builder', async () => {
 		const schema1 = SchemaDefinition.createModel(model)
 		const relation = schema1.entities['Author'].fields['posts']
-		assert.deepEqual((relation as Model.OneHasManyRelation).orderBy, [
+		expect((relation as Model.OneHasManyRelation).orderBy).toStrictEqual([
 			{ path: ['publishedAt'], direction: Model.OrderDirection.desc },
 		])
 		await testSchema({

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

@@ -38,6 +38,7 @@ type Root {
   id: UUID!
   foo: String
   r(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], offset: Int, limit: Int): [OneHasManyEntity!]!
+  rBy(by: ROfRootByUniqueWhere!, filter: OneHasManyEntityWhere): OneHasManyEntity
   paginateR(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], skip: Int, first: Int): OneHasManyEntityConnection!
 }
 
@@ -125,6 +126,10 @@ input RootOrderBy {
   foo: OrderDirection
 }
 
+input ROfRootByUniqueWhere {
+  id: UUID
+}
+
 type OneHasManyEntityConnection {
   pageInfo: PageInfo!
   edges: [OneHasManyEntityEdge!]!
@@ -263,6 +268,7 @@ input RootUpdateREntityRelationInput {
   update: RootUpdateRRelationInput
   upsert: RootUpsertRRelationInput
   connect: OneHasManyEntityUniqueWhere
+  connectOrCreate: RootConnectOrCreateRRelationInput
   disconnect: OneHasManyEntityUniqueWhere
   delete: OneHasManyEntityUniqueWhere
   alias: String

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

@@ -1,8 +1,8 @@
 type Query {
   validateCreateAuthor(data: AuthorCreateInput!): _ValidationResult!
+  validateCreateCategory(data: CategoryCreateInput!): _ValidationResult!
   validateCreatePost(data: PostCreateInput!): _ValidationResult!
   validateCreatePostLocale(data: PostLocaleCreateInput!): _ValidationResult!
-  validateCreateCategory(data: CategoryCreateInput!): _ValidationResult!
   transaction: QueryTransaction
   _info: Info
 }
@@ -85,10 +85,20 @@ enum Locale {
   en
 }
 
-input PostCreateInput {
+input CategoryCreateInput {
+  name: String
+  posts: [CategoryCreatePostsEntityRelationInput!]
+  _dummy_field_: Boolean
+}
+
+input CategoryCreatePostsEntityRelationInput {
+  create: PostWithoutCategoriesCreateInput
+  alias: String
+}
+
+input PostWithoutCategoriesCreateInput {
   state: PostState
   publishedAt: DateTime
-  categories: [PostCreateCategoriesEntityRelationInput!]
   author: PostCreateAuthorEntityRelationInput
   locales: [PostCreateLocalesEntityRelationInput!]
   _dummy_field_: Boolean
@@ -103,6 +113,15 @@ input AuthorWithoutPostsCreateInput {
   _dummy_field_: Boolean
 }
 
+input PostCreateInput {
+  state: PostState
+  publishedAt: DateTime
+  categories: [PostCreateCategoriesEntityRelationInput!]
+  author: PostCreateAuthorEntityRelationInput
+  locales: [PostCreateLocalesEntityRelationInput!]
+  _dummy_field_: Boolean
+}
+
 input PostLocaleCreateInput {
   locale: Locale
   title: String
@@ -122,30 +141,11 @@ input PostWithoutLocalesCreateInput {
   _dummy_field_: Boolean
 }
 
-input CategoryCreateInput {
-  name: String
-  posts: [CategoryCreatePostsEntityRelationInput!]
-  _dummy_field_: Boolean
-}
-
-input CategoryCreatePostsEntityRelationInput {
-  create: PostWithoutCategoriesCreateInput
-  alias: String
-}
-
-input PostWithoutCategoriesCreateInput {
-  state: PostState
-  publishedAt: DateTime
-  author: PostCreateAuthorEntityRelationInput
-  locales: [PostCreateLocalesEntityRelationInput!]
-  _dummy_field_: Boolean
-}
-
 type QueryTransaction {
   validateCreateAuthor(data: AuthorCreateInput!): _ValidationResult!
+  validateCreateCategory(data: CategoryCreateInput!): _ValidationResult!
   validateCreatePost(data: PostCreateInput!): _ValidationResult!
   validateCreatePostLocale(data: PostLocaleCreateInput!): _ValidationResult!
-  validateCreateCategory(data: CategoryCreateInput!): _ValidationResult!
 }
 
 type Info {
@@ -154,9 +154,9 @@ type Info {
 
 type Mutation {
   createAuthor(data: AuthorCreateInput!): AuthorCreateResult!
+  createCategory(data: CategoryCreateInput!): CategoryCreateResult!
   createPost(data: PostCreateInput!): PostCreateResult!
   createPostLocale(data: PostLocaleCreateInput!): PostLocaleCreateResult!
-  createCategory(data: CategoryCreateInput!): CategoryCreateResult!
   transaction(options: MutationTransactionOptions): MutationTransaction!
   query: Query!
 }
@@ -191,21 +191,21 @@ enum _MutationErrorType {
   SqlError
 }
 
-type PostCreateResult implements MutationResult {
+type CategoryCreateResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
   validation: _ValidationResult!
 }
 
-type PostLocaleCreateResult implements MutationResult {
+type PostCreateResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
   validation: _ValidationResult!
 }
 
-type CategoryCreateResult implements MutationResult {
+type PostLocaleCreateResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
@@ -218,9 +218,9 @@ type MutationTransaction {
   errors: [_MutationError!]!
   validation: _ValidationResult!
   createAuthor(data: AuthorCreateInput!): AuthorCreateResult!
+  createCategory(data: CategoryCreateInput!): CategoryCreateResult!
   createPost(data: PostCreateInput!): PostCreateResult!
   createPostLocale(data: PostLocaleCreateInput!): PostLocaleCreateResult!
-  createCategory(data: CategoryCreateInput!): CategoryCreateResult!
   query: Query
 }
 

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

@@ -35,6 +35,7 @@ type Root {
   _meta: RootMeta
   id: UUID!
   r(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], offset: Int, limit: Int): [OneHasManyEntity!]!
+  rBy(by: ROfRootByUniqueWhere!, filter: OneHasManyEntityWhere): OneHasManyEntity
   paginateR(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], skip: Int, first: Int): OneHasManyEntityConnection!
 }
 
@@ -119,6 +120,10 @@ input RootOrderBy {
   id: OrderDirection
 }
 
+input ROfRootByUniqueWhere {
+  id: UUID
+}
+
 type OneHasManyEntityConnection {
   pageInfo: PageInfo!
   edges: [OneHasManyEntityEdge!]!

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

@@ -37,6 +37,7 @@ type Root {
   _meta: RootMeta
   id: UUID!
   r(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], offset: Int, limit: Int): [OneHasManyEntity!]!
+  rBy(by: ROfRootByUniqueWhere!, filter: OneHasManyEntityWhere): OneHasManyEntity
   paginateR(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], skip: Int, first: Int): OneHasManyEntityConnection!
 }
 
@@ -121,6 +122,10 @@ input RootOrderBy {
   id: OrderDirection
 }
 
+input ROfRootByUniqueWhere {
+  id: UUID
+}
+
 type OneHasManyEntityConnection {
   pageInfo: PageInfo!
   edges: [OneHasManyEntityEdge!]!
@@ -255,6 +260,7 @@ input RootUpdateREntityRelationInput {
   update: RootUpdateRRelationInput
   upsert: RootUpsertRRelationInput
   connect: OneHasManyEntityUniqueWhere
+  connectOrCreate: RootConnectOrCreateRRelationInput
   disconnect: OneHasManyEntityUniqueWhere
   alias: String
 }

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

@@ -36,6 +36,7 @@ type Root {
   _meta: RootMeta
   id: UUID!
   r(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], offset: Int, limit: Int): [OneHasManyEntity!]!
+  rBy(by: ROfRootByUniqueWhere!, filter: OneHasManyEntityWhere): OneHasManyEntity
   paginateR(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], skip: Int, first: Int): OneHasManyEntityConnection!
 }
 
@@ -120,6 +121,10 @@ input RootOrderBy {
   id: OrderDirection
 }
 
+input ROfRootByUniqueWhere {
+  id: UUID
+}
+
 type OneHasManyEntityConnection {
   pageInfo: PageInfo!
   edges: [OneHasManyEntityEdge!]!

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

@@ -29,6 +29,7 @@ type Author {
   name: String
   posts(filter: PostWhere, orderBy: [PostOrderBy!], offset: Int, limit: Int): [Post!]!
   postsByLocales(by: AuthorPostsByLocalesUniqueWhere!, filter: PostWhere): Post
+  postsBy(by: PostsOfAuthorByUniqueWhere!, filter: PostWhere): Post
   paginatePosts(filter: PostWhere, orderBy: [PostOrderBy!], skip: Int, first: Int): PostConnection!
 }
 
@@ -52,6 +53,7 @@ type Post {
   publishedAt: DateTime
   locales(filter: PostLocaleWhere, orderBy: [PostLocaleOrderBy!], offset: Int, limit: Int): [PostLocale!]!
   categories(filter: CategoryWhere, orderBy: [CategoryOrderBy!], offset: Int, limit: Int): [Category!]!
+  localesBy(by: LocalesOfPostByUniqueWhere!, filter: PostLocaleWhere): PostLocale
   paginateLocales(filter: PostLocaleWhere, orderBy: [PostLocaleOrderBy!], skip: Int, first: Int): PostLocaleConnection!
   paginateCategories(filter: CategoryWhere, orderBy: [CategoryOrderBy!], skip: Int, first: Int): CategoryConnection!
 }
@@ -235,6 +237,10 @@ input CategoryOrderBy {
   name: OrderDirection
 }
 
+input LocalesOfPostByUniqueWhere {
+  id: UUID
+}
+
 type PostLocaleConnection {
   pageInfo: PageInfo!
   edges: [PostLocaleEdge!]!
@@ -261,6 +267,11 @@ input PostLocaleUniqueWhere {
   id: UUID
 }
 
+input PostsOfAuthorByUniqueWhere {
+  id: UUID
+  locales: PostLocaleUniqueWhere
+}
+
 input AuthorUniqueWhere {
   id: UUID
   posts: PostUniqueWhere
@@ -379,6 +390,7 @@ input AuthorUpdatePostsEntityRelationInput {
   update: AuthorUpdatePostsRelationInput
   upsert: AuthorUpsertPostsRelationInput
   connect: PostUniqueWhere
+  connectOrCreate: AuthorConnectOrCreatePostsRelationInput
   disconnect: PostUniqueWhere
   delete: PostUniqueWhere
   alias: String
@@ -401,6 +413,7 @@ input PostUpdateLocalesEntityRelationInput {
   update: PostUpdateLocalesRelationInput
   upsert: PostUpsertLocalesRelationInput
   connect: PostLocaleUniqueWhere
+  connectOrCreate: PostConnectOrCreateLocalesRelationInput
   disconnect: PostLocaleUniqueWhere
   delete: PostLocaleUniqueWhere
   alias: String
@@ -427,6 +440,7 @@ input PostUpdateCategoriesEntityRelationInput {
   update: PostUpdateCategoriesRelationInput
   upsert: PostUpsertCategoriesRelationInput
   connect: CategoryUniqueWhere
+  connectOrCreate: PostConnectOrCreateCategoriesRelationInput
   disconnect: CategoryUniqueWhere
   delete: CategoryUniqueWhere
   alias: String
@@ -506,6 +520,7 @@ input CategoryUpdatePostsEntityRelationInput {
   update: CategoryUpdatePostsRelationInput
   upsert: CategoryUpsertPostsRelationInput
   connect: PostUniqueWhere
+  connectOrCreate: CategoryConnectOrCreatePostsRelationInput
   disconnect: PostUniqueWhere
   delete: PostUniqueWhere
   alias: String

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

@@ -42,6 +42,7 @@ type FrontPage {
   introVideo(filter: VideoWhere): Video
   inHouseVideos(filter: VideoWhere, orderBy: [VideoOrderBy!], offset: Int, limit: Int): [Video!]!
   inHouseVideosByFrontPageForIntro(by: FrontPageInHouseVideosByFrontPageForIntroUniqueWhere!, filter: VideoWhere): Video
+  inHouseVideosBy(by: InHouseVideosOfFrontPageByUniqueWhere!, filter: VideoWhere): Video
   paginateInHouseVideos(filter: VideoWhere, orderBy: [VideoOrderBy!], skip: Int, first: Int): VideoConnection!
 }
 
@@ -170,6 +171,11 @@ input VideoUniqueWhere {
   frontPageForIntro: FrontPageUniqueWhere
 }
 
+input InHouseVideosOfFrontPageByUniqueWhere {
+  id: UUID
+  frontPageForIntro: FrontPageUniqueWhere
+}
+
 type VideoConnection {
   pageInfo: PageInfo!
   edges: [VideoEdge!]!
@@ -312,6 +318,7 @@ input FrontPageUpdateInHouseVideosEntityRelationInput {
   update: FrontPageUpdateInHouseVideosRelationInput
   upsert: FrontPageUpsertInHouseVideosRelationInput
   connect: VideoUniqueWhere
+  connectOrCreate: FrontPageConnectOrCreateInHouseVideosRelationInput
   disconnect: VideoUniqueWhere
   delete: VideoUniqueWhere
   alias: String

package/tests/cases/integration/graphQlSchema/schema-custom-primary.gql

@@ -29,6 +29,7 @@ type Author {
   name: String
   posts(filter: PostWhere, orderBy: [PostOrderBy!], offset: Int, limit: Int): [Post!]!
   postsByLocales(by: AuthorPostsByLocalesUniqueWhere!, filter: PostWhere): Post
+  postsBy(by: PostsOfAuthorByUniqueWhere!, filter: PostWhere): Post
   paginatePosts(filter: PostWhere, orderBy: [PostOrderBy!], skip: Int, first: Int): PostConnection!
 }
 
@@ -52,6 +53,7 @@ type Post {
   publishedAt: DateTime
   locales(filter: PostLocaleWhere, orderBy: [PostLocaleOrderBy!], offset: Int, limit: Int): [PostLocale!]!
   categories(filter: CategoryWhere, orderBy: [CategoryOrderBy!], offset: Int, limit: Int): [Category!]!
+  localesBy(by: LocalesOfPostByUniqueWhere!, filter: PostLocaleWhere): PostLocale
   paginateLocales(filter: PostLocaleWhere, orderBy: [PostLocaleOrderBy!], skip: Int, first: Int): PostLocaleConnection!
   paginateCategories(filter: CategoryWhere, orderBy: [CategoryOrderBy!], skip: Int, first: Int): CategoryConnection!
 }
@@ -235,6 +237,10 @@ input CategoryOrderBy {
   name: OrderDirection
 }
 
+input LocalesOfPostByUniqueWhere {
+  id: UUID
+}
+
 type PostLocaleConnection {
   pageInfo: PageInfo!
   edges: [PostLocaleEdge!]!
@@ -261,6 +267,11 @@ input PostLocaleUniqueWhere {
   id: UUID
 }
 
+input PostsOfAuthorByUniqueWhere {
+  id: UUID
+  locales: PostLocaleUniqueWhere
+}
+
 input AuthorUniqueWhere {
   id: UUID
   posts: PostUniqueWhere
@@ -383,6 +394,7 @@ input AuthorUpdatePostsEntityRelationInput {
   update: AuthorUpdatePostsRelationInput
   upsert: AuthorUpsertPostsRelationInput
   connect: PostUniqueWhere
+  connectOrCreate: AuthorConnectOrCreatePostsRelationInput
   disconnect: PostUniqueWhere
   delete: PostUniqueWhere
   alias: String
@@ -405,6 +417,7 @@ input PostUpdateLocalesEntityRelationInput {
   update: PostUpdateLocalesRelationInput
   upsert: PostUpsertLocalesRelationInput
   connect: PostLocaleUniqueWhere
+  connectOrCreate: PostConnectOrCreateLocalesRelationInput
   disconnect: PostLocaleUniqueWhere
   delete: PostLocaleUniqueWhere
   alias: String
@@ -431,6 +444,7 @@ input PostUpdateCategoriesEntityRelationInput {
   update: PostUpdateCategoriesRelationInput
   upsert: PostUpsertCategoriesRelationInput
   connect: CategoryUniqueWhere
+  connectOrCreate: PostConnectOrCreateCategoriesRelationInput
   disconnect: CategoryUniqueWhere
   delete: CategoryUniqueWhere
   alias: String
@@ -513,6 +527,7 @@ input CategoryUpdatePostsEntityRelationInput {
   update: CategoryUpdatePostsRelationInput
   upsert: CategoryUpsertPostsRelationInput
   connect: PostUniqueWhere
+  connectOrCreate: CategoryConnectOrCreatePostsRelationInput
   disconnect: PostUniqueWhere
   delete: PostUniqueWhere
   alias: String

package/tests/cases/integration/graphQlSchema/schema-has-many-reduction.gql

@@ -41,6 +41,7 @@ type Post {
   publishedAt: DateTime
   locales(filter: PostLocaleWhere, orderBy: [PostLocaleOrderBy!], offset: Int, limit: Int): [PostLocale!]!
   localesByLocale(by: PostLocalesByLocaleUniqueWhere!, filter: PostLocaleWhere): PostLocale
+  localesBy(by: LocalesOfPostByUniqueWhere!, filter: PostLocaleWhere): PostLocale
   paginateLocales(filter: PostLocaleWhere, orderBy: [PostLocaleOrderBy!], skip: Int, first: Int): PostLocaleConnection!
 }
 
@@ -152,6 +153,11 @@ input PostLocalesByLocaleUniqueWhere {
   locale: String
 }
 
+input LocalesOfPostByUniqueWhere {
+  id: UUID
+  locale: String
+}
+
 type PostLocaleConnection {
   pageInfo: PageInfo!
   edges: [PostLocaleEdge!]!
@@ -295,6 +301,7 @@ input PostUpdateLocalesEntityRelationInput {
   update: PostUpdateLocalesRelationInput
   upsert: PostUpsertLocalesRelationInput
   connect: PostLocaleUniqueWhere
+  connectOrCreate: PostConnectOrCreateLocalesRelationInput
   disconnect: PostLocaleUniqueWhere
   delete: PostLocaleUniqueWhere
   alias: String