@contember/engine-content-api 1.2.0-alpha.10 → 1.2.0-alpha.11

package/src/schema/mutations/CreateEntityRelationInputFieldVisitor.ts

@@ -26,29 +26,16 @@ export class CreateEntityRelationInputFieldVisitor implements
 		throw new ImplementationException('CreateEntityRelationInputFieldVisitor: Not applicable for a column')
 	}
 
-	public visitHasOne(
-		entity: Model.Entity,
-		relation: Model.Relation & Model.NullableRelation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.Relation | null,
-	): GraphQLInputObjectType | undefined {
-		return this.createInputObject(entity, relation, targetEntity, targetRelation, false)
+	public visitHasOne(context: Model.ManyHasOneContext): GraphQLInputObjectType | undefined {
+		return this.createInputObject(context, false)
 	}
 
-	public visitHasMany(
-		entity: Model.Entity,
-		relation: Model.Relation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.Relation | null,
-	): GraphQLInputObjectType | undefined {
-		return this.createInputObject(entity, relation, targetEntity, targetRelation, true)
+	public visitHasMany(context: Model.OneHasManyContext): GraphQLInputObjectType | undefined {
+		return this.createInputObject(context, true)
 	}
 
 	public createInputObject(
-		entity: Model.Entity,
-		relation: Model.Relation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.Relation | null,
+		{ entity, relation, targetEntity, targetRelation }: Model.AnyRelationContext,
 		withAliasField: boolean,
 	): GraphQLInputObjectType | undefined {
 		const targetName = targetRelation ? targetRelation.name : undefined

package/src/schema/mutations/UpdateEntityInputFieldVisitor.ts

@@ -14,7 +14,7 @@ export class UpdateEntityInputFieldVisitor implements
 		private readonly updateEntityRelationInputProvider: UpdateEntityRelationInputProvider,
 	) {}
 
-	public visitColumn(entity: Model.Entity, column: Model.AnyColumn): GraphQLInputFieldConfig | undefined {
+	public visitColumn({ entity, column }: Model.ColumnContext) {
 		if (entity.primary === column.name) {
 			return undefined
 		}
@@ -27,10 +27,7 @@ export class UpdateEntityInputFieldVisitor implements
 		}
 	}
 
-	public visitHasOne(
-		entity: Model.Entity,
-		relation: Model.Relation & Model.NullableRelation,
-	): GraphQLInputFieldConfig | undefined {
+	public visitHasOne({ entity, relation }: Model.AnyHasOneRelationContext) {
 		const type = this.updateEntityRelationInputProvider.getUpdateEntityRelationInput(entity.name, relation.name)
 		if (type === undefined) {
 			return undefined
@@ -40,7 +37,7 @@ export class UpdateEntityInputFieldVisitor implements
 		}
 	}
 
-	public visitHasMany(entity: Model.Entity, relation: Model.Relation): GraphQLInputFieldConfig | undefined {
+	public visitHasMany({ entity, relation }: Model.AnyHasManyRelationContext) {
 		const type = this.updateEntityRelationInputProvider.getUpdateEntityRelationInput(entity.name, relation.name)
 		if (type === undefined) {
 			return undefined

package/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.ts

@@ -11,23 +11,19 @@ export class UpdateEntityRelationAllowedOperationsVisitor implements
 		throw new Error('UpdateEntityRelationAllowedOperationsVisitor: Not applicable for a column')
 	}
 
-	public visitManyHasManyInverse({}, {}, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyOwningRelation) {
+	public visitManyHasManyInverse({ targetEntity, targetRelation }: Model.ManyHasManyInverseContext) {
 		return this.getAllowedOperations(targetEntity, targetEntity, targetRelation)
 	}
 
-	public visitManyHasManyOwning(
-		entity: Model.Entity,
-		relation: Model.ManyHasManyOwningRelation,
-		targetEntity: Model.Entity,
-	) {
+	public visitManyHasManyOwning({ entity, targetEntity, relation }: Model.ManyHasManyOwningContext) {
 		return this.getAllowedOperations(targetEntity, entity, relation)
 	}
 
-	public visitOneHasMany({}, {}, targetEntity: Model.Entity, targetRelation: Model.ManyHasOneRelation) {
+	public visitOneHasMany({ targetRelation, targetEntity }: Model.OneHasManyContext) {
 		return this.getAllowedOperations(targetEntity, targetEntity, targetRelation)
 	}
 
-	public visitManyHasOne(entity: Model.Entity, relation: Model.ManyHasOneRelation, targetEntity: Model.Entity) {
+	public visitManyHasOne({ targetEntity, relation, entity }: Model.ManyHasOneContext) {
 		const operations = this.getAllowedOperations(targetEntity, entity, relation)
 		if (relation.nullable) {
 			return operations
@@ -39,12 +35,7 @@ export class UpdateEntityRelationAllowedOperationsVisitor implements
 		return operations.filter(it => !forbiddenOperations.includes(it))
 	}
 
-	public visitOneHasOneInverse(
-		{},
-		relation: Model.OneHasOneInverseRelation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.OneHasOneOwningRelation,
-	) {
+	public visitOneHasOneInverse({ relation, targetEntity, targetRelation }: Model.OneHasOneInverseContext) {
 		const operations = this.getAllowedOperations(targetEntity, targetEntity, targetRelation)
 		if (relation.nullable || targetRelation.nullable) {
 			return operations
@@ -52,12 +43,7 @@ export class UpdateEntityRelationAllowedOperationsVisitor implements
 		return operations.filter(it => it === Input.UpdateRelationOperation.update)
 	}
 
-	public visitOneHasOneOwning(
-		entity: Model.Entity,
-		relation: Model.OneHasOneOwningRelation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.OneHasOneInverseRelation | null,
-	) {
+	public visitOneHasOneOwning({ targetEntity, entity, relation, targetRelation }: Model.OneHasOneOwningContext) {
 		const operations = this.getAllowedOperations(targetEntity, entity, relation)
 		if (relation.nullable || !targetRelation || targetRelation.nullable) {
 			return operations

package/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.ts

@@ -27,12 +27,7 @@ export class UpdateEntityRelationInputFieldVisitor implements
 		throw new Error('UpdateEntityRelationInputFieldVisitor: Not applicable for a column')
 	}
 
-	public visitHasOne(
-		entity: Model.Entity,
-		relation: Model.Relation & Model.NullableRelation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.Relation | null,
-	): GraphQLInputObjectType | undefined {
+	public visitHasOne({ targetRelation, targetEntity, relation, entity }: Model.AnyHasOneRelationContext) {
 		const withoutRelation = targetRelation ? targetRelation.name : undefined
 
 		const whereInput = this.createWhereInput(targetEntity)
@@ -84,12 +79,7 @@ export class UpdateEntityRelationInputFieldVisitor implements
 		})
 	}
 
-	public visitHasMany(
-		entity: Model.Entity,
-		relation: Model.Relation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.Relation | null,
-	): GraphQLInputObjectType | undefined {
+	public visitHasMany({ entity, relation, targetEntity, targetRelation }: Model.AnyHasManyRelationContext) {
 		const withoutRelation = targetRelation ? targetRelation.name : undefined
 
 		const whereInput = this.createWhereInput(targetEntity)

package/src/utils/uniqueWhereFields.ts

@@ -8,10 +8,10 @@ export const getFieldsForUniqueWhere = (schema: Model.Schema, entity: Model.Enti
 			visitColumn: () => undefined,
 			visitManyHasManyInverse: () => undefined,
 			visitManyHasManyOwning: () => undefined,
-			visitOneHasMany: ({}, relation) => [relation.name],
+			visitOneHasMany: ({ relation }) => [relation.name],
 			visitManyHasOne: () => undefined,
-			visitOneHasOneInverse: ({}, relation) => [relation.name],
-			visitOneHasOneOwning: ({}, relation) => [relation.name],
+			visitOneHasOneInverse: ({ relation }) => [relation.name],
+			visitOneHasOneOwning: ({ relation }) => [relation.name],
 		}),
 	).filter((it): it is [string] => !!it)
 

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

@@ -76,8 +76,14 @@ describe('Predicates factory', () => {
 	it('eliminates a predicate', () => {
 		const predicateFactory = new PredicateFactory(permissions, schema, new VariableInjector(schema, {}))
 		const image = schema.entities['Image']
-		const authorRelation = image.fields['authors'] as Model.AnyRelation
-		const predicate = predicateFactory.create(image, Acl.Operation.read, undefined, authorRelation)
+		const authorRelation = image.fields['authors'] as Model.OneHasManyRelation
+		const predicate = predicateFactory.create(image, Acl.Operation.read, undefined, {
+			type: 'manyHasOne',
+			entity: schema.entities.Author,
+			relation: schema.entities.Author.fields.image as Model.ManyHasOneRelation,
+			targetEntity: image,
+			targetRelation: authorRelation,
+		})
 		assert.deepStrictEqual(predicate, {
 			or: [
 				{

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

@@ -2,18 +2,21 @@ import { describe, it, assert } from 'vitest'
 import { ConditionOptimizer } from '../../../src/mapper/select/optimizer/ConditionOptimizer'
 import { SchemaDefinition as def } from '@contember/schema-definition'
 import { WhereOptimizer } from '../../../src/mapper/select/optimizer/WhereOptimizer'
+import { acceptFieldVisitor } from '@contember/schema-utils'
 
 namespace TestModel {
 	export class Author {
 		name = def.stringColumn()
 		isPublic = def.boolColumn().notNull()
 		image = def.manyHasOne(Image, 'authors')
+		articles = def.oneHasMany(Article, 'author')
 	}
 
 	export class Article {
 		title = def.stringColumn()
 		isPublic = def.boolColumn().notNull()
 		image = def.manyHasOne(Image, 'articles')
+		author = def.manyHasOne(Author, 'articles')
 	}
 
 	export class Image {
@@ -192,4 +195,95 @@ describe('where optimized', () => {
 			],
 		})
 	})
+
+
+	describe('remove id predicates', () => {
+
+		it('remove ID predicate when traversing from a relation - always', () => {
+			assert.deepStrictEqual(whereOptimizer.optimize({
+				image: { id: { isNull: false } },
+			}, model.entities.Author, [acceptFieldVisitor(model, 'Image', 'authors', {
+				visitColumn: () => {
+					throw new Error()
+				},
+				visitRelation: context => context,
+			})]), {
+				id: { always: true },
+			})
+		})
+
+
+		it('remove ID predicate when traversing from a relation - never', () => {
+			assert.deepStrictEqual(whereOptimizer.optimize({
+				image: { id: { isNull: true } },
+			}, model.entities.Author, [acceptFieldVisitor(model, 'Image', 'authors', {
+				visitColumn: () => {
+					throw new Error()
+				},
+				visitRelation: context => context,
+			})]), {
+				id: { never: true },
+			})
+		})
+
+		it('remove ID predicate when traversing in where', () => {
+			assert.deepStrictEqual(whereOptimizer.optimize({
+				authors: { image: { id: { isNull: false } } },
+			}, model.entities.Image, []), {
+				id: { always: true },
+			})
+		})
+
+		it('do not remove ID predicate when traversing from a has-many relation', () => {
+			assert.deepStrictEqual(whereOptimizer.optimize({
+				authors: { id: { isNull: false } },
+			}, model.entities.Image, [acceptFieldVisitor(model, 'Author', 'image', {
+				visitColumn: () => {
+					throw new Error()
+				},
+				visitRelation: context => context,
+			})]), {
+				authors: { id: { isNull: false } },
+			})
+		})
+
+		it('do not remove ID predicate when traversing from a nested has-many relation', () => {
+			assert.deepStrictEqual(whereOptimizer.optimize({
+				articles: { author: { id: { isNull: false } } },
+			}, model.entities.Image, [
+				acceptFieldVisitor(model, 'Author', 'articles', {
+					visitColumn: () => {
+						throw new Error()
+					},
+					visitRelation: context => context,
+				}),
+				acceptFieldVisitor(model, 'Article', 'image', {
+					visitColumn: () => {
+						throw new Error()
+					},
+					visitRelation: context => context,
+				}),
+			]), {
+				articles: { author: { id: { isNull: false } } },
+			})
+		})
+
+		it('do not remove ID predicate when traversing in where over has-many relation', () => {
+			assert.deepStrictEqual(whereOptimizer.optimize({
+				image: { authors: { id: { isNull: false } } },
+			}, model.entities.Author, []), {
+				image: { authors: { id: { isNull: false } } },
+			})
+		})
+
+
+		it('do not remove ID predicate when traversing in where over has-many relation - nested', () => {
+			assert.deepStrictEqual(whereOptimizer.optimize({
+				image: { authors: { image: { id: { isNull: false } } } },
+			}, model.entities.Author, []), {
+				image: { authors: { image: { id: { isNull: false } } } },
+			})
+		})
+	})
 })
+

package/dist/src/inputProcessing/InputContext.d.ts

@@ -1,43 +0,0 @@
-import { Input, Model } from '@contember/schema';
-export interface ColumnContext {
-    entity: Model.Entity;
-    column: Model.AnyColumn;
-    input: Input.ColumnValue | undefined;
-}
-export interface ManyHasManyInverseContext {
-    entity: Model.Entity;
-    relation: Model.ManyHasManyInverseRelation;
-    targetEntity: Model.Entity;
-    targetRelation: Model.ManyHasManyOwningRelation;
-}
-export interface ManyHasManyOwningContext {
-    entity: Model.Entity;
-    relation: Model.ManyHasManyOwningRelation;
-    targetEntity: Model.Entity;
-    targetRelation: Model.ManyHasManyInverseRelation | null;
-}
-export interface ManyHasOneContext {
-    entity: Model.Entity;
-    relation: Model.ManyHasOneRelation;
-    targetEntity: Model.Entity;
-    targetRelation: Model.OneHasManyRelation | null;
-}
-export interface OneHasManyContext {
-    entity: Model.Entity;
-    relation: Model.OneHasManyRelation;
-    targetEntity: Model.Entity;
-    targetRelation: Model.ManyHasOneRelation;
-}
-export interface OneHasOneInverseContext {
-    entity: Model.Entity;
-    relation: Model.OneHasOneInverseRelation;
-    targetEntity: Model.Entity;
-    targetRelation: Model.OneHasOneOwningRelation;
-}
-export interface OneHasOneOwningContext {
-    entity: Model.Entity;
-    relation: Model.OneHasOneOwningRelation;
-    targetEntity: Model.Entity;
-    targetRelation: Model.OneHasOneInverseRelation | null;
-}
-//# sourceMappingURL=InputContext.d.ts.map

package/dist/src/inputProcessing/InputContext.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"InputContext.d.ts","sourceRoot":"","sources":["../../../src/inputProcessing/InputContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEhD,MAAM,WAAW,aAAa;IAC7B,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,MAAM,EAAE,KAAK,CAAC,SAAS,CAAA;IACvB,KAAK,EAAE,KAAK,CAAC,WAAW,GAAG,SAAS,CAAA;CACpC;AAED,MAAM,WAAW,yBAAyB;IACzC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,CAAA;IAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,CAAA;CAC/C;AAED,MAAM,WAAW,wBAAwB;IACxC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,CAAA;IACzC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,CAAA;CACvD;AAED,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,CAAA;IAClC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAA;CAC/C;AAED,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,CAAA;IAClC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,CAAA;CACxC;AAED,MAAM,WAAW,uBAAuB;IACvC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,wBAAwB,CAAA;IACxC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,uBAAuB,CAAA;CAC7C;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,uBAAuB,CAAA;IACvC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,wBAAwB,GAAG,IAAI,CAAA;CACrD"}

package/dist/src/inputProcessing/InputContext.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=InputContext.js.map

package/dist/src/inputProcessing/InputContext.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"InputContext.js","sourceRoot":"","sources":["../../../src/inputProcessing/InputContext.ts"],"names":[],"mappings":""}

package/src/inputProcessing/InputContext.ts

@@ -1,49 +0,0 @@
-import { Input, Model } from '@contember/schema'
-
-export interface ColumnContext {
-	entity: Model.Entity
-	column: Model.AnyColumn
-	input: Input.ColumnValue | undefined
-}
-
-export interface ManyHasManyInverseContext {
-	entity: Model.Entity
-	relation: Model.ManyHasManyInverseRelation
-	targetEntity: Model.Entity
-	targetRelation: Model.ManyHasManyOwningRelation
-}
-
-export interface ManyHasManyOwningContext {
-	entity: Model.Entity
-	relation: Model.ManyHasManyOwningRelation
-	targetEntity: Model.Entity
-	targetRelation: Model.ManyHasManyInverseRelation | null
-}
-
-export interface ManyHasOneContext {
-	entity: Model.Entity
-	relation: Model.ManyHasOneRelation
-	targetEntity: Model.Entity
-	targetRelation: Model.OneHasManyRelation | null
-}
-
-export interface OneHasManyContext {
-	entity: Model.Entity
-	relation: Model.OneHasManyRelation
-	targetEntity: Model.Entity
-	targetRelation: Model.ManyHasOneRelation
-}
-
-export interface OneHasOneInverseContext {
-	entity: Model.Entity
-	relation: Model.OneHasOneInverseRelation
-	targetEntity: Model.Entity
-	targetRelation: Model.OneHasOneOwningRelation
-}
-
-export interface OneHasOneOwningContext {
-	entity: Model.Entity
-	relation: Model.OneHasOneOwningRelation
-	targetEntity: Model.Entity
-	targetRelation: Model.OneHasOneInverseRelation | null
-}