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

package/tests/cases/integration/graphQlSchema/schema-new-builder.gql

@@ -4,6 +4,11 @@ type Query {
   paginateAuthor(filter: AuthorWhere, orderBy: [AuthorOrderBy!], skip: Int, first: Int): AuthorConnection!
   validateCreateAuthor(data: AuthorCreateInput!): _ValidationResult!
   validateUpdateAuthor(by: AuthorUniqueWhere!, data: AuthorUpdateInput!): _ValidationResult!
+  getCategory(by: CategoryUniqueWhere!, filter: CategoryWhere): Category
+  listCategory(filter: CategoryWhere, orderBy: [CategoryOrderBy!], offset: Int, limit: Int): [Category!]!
+  paginateCategory(filter: CategoryWhere, orderBy: [CategoryOrderBy!], skip: Int, first: Int): CategoryConnection!
+  validateCreateCategory(data: CategoryCreateInput!): _ValidationResult!
+  validateUpdateCategory(by: CategoryUniqueWhere!, data: CategoryUpdateInput!): _ValidationResult!
   getPost(by: PostUniqueWhere!, filter: PostWhere): Post
   listPost(filter: PostWhere, orderBy: [PostOrderBy!], offset: Int, limit: Int): [Post!]!
   paginatePost(filter: PostWhere, orderBy: [PostOrderBy!], skip: Int, first: Int): PostConnection!
@@ -14,11 +19,6 @@ type Query {
   paginatePostLocale(filter: PostLocaleWhere, orderBy: [PostLocaleOrderBy!], skip: Int, first: Int): PostLocaleConnection!
   validateCreatePostLocale(data: PostLocaleCreateInput!): _ValidationResult!
   validateUpdatePostLocale(by: PostLocaleUniqueWhere!, data: PostLocaleUpdateInput!): _ValidationResult!
-  getCategory(by: CategoryUniqueWhere!, filter: CategoryWhere): Category
-  listCategory(filter: CategoryWhere, orderBy: [CategoryOrderBy!], offset: Int, limit: Int): [Category!]!
-  paginateCategory(filter: CategoryWhere, orderBy: [CategoryOrderBy!], skip: Int, first: Int): CategoryConnection!
-  validateCreateCategory(data: CategoryCreateInput!): _ValidationResult!
-  validateUpdateCategory(by: CategoryUniqueWhere!, data: CategoryUpdateInput!): _ValidationResult!
   transaction: QueryTransaction
   _info: Info
 }
@@ -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!
 }
 
@@ -54,6 +55,7 @@ type Post {
   author(filter: AuthorWhere): Author
   locales(filter: PostLocaleWhere, orderBy: [PostLocaleOrderBy!], offset: Int, limit: Int): [PostLocale!]!
   localesByLocale(by: PostLocalesByLocaleUniqueWhere!, filter: PostLocaleWhere): PostLocale
+  localesBy(by: LocalesOfPostByUniqueWhere!, filter: PostLocaleWhere): PostLocale
   paginateCategories(filter: CategoryWhere, orderBy: [CategoryOrderBy!], skip: Int, first: Int): CategoryConnection!
   paginateLocales(filter: PostLocaleWhere, orderBy: [PostLocaleOrderBy!], skip: Int, first: Int): PostLocaleConnection!
 }
@@ -291,6 +293,11 @@ input PostLocalesByLocaleUniqueWhere {
   locale: Locale
 }
 
+input LocalesOfPostByUniqueWhere {
+  id: UUID
+  locale: Locale
+}
+
 type CategoryConnection {
   pageInfo: PageInfo!
   edges: [CategoryEdge!]!
@@ -324,6 +331,11 @@ input PostUniqueWhere {
   locales: PostLocaleUniqueWhere
 }
 
+input PostsOfAuthorByUniqueWhere {
+  id: UUID
+  locales: PostLocaleUniqueWhere
+}
+
 input AuthorUniqueWhere {
   id: UUID
   posts: PostUniqueWhere
@@ -440,6 +452,7 @@ input AuthorUpdatePostsEntityRelationInput {
   update: AuthorUpdatePostsRelationInput
   upsert: AuthorUpsertPostsRelationInput
   connect: PostUniqueWhere
+  connectOrCreate: AuthorConnectOrCreatePostsRelationInput
   disconnect: PostUniqueWhere
   delete: PostUniqueWhere
   alias: String
@@ -463,6 +476,7 @@ input PostUpdateCategoriesEntityRelationInput {
   update: PostUpdateCategoriesRelationInput
   upsert: PostUpsertCategoriesRelationInput
   connect: CategoryUniqueWhere
+  connectOrCreate: PostConnectOrCreateCategoriesRelationInput
   disconnect: CategoryUniqueWhere
   delete: CategoryUniqueWhere
   alias: String
@@ -489,6 +503,7 @@ input PostUpdateLocalesEntityRelationInput {
   update: PostUpdateLocalesRelationInput
   upsert: PostUpsertLocalesRelationInput
   connect: PostLocaleUniqueWhere
+  connectOrCreate: PostConnectOrCreateLocalesRelationInput
   disconnect: PostLocaleUniqueWhere
   delete: PostLocaleUniqueWhere
   alias: String
@@ -517,10 +532,22 @@ input AuthorUpsertPostsRelationInput {
   create: PostWithoutAuthorCreateInput!
 }
 
-input PostCreateInput {
+input CategoryCreateInput {
+  name: String
+  posts: [CategoryCreatePostsEntityRelationInput!]
+  _dummy_field_: Boolean
+}
+
+input CategoryCreatePostsEntityRelationInput {
+  connect: PostUniqueWhere
+  create: PostWithoutCategoriesCreateInput
+  connectOrCreate: CategoryConnectOrCreatePostsRelationInput
+  alias: String
+}
+
+input PostWithoutCategoriesCreateInput {
   state: PostState
   publishedAt: DateTime
-  categories: [PostCreateCategoriesEntityRelationInput!]
   author: PostCreateAuthorEntityRelationInput
   locales: [PostCreateLocalesEntityRelationInput!]
   _dummy_field_: Boolean
@@ -542,10 +569,36 @@ input PostConnectOrCreateAuthorRelationInput {
   create: AuthorWithoutPostsCreateInput!
 }
 
-input PostUpdateInput {
+input CategoryConnectOrCreatePostsRelationInput {
+  connect: PostUniqueWhere!
+  create: PostWithoutCategoriesCreateInput!
+}
+
+input CategoryUpdateInput {
+  name: String
+  posts: [CategoryUpdatePostsEntityRelationInput!]
+  _dummy_field_: Boolean
+}
+
+input CategoryUpdatePostsEntityRelationInput {
+  create: PostWithoutCategoriesCreateInput
+  update: CategoryUpdatePostsRelationInput
+  upsert: CategoryUpsertPostsRelationInput
+  connect: PostUniqueWhere
+  connectOrCreate: CategoryConnectOrCreatePostsRelationInput
+  disconnect: PostUniqueWhere
+  delete: PostUniqueWhere
+  alias: String
+}
+
+input CategoryUpdatePostsRelationInput {
+  by: PostUniqueWhere!
+  data: PostWithoutCategoriesUpdateInput!
+}
+
+input PostWithoutCategoriesUpdateInput {
   state: PostState
   publishedAt: DateTime
-  categories: [PostUpdateCategoriesEntityRelationInput!]
   author: PostUpdateAuthorEntityRelationInput
   locales: [PostUpdateLocalesEntityRelationInput!]
   _dummy_field_: Boolean
@@ -571,6 +624,30 @@ input PostUpsertAuthorRelationInput {
   create: AuthorWithoutPostsCreateInput!
 }
 
+input CategoryUpsertPostsRelationInput {
+  by: PostUniqueWhere!
+  update: PostWithoutCategoriesUpdateInput!
+  create: PostWithoutCategoriesCreateInput!
+}
+
+input PostCreateInput {
+  state: PostState
+  publishedAt: DateTime
+  categories: [PostCreateCategoriesEntityRelationInput!]
+  author: PostCreateAuthorEntityRelationInput
+  locales: [PostCreateLocalesEntityRelationInput!]
+  _dummy_field_: Boolean
+}
+
+input PostUpdateInput {
+  state: PostState
+  publishedAt: DateTime
+  categories: [PostUpdateCategoriesEntityRelationInput!]
+  author: PostUpdateAuthorEntityRelationInput
+  locales: [PostUpdateLocalesEntityRelationInput!]
+  _dummy_field_: Boolean
+}
+
 input PostLocaleCreateInput {
   locale: Locale
   title: String
@@ -627,73 +704,17 @@ input PostLocaleUpsertPostRelationInput {
   create: PostWithoutLocalesCreateInput!
 }
 
-input CategoryCreateInput {
-  name: String
-  posts: [CategoryCreatePostsEntityRelationInput!]
-  _dummy_field_: Boolean
-}
-
-input CategoryCreatePostsEntityRelationInput {
-  connect: PostUniqueWhere
-  create: PostWithoutCategoriesCreateInput
-  connectOrCreate: CategoryConnectOrCreatePostsRelationInput
-  alias: String
-}
-
-input PostWithoutCategoriesCreateInput {
-  state: PostState
-  publishedAt: DateTime
-  author: PostCreateAuthorEntityRelationInput
-  locales: [PostCreateLocalesEntityRelationInput!]
-  _dummy_field_: Boolean
-}
-
-input CategoryConnectOrCreatePostsRelationInput {
-  connect: PostUniqueWhere!
-  create: PostWithoutCategoriesCreateInput!
-}
-
-input CategoryUpdateInput {
-  name: String
-  posts: [CategoryUpdatePostsEntityRelationInput!]
-  _dummy_field_: Boolean
-}
-
-input CategoryUpdatePostsEntityRelationInput {
-  create: PostWithoutCategoriesCreateInput
-  update: CategoryUpdatePostsRelationInput
-  upsert: CategoryUpsertPostsRelationInput
-  connect: PostUniqueWhere
-  disconnect: PostUniqueWhere
-  delete: PostUniqueWhere
-  alias: String
-}
-
-input CategoryUpdatePostsRelationInput {
-  by: PostUniqueWhere!
-  data: PostWithoutCategoriesUpdateInput!
-}
-
-input PostWithoutCategoriesUpdateInput {
-  state: PostState
-  publishedAt: DateTime
-  author: PostUpdateAuthorEntityRelationInput
-  locales: [PostUpdateLocalesEntityRelationInput!]
-  _dummy_field_: Boolean
-}
-
-input CategoryUpsertPostsRelationInput {
-  by: PostUniqueWhere!
-  update: PostWithoutCategoriesUpdateInput!
-  create: PostWithoutCategoriesCreateInput!
-}
-
 type QueryTransaction {
   getAuthor(by: AuthorUniqueWhere!, filter: AuthorWhere): Author
   listAuthor(filter: AuthorWhere, orderBy: [AuthorOrderBy!], offset: Int, limit: Int): [Author!]!
   paginateAuthor(filter: AuthorWhere, orderBy: [AuthorOrderBy!], skip: Int, first: Int): AuthorConnection!
   validateCreateAuthor(data: AuthorCreateInput!): _ValidationResult!
   validateUpdateAuthor(by: AuthorUniqueWhere!, data: AuthorUpdateInput!): _ValidationResult!
+  getCategory(by: CategoryUniqueWhere!, filter: CategoryWhere): Category
+  listCategory(filter: CategoryWhere, orderBy: [CategoryOrderBy!], offset: Int, limit: Int): [Category!]!
+  paginateCategory(filter: CategoryWhere, orderBy: [CategoryOrderBy!], skip: Int, first: Int): CategoryConnection!
+  validateCreateCategory(data: CategoryCreateInput!): _ValidationResult!
+  validateUpdateCategory(by: CategoryUniqueWhere!, data: CategoryUpdateInput!): _ValidationResult!
   getPost(by: PostUniqueWhere!, filter: PostWhere): Post
   listPost(filter: PostWhere, orderBy: [PostOrderBy!], offset: Int, limit: Int): [Post!]!
   paginatePost(filter: PostWhere, orderBy: [PostOrderBy!], skip: Int, first: Int): PostConnection!
@@ -704,11 +725,6 @@ type QueryTransaction {
   paginatePostLocale(filter: PostLocaleWhere, orderBy: [PostLocaleOrderBy!], skip: Int, first: Int): PostLocaleConnection!
   validateCreatePostLocale(data: PostLocaleCreateInput!): _ValidationResult!
   validateUpdatePostLocale(by: PostLocaleUniqueWhere!, data: PostLocaleUpdateInput!): _ValidationResult!
-  getCategory(by: CategoryUniqueWhere!, filter: CategoryWhere): Category
-  listCategory(filter: CategoryWhere, orderBy: [CategoryOrderBy!], offset: Int, limit: Int): [Category!]!
-  paginateCategory(filter: CategoryWhere, orderBy: [CategoryOrderBy!], skip: Int, first: Int): CategoryConnection!
-  validateCreateCategory(data: CategoryCreateInput!): _ValidationResult!
-  validateUpdateCategory(by: CategoryUniqueWhere!, data: CategoryUpdateInput!): _ValidationResult!
 }
 
 type Info {
@@ -720,6 +736,10 @@ type Mutation {
   deleteAuthor(by: AuthorUniqueWhere!, filter: AuthorWhere): AuthorDeleteResult!
   updateAuthor(by: AuthorUniqueWhere!, filter: AuthorWhere, data: AuthorUpdateInput!): AuthorUpdateResult!
   upsertAuthor(by: AuthorUniqueWhere!, filter: AuthorWhere, update: AuthorUpdateInput!, create: AuthorCreateInput!): AuthorUpsertResult!
+  createCategory(data: CategoryCreateInput!): CategoryCreateResult!
+  deleteCategory(by: CategoryUniqueWhere!, filter: CategoryWhere): CategoryDeleteResult!
+  updateCategory(by: CategoryUniqueWhere!, filter: CategoryWhere, data: CategoryUpdateInput!): CategoryUpdateResult!
+  upsertCategory(by: CategoryUniqueWhere!, filter: CategoryWhere, update: CategoryUpdateInput!, create: CategoryCreateInput!): CategoryUpsertResult!
   createPost(data: PostCreateInput!): PostCreateResult!
   deletePost(by: PostUniqueWhere!, filter: PostWhere): PostDeleteResult!
   updatePost(by: PostUniqueWhere!, filter: PostWhere, data: PostUpdateInput!): PostUpdateResult!
@@ -728,10 +748,6 @@ type Mutation {
   deletePostLocale(by: PostLocaleUniqueWhere!, filter: PostLocaleWhere): PostLocaleDeleteResult!
   updatePostLocale(by: PostLocaleUniqueWhere!, filter: PostLocaleWhere, data: PostLocaleUpdateInput!): PostLocaleUpdateResult!
   upsertPostLocale(by: PostLocaleUniqueWhere!, filter: PostLocaleWhere, update: PostLocaleUpdateInput!, create: PostLocaleCreateInput!): PostLocaleUpsertResult!
-  createCategory(data: CategoryCreateInput!): CategoryCreateResult!
-  deleteCategory(by: CategoryUniqueWhere!, filter: CategoryWhere): CategoryDeleteResult!
-  updateCategory(by: CategoryUniqueWhere!, filter: CategoryWhere, data: CategoryUpdateInput!): CategoryUpdateResult!
-  upsertCategory(by: CategoryUniqueWhere!, filter: CategoryWhere, update: CategoryUpdateInput!, create: CategoryCreateInput!): CategoryUpsertResult!
   transaction(options: MutationTransactionOptions): MutationTransaction!
   query: Query!
 }
@@ -790,96 +806,96 @@ type AuthorUpsertResult implements MutationResult {
   validation: _ValidationResult!
 }
 
-type PostCreateResult implements MutationResult {
+type CategoryCreateResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: Post
+  node: Category
   validation: _ValidationResult!
 }
 
-type PostDeleteResult implements MutationResult {
+type CategoryDeleteResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: Post
+  node: Category
 }
 
-type PostUpdateResult implements MutationResult {
+type CategoryUpdateResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: Post
+  node: Category
   validation: _ValidationResult!
 }
 
-type PostUpsertResult implements MutationResult {
+type CategoryUpsertResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: Post
+  node: Category
   validation: _ValidationResult!
 }
 
-type PostLocaleCreateResult implements MutationResult {
+type PostCreateResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: PostLocale
+  node: Post
   validation: _ValidationResult!
 }
 
-type PostLocaleDeleteResult implements MutationResult {
+type PostDeleteResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: PostLocale
+  node: Post
 }
 
-type PostLocaleUpdateResult implements MutationResult {
+type PostUpdateResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: PostLocale
+  node: Post
   validation: _ValidationResult!
 }
 
-type PostLocaleUpsertResult implements MutationResult {
+type PostUpsertResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: PostLocale
+  node: Post
   validation: _ValidationResult!
 }
 
-type CategoryCreateResult implements MutationResult {
+type PostLocaleCreateResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: Category
+  node: PostLocale
   validation: _ValidationResult!
 }
 
-type CategoryDeleteResult implements MutationResult {
+type PostLocaleDeleteResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: Category
+  node: PostLocale
 }
 
-type CategoryUpdateResult implements MutationResult {
+type PostLocaleUpdateResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: Category
+  node: PostLocale
   validation: _ValidationResult!
 }
 
-type CategoryUpsertResult implements MutationResult {
+type PostLocaleUpsertResult implements MutationResult {
   ok: Boolean!
   errorMessage: String
   errors: [_MutationError!]!
-  node: Category
+  node: PostLocale
   validation: _ValidationResult!
 }
 
@@ -892,6 +908,10 @@ type MutationTransaction {
   deleteAuthor(by: AuthorUniqueWhere!, filter: AuthorWhere): AuthorDeleteResult!
   updateAuthor(by: AuthorUniqueWhere!, filter: AuthorWhere, data: AuthorUpdateInput!): AuthorUpdateResult!
   upsertAuthor(by: AuthorUniqueWhere!, filter: AuthorWhere, update: AuthorUpdateInput!, create: AuthorCreateInput!): AuthorUpsertResult!
+  createCategory(data: CategoryCreateInput!): CategoryCreateResult!
+  deleteCategory(by: CategoryUniqueWhere!, filter: CategoryWhere): CategoryDeleteResult!
+  updateCategory(by: CategoryUniqueWhere!, filter: CategoryWhere, data: CategoryUpdateInput!): CategoryUpdateResult!
+  upsertCategory(by: CategoryUniqueWhere!, filter: CategoryWhere, update: CategoryUpdateInput!, create: CategoryCreateInput!): CategoryUpsertResult!
   createPost(data: PostCreateInput!): PostCreateResult!
   deletePost(by: PostUniqueWhere!, filter: PostWhere): PostDeleteResult!
   updatePost(by: PostUniqueWhere!, filter: PostWhere, data: PostUpdateInput!): PostUpdateResult!
@@ -900,10 +920,6 @@ type MutationTransaction {
   deletePostLocale(by: PostLocaleUniqueWhere!, filter: PostLocaleWhere): PostLocaleDeleteResult!
   updatePostLocale(by: PostLocaleUniqueWhere!, filter: PostLocaleWhere, data: PostLocaleUpdateInput!): PostLocaleUpdateResult!
   upsertPostLocale(by: PostLocaleUniqueWhere!, filter: PostLocaleWhere, update: PostLocaleUpdateInput!, create: PostLocaleCreateInput!): PostLocaleUpsertResult!
-  createCategory(data: CategoryCreateInput!): CategoryCreateResult!
-  deleteCategory(by: CategoryUniqueWhere!, filter: CategoryWhere): CategoryDeleteResult!
-  updateCategory(by: CategoryUniqueWhere!, filter: CategoryWhere, data: CategoryUpdateInput!): CategoryUpdateResult!
-  upsertCategory(by: CategoryUniqueWhere!, filter: CategoryWhere, update: CategoryUpdateInput!, create: CategoryCreateInput!): CategoryUpsertResult!
   query: Query
 }
 

package/tests/cases/unit/aclVariablesFactory.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, assert } from 'vitest'
+import { describe, it, expect } from 'bun:test'
 import { createAclVariables } from '../../../src'
 import { Acl } from '@contember/schema'
 import { testUuid } from '../../src/testUuid'
@@ -7,7 +7,7 @@ describe('create acl variables', () => {
 
 	const definition: Acl.EntityVariable = { type: Acl.VariableType.entity, entityName: 'Author' }
 	it('prefix from memberships', () => {
-		assert.deepStrictEqual(createAclVariables({
+		expect(createAclVariables({
 			roles: {
 				author: {
 					stages: '*',
@@ -18,14 +18,14 @@ describe('create acl variables', () => {
 					},
 				},
 			},
-		}, [{ role: 'author', variables: [{ name: 'authorID', condition: { in: [testUuid(2)] } }] }]), {
+		}, [{ role: 'author', variables: [{ name: 'authorID', condition: { in: [testUuid(2)] } }] }])).toStrictEqual({
 			author__authorID: { in: [testUuid(2)] },
 		})
 	})
 
 
 	it('undefined variable', () => {
-		assert.deepStrictEqual(createAclVariables({
+		expect(createAclVariables({
 			roles: {
 				author: {
 					stages: '*',
@@ -36,7 +36,7 @@ describe('create acl variables', () => {
 				},
 			},
 		}, [{ role: 'author', variables: [] }],
-		), {
+		)).toStrictEqual({
 			author__authorID: { never: true },
 		})
 	})

package/tests/cases/unit/conditionOptimizer.test.ts

@@ -1,6 +1,12 @@
-import { describe, it, assert } from 'vitest'
+import { describe, it, expect } from 'bun:test'
 import { ConditionOptimizer } from '../../../src/mapper/select/optimizer/ConditionOptimizer'
 
+const assert = {
+	deepStrictEqual: (a: any, b: any) => {
+		expect(a).toEqual(b)
+	},
+}
+
 describe('condition optimizer', () => {
 	const optimizer = new ConditionOptimizer()
 

package/tests/cases/unit/inputPreValidator.test.ts

@@ -11,8 +11,9 @@ import { getEntity } from '@contember/schema-utils'
 import { Mapper } from '../../../src/mapper'
 import { createMock } from '../../src/utils'
 import { testUuid } from '../../src/testUuid'
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 import { SchemaDefinition as def } from '@contember/schema-definition'
+import { assert } from '../../src/assert'
 
 type PrimaryValueExpectation = { entity: string; where: Input.UniqueWhere; result: Value.PrimaryValue }
 type SelectExpectation = {
@@ -32,7 +33,7 @@ const createDataSelectorMock = (primaryValues: PrimaryValueExpectation[], select
 			}
 			assert.deepStrictEqual(entity.name, entry.entity)
 			assert.deepStrictEqual(where, entry.where)
-			return entry.result
+			return [entry.result, undefined]
 		},
 		select: async (
 			mapper: Mapper,

package/tests/cases/unit/inputValidation.test.ts

@@ -10,7 +10,8 @@ import {
 	ValidationContext,
 } from '../../../src/input-validation'
 import { FieldNode, ObjectNode } from '../../../src/inputProcessing'
-import { describe, it, assert } from 'vitest'
+import { describe, expect, it } from 'bun:test'
+import { assert } from '../../src/assert'
 
 describe('input validation tests', () => {
 
@@ -33,7 +34,7 @@ describe('input validation tests', () => {
 
 		const context = ValidationContext.createRootContext(author)
 
-		assert.ok(evaluateValidation(context, rule))
+		expect(evaluateValidation(context, rule)).toBeTrue()
 	})
 
 	it('evaluates collection length rule', () => {
@@ -45,7 +46,7 @@ describe('input validation tests', () => {
 
 		const context = ValidationContext.createRootContext(author)
 
-		assert.ok(evaluateValidation(context, rule))
+		expect(evaluateValidation(context, rule)).toBeTrue()
 	})
 
 	it('collects dependencies', () => {
@@ -178,7 +179,7 @@ describe('input validation tests', () => {
 
 			const context = ValidationContext.createRootContext(author)
 
-			assert.isNull(evaluateValidation(context, rule))
+			expect(evaluateValidation(context, rule)).toBeNull()
 		})
 
 		it('trinary "and" results in a false', () => {
@@ -194,7 +195,7 @@ describe('input validation tests', () => {
 
 			const context = ValidationContext.createRootContext(author)
 
-			assert.notOk(evaluateValidation(context, rule))
+			expect(evaluateValidation(context, rule)).toBeFalsy()
 		})
 		it('trinary "and" results in a true', () => {
 			const rule = validation.rules.and(
@@ -209,7 +210,7 @@ describe('input validation tests', () => {
 
 			const context = ValidationContext.createRootContext(author)
 
-			assert.ok(evaluateValidation(context, rule))
+			expect(evaluateValidation(context, rule)).toBeTrue()
 		})
 	})
 })

package/tests/cases/unit/orderbyHelper.test.ts

@@ -1,7 +1,8 @@
 import { Input, Model } from '@contember/schema'
 import { OrderByHelper } from '../../../src/mapper'
 import { ObjectNode } from '../../../src/inputProcessing'
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
+import { assert } from '../../src/assert'
 
 const entity: Model.Entity = {
 	name: 'Foo',
@@ -66,7 +67,7 @@ describe('order by helper', () => {
 		const objectNode = new ObjectNode('test', 'test', [], {}, {}, [])
 
 		const newNode = OrderByHelper.appendDefaultOrderBy(entity, objectNode, [])
-		assert.isUndefined(newNode.args.orderBy)
+		assert.equal(newNode.args.orderBy, undefined)
 	})
 
 	it('set default order by without defined order', () => {

package/tests/cases/unit/permissionMerger.test.ts

@@ -1,8 +1,9 @@
 import { Acl, Model } from '@contember/schema'
 import { PermissionFactory } from '../../../src/acl'
 import { SchemaBuilder } from '@contember/schema-definition'
-import { assert, describe, it } from 'vitest'
+import { describe, it } from 'bun:test'
 import { emptySchema } from '@contember/schema-utils'
+import { assert } from '../../src/assert'
 
 interface Test {
 	acl: Acl.Schema

package/tests/cases/unit/predicatesFactory.test.ts

@@ -1,7 +1,8 @@
 import { PredicateFactory, VariableInjector } from '../../../src/acl'
 import { SchemaDefinition as def } from '@contember/schema-definition'
 import { Acl, Model } from '@contember/schema'
-import { assert, describe, it } from 'vitest'
+import { describe, it } from 'bun:test'
+import { assert } from '../../src/assert'
 
 namespace TestModel {
 	export class Author {

package/tests/cases/unit/predicatesInjector.test.ts

@@ -1,11 +1,12 @@
 import { PermissionFactory, PredicateFactory, PredicatesInjector, VariableInjector } from '../../../src/acl'
 import { SchemaBuilder, SchemaDefinition as def, AclDefinition as acl, createSchema, PermissionsBuilder } from '@contember/schema-definition'
 import { Acl, Model } from '@contember/schema'
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 import { WhereOptimizer } from '../../../src/mapper/select/optimizer/WhereOptimizer'
 import { ConditionOptimizer } from '../../../src/mapper/select/optimizer/ConditionOptimizer'
 import { acceptFieldVisitor, AllowAllPermissionFactory } from '@contember/schema-utils'
 import { testUuid } from '../../src/testUuid'
+import { assert } from '../../src/assert'
 
 
 

package/tests/cases/unit/uuidType.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest'
+import { describe, it, expect } from 'bun:test'
 import { CustomTypesProvider } from '../../../src'
 
 describe('uuid graphql type', () => {
@@ -6,20 +6,20 @@ describe('uuid graphql type', () => {
 	const customTypesProvider = new CustomTypesProvider()
 	it('accepts valid uuid', () => {
 		const validUuid = 'e0818cf9-eee3-4452-9a13-031435218473'
-		expect(customTypesProvider.uuidType.parseValue(validUuid)).eq(validUuid)
+		expect(customTypesProvider.uuidType.parseValue(validUuid)).toEqual(validUuid)
 	})
 
 	it('accepts valid uuid without dashes', () => {
 		const validUuid = 'e0818cf9eee344529a13031435218473'
-		expect(customTypesProvider.uuidType.parseValue(validUuid)).eq(validUuid)
+		expect(customTypesProvider.uuidType.parseValue(validUuid)).toEqual(validUuid)
 	})
 
 	it('declines invalid uuid', () => {
 		const invalidUuid = '818cf9-eee3-4452-9a13-031435218473'
-		expect(customTypesProvider.uuidType.parseValue(invalidUuid)).eq(undefined)
+		expect(customTypesProvider.uuidType.parseValue(invalidUuid)).toEqual(undefined)
 	})
 
 	it('declines not-string', () => {
-		expect(customTypesProvider.uuidType.parseValue(1)).eq(undefined)
+		expect(customTypesProvider.uuidType.parseValue(1)).toEqual(undefined)
 	})
 })

package/tests/cases/unit/variableInjector.test.ts

@@ -1,7 +1,8 @@
 import { VariableInjector } from '../../../src/acl'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Acl, Model } from '@contember/schema'
-import { assert, describe, it } from 'vitest'
+import { describe, it } from 'bun:test'
+import { assert } from '../../src/assert'
 
 describe('Variable injector', () => {
 

package/tests/cases/unit/whereBuilder.test.ts

@@ -1,10 +1,11 @@
-import { describe, it, assert } from 'vitest'
+import { describe, it } from 'bun:test'
 import { ConditionOptimizer } from '../../../src/mapper/select/optimizer/ConditionOptimizer'
 import { createSchema, SchemaDefinition as def } from '@contember/schema-definition'
 import { WhereOptimizer } from '../../../src/mapper/select/optimizer/WhereOptimizer'
 import { ConditionBuilder, JoinBuilder, PathFactory, WhereBuilder } from '../../../src/mapper'
 import { Compiler, SelectBuilder } from '@contember/database'
 import { Input, Schema } from '@contember/schema'
+import { assert } from '../../src/assert'
 
 namespace WhereBuilderModel {
 	export class Author {