@contember/engine-content-api 2.1.0-alpha.30 → 2.1.0-alpha.36

package/tests/cases/integration/graphQlRequests/validation/conditions.test.ts

@@ -7,13 +7,13 @@ export class Author {
 
 	emailValidated = d.boolColumn().notNull()
 
+	// dprint-ignore
 	@(v.when(v.rules.on('emailValidated', v.rules.equals(true))).assertPattern(/.+@.+/, 'E-mail is not valid'))
 	email = d.stringColumn().notNull()
 }
 
 const schema = createSchema({ Author })
 describe('Validation conditions', () => {
-
 	it('succeeds when rule condition is not true', async () => {
 		await testCreate({
 			schema,

package/tests/cases/integration/graphQlRequests/validation/nestedValidation.test.ts

@@ -4,8 +4,6 @@ import { testUuid } from '../../../../src/testUuid'
 import { describe, it } from 'bun:test'
 
 describe('Nested validations', () => {
-
-
 	it('validates nested m:n create with an alias', async () => {
 		class Post {
 			title = d.stringColumn()

package/tests/cases/integration/graphQlRequests/validation/optionalAssert.test.ts

@@ -13,7 +13,6 @@ export class Author {
 const schema = createSchema({ Author })
 
 describe('Optional validation', () => {
-
 	it('create succeeds when null', async () => {
 		await testCreate({
 			schema,
@@ -63,5 +62,4 @@ describe('Optional validation', () => {
 			errors: [],
 		})
 	})
-
 })

package/tests/cases/integration/graphQlRequests/validation/required.test.ts

@@ -4,8 +4,6 @@ import { testUuid } from '../../../../src/testUuid'
 import { describe, it } from 'bun:test'
 
 describe('Required validation', () => {
-
-
 	it('create fails when column value is not set', async () => {
 		class Author {
 			@v.required('Author name is required')

package/tests/cases/integration/graphQlRequests/validation/requiredWhen.test.ts

@@ -8,14 +8,13 @@ export class Author {
 
 	authorWithContact = d.boolColumn().notNull()
 
+	// dprint-ignore
 	@(v.when(v.rules.on('authorWithContact', v.rules.equals(true))).assertNotEmpty('E-mail is required'))
 	email = d.stringColumn()
 }
 
 const schema = createSchema({ Author })
 describe('Required when condition', () => {
-
-
 	it('create succeeds when rule condition is not true', async () => {
 		await testCreate({
 			schema,

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

@@ -11,7 +11,6 @@ const schema = createSchema({
 	Item,
 })
 describe('Logical AND rule', () => {
-
 	it('fails when value not valid', async () => {
 		await testCreate({
 			schema,

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

@@ -11,7 +11,6 @@ const schema = createSchema({
 	Item,
 })
 describe('Length range rule', () => {
-
 	it('fails when value not valid #1', async () => {
 		await testCreate({
 			schema,

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

@@ -3,7 +3,6 @@ import { InputValidation as v } from '@contember/schema-definition'
 import { SchemaDefinition as d } from '@contember/schema-definition'
 import { createSchema, testCreate } from '../utils'
 
-
 class Item {
 	@v.assert(v.rules.maxLength(5), 'failure')
 	value = d.stringColumn()

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

@@ -29,7 +29,4 @@ describe('Min length rule', () => {
 			errors: [],
 		})
 	})
-
 })
-
-

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

@@ -11,8 +11,6 @@ const schema = createSchema({
 })
 
 describe('Not empty rule', () => {
-
-
 	it('fails when value not valid #1', async () => {
 		await testCreate({
 			schema,
@@ -47,5 +45,3 @@ describe('Not empty rule', () => {
 		})
 	})
 })
-
-

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

@@ -28,6 +28,4 @@ describe('Not rule', () => {
 			errors: [],
 		})
 	})
-
-
 })

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

@@ -10,7 +10,6 @@ const schema = createSchema({
 	Item,
 })
 describe('Logical OR rule', () => {
-
 	it('fails when value not valid', async () => {
 		await testCreate({
 			schema,
@@ -38,5 +37,3 @@ describe('Logical OR rule', () => {
 		})
 	})
 })
-
-

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

@@ -30,4 +30,3 @@ describe('Pattern rule', () => {
 		})
 	})
 })
-

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

@@ -38,4 +38,3 @@ describe('Range rule', () => {
 		})
 	})
 })
-

package/tests/cases/integration/graphQlRequests/validation/utils.ts

@@ -53,9 +53,7 @@ export const testUpdate = async (test: UpdateTest) => {
 		return: {
 			data: {
 				result: {
-					errors: (test.errors as any).map((it: string | Result.ValidationError) =>
-						typeof it === 'string' ? { message: { text: it } } : it,
-					),
+					errors: (test.errors as any).map((it: string | Result.ValidationError) => typeof it === 'string' ? { message: { text: it } } : it),
 					valid: test.errors.length === 0,
 				},
 			},
@@ -87,9 +85,7 @@ export const testCreate = async (test: CreateTest) => {
 		return: {
 			data: {
 				result: {
-					errors: (test.errors as any).map((it: string | Result.ValidationError) =>
-						typeof it === 'string' ? { message: { text: it } } : it,
-					),
+					errors: (test.errors as any).map((it: string | Result.ValidationError) => typeof it === 'string' ? { message: { text: it } } : it),
 					valid: test.errors.length === 0,
 				},
 			},

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

@@ -2,17 +2,10 @@ import { graphql, printSchema } from 'graphql'
 import { Acl, Model } from '@contember/schema'
 import * as fs from 'node:fs/promises'
 import * as path from 'node:path'
-import {
-	AllowAllPermissionFactory,
-	SchemaBuilder,
-	SchemaDefinition,
-	c,
-	createSchema,
-	SchemaDefinition as def,
-} from '@contember/schema-definition'
+import { AllowAllPermissionFactory, c, createSchema, SchemaBuilder, SchemaDefinition, SchemaDefinition as def } from '@contember/schema-definition'
 import { Authorizator, GraphQlSchemaBuilderFactory, PermissionFactory } from '../../../../src'
 import * as model from './model'
-import { expect, describe, it } from 'bun:test'
+import { describe, expect, it } from 'bun:test'
 import { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -63,20 +56,21 @@ const testSchema = async (test: Test) => {
 describe('GraphQL schema builder', () => {
 	it('column types', async () => {
 		await testSchema({
-			schema: () => createSchema({
-				Columns: class Columns {
-					string = c.stringColumn()
-					int = c.intColumn()
-					float = c.doubleColumn()
-					boolean = c.boolColumn()
-					date = c.dateColumn()
-					dateTime = c.dateTimeColumn()
-					json = c.jsonColumn()
-					uuid = c.uuidColumn()
-					time = c.timeColumn()
-					enum = c.enumColumn(c.createEnum('a', 'b', 'c'))
-				},
-			}).model,
+			schema: () =>
+				createSchema({
+					Columns: class Columns {
+						string = c.stringColumn()
+						int = c.intColumn()
+						float = c.doubleColumn()
+						boolean = c.boolColumn()
+						date = c.dateColumn()
+						dateTime = c.dateTimeColumn()
+						json = c.jsonColumn()
+						uuid = c.uuidColumn()
+						time = c.timeColumn()
+						enum = c.enumColumn(c.createEnum('a', 'b', 'c'))
+					},
+				}).model,
 			permissions: schema => new AllowAllPermissionFactory().create(schema),
 			graphQlSchemaFile: 'schema-column-types.gql',
 		})
@@ -89,17 +83,13 @@ describe('GraphQL schema builder', () => {
 					.entity('Author', e =>
 						e
 							.column('name', c => c.type(Model.ColumnType.String))
-							.oneHasMany('posts', r => r.target('Post').ownedBy('author')),
-					)
+							.oneHasMany('posts', r => r.target('Post').ownedBy('author')))
 					.entity('Category', e => e.column('name', c => c.type(Model.ColumnType.String)))
 					.entity('Post', e =>
 						e
 							.column('publishedAt', c => c.type(Model.ColumnType.DateTime))
-							.oneHasMany('locales', r =>
-								r.target('PostLocale', e => e.column('title', c => c.type(Model.ColumnType.String))),
-							)
-							.manyHasMany('categories', r => r.target('Category').inversedBy('posts')),
-					),
+							.oneHasMany('locales', r => r.target('PostLocale', e => e.column('title', c => c.type(Model.ColumnType.String))))
+							.manyHasMany('categories', r => r.target('Category').inversedBy('posts'))),
 			permissions: schema => new AllowAllPermissionFactory().create(schema),
 			graphQlSchemaFile: 'schema-basic.gql',
 		})
@@ -112,8 +102,7 @@ describe('GraphQL schema builder', () => {
 					e
 						.column('a', c => c.type(Model.ColumnType.String))
 						.column('b', c => c.type(Model.ColumnType.String))
-						.column('c', c => c.type(Model.ColumnType.String)),
-				),
+						.column('c', c => c.type(Model.ColumnType.String))),
 			permissions: () => ({
 				Test: {
 					predicates: {},
@@ -143,8 +132,7 @@ describe('GraphQL schema builder', () => {
 				builder.entity('Test', e =>
 					e
 						.column('a', c => c.type(Model.ColumnType.String))
-						.column('b', c => c.type(Model.ColumnType.String)),
-				),
+						.column('b', c => c.type(Model.ColumnType.String))),
 			permissions: () => ({
 				Test: {
 					predicates: {},
@@ -161,14 +149,12 @@ describe('GraphQL schema builder', () => {
 		})
 	})
 
-
 	it('conditionally restricted read of some fields', async () => {
 		await testSchema({
 			schema: builder =>
 				builder.entity('Test', e =>
 					e
-						.column('a', c => c.type(Model.ColumnType.String).notNull()),
-				),
+						.column('a', c => c.type(Model.ColumnType.String).notNull())),
 			permissions: () => ({
 				Test: {
 					predicates: {
@@ -188,14 +174,12 @@ describe('GraphQL schema builder', () => {
 		})
 	})
 
-
 	it('conditionally restricted read of whole row', async () => {
 		await testSchema({
 			schema: builder =>
 				builder.entity('Test', e =>
 					e
-						.column('a', c => c.type(Model.ColumnType.String).notNull()),
-				),
+						.column('a', c => c.type(Model.ColumnType.String).notNull())),
 			permissions: () => ({
 				Test: {
 					predicates: {
@@ -219,10 +203,7 @@ describe('GraphQL schema builder', () => {
 		builder.entity('Root', e =>
 			e
 				.column('foo', c => c.type(Model.ColumnType.String))
-				.oneHasMany('r', r =>
-					r.target('OneHasManyEntity', e => e.column('a', c => c.type(Model.ColumnType.String))).ownedBy('r2'),
-				),
-		)
+				.oneHasMany('r', r => r.target('OneHasManyEntity', e => e.column('a', c => c.type(Model.ColumnType.String))).ownedBy('r2')))
 
 	it('ACL with relations - everything allowed', async () => {
 		await testSchema({
@@ -320,10 +301,7 @@ describe('GraphQL schema builder', () => {
 								e
 									.unique(['locale', 'post'])
 									.column('locale', c => c.type(Model.ColumnType.String))
-									.column('title', c => c.type(Model.ColumnType.String)),
-							),
-						),
-				),
+									.column('title', c => c.type(Model.ColumnType.String))))),
 			permissions: schema => new AllowAllPermissionFactory().create(schema),
 			graphQlSchemaFile: 'schema-has-many-reduction.gql',
 		})
@@ -339,8 +317,7 @@ describe('GraphQL schema builder', () => {
 						entity
 							.column('unique', column => column.type(Model.ColumnType.Enum, { enumName: 'one' }).unique().notNull())
 							.oneHasOne('introVideo', relation => relation.target('Video').notNull().inversedBy('frontPageForIntro'))
-							.oneHasMany('inHouseVideos', relation => relation.target('Video').ownedBy('frontPage')),
-					),
+							.oneHasMany('inHouseVideos', relation => relation.target('Video').ownedBy('frontPage'))),
 			permissions: schema => new AllowAllPermissionFactory().create(schema),
 			graphQlSchemaFile: 'schema-bug-66.gql',
 		})
@@ -375,17 +352,13 @@ describe('GraphQL schema builder', () => {
 					.entity('Author', e =>
 						e
 							.column('name', c => c.type(Model.ColumnType.String))
-							.oneHasMany('posts', r => r.target('Post').ownedBy('author')),
-					)
+							.oneHasMany('posts', r => r.target('Post').ownedBy('author')))
 					.entity('Category', e => e.column('name', c => c.type(Model.ColumnType.String)))
 					.entity('Post', e =>
 						e
 							.column('publishedAt', c => c.type(Model.ColumnType.DateTime))
-							.oneHasMany('locales', r =>
-								r.target('PostLocale', e => e.column('title', c => c.type(Model.ColumnType.String))),
-							)
-							.manyHasMany('categories', r => r.target('Category').inversedBy('posts')),
-					),
+							.oneHasMany('locales', r => r.target('PostLocale', e => e.column('title', c => c.type(Model.ColumnType.String))))
+							.manyHasMany('categories', r => r.target('Category').inversedBy('posts'))),
 			permissions: schema => new AllowAllPermissionFactory().create(schema, true),
 			graphQlSchemaFile: 'schema-custom-primary.gql',
 		})
@@ -393,14 +366,12 @@ describe('GraphQL schema builder', () => {
 
 	it('aliased type', async () => {
 		await testSchema({
-			schema: builder =>
-				builder.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String).typeAlias('AuthorName'))),
+			schema: builder => builder.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String).typeAlias('AuthorName'))),
 			permissions: schema => new AllowAllPermissionFactory().create(schema),
 			graphQlSchemaFile: 'schema-aliased-type.gql',
 		})
 	})
 
-
 	it('view entity', async () => {
 		await testSchema({
 			schema: () => SchemaDefinition.createModel(ViewEntity),
@@ -422,7 +393,6 @@ describe('GraphQL schema builder', () => {
 		})
 	})
 
-
 	it('array', async () => {
 		const schema = createSchema({
 			Foo: class Foo {

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

@@ -1,10 +1,9 @@
-import { describe, it, expect } from 'bun:test'
+import { describe, expect, it } from 'bun:test'
 import { createAclVariables } from '../../../src'
 import { Acl } from '@contember/schema'
 import { testUuid } from '../../src/testUuid'
 
 describe('create acl variables', () => {
-
 	const definition: Acl.EntityVariable = { type: Acl.VariableType.entity, entityName: 'Author' }
 	it('prefix from memberships', () => {
 		expect(createAclVariables({
@@ -14,8 +13,7 @@ describe('create acl variables', () => {
 					variables: {
 						authorID: definition,
 					},
-					entities: {
-					},
+					entities: {},
 				},
 			},
 		}, [{ role: 'author', variables: [{ name: 'authorID', condition: { in: [testUuid(2)] } }] }])).toStrictEqual({
@@ -23,7 +21,6 @@ describe('create acl variables', () => {
 		})
 	})
 
-
 	it('undefined variable', () => {
 		expect(createAclVariables({
 			roles: {
@@ -35,8 +32,7 @@ describe('create acl variables', () => {
 					entities: {},
 				},
 			},
-		}, [{ role: 'author', variables: [] }],
-		)).toStrictEqual({
+		}, [{ role: 'author', variables: [] }])).toStrictEqual({
 			author__authorID: { never: true },
 		})
 	})

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

@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'bun:test'
+import { describe, expect, it } from 'bun:test'
 import { ConditionOptimizer } from '../../../src/mapper/select/optimizer/ConditionOptimizer'
 
 const assert = {
@@ -11,124 +11,169 @@ describe('condition optimizer', () => {
 	const optimizer = new ConditionOptimizer()
 
 	it('remove OR when only 1', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			or: [{ eq: 1 }],
-		}), { eq: 1 })
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				or: [{ eq: 1 }],
+			}),
+			{ eq: 1 },
+		)
 	})
 
 	it('keep OR when > 1', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			or: [{ eq: 1 }, { eq: 2 }],
-		}), {
-			or: [{ eq: 1 }, { eq: 2 }],
-		})
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				or: [{ eq: 1 }, { eq: 2 }],
+			}),
+			{
+				or: [{ eq: 1 }, { eq: 2 }],
+			},
+		)
 	})
 
 	it('keep never in OR', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			or: [{ never: true }],
-		}), false)
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				or: [{ never: true }],
+			}),
+			false,
+		)
 	})
 
 	it('optimizes OR with never', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			or: [{ eq: 1 }, { never: true }],
-		}), { eq: 1 })
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				or: [{ eq: 1 }, { never: true }],
+			}),
+			{ eq: 1 },
+		)
 	})
 
 	it('optimizes OR with always', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			or: [{ eq: 1 }, { always: true }],
-		}), true)
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				or: [{ eq: 1 }, { always: true }],
+			}),
+			true,
+		)
 	})
 
 	it('optimizes AND with never', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			and: [{ eq: 1 }, { never: true }],
-		}), false)
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				and: [{ eq: 1 }, { never: true }],
+			}),
+			false,
+		)
 	})
 
 	it('optimizes AND with always', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			and: [{ eq: 1 }, { always: true }],
-		}), { eq: 1 })
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				and: [{ eq: 1 }, { always: true }],
+			}),
+			{ eq: 1 },
+		)
 	})
 
 	it('optimizes NOT with never', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			not: { never: true },
-		}), true)
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				not: { never: true },
+			}),
+			true,
+		)
 	})
 
 	it('optimizes NOT with always', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			not: { always: true },
-		}), false)
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				not: { always: true },
+			}),
+			false,
+		)
 	})
 
 	it('optimizes empty AND', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			and: [],
-		}), {})
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				and: [],
+			}),
+			{},
+		)
 	})
 
 	it('optimizes empty OR', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			or: [],
-		}), {})
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				or: [],
+			}),
+			{},
+		)
 	})
 
-
 	it('flattens AND', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			eq: 0,
-			and: [
-				{ eq: 1 },
-				{
-					eq: 2,
-					and: [
-						{ eq: 3 },
-						{
-							eq: 4,
-							and: [{ eq: 5 }, { eq: 6 }],
-						},
-					],
-				},
-			],
-		}), { and: [{ eq: 0 }, { eq: 1 }, { eq: 2 }, { eq: 3 }, { eq: 4 }, { eq: 5 }, { eq: 6 }] })
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				eq: 0,
+				and: [
+					{ eq: 1 },
+					{
+						eq: 2,
+						and: [
+							{ eq: 3 },
+							{
+								eq: 4,
+								and: [{ eq: 5 }, { eq: 6 }],
+							},
+						],
+					},
+				],
+			}),
+			{ and: [{ eq: 0 }, { eq: 1 }, { eq: 2 }, { eq: 3 }, { eq: 4 }, { eq: 5 }, { eq: 6 }] },
+		)
 	})
 
 	it('flattens OR', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			or: [
-				{ eq: 1 },
-				{
-
-					or: [
-						{ eq: 2 },
-						{ or: [{ eq: 3 }, { eq: 4 }] },
-					],
-				},
-			],
-		}), { or: [{ eq: 1 }, { eq: 2 }, { eq: 3 }, { eq: 4 }] })
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				or: [
+					{ eq: 1 },
+					{
+						or: [
+							{ eq: 2 },
+							{ or: [{ eq: 3 }, { eq: 4 }] },
+						],
+					},
+				],
+			}),
+			{ or: [{ eq: 1 }, { eq: 2 }, { eq: 3 }, { eq: 4 }] },
+		)
 	})
 
 	it('flattens NOT', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			not: { not: { not: { eq: 1 } } },
-		}), { not: { eq: 1 } })
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				not: { not: { not: { eq: 1 } } },
+			}),
+			{ not: { eq: 1 } },
+		)
 	})
 
 	it('combine AND and OR', () => {
-		assert.deepStrictEqual(optimizer.optimize({
-			or: [
-				{ and: [{ eq: 1 }, { eq: 2 }] },
-				{ and: [{ eq: 3 }, { eq: 4 }], eq: 5 },
-			],
-		}), { or: [
-			{ and: [{ eq: 1 }, { eq: 2 }] },
-			{ and: [{ eq: 3 }, { eq: 4 }, { eq: 5 }] },
-		] })
+		assert.deepStrictEqual(
+			optimizer.optimize({
+				or: [
+					{ and: [{ eq: 1 }, { eq: 2 }] },
+					{ and: [{ eq: 3 }, { eq: 4 }], eq: 5 },
+				],
+			}),
+			{
+				or: [
+					{ and: [{ eq: 1 }, { eq: 2 }] },
+					{ and: [{ eq: 3 }, { eq: 4 }, { eq: 5 }] },
+				],
+			},
+		)
 	})
 
 	it('remove conditions with null value', () => {