@contember/engine-content-api 1.2.0-rc.1 → 1.2.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "1.2.0-rc.1",
+  "version": "1.2.0-rc.3",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -10,31 +10,31 @@
     "test": "vitest --no-threads"
   },
   "dependencies": {
-    "@contember/database": "^1.2.0-rc.1",
-    "@contember/dic": "^1.2.0-rc.1",
-    "@contember/logger": "^1.2.0-rc.1",
-    "@contember/graphql-utils": "^1.2.0-rc.1",
-    "@contember/schema": "^1.2.0-rc.1",
-    "@contember/schema-definition": "^1.2.0-rc.1",
-    "@contember/schema-utils": "^1.2.0-rc.1",
+    "@contember/database": "^1.2.0-rc.3",
+    "@contember/dic": "^1.2.0-rc.3",
+    "@contember/logger": "^1.2.0-rc.3",
+    "@contember/graphql-utils": "^1.2.0-rc.3",
+    "@contember/schema": "^1.2.0-rc.3",
+    "@contember/schema-definition": "^1.2.0-rc.3",
+    "@contember/schema-utils": "^1.2.0-rc.3",
     "@graphql-tools/schema": "^8.3.5",
     "fast-deep-equal": "^3.1.3",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "^1.2.0-rc.1",
-    "@contember/engine-api-tester": "^1.2.0-rc.1",
-    "@contember/schema-definition": "^1.2.0-rc.1",
+    "@contember/database-tester": "^1.2.0-rc.3",
+    "@contember/engine-api-tester": "^1.2.0-rc.3",
+    "@contember/schema-definition": "^1.2.0-rc.3",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",
     "@graphql-codegen/typescript-resolvers": "^2.6.6",
     "@types/node": "^18",
     "graphql": "^16.5.0",
-    "pg": "^8.5.0"
+    "pg": "^8.9.0"
   },
   "peerDependencies": {
     "graphql": ">= 14.6.0",
-    "pg": "^8.5.0"
+    "pg": "^8.9.0"
   }
 }

package/src/acl/VariableInjector.ts

@@ -2,12 +2,18 @@ import { Acl, Input, Model } from '@contember/schema'
 import { PredicateDefinitionProcessor } from '@contember/schema-utils'
 
 export class VariableInjector {
+	private injectorCache = new WeakMap<Acl.PredicateDefinition, Input.Where>()
+
 	constructor(private readonly schema: Model.Schema, private readonly variables: Acl.VariablesMap) {}
 
 	public inject(entity: Model.Entity, where: Acl.PredicateDefinition): Input.Where {
+		const cacheEntry = this.injectorCache.get(where)
+		if (cacheEntry !== undefined) {
+			return cacheEntry
+		}
 		const predicateDefinitionProcessor = new PredicateDefinitionProcessor(this.schema)
 
-		return predicateDefinitionProcessor.process(entity, where, {
+		const resultWhere = predicateDefinitionProcessor.process(entity, where, {
 			handleColumn: ({ value }) => {
 				if (typeof value === 'string') {
 					return this.variables[value] ?? { never: true }
@@ -21,5 +27,7 @@ export class VariableInjector {
 				return value
 			},
 		})
+		this.injectorCache.set(where, resultWhere)
+		return resultWhere
 	}
 }

package/src/mapper/Mapper.ts

@@ -153,7 +153,7 @@ export class Mapper {
 			.select(expr => expr.raw('count(*)'), 'row_count')
 			.select([path.alias, relation.joiningColumn.columnName])
 			.groupBy([path.alias, relation.joiningColumn.columnName])
-		const withPredicates = this.predicatesInjector.inject(entity, filter)
+		const withPredicates = this.predicatesInjector.inject(entity, filter, relationPath[relationPath.length - 1])
 		const qbWithWhere = this.whereBuilder.build(qb, entity, path, withPredicates, { relationPath })
 		const rows = await qbWithWhere.getResult(this.db)
 		const result = new Map<string, number>()

package/src/mapper/select/RelationFetcher.ts

@@ -118,7 +118,10 @@ export class RelationFetcher {
 
 		const joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable })
 
-		const qb = this.buildJunctionQb(owningRelation, ids, joiningColumns, relationContext.targetEntity, { filter }, relationPath)
+		const qb = this.buildJunctionQb(owningRelation, ids, joiningColumns, relationContext.targetEntity, { filter }, [
+			...relationPath,
+			relationContext,
+		])
 			.select(['junction_', joiningColumns.sourceColumn.columnName])
 			.select(expr => expr.raw('count(*)'), 'row_count')
 			.groupBy(['junction_', joiningColumns.sourceColumn.columnName])
@@ -151,7 +154,7 @@ export class RelationFetcher {
 			joiningColumns,
 			targetEntity,
 			objectNode,
-			relationPath,
+			[...relationPath, relationContext],
 		)
 		if (junctionValues.length === 0) {
 			return {}
@@ -259,7 +262,7 @@ export class RelationFetcher {
 			.from(joiningTable.tableName, 'junction_')
 			.where(clause => clause.in(['junction_', whereColumn], ids))
 
-		const where = this.predicateInjector.inject(targetEntity, objectArgs.filter || {})
+		const where = this.predicateInjector.inject(targetEntity, objectArgs.filter || {}, relationPath[relationPath.length - 1])
 		const hasWhere = where && Object.keys(where).length > 0
 		const hasFieldOrderBy =
 			objectArgs.orderBy &&