@contember/engine-content-api 2.0.0-alpha.32 → 2.0.0-alpha.36

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-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
 }
@@ -520,10 +520,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
@@ -545,10 +557,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
@@ -574,6 +612,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
@@ -630,74 +692,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
-  connectOrCreate: CategoryConnectOrCreatePostsRelationInput
-  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!
@@ -708,11 +713,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 {
@@ -724,6 +724,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!
@@ -732,10 +736,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!
 }
@@ -794,96 +794,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!
 }
 
@@ -896,6 +896,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!
@@ -904,10 +908,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 = {

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'