@contember/engine-content-api 2.1.0-alpha.24 → 2.1.0-alpha.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "2.1.0-alpha.24",
+  "version": "2.1.0-alpha.26",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -26,18 +26,18 @@
     "generate": "gql-gen --config graphql.codegen.yml"
   },
   "dependencies": {
-    "@contember/database": "2.1.0-alpha.24",
-    "@contember/dic": "2.1.0-alpha.24",
-    "@contember/graphql-utils": "2.1.0-alpha.24",
-    "@contember/logger": "2.1.0-alpha.24",
-    "@contember/schema": "2.1.0-alpha.24",
-    "@contember/schema-definition": "2.1.0-alpha.24",
-    "@contember/schema-utils": "2.1.0-alpha.24",
+    "@contember/database": "2.1.0-alpha.26",
+    "@contember/dic": "2.1.0-alpha.26",
+    "@contember/graphql-utils": "2.1.0-alpha.26",
+    "@contember/logger": "2.1.0-alpha.26",
+    "@contember/schema": "2.1.0-alpha.26",
+    "@contember/schema-definition": "2.1.0-alpha.26",
+    "@contember/schema-utils": "2.1.0-alpha.26",
     "fast-deep-equal": "^3.1.3"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.1.0-alpha.24",
-    "@contember/schema-definition": "2.1.0-alpha.24",
+    "@contember/database-tester": "2.1.0-alpha.26",
+    "@contember/schema-definition": "2.1.0-alpha.26",
     "@types/node": "^20.17.22",
     "graphql": "^16.9.0",
     "pg": "^8.12.0"

package/src/ExecutionContainer.ts

@@ -31,7 +31,7 @@ import { Client, DatabaseMetadata, SelectBuilder as DbSelectBuilder } from '@con
 import { ParsedMembership, Providers } from '@contember/schema-utils'
 import { PaginatedHasManyExecutionHandler } from './extensions/paginatedHasMany/PaginatedHasManyExecutionHandler'
 import { PaginatedHasManyFieldProvider } from './extensions/paginatedHasMany/PaginatedHasManyFieldProvider'
-import { WhereOptimizer } from './mapper/select/optimizer/WhereOptimizer'
+import { WhereOptimizer, WhereOptimizerOptions } from './mapper/select/optimizer/WhereOptimizer'
 import { ConditionOptimizer } from './mapper/select/optimizer/ConditionOptimizer'
 import { GraphQlQueryAstFactory, MutationResolver, ReadResolver, ValidationResolver } from './resolvers'
 import {
@@ -54,6 +54,7 @@ export type ExecutionContainerArgs = {
 	systemSchema: string
 	project: { slug: string }
 	stage: { id: string; slug: string }
+	userInfo: { ipAddress: string | null; userAgent: string | null }
 }
 
 export interface ExecutionContainer {
@@ -71,6 +72,7 @@ export class ExecutionContainerFactory {
 
 	constructor(
 		private readonly providers: Providers,
+		private readonly whereOptimizerOptions?: WhereOptimizerOptions,
 	) {
 	}
 
@@ -79,7 +81,7 @@ export class ExecutionContainerFactory {
 		return this.hooks.reduce((acc, cb) => cb(acc), builder)
 	}
 
-	createBuilderInternal({ permissions, identityVariables, identityId, db, schema, schemaMeta, systemSchema, stage, project, schemaDatabaseMetadata }: ExecutionContainerArgs) {
+	createBuilderInternal({ permissions, identityVariables, identityId, db, schema, schemaMeta, systemSchema, stage, project, schemaDatabaseMetadata, userInfo }: ExecutionContainerArgs) {
 		return new Builder({})
 			.addService('systemSchema', () =>
 				systemSchema)
@@ -95,6 +97,8 @@ export class ExecutionContainerFactory {
 				schemaMeta)
 			.addService('schemaDatabaseMetadata', () =>
 				schemaDatabaseMetadata)
+			.addService('userInfo', () =>
+				userInfo)
 			.addService('providers', () =>
 				this.providers)
 			.addService('variableInjector', ({ schema }) =>
@@ -110,7 +114,7 @@ export class ExecutionContainerFactory {
 			.addService('pathFactory', () =>
 				new PathFactory())
 			.addService('whereOptimized', ({ schema }) =>
-				new WhereOptimizer(schema.model, new ConditionOptimizer()))
+				new WhereOptimizer(schema.model, new ConditionOptimizer(), this.whereOptimizerOptions))
 			.addService('whereBuilder', ({ joinBuilder, conditionBuilder, pathFactory, whereOptimized, schema }) =>
 				new WhereBuilder(
 					schema.model,

package/src/index.ts

@@ -25,7 +25,8 @@ export {
 	type ExecutionContainer,
 	type ExecutionContainerBuilder,
 	Path,
-	WhereBuilder,
+	type WhereBuilder,
+	type JoinBuilder,
 	PathFactory,
 	ExecutionContainerFactory,
 	type ExecutionContainerHook,

package/src/mapper/select/optimizer/WhereOptimizer.ts

@@ -18,16 +18,25 @@ export interface WhereOptimizationHints {
 
 type OptimizedOperand = Input.OptionalWhere | undefined | boolean
 
+export type WhereOptimizerOptions = {
+	disable?: boolean
+	maxCrossOptimizationInput?: number
+}
+
 export class WhereOptimizer {
 	private static eliminableRelations = new Set<Model.AnyRelationContext['type']>(['oneHasMany', 'oneHasOneInverse', 'oneHasOneOwning'])
 
 	constructor(
 		private readonly model: Model.Schema,
 		private readonly conditionOptimizer: ConditionOptimizer,
+		private readonly options?: WhereOptimizerOptions,
 	) {
 	}
 
 	public optimize(where: Input.OptionalWhere, entity: Model.Entity, { relationPath = [], evaluatedPredicates = [] }: WhereOptimizationHints = {}): Input.OptionalWhere {
+		if (this.options?.disable) {
+			return where
+		}
 		let processedRelationPath: ExtendedRelationContext[] = []
 		for (const i in relationPath) {
 			const el = relationPath[i]
@@ -134,7 +143,7 @@ export class WhereOptimizer {
 	private crossOptimize(operands: Input.OptionalWhere[], entity: Model.Entity, replacement: Input.Condition, relationPath: ExtendedRelationContext[]): (Input.OptionalWhere | boolean)[] {
 		let result: (Input.OptionalWhere | boolean)[] = operands
 		let copied = false
-		const count = result.length
+		const count = Math.min(result.length, this.options?.maxCrossOptimizationInput ?? 50)
 		for (let i = 0; i < count; i++) {
 			for (let j = 0; j < count; j++) {
 				const a = result[j]

package/tests/src/test.ts

@@ -113,6 +113,7 @@ export const execute = async (test: Test) => {
 					stage: { id: '00000000-0000-0000-0000-000000000000', slug: 'live' },
 					project: { slug: 'test' },
 					schemaDatabaseMetadata: emptyDatabaseMetadata,
+					userInfo: { ipAddress: null, userAgent: null },
 				}),
 			timer: (label: any, cb: any) => cb(),
 		},