@contember/engine-content-api 1.2.0-alpha.3 → 1.2.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "1.2.0-alpha.3",
+  "version": "1.2.0-alpha.4",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -10,19 +10,19 @@
     "test": "vitest --no-threads"
   },
   "dependencies": {
-    "@contember/database": "^1.2.0-alpha.3",
-    "@contember/dic": "^1.2.0-alpha.3",
-    "@contember/engine-common": "^1.2.0-alpha.3",
-    "@contember/graphql-utils": "^1.2.0-alpha.3",
-    "@contember/schema": "^1.2.0-alpha.3",
-    "@contember/schema-utils": "^1.2.0-alpha.3",
+    "@contember/database": "^1.2.0-alpha.4",
+    "@contember/dic": "^1.2.0-alpha.4",
+    "@contember/engine-common": "^1.2.0-alpha.4",
+    "@contember/graphql-utils": "^1.2.0-alpha.4",
+    "@contember/schema": "^1.2.0-alpha.4",
+    "@contember/schema-utils": "^1.2.0-alpha.4",
     "@graphql-tools/schema": "^8.3.5",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "^1.2.0-alpha.3",
-    "@contember/engine-api-tester": "^1.2.0-alpha.3",
-    "@contember/schema-definition": "^1.2.0-alpha.3",
+    "@contember/database-tester": "^1.2.0-alpha.4",
+    "@contember/engine-api-tester": "^1.2.0-alpha.4",
+    "@contember/schema-definition": "^1.2.0-alpha.4",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",

package/src/acl/VariableInjector.ts

@@ -10,31 +10,16 @@ export class VariableInjector {
 		return predicateDefinitionProcessor.process(entity, where, {
 			handleColumn: ({ value }) => {
 				if (typeof value === 'string') {
-					return this.createCondition(this.variables[value] || undefined)
+					return this.variables[value] ?? { never: true }
 				}
 				return value as Input.Condition
 			},
 			handleRelation: ({ value, targetEntity }) => {
 				if (typeof value === 'string') {
-					return { [targetEntity.primary]: this.createCondition(this.variables[value] || undefined) }
+					return { [targetEntity.primary]: this.variables[value] ?? { never: true } }
 				}
 				return value
 			},
 		})
 	}
-
-	private createCondition(variable: Acl.VariableMapEntry | undefined): Input.Condition {
-		if (variable === undefined || variable.value.length === 0) {
-			return { never: true }
-		}
-
-		const { value, definition } = variable
-		if (definition.type === Acl.VariableType.condition) {
-			if (value.length === 1) {
-				return value[0] as Input.Condition
-			}
-			return { or: value as Input.Condition[] }
-		}
-		return { in: value as (string | number)[] }
-	}
 }

package/src/acl/VariableUtils.ts

@@ -1,41 +1,20 @@
-import { Acl } from '@contember/schema'
-import { getRoleVariables } from '@contember/schema-utils'
+import { Acl, Input } from '@contember/schema'
+import { getRoleVariables, ParsedMembership } from '@contember/schema-utils'
 
-type Memberships = readonly { role: string; variables: readonly { name: string; values: readonly string[] }[] }[]
 
 export const createAclVariables = (
 	aclSchema: Acl.Schema,
-	identity: {
-		identityId: string
-		personId: string | null
-		memberships: Memberships
-	},
+	memberships: readonly ParsedMembership[],
 ): Acl.VariablesMap => {
 
-	const variablesEntries = identity.memberships.flatMap(
+	const variablesEntries = memberships.flatMap(
 		membership => {
 			const roleVariables = getRoleVariables(membership.role, aclSchema)
-			const membershipVariablesMap = Object.fromEntries(membership.variables.map(it => [it.name, it.values]))
+			const membershipVariablesMap = Object.fromEntries(membership.variables.map(it => [it.name, it.condition]))
 
-			return Object.entries(roleVariables).map(([name, def]): [string, Acl.VariableMapEntry] => {
+			return Object.keys(roleVariables).map((name): [string, Input.Condition] => {
 				const prefixed = prefixVariable(membership.role, name)
-				const value = (() => {
-					switch (def.type) {
-						case Acl.VariableType.entity:
-							return membershipVariablesMap[name] ?? []
-						case Acl.VariableType.predefined:
-							switch (def.value) {
-								case 'identityID':
-									return [identity.identityId]
-								case 'personID':
-									return identity.personId ? [identity.personId] : []
-							}
-							throw new Error(`Unknown predefined variable ${def.value}`)
-						case Acl.VariableType.condition:
-							return (membershipVariablesMap[name] ?? []).map(it => JSON.parse(it))
-					}
-				})()
-				return [prefixed, { value: value, definition: def }]
+				return [prefixed, membershipVariablesMap[name] ?? { never: true }]
 			})
 		},
 	)

package/src/input-validation/EntityRulesResolver.ts

@@ -35,7 +35,7 @@ export class EntityRulesResolver {
 
 	public getEntityRules(entityName: string): Validation.EntityRules {
 		const definedRules = this.validationSchema[entityName] || {}
-		const fieldsNotNullFlag = acceptEveryFieldVisitor(this.model, entityName, new NotNullFieldsVisitor())
+		const fieldsNotNullFlag = acceptEveryFieldVisitor(this.model, entityName, new RequiredFieldsVisitor())
 		const notNullFields = Object.keys(filterObject(fieldsNotNullFlag, (field, val) => val))
 		return notNullFields.reduce(
 			(entityRules, field) => ({
@@ -50,9 +50,9 @@ export class EntityRulesResolver {
 	}
 }
 
-class NotNullFieldsVisitor implements Model.RelationByTypeVisitor<boolean>, Model.ColumnVisitor<boolean> {
+class RequiredFieldsVisitor implements Model.RelationByTypeVisitor<boolean>, Model.ColumnVisitor<boolean> {
 	visitColumn(entity: Model.Entity, column: Model.AnyColumn): boolean {
-		return !column.nullable
+		return !column.nullable && typeof column.default === 'undefined' && !column.sequence
 	}
 
 	visitManyHasManyInverse(): boolean {

package/src/input-validation/ValidationContext.ts

@@ -10,7 +10,7 @@ namespace ValidationContext {
 	}
 
 	export type NodeType = Value.Object
-	export type ValueType = Value.FieldValue
+	export type ValueType = Value.FieldValue | undefined
 
 	export enum NodeContextType {
 		value = 'value',
@@ -69,7 +69,7 @@ namespace ValidationContext {
 
 	export const createSingleNodeContext = (
 		parent: NodeContext | ValueContext,
-		value: object | null | string | number | boolean,
+		value: ValueType,
 	): NodeContext | ValueContext => {
 		if (Array.isArray(value)) {
 			throw new Error('Nested arrays are not allowed')

package/tests/cases/integration/graphQlDb/insert/insertSequence.test.ts

@@ -0,0 +1,34 @@
+import { SchemaDefinition as def } from '@contember/schema-definition'
+import { GQL } from '../../../../src/tags'
+import { test } from 'vitest'
+import { executeDbTest } from '@contember/engine-api-tester'
+
+namespace SeqModel {
+	export class Order {
+		seqId = def.intColumn().sequence().notNull()
+	}
+}
+
+test('insert author with id', async () => {
+	const schema = def.createModel(SeqModel)
+	await executeDbTest({
+		schema: schema,
+		query: GQL`
+          mutation {
+              createOrder(data: {}) {
+                  node {
+                  	seqId
+                  }
+              }
+          }`,
+		seed: [],
+		return: {
+			createOrder: {
+				node: {
+					seqId: 1,
+				},
+			},
+		},
+	})
+})
+

package/tests/cases/integration/graphQlRequests/delete/aclDelete.test.ts

@@ -32,12 +32,7 @@ test('delete post with acl', async () => {
 			},
 		},
 		variables: {
-			locale_variable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['cs'] }],
-			},
+			locale_variable: { in: ['cs'] },
 		},
 		executes: [
 			...sqlTransaction([

package/tests/cases/integration/graphQlRequests/insert/acl/setField.test.ts

@@ -34,12 +34,7 @@ test('set a name - allowed', async () => {
 			},
 		},
 		variables: {
-			name_variable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['John', 'Jack'] }],
-			},
+			name_variable: { in: ['John', 'Jack'] },
 		},
 		executes: [
 			...sqlTransaction([
@@ -94,12 +89,7 @@ test('set a name - denied', async () => {
 			},
 		},
 		variables: {
-			name_variable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['John', 'Jack'] }],
-			},
+			name_variable: { in: ['John', 'Jack'] },
 		},
 		executes: [
 			...failedTransaction([

package/tests/cases/integration/graphQlRequests/insert/aclInsert.test.ts

@@ -27,12 +27,7 @@ test('insert author (with acl)', async () => {
 			},
 		},
 		variables: {
-			name_variable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['John', 'Jack'] }],
-			},
+			name_variable: { in: ['John', 'Jack'] },
 		},
 		query: GQL`
         mutation {

package/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.ts

@@ -45,12 +45,7 @@ test('querying id and title', async () => {
 		schema: schema,
 		permissions: permissions,
 		variables: {
-			localeVariable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['cs'] }],
-			},
+			localeVariable: { in: ['cs'] },
 		},
 		query: GQL`
         query {
@@ -126,12 +121,7 @@ test('querying with extra where', async () => {
 		schema: schema,
 		permissions: permissions,
 		variables: {
-			localeVariable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['cs'] }],
-			},
+			localeVariable: { in: ['cs'] },
 		},
 		query: GQL`
         query {
@@ -177,12 +167,7 @@ test('querying only id', async () => {
 		schema: schema,
 		permissions: permissions,
 		variables: {
-			localeVariable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['cs'] }],
-			},
+			localeVariable: { in: ['cs'] },
 		},
 		query: GQL`
         query {
@@ -254,12 +239,7 @@ test('querying on nested field', async () => {
 		schema: schema,
 		permissions: permissions,
 		variables: {
-			localeVariable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['cs'] }],
-			},
+			localeVariable: { in: ['cs'] },
 		},
 		query: GQL`
         query {

package/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.ts

@@ -58,12 +58,7 @@ test('querying post + author name', async () => {
 		schema: schema,
 		permissions: permissions,
 		variables: {
-			countryVariable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['Czechia'] }],
-			},
+			countryVariable: { in: ['Czechia'] },
 		},
 		query: GQL`
         query {

package/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'vitest'
 import { execute, failedTransaction, sqlTransaction } from '../../../../../src/test'
 import { SchemaBuilder } from '@contember/schema-definition'
-import { Acl, Model } from '@contember/schema'
+import {  Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
 
@@ -35,12 +35,7 @@ test('update name', async () => {
 			},
 		},
 		variables: {
-			name_variable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['John', 'Jack'] }],
-			},
+			name_variable: { in: ['John', 'Jack'] },
 		},
 		executes: [
 			...sqlTransaction([
@@ -103,12 +98,7 @@ test('update name - denied', async () => {
 			},
 		},
 		variables: {
-			name_variable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['John', 'Jack'] }],
-			},
+			name_variable: { in: ['John', 'Jack'] },
 		},
 		executes: [
 			...failedTransaction([
@@ -186,18 +176,8 @@ test('update m:n', async () => {
 			},
 		},
 		variables: {
-			post_name_variable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['Lorem ipsum', 'Dolor sit'] }],
-			},
-			category_name_variable: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ in: ['foo', 'bar'] }],
-			},
+			post_name_variable: { in: ['Lorem ipsum', 'Dolor sit'] },
+			category_name_variable: { in: ['foo', 'bar'] },
 		},
 		query: GQL`mutation  {
           updatePost(by: {id: "${testUuid(1)}"}, data: {categories: [

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

@@ -18,12 +18,8 @@ describe('create acl variables', () => {
 					},
 				},
 			},
-		}, {
-			identityId: testUuid(1),
-			personId: null,
-			memberships: [{ role: 'author', variables: [{ name: 'authorID', values: [testUuid(2)] }] }],
-		}), {
-			author__authorID: { definition, value: [testUuid(2)] },
+		}, [{ role: 'author', variables: [{ name: 'authorID', condition: { in: [testUuid(2)] } }] }]), {
+			author__authorID: { in: [testUuid(2)] },
 		})
 	})
 
@@ -39,34 +35,9 @@ describe('create acl variables', () => {
 					entities: {},
 				},
 			},
-		}, {
-			identityId: testUuid(1),
-			personId: null,
-			memberships: [{ role: 'author', variables: [] }],
-		}), {
-			author__authorID: { definition, value: [] },
-		})
-	})
-
-
-	it('predefined', () => {
-		const definition: Acl.PredefinedVariable = { type: Acl.VariableType.predefined, value: 'identityID' }
-		assert.deepStrictEqual(createAclVariables({
-			roles: {
-				author: {
-					stages: '*',
-					variables: {
-						authorIdentity: definition,
-					},
-					entities: {},
-				},
-			},
-		}, {
-			identityId: testUuid(1),
-			personId: null,
-			memberships: [{ role: 'author', variables: [] }],
-		}), {
-			author__authorIdentity: { definition, value: [testUuid(1)] },
+		}, [{ role: 'author', variables: [] }],
+		), {
+			author__authorID: { never: true },
 		})
 	})
 })

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

@@ -11,6 +11,7 @@ const entity: Model.Entity = {
 	fields: {},
 	unique: {},
 	eventLog: { enabled: true },
+	indexes: {},
 }
 
 describe('order by helper', () => {

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

@@ -45,12 +45,7 @@ const permissions: Acl.Permissions = {
 describe('Predicates injector', () => {
 
 	const variables: Acl.VariablesMap = {
-		localeVariable: {
-			definition: {
-				type: Acl.VariableType.condition,
-			},
-			value: [{ in: ['cs'] }],
-		},
+		localeVariable: { in: ['cs'] },
 	}
 	it('injects predicate', () => {
 		const injector = new PredicatesInjector(

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

@@ -19,19 +19,8 @@ describe('Variable injector', () => {
 
 		const ids = ['91528a5c-839b-4114-9952-d661914a607f', '1e2f3937-a0b1-4105-8aae-6da8ac9fc146']
 		const injector = new VariableInjector(schema, {
-			site: {
-				definition: {
-					type: Acl.VariableType.entity,
-					entityName: 'Site',
-				},
-				value: ids,
-			},
-			locale: {
-				definition: {
-					type: Acl.VariableType.condition,
-				},
-				value: [{ eq: 'cs' }],
-			},
+			site: { in: ids },
+			locale: { eq: 'cs' },
 		})
 		const result = injector.inject(schema.entities['PostLocale'], {
 			or: [