@contember/engine-content-api 2.1.0-alpha.9 → 2.1.0-beta.2

package/tests/cases/integration/graphQlRequests/update/validation/toBeFixed.test.ts

@@ -6,9 +6,7 @@ import { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
 
 const bookSchema = new SchemaBuilder()
-	.entity('Book', entity =>
-		entity.column('name', c => c.type(Model.ColumnType.String)).oneHasMany('tags', r => r.target('Tag')),
-	)
+	.entity('Book', entity => entity.column('name', c => c.type(Model.ColumnType.String)).oneHasMany('tags', r => r.target('Tag')))
 	.entity('Tag', e => e.column('label'))
 	.buildSchema()
 
@@ -26,15 +24,15 @@ const bookValidation: Validation.Schema = {
 }
 
 test.skip('update book with validation - failed', async () => {
-	//fixme
-	return
-
+	// fixme
 	await execute({
 		schema: bookSchema,
 		validation: bookValidation,
 		query: GQL`
           mutation {
-              updateBook(by: {id: "${testUuid(1)}"}, data: {name: "", tags: [{connect: {id: "${testUuid(2)}"}}, {disconnect: {id: "${testUuid(3)}"}}]}) {
+              updateBook(by: {id: "${testUuid(1)}"}, data: {name: "", tags: [{connect: {id: "${testUuid(2)}"}}, {disconnect: {id: "${
+			testUuid(3)
+		}"}}]}) {
                   ok
                   validation {
                       valid
@@ -60,14 +58,16 @@ test.skip('update book with validation - failed', async () => {
 		executes: [
 			...sqlTransaction([
 				{
-					sql: SQL`select "root_"."name" as "root_name", "root_"."id" as "root_id", "root_"."id" as "root_id" from "public"."book" as "root_" where "root_"."id" = ?`,
+					sql:
+						SQL`select "root_"."name" as "root_name", "root_"."id" as "root_id", "root_"."id" as "root_id" from "public"."book" as "root_" where "root_"."id" = ?`,
 					parameters: [testUuid(1)],
 					response: {
 						rows: [{ root_id: testUuid(1), name: 'John' }],
 					},
 				},
 				{
-					sql: SQL`select "root_"."book_id" as "__grouping_key", "root_"."id" as "root_id" from  "public"."tag" as "root_"   where "root_"."book_id" in (?)`,
+					sql:
+						SQL`select "root_"."book_id" as "__grouping_key", "root_"."id" as "root_id" from  "public"."tag" as "root_"   where "root_"."book_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: {
 						rows: [{ __grouping_key: testUuid(1), root_id: testUuid(3) }],
@@ -110,4 +110,3 @@ test.skip('update book with validation - failed', async () => {
 		},
 	})
 })
-

package/tests/cases/integration/graphQlRequests/upsert/basicUpsert.test.ts

@@ -11,8 +11,7 @@ test('upsert author (not exists)', async () => {
 			.entity('Author', entity =>
 				entity
 					.column('name', c => c.type(Model.ColumnType.String))
-					.column('slug', c => c.type(Model.ColumnType.String).unique()),
-			)
+					.column('slug', c => c.type(Model.ColumnType.String).unique()))
 			.buildSchema(),
 		query: GQL`
           mutation {
@@ -67,8 +66,7 @@ test('upsert author (exists)', async () => {
 			.entity('Author', entity =>
 				entity
 					.column('name', c => c.type(Model.ColumnType.String))
-					.column('slug', c => c.type(Model.ColumnType.String).unique()),
-			)
+					.column('slug', c => c.type(Model.ColumnType.String).unique()))
 			.buildSchema(),
 		query: GQL`
           mutation {
@@ -88,7 +86,8 @@ test('upsert author (exists)', async () => {
 					response: { rows: [{ id: testUuid(2) }] },
 				},
 				{
-					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id", "root_"."slug"  from "public"."author" as "root_"  where "root_"."id" = ?) 
+					sql:
+						SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id", "root_"."slug"  from "public"."author" as "root_"  where "root_"."id" = ?) 
 						update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['John Doe', testUuid(2)],
 					response: { rows: [{ name_old__: 'Foo' }] },
@@ -119,8 +118,7 @@ test('upsert author (exists) with noop update)', async () => {
 			.entity('Author', entity =>
 				entity
 					.column('name', c => c.type(Model.ColumnType.String))
-					.column('slug', c => c.type(Model.ColumnType.String).unique()),
-			)
+					.column('slug', c => c.type(Model.ColumnType.String).unique()))
 			.buildSchema(),
 		query: GQL`
           mutation {
@@ -158,5 +156,3 @@ test('upsert author (exists) with noop update)', async () => {
 		},
 	})
 })
-
-

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/integration/graphQlSchema/schema-column-types.gql

@@ -204,6 +204,7 @@ input JsonCondition {
   not: JsonCondition
   null: Boolean
   isNull: Boolean
+  includes: Json
 }
 
 input TimeCondition {

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 },
 		})
 	})