npm - @contember/engine-content-api - Versions diffs - 2.1.0-alpha.9 → 2.1.0-beta.2 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1030) hide show

package/dist/development/src/mapper/select/RelationFetcher.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RelationFetcher.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/select/RelationFetcher.ts"],"sourcesContent":["import { PathFactory } from './Path'\nimport { WhereBuilder } from './WhereBuilder'\nimport { Client, LimitByGroupWrapper, Operator, SelectBuilder } from '@contember/database'\nimport { Input, Model, Value } from '@contember/schema'\nimport { OrderByBuilder } from './OrderByBuilder'\nimport { PredicatesInjector } from '../../acl'\nimport { FieldNode, ObjectNode } from '../../inputProcessing'\nimport { JoiningColumns } from '../types'\nimport { OrderByHelper } from './OrderByHelper'\nimport { SelectGroupedObjects, SelectResultObject, SelectRow } from './SelectHydrator'\nimport { Mapper } from '../Mapper'\n\nexport type GroupedCounts = Record<Input.PrimaryValue, number>\n\ntype CountOneHasManyGroupsArgs = {\n\tmapper: Mapper\n\tfilter: Input.OptionalWhere \| undefined\n\trelationPath: Model.AnyRelationContext[]\n\trelationContext: Model.OneHasManyContext\n\tids: Input.PrimaryValue[]\n}\n\ntype FetchOneHasManyGroupsArgs = {\n\tmapper: Mapper\n\tobjectNode: ObjectNode<Input.ListQueryInput>\n\trelationPath: Model.AnyRelationContext[]\n\trelationContext: Model.OneHasManyContext\n\tids: Input.PrimaryValue[]\n}\n\ntype ManyHasManyBaseArgs =\n\t& {\n\t\tmapper: Mapper\n\t\tids: Input.PrimaryValue[]\n\t\trelationPath: Model.AnyRelationContext[]\n\t\trelationContext: Model.ManyHasManyInverseContext \| Model.ManyHasManyOwningContext\n\t}\ntype CountManyHasManyGroupArgs =\n\t& ManyHasManyBaseArgs\n\t& {\n\t\tfilter: Input.OptionalWhere \| undefined\n\t}\n\ntype FetchManyHasManyGroupsArgs =\n\t& ManyHasManyBaseArgs\n\t& {\n\t\tfield: ObjectNode<Input.ListQueryInput>\n\t}\n\nexport class RelationFetcher {\n\tconstructor(\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly orderBuilder: OrderByBuilder,\n\t\tprivate readonly predicateInjector: PredicatesInjector,\n\t\tprivate readonly pathFactory: PathFactory,\n\t) {}\n\n\tpublic async countOneHasManyGroups({\n\t\tmapper,\n\t\tfilter,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: CountOneHasManyGroupsArgs): Promise<GroupedCounts> {\n\t\tconst { targetRelation, targetEntity } = relationContext\n\t\tconst filterWithParent = this.createOneHasManyFilter(targetEntity, targetRelation, ids, filter)\n\t\treturn mapper.countGrouped(targetEntity, filterWithParent, targetRelation, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t}\n\n\tpublic async fetchOneHasManyGroups({\n\t\tmapper,\n\t\tobjectNode,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: FetchOneHasManyGroupsArgs): Promise<SelectGroupedObjects> {\n\t\tconst { relation, targetEntity, targetRelation } = relationContext\n\t\tconst filter = this.createOneHasManyFilter(targetEntity, targetRelation, ids, objectNode.args.filter)\n\t\tconst objectNodeWithWhere = objectNode.withArg<Input.ListQueryInput>('filter', filter)\n\t\tconst objectNodeWithOrder = OrderByHelper.appendDefaultOrderBy(\n\t\t\ttargetEntity,\n\t\t\tobjectNodeWithWhere,\n\t\t\trelation.orderBy,\n\t\t)\n\n\t\treturn mapper.selectGrouped(targetEntity, objectNodeWithOrder, targetRelation, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t}\n\n\tprivate createOneHasManyFilter(\n\t\ttargetEntity: Model.Entity,\n\t\ttargetRelation: Model.ManyHasOneRelation,\n\t\tids: Input.PrimaryValue[],\n\t\tfilter: Input.OptionalWhere \| undefined,\n\t): Input.OptionalWhere {\n\t\tconst targetRelationFilter: Input.OptionalWhere = { [targetEntity.primary]: { in: ids } }\n\t\treturn {\n\t\t\t...filter,\n\t\t\t[targetRelation.name]: !filter?.[targetRelation.name]\n\t\t\t\t? targetRelationFilter\n\t\t\t\t: ({ and: [filter[targetRelation.name], targetRelationFilter] } as Input.OptionalWhere),\n\t\t}\n\t}\n\n\tpublic async countManyHasManyGroups({\n\t\tmapper,\n\t\tfilter,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: CountManyHasManyGroupArgs): Promise<GroupedCounts> {\n\t\tconst owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation\n\n\t\tconst joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable })\n\n\t\tconst qb = this.buildJunctionQb(owningRelation, ids, joiningColumns, relationContext.targetEntity, relationContext.entity, { filter }, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t\t\t.select(['junction_', joiningColumns.sourceColumn.columnName])\n\t\t\t.select(expr => expr.raw('count(*)'), 'row_count')\n\t\t\t.groupBy(['junction_', joiningColumns.sourceColumn.columnName])\n\n\t\tconst result = new Map<string, number>()\n\t\tconst rows = await qb.getResult(mapper.db)\n\t\tfor (const row of rows) {\n\t\t\tresult.set(String(row[joiningColumns.sourceColumn.columnName]), Number(row.row_count))\n\t\t}\n\n\t\treturn Object.fromEntries(result)\n\t}\n\n\tpublic async fetchManyHasManyGroups({\n\t\tmapper,\n\t\tfield,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: FetchManyHasManyGroupsArgs): Promise<SelectGroupedObjects> {\n\t\tconst owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation\n\t\tconst joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable })\n\t\tconst defaultOrderBy = relationContext.relation.orderBy\n\t\tconst objectNode = OrderByHelper.appendDefaultOrderBy(relationContext.targetEntity, field, defaultOrderBy)\n\t\tconst { targetEntity, entity } = relationContext\n\t\tconst junctionValues = await this.fetchJunction(\n\t\t\tmapper.db,\n\t\t\towningRelation,\n\t\t\tids,\n\t\t\tjoiningColumns,\n\t\t\ttargetEntity,\n\t\t\tentity,\n\t\t\tobjectNode,\n\t\t\t[...relationPath, relationContext],\n\t\t)\n\t\tif (junctionValues.length === 0) {\n\t\t\treturn {}\n\t\t}\n\n\t\tconst primaryField = new FieldNode(targetEntity.primary, targetEntity.primary, {})\n\t\tconst inverseJoiningColumn = joiningColumns.targetColumn.columnName\n\t\tconst inverseIds = junctionValues\n\t\t\t.map(it => it[inverseJoiningColumn])\n\t\t\t.filter((it, index, arr) => arr.indexOf(it) === index)\n\n\t\tconst queryWithWhere = objectNode\n\t\t\t.withArgs({\n\t\t\t\tfilter: {\n\t\t\t\t\t[targetEntity.primary]: { in: inverseIds },\n\t\t\t\t},\n\t\t\t})\n\t\t\t.withField(primaryField)\n\t\tconst result = await mapper.select(targetEntity, queryWithWhere, [...relationPath, relationContext])\n\n\t\treturn this.buildManyHasManyGroups(targetEntity, joiningColumns, result, junctionValues)\n\t}\n\n\tprivate resolveJoiningColumns({ relationType, joiningTable }: { joiningTable: Model.JoiningTable; relationType: 'manyHasManyOwning' \| 'manyHasManyInverse' }): JoiningColumns {\n\t\treturn relationType === 'manyHasManyOwning' ? {\n\t\t\tsourceColumn: joiningTable.joiningColumn,\n\t\t\ttargetColumn: joiningTable.inverseJoiningColumn,\n\t\t} : {\n\t\t\tsourceColumn: joiningTable.inverseJoiningColumn,\n\t\t\ttargetColumn: joiningTable.joiningColumn,\n\t\t}\n\t}\n\n\tprivate buildManyHasManyGroups(\n\t\tentity: Model.Entity,\n\t\tjoiningColumns: JoiningColumns,\n\t\tresultObjects: SelectResultObject[],\n\t\tjunctionValues: SelectRow[],\n\t): SelectGroupedObjects {\n\t\tconst dataById: { [id: string]: SelectResultObject } = {}\n\t\tfor (let object of resultObjects) {\n\t\t\tdataById[object[entity.primary] as Value.PrimaryValue] = object\n\t\t}\n\t\tconst sourceColumn = joiningColumns.sourceColumn.columnName\n\t\tconst targetColumn = joiningColumns.targetColumn.columnName\n\t\tconst groupedResult: SelectGroupedObjects = {}\n\t\tfor (let pair of junctionValues) {\n\t\t\tif (!groupedResult[pair[sourceColumn] as Value.PrimaryValue]) {\n\t\t\t\tgroupedResult[pair[sourceColumn] as Value.PrimaryValue] = []\n\t\t\t}\n\t\t\tconst resultObject = dataById[pair[targetColumn] as Value.PrimaryValue]\n\t\t\tif (resultObject) {\n\t\t\t\tgroupedResult[pair[sourceColumn] as Value.PrimaryValue].push(resultObject)\n\t\t\t}\n\t\t}\n\t\treturn groupedResult\n\t}\n\n\tprivate async fetchJunction(\n\t\tdb: Client,\n\t\trelation: Model.ManyHasManyOwningRelation,\n\t\tvalues: Input.PrimaryValue[],\n\t\tcolumn: JoiningColumns,\n\t\ttargetEntity: Model.Entity,\n\t\tsourceEntity: Model.Entity,\n\t\tobject: ObjectNode<Input.ListQueryInput>,\n\t\trelationPath: Model.AnyRelationContext[],\n\t): Promise<Record<string, Value.AtomicValue>[]> {\n\t\tconst joiningTable = relation.joiningTable\n\t\tconst qb = this.buildJunctionQb(relation, values, column, targetEntity, sourceEntity, object.args, relationPath)\n\t\t\t.select(['junction_', joiningTable.inverseJoiningColumn.columnName])\n\t\t\t.select(['junction_', joiningTable.joiningColumn.columnName])\n\t\tconst wrapper = new LimitByGroupWrapper(\n\t\t\t['junction_', column.sourceColumn.columnName],\n\t\t\t(orderable, qb) => {\n\t\t\t\tif (object.args.orderBy) {\n\t\t\t\t\t[qb, orderable] = this.orderBuilder.build(\n\t\t\t\t\t\tqb,\n\t\t\t\t\t\torderable,\n\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\tthis.pathFactory.create([]),\n\t\t\t\t\t\tobject.args.orderBy,\n\t\t\t\t\t)\n\t\t\t\t}\n\t\t\t\treturn [orderable, qb]\n\t\t\t},\n\t\t\tobject.args.offset,\n\t\t\tobject.args.limit,\n\t\t)\n\n\t\treturn await wrapper.getResult(qb, db)\n\t}\n\n\tprivate buildJunctionQb(\n\t\trelation: Model.ManyHasManyOwningRelation,\n\t\tids: Input.PrimaryValue[],\n\t\tcolumn: JoiningColumns,\n\t\ttargetEntity: Model.Entity,\n\t\tsourceEntity: Model.Entity,\n\t\tobjectArgs: Input.ListQueryInput,\n\t\trelationPath: Model.AnyRelationContext[],\n\t): SelectBuilder {\n\t\tconst joiningTable = relation.joiningTable\n\n\t\tconst whereColumn = column.sourceColumn.columnName\n\t\tconst primaryColumn = sourceEntity.fields[sourceEntity.primary] as Model.AnyColumn\n\t\tlet qb = SelectBuilder.create()\n\t\t\t.from(joiningTable.tableName, 'junction_')\n\t\t\t.where(clause => clause.in(['junction_', whereColumn], ids, primaryColumn.columnType))\n\n\t\tconst where = this.predicateInjector.inject(targetEntity, objectArgs.filter \|\| {}, relationPath[relationPath.length - 1])\n\t\tconst hasWhere = where && Object.keys(where).length > 0\n\t\tconst hasFieldOrderBy =\n\t\t\tobjectArgs.orderBy &&\n\t\t\tobjectArgs.orderBy.length > 0 &&\n\t\t\t!objectArgs.orderBy[0]._random &&\n\t\t\tobjectArgs.orderBy[0]._randomSeeded === undefined\n\n\t\tif (hasWhere \|\| hasFieldOrderBy) {\n\t\t\tconst path = this.pathFactory.create([])\n\t\t\tqb = qb.join(targetEntity.tableName, path.alias, condition =>\n\t\t\t\tcondition.compareColumns(['junction_', column.targetColumn.columnName], Operator.eq, [\n\t\t\t\t\tpath.alias,\n\t\t\t\t\ttargetEntity.primaryColumn,\n\t\t\t\t]),\n\t\t\t)\n\t\t}\n\n\t\tif (where && hasWhere) {\n\t\t\tqb = this.whereBuilder.build(qb, targetEntity, this.pathFactory.create([]), where, { relationPath })\n\t\t}\n\t\treturn qb\n\t}\n}\n"],"names":["OrderByHelper","FieldNode","LimitByGroupWrapper","qb","SelectBuilder","Operator"],"mappings":"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"}
1	+ {"version":3,"file":"RelationFetcher.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/select/RelationFetcher.ts"],"sourcesContent":["import { PathFactory } from './Path'\nimport { WhereBuilder } from './WhereBuilder'\nimport { Client, LimitByGroupWrapper, Operator, SelectBuilder } from '@contember/database'\nimport { Input, Model, Value } from '@contember/schema'\nimport { OrderByBuilder } from './OrderByBuilder'\nimport { PredicatesInjector } from '../../acl'\nimport { FieldNode, ObjectNode } from '../../inputProcessing'\nimport { JoiningColumns } from '../types'\nimport { OrderByHelper } from './OrderByHelper'\nimport { SelectGroupedObjects, SelectResultObject, SelectRow } from './SelectHydrator'\nimport { Mapper } from '../Mapper'\n\nexport type GroupedCounts = Record<Input.PrimaryValue, number>\n\ntype CountOneHasManyGroupsArgs = {\n\tmapper: Mapper\n\tfilter: Input.OptionalWhere \| undefined\n\trelationPath: Model.AnyRelationContext[]\n\trelationContext: Model.OneHasManyContext\n\tids: Input.PrimaryValue[]\n}\n\ntype FetchOneHasManyGroupsArgs = {\n\tmapper: Mapper\n\tobjectNode: ObjectNode<Input.ListQueryInput>\n\trelationPath: Model.AnyRelationContext[]\n\trelationContext: Model.OneHasManyContext\n\tids: Input.PrimaryValue[]\n}\n\ntype ManyHasManyBaseArgs = {\n\tmapper: Mapper\n\tids: Input.PrimaryValue[]\n\trelationPath: Model.AnyRelationContext[]\n\trelationContext: Model.ManyHasManyInverseContext \| Model.ManyHasManyOwningContext\n}\ntype CountManyHasManyGroupArgs =\n\t& ManyHasManyBaseArgs\n\t& {\n\t\tfilter: Input.OptionalWhere \| undefined\n\t}\n\ntype FetchManyHasManyGroupsArgs =\n\t& ManyHasManyBaseArgs\n\t& {\n\t\tfield: ObjectNode<Input.ListQueryInput>\n\t}\n\nexport class RelationFetcher {\n\tconstructor(\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly orderBuilder: OrderByBuilder,\n\t\tprivate readonly predicateInjector: PredicatesInjector,\n\t\tprivate readonly pathFactory: PathFactory,\n\t) {}\n\n\tpublic async countOneHasManyGroups({\n\t\tmapper,\n\t\tfilter,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: CountOneHasManyGroupsArgs): Promise<GroupedCounts> {\n\t\tconst { targetRelation, targetEntity } = relationContext\n\t\tconst filterWithParent = this.createOneHasManyFilter(targetEntity, targetRelation, ids, filter)\n\t\treturn mapper.countGrouped(targetEntity, filterWithParent, targetRelation, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t}\n\n\tpublic async fetchOneHasManyGroups({\n\t\tmapper,\n\t\tobjectNode,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: FetchOneHasManyGroupsArgs): Promise<SelectGroupedObjects> {\n\t\tconst { relation, targetEntity, targetRelation } = relationContext\n\t\tconst filter = this.createOneHasManyFilter(targetEntity, targetRelation, ids, objectNode.args.filter)\n\t\tconst objectNodeWithWhere = objectNode.withArg<Input.ListQueryInput>('filter', filter)\n\t\tconst objectNodeWithOrder = OrderByHelper.appendDefaultOrderBy(\n\t\t\ttargetEntity,\n\t\t\tobjectNodeWithWhere,\n\t\t\trelation.orderBy,\n\t\t)\n\n\t\treturn mapper.selectGrouped(targetEntity, objectNodeWithOrder, targetRelation, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t}\n\n\tprivate createOneHasManyFilter(\n\t\ttargetEntity: Model.Entity,\n\t\ttargetRelation: Model.ManyHasOneRelation,\n\t\tids: Input.PrimaryValue[],\n\t\tfilter: Input.OptionalWhere \| undefined,\n\t): Input.OptionalWhere {\n\t\tconst targetRelationFilter: Input.OptionalWhere = { [targetEntity.primary]: { in: ids } }\n\t\treturn {\n\t\t\t...filter,\n\t\t\t[targetRelation.name]: !filter?.[targetRelation.name]\n\t\t\t\t? targetRelationFilter\n\t\t\t\t: ({ and: [filter[targetRelation.name], targetRelationFilter] } as Input.OptionalWhere),\n\t\t}\n\t}\n\n\tpublic async countManyHasManyGroups({\n\t\tmapper,\n\t\tfilter,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: CountManyHasManyGroupArgs): Promise<GroupedCounts> {\n\t\tconst owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation\n\n\t\tconst joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable })\n\n\t\tconst qb = this.buildJunctionQb(owningRelation, ids, joiningColumns, relationContext.targetEntity, relationContext.entity, { filter }, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t\t\t.select(['junction_', joiningColumns.sourceColumn.columnName])\n\t\t\t.select(expr => expr.raw('count(*)'), 'row_count')\n\t\t\t.groupBy(['junction_', joiningColumns.sourceColumn.columnName])\n\n\t\tconst result = new Map<string, number>()\n\t\tconst rows = await qb.getResult(mapper.db)\n\t\tfor (const row of rows) {\n\t\t\tresult.set(String(row[joiningColumns.sourceColumn.columnName]), Number(row.row_count))\n\t\t}\n\n\t\treturn Object.fromEntries(result)\n\t}\n\n\tpublic async fetchManyHasManyGroups({\n\t\tmapper,\n\t\tfield,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: FetchManyHasManyGroupsArgs): Promise<SelectGroupedObjects> {\n\t\tconst owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation\n\t\tconst joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable })\n\t\tconst defaultOrderBy = relationContext.relation.orderBy\n\t\tconst objectNode = OrderByHelper.appendDefaultOrderBy(relationContext.targetEntity, field, defaultOrderBy)\n\t\tconst { targetEntity, entity } = relationContext\n\t\tconst junctionValues = await this.fetchJunction(\n\t\t\tmapper.db,\n\t\t\towningRelation,\n\t\t\tids,\n\t\t\tjoiningColumns,\n\t\t\ttargetEntity,\n\t\t\tentity,\n\t\t\tobjectNode,\n\t\t\t[...relationPath, relationContext],\n\t\t)\n\t\tif (junctionValues.length === 0) {\n\t\t\treturn {}\n\t\t}\n\n\t\tconst primaryField = new FieldNode(targetEntity.primary, targetEntity.primary, {})\n\t\tconst inverseJoiningColumn = joiningColumns.targetColumn.columnName\n\t\tconst inverseIds = junctionValues\n\t\t\t.map(it => it[inverseJoiningColumn])\n\t\t\t.filter((it, index, arr) => arr.indexOf(it) === index)\n\n\t\tconst queryWithWhere = objectNode\n\t\t\t.withArgs({\n\t\t\t\tfilter: {\n\t\t\t\t\t[targetEntity.primary]: { in: inverseIds },\n\t\t\t\t},\n\t\t\t})\n\t\t\t.withField(primaryField)\n\t\tconst result = await mapper.select(targetEntity, queryWithWhere, [...relationPath, relationContext])\n\n\t\treturn this.buildManyHasManyGroups(targetEntity, joiningColumns, result, junctionValues)\n\t}\n\n\tprivate resolveJoiningColumns(\n\t\t{ relationType, joiningTable }: { joiningTable: Model.JoiningTable; relationType: 'manyHasManyOwning' \| 'manyHasManyInverse' },\n\t): JoiningColumns {\n\t\treturn relationType === 'manyHasManyOwning'\n\t\t\t? {\n\t\t\t\tsourceColumn: joiningTable.joiningColumn,\n\t\t\t\ttargetColumn: joiningTable.inverseJoiningColumn,\n\t\t\t}\n\t\t\t: {\n\t\t\t\tsourceColumn: joiningTable.inverseJoiningColumn,\n\t\t\t\ttargetColumn: joiningTable.joiningColumn,\n\t\t\t}\n\t}\n\n\tprivate buildManyHasManyGroups(\n\t\tentity: Model.Entity,\n\t\tjoiningColumns: JoiningColumns,\n\t\tresultObjects: SelectResultObject[],\n\t\tjunctionValues: SelectRow[],\n\t): SelectGroupedObjects {\n\t\tconst dataById: { [id: string]: SelectResultObject } = {}\n\t\tfor (let object of resultObjects) {\n\t\t\tdataById[object[entity.primary] as Value.PrimaryValue] = object\n\t\t}\n\t\tconst sourceColumn = joiningColumns.sourceColumn.columnName\n\t\tconst targetColumn = joiningColumns.targetColumn.columnName\n\t\tconst groupedResult: SelectGroupedObjects = {}\n\t\tfor (let pair of junctionValues) {\n\t\t\tif (!groupedResult[pair[sourceColumn] as Value.PrimaryValue]) {\n\t\t\t\tgroupedResult[pair[sourceColumn] as Value.PrimaryValue] = []\n\t\t\t}\n\t\t\tconst resultObject = dataById[pair[targetColumn] as Value.PrimaryValue]\n\t\t\tif (resultObject) {\n\t\t\t\tgroupedResult[pair[sourceColumn] as Value.PrimaryValue].push(resultObject)\n\t\t\t}\n\t\t}\n\t\treturn groupedResult\n\t}\n\n\tprivate async fetchJunction(\n\t\tdb: Client,\n\t\trelation: Model.ManyHasManyOwningRelation,\n\t\tvalues: Input.PrimaryValue[],\n\t\tcolumn: JoiningColumns,\n\t\ttargetEntity: Model.Entity,\n\t\tsourceEntity: Model.Entity,\n\t\tobject: ObjectNode<Input.ListQueryInput>,\n\t\trelationPath: Model.AnyRelationContext[],\n\t): Promise<Record<string, Value.AtomicValue>[]> {\n\t\tconst joiningTable = relation.joiningTable\n\t\tconst qb = this.buildJunctionQb(relation, values, column, targetEntity, sourceEntity, object.args, relationPath)\n\t\t\t.select(['junction_', joiningTable.inverseJoiningColumn.columnName])\n\t\t\t.select(['junction_', joiningTable.joiningColumn.columnName])\n\t\tconst wrapper = new LimitByGroupWrapper(\n\t\t\t['junction_', column.sourceColumn.columnName],\n\t\t\t(orderable, qb) => {\n\t\t\t\tif (object.args.orderBy) {\n\t\t\t\t\t;[qb, orderable] = this.orderBuilder.build(\n\t\t\t\t\t\tqb,\n\t\t\t\t\t\torderable,\n\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\tthis.pathFactory.create([]),\n\t\t\t\t\t\tobject.args.orderBy,\n\t\t\t\t\t)\n\t\t\t\t}\n\t\t\t\treturn [orderable, qb]\n\t\t\t},\n\t\t\tobject.args.offset,\n\t\t\tobject.args.limit,\n\t\t)\n\n\t\treturn await wrapper.getResult(qb, db)\n\t}\n\n\tprivate buildJunctionQb(\n\t\trelation: Model.ManyHasManyOwningRelation,\n\t\tids: Input.PrimaryValue[],\n\t\tcolumn: JoiningColumns,\n\t\ttargetEntity: Model.Entity,\n\t\tsourceEntity: Model.Entity,\n\t\tobjectArgs: Input.ListQueryInput,\n\t\trelationPath: Model.AnyRelationContext[],\n\t): SelectBuilder {\n\t\tconst joiningTable = relation.joiningTable\n\n\t\tconst whereColumn = column.sourceColumn.columnName\n\t\tconst primaryColumn = sourceEntity.fields[sourceEntity.primary] as Model.AnyColumn\n\t\tlet qb = SelectBuilder.create()\n\t\t\t.from(joiningTable.tableName, 'junction_')\n\t\t\t.where(clause => clause.in(['junction_', whereColumn], ids, primaryColumn.columnType))\n\n\t\tconst where = this.predicateInjector.inject(targetEntity, objectArgs.filter \|\| {}, relationPath[relationPath.length - 1])\n\t\tconst hasWhere = where && Object.keys(where).length > 0\n\t\tconst hasFieldOrderBy = objectArgs.orderBy\n\t\t\t&& objectArgs.orderBy.length > 0\n\t\t\t&& !objectArgs.orderBy[0]._random\n\t\t\t&& objectArgs.orderBy[0]._randomSeeded === undefined\n\n\t\tif (hasWhere \|\| hasFieldOrderBy) {\n\t\t\tconst path = this.pathFactory.create([])\n\t\t\tqb = qb.join(\n\t\t\t\ttargetEntity.tableName,\n\t\t\t\tpath.alias,\n\t\t\t\tcondition =>\n\t\t\t\t\tcondition.compareColumns(['junction_', column.targetColumn.columnName], Operator.eq, [\n\t\t\t\t\t\tpath.alias,\n\t\t\t\t\t\ttargetEntity.primaryColumn,\n\t\t\t\t\t]),\n\t\t\t)\n\t\t}\n\n\t\tif (where && hasWhere) {\n\t\t\tqb = this.whereBuilder.build(qb, targetEntity, this.pathFactory.create([]), where, { relationPath })\n\t\t}\n\t\treturn qb\n\t}\n}\n"],"names":["OrderByHelper","FieldNode","LimitByGroupWrapper","qb","SelectBuilder","Operator"],"mappings":"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"}

package/dist/development/src/mapper/select/RelationFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RelationFetcher.js","sources":["../../../../../../packages/engine-content-api/src/mapper/select/RelationFetcher.ts"],"sourcesContent":["import { PathFactory } from './Path'\nimport { WhereBuilder } from './WhereBuilder'\nimport { Client, LimitByGroupWrapper, Operator, SelectBuilder } from '@contember/database'\nimport { Input, Model, Value } from '@contember/schema'\nimport { OrderByBuilder } from './OrderByBuilder'\nimport { PredicatesInjector } from '../../acl'\nimport { FieldNode, ObjectNode } from '../../inputProcessing'\nimport { JoiningColumns } from '../types'\nimport { OrderByHelper } from './OrderByHelper'\nimport { SelectGroupedObjects, SelectResultObject, SelectRow } from './SelectHydrator'\nimport { Mapper } from '../Mapper'\n\nexport type GroupedCounts = Record<Input.PrimaryValue, number>\n\ntype CountOneHasManyGroupsArgs = {\n\tmapper: Mapper\n\tfilter: Input.OptionalWhere \| undefined\n\trelationPath: Model.AnyRelationContext[]\n\trelationContext: Model.OneHasManyContext\n\tids: Input.PrimaryValue[]\n}\n\ntype FetchOneHasManyGroupsArgs = {\n\tmapper: Mapper\n\tobjectNode: ObjectNode<Input.ListQueryInput>\n\trelationPath: Model.AnyRelationContext[]\n\trelationContext: Model.OneHasManyContext\n\tids: Input.PrimaryValue[]\n}\n\ntype ManyHasManyBaseArgs =\n\t& {\n\t\tmapper: Mapper\n\t\tids: Input.PrimaryValue[]\n\t\trelationPath: Model.AnyRelationContext[]\n\t\trelationContext: Model.ManyHasManyInverseContext \| Model.ManyHasManyOwningContext\n\t}\ntype CountManyHasManyGroupArgs =\n\t& ManyHasManyBaseArgs\n\t& {\n\t\tfilter: Input.OptionalWhere \| undefined\n\t}\n\ntype FetchManyHasManyGroupsArgs =\n\t& ManyHasManyBaseArgs\n\t& {\n\t\tfield: ObjectNode<Input.ListQueryInput>\n\t}\n\nexport class RelationFetcher {\n\tconstructor(\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly orderBuilder: OrderByBuilder,\n\t\tprivate readonly predicateInjector: PredicatesInjector,\n\t\tprivate readonly pathFactory: PathFactory,\n\t) {}\n\n\tpublic async countOneHasManyGroups({\n\t\tmapper,\n\t\tfilter,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: CountOneHasManyGroupsArgs): Promise<GroupedCounts> {\n\t\tconst { targetRelation, targetEntity } = relationContext\n\t\tconst filterWithParent = this.createOneHasManyFilter(targetEntity, targetRelation, ids, filter)\n\t\treturn mapper.countGrouped(targetEntity, filterWithParent, targetRelation, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t}\n\n\tpublic async fetchOneHasManyGroups({\n\t\tmapper,\n\t\tobjectNode,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: FetchOneHasManyGroupsArgs): Promise<SelectGroupedObjects> {\n\t\tconst { relation, targetEntity, targetRelation } = relationContext\n\t\tconst filter = this.createOneHasManyFilter(targetEntity, targetRelation, ids, objectNode.args.filter)\n\t\tconst objectNodeWithWhere = objectNode.withArg<Input.ListQueryInput>('filter', filter)\n\t\tconst objectNodeWithOrder = OrderByHelper.appendDefaultOrderBy(\n\t\t\ttargetEntity,\n\t\t\tobjectNodeWithWhere,\n\t\t\trelation.orderBy,\n\t\t)\n\n\t\treturn mapper.selectGrouped(targetEntity, objectNodeWithOrder, targetRelation, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t}\n\n\tprivate createOneHasManyFilter(\n\t\ttargetEntity: Model.Entity,\n\t\ttargetRelation: Model.ManyHasOneRelation,\n\t\tids: Input.PrimaryValue[],\n\t\tfilter: Input.OptionalWhere \| undefined,\n\t): Input.OptionalWhere {\n\t\tconst targetRelationFilter: Input.OptionalWhere = { [targetEntity.primary]: { in: ids } }\n\t\treturn {\n\t\t\t...filter,\n\t\t\t[targetRelation.name]: !filter?.[targetRelation.name]\n\t\t\t\t? targetRelationFilter\n\t\t\t\t: ({ and: [filter[targetRelation.name], targetRelationFilter] } as Input.OptionalWhere),\n\t\t}\n\t}\n\n\tpublic async countManyHasManyGroups({\n\t\tmapper,\n\t\tfilter,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: CountManyHasManyGroupArgs): Promise<GroupedCounts> {\n\t\tconst owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation\n\n\t\tconst joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable })\n\n\t\tconst qb = this.buildJunctionQb(owningRelation, ids, joiningColumns, relationContext.targetEntity, relationContext.entity, { filter }, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t\t\t.select(['junction_', joiningColumns.sourceColumn.columnName])\n\t\t\t.select(expr => expr.raw('count(*)'), 'row_count')\n\t\t\t.groupBy(['junction_', joiningColumns.sourceColumn.columnName])\n\n\t\tconst result = new Map<string, number>()\n\t\tconst rows = await qb.getResult(mapper.db)\n\t\tfor (const row of rows) {\n\t\t\tresult.set(String(row[joiningColumns.sourceColumn.columnName]), Number(row.row_count))\n\t\t}\n\n\t\treturn Object.fromEntries(result)\n\t}\n\n\tpublic async fetchManyHasManyGroups({\n\t\tmapper,\n\t\tfield,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: FetchManyHasManyGroupsArgs): Promise<SelectGroupedObjects> {\n\t\tconst owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation\n\t\tconst joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable })\n\t\tconst defaultOrderBy = relationContext.relation.orderBy\n\t\tconst objectNode = OrderByHelper.appendDefaultOrderBy(relationContext.targetEntity, field, defaultOrderBy)\n\t\tconst { targetEntity, entity } = relationContext\n\t\tconst junctionValues = await this.fetchJunction(\n\t\t\tmapper.db,\n\t\t\towningRelation,\n\t\t\tids,\n\t\t\tjoiningColumns,\n\t\t\ttargetEntity,\n\t\t\tentity,\n\t\t\tobjectNode,\n\t\t\t[...relationPath, relationContext],\n\t\t)\n\t\tif (junctionValues.length === 0) {\n\t\t\treturn {}\n\t\t}\n\n\t\tconst primaryField = new FieldNode(targetEntity.primary, targetEntity.primary, {})\n\t\tconst inverseJoiningColumn = joiningColumns.targetColumn.columnName\n\t\tconst inverseIds = junctionValues\n\t\t\t.map(it => it[inverseJoiningColumn])\n\t\t\t.filter((it, index, arr) => arr.indexOf(it) === index)\n\n\t\tconst queryWithWhere = objectNode\n\t\t\t.withArgs({\n\t\t\t\tfilter: {\n\t\t\t\t\t[targetEntity.primary]: { in: inverseIds },\n\t\t\t\t},\n\t\t\t})\n\t\t\t.withField(primaryField)\n\t\tconst result = await mapper.select(targetEntity, queryWithWhere, [...relationPath, relationContext])\n\n\t\treturn this.buildManyHasManyGroups(targetEntity, joiningColumns, result, junctionValues)\n\t}\n\n\tprivate resolveJoiningColumns({ relationType, joiningTable }: { joiningTable: Model.JoiningTable; relationType: 'manyHasManyOwning' \| 'manyHasManyInverse' }): JoiningColumns {\n\t\treturn relationType === 'manyHasManyOwning' ? {\n\t\t\tsourceColumn: joiningTable.joiningColumn,\n\t\t\ttargetColumn: joiningTable.inverseJoiningColumn,\n\t\t} : {\n\t\t\tsourceColumn: joiningTable.inverseJoiningColumn,\n\t\t\ttargetColumn: joiningTable.joiningColumn,\n\t\t}\n\t}\n\n\tprivate buildManyHasManyGroups(\n\t\tentity: Model.Entity,\n\t\tjoiningColumns: JoiningColumns,\n\t\tresultObjects: SelectResultObject[],\n\t\tjunctionValues: SelectRow[],\n\t): SelectGroupedObjects {\n\t\tconst dataById: { [id: string]: SelectResultObject } = {}\n\t\tfor (let object of resultObjects) {\n\t\t\tdataById[object[entity.primary] as Value.PrimaryValue] = object\n\t\t}\n\t\tconst sourceColumn = joiningColumns.sourceColumn.columnName\n\t\tconst targetColumn = joiningColumns.targetColumn.columnName\n\t\tconst groupedResult: SelectGroupedObjects = {}\n\t\tfor (let pair of junctionValues) {\n\t\t\tif (!groupedResult[pair[sourceColumn] as Value.PrimaryValue]) {\n\t\t\t\tgroupedResult[pair[sourceColumn] as Value.PrimaryValue] = []\n\t\t\t}\n\t\t\tconst resultObject = dataById[pair[targetColumn] as Value.PrimaryValue]\n\t\t\tif (resultObject) {\n\t\t\t\tgroupedResult[pair[sourceColumn] as Value.PrimaryValue].push(resultObject)\n\t\t\t}\n\t\t}\n\t\treturn groupedResult\n\t}\n\n\tprivate async fetchJunction(\n\t\tdb: Client,\n\t\trelation: Model.ManyHasManyOwningRelation,\n\t\tvalues: Input.PrimaryValue[],\n\t\tcolumn: JoiningColumns,\n\t\ttargetEntity: Model.Entity,\n\t\tsourceEntity: Model.Entity,\n\t\tobject: ObjectNode<Input.ListQueryInput>,\n\t\trelationPath: Model.AnyRelationContext[],\n\t): Promise<Record<string, Value.AtomicValue>[]> {\n\t\tconst joiningTable = relation.joiningTable\n\t\tconst qb = this.buildJunctionQb(relation, values, column, targetEntity, sourceEntity, object.args, relationPath)\n\t\t\t.select(['junction_', joiningTable.inverseJoiningColumn.columnName])\n\t\t\t.select(['junction_', joiningTable.joiningColumn.columnName])\n\t\tconst wrapper = new LimitByGroupWrapper(\n\t\t\t['junction_', column.sourceColumn.columnName],\n\t\t\t(orderable, qb) => {\n\t\t\t\tif (object.args.orderBy) {\n\t\t\t\t\t[qb, orderable] = this.orderBuilder.build(\n\t\t\t\t\t\tqb,\n\t\t\t\t\t\torderable,\n\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\tthis.pathFactory.create([]),\n\t\t\t\t\t\tobject.args.orderBy,\n\t\t\t\t\t)\n\t\t\t\t}\n\t\t\t\treturn [orderable, qb]\n\t\t\t},\n\t\t\tobject.args.offset,\n\t\t\tobject.args.limit,\n\t\t)\n\n\t\treturn await wrapper.getResult(qb, db)\n\t}\n\n\tprivate buildJunctionQb(\n\t\trelation: Model.ManyHasManyOwningRelation,\n\t\tids: Input.PrimaryValue[],\n\t\tcolumn: JoiningColumns,\n\t\ttargetEntity: Model.Entity,\n\t\tsourceEntity: Model.Entity,\n\t\tobjectArgs: Input.ListQueryInput,\n\t\trelationPath: Model.AnyRelationContext[],\n\t): SelectBuilder {\n\t\tconst joiningTable = relation.joiningTable\n\n\t\tconst whereColumn = column.sourceColumn.columnName\n\t\tconst primaryColumn = sourceEntity.fields[sourceEntity.primary] as Model.AnyColumn\n\t\tlet qb = SelectBuilder.create()\n\t\t\t.from(joiningTable.tableName, 'junction_')\n\t\t\t.where(clause => clause.in(['junction_', whereColumn], ids, primaryColumn.columnType))\n\n\t\tconst where = this.predicateInjector.inject(targetEntity, objectArgs.filter \|\| {}, relationPath[relationPath.length - 1])\n\t\tconst hasWhere = where && Object.keys(where).length > 0\n\t\tconst hasFieldOrderBy =\n\t\t\tobjectArgs.orderBy &&\n\t\t\tobjectArgs.orderBy.length > 0 &&\n\t\t\t!objectArgs.orderBy[0]._random &&\n\t\t\tobjectArgs.orderBy[0]._randomSeeded === undefined\n\n\t\tif (hasWhere \|\| hasFieldOrderBy) {\n\t\t\tconst path = this.pathFactory.create([])\n\t\t\tqb = qb.join(targetEntity.tableName, path.alias, condition =>\n\t\t\t\tcondition.compareColumns(['junction_', column.targetColumn.columnName], Operator.eq, [\n\t\t\t\t\tpath.alias,\n\t\t\t\t\ttargetEntity.primaryColumn,\n\t\t\t\t]),\n\t\t\t)\n\t\t}\n\n\t\tif (where && hasWhere) {\n\t\t\tqb = this.whereBuilder.build(qb, targetEntity, this.pathFactory.create([]), where, { relationPath })\n\t\t}\n\t\treturn qb\n\t}\n}\n"],"names":["qb"],"mappings":"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"}
1	+ {"version":3,"file":"RelationFetcher.js","sources":["../../../../../../packages/engine-content-api/src/mapper/select/RelationFetcher.ts"],"sourcesContent":["import { PathFactory } from './Path'\nimport { WhereBuilder } from './WhereBuilder'\nimport { Client, LimitByGroupWrapper, Operator, SelectBuilder } from '@contember/database'\nimport { Input, Model, Value } from '@contember/schema'\nimport { OrderByBuilder } from './OrderByBuilder'\nimport { PredicatesInjector } from '../../acl'\nimport { FieldNode, ObjectNode } from '../../inputProcessing'\nimport { JoiningColumns } from '../types'\nimport { OrderByHelper } from './OrderByHelper'\nimport { SelectGroupedObjects, SelectResultObject, SelectRow } from './SelectHydrator'\nimport { Mapper } from '../Mapper'\n\nexport type GroupedCounts = Record<Input.PrimaryValue, number>\n\ntype CountOneHasManyGroupsArgs = {\n\tmapper: Mapper\n\tfilter: Input.OptionalWhere \| undefined\n\trelationPath: Model.AnyRelationContext[]\n\trelationContext: Model.OneHasManyContext\n\tids: Input.PrimaryValue[]\n}\n\ntype FetchOneHasManyGroupsArgs = {\n\tmapper: Mapper\n\tobjectNode: ObjectNode<Input.ListQueryInput>\n\trelationPath: Model.AnyRelationContext[]\n\trelationContext: Model.OneHasManyContext\n\tids: Input.PrimaryValue[]\n}\n\ntype ManyHasManyBaseArgs = {\n\tmapper: Mapper\n\tids: Input.PrimaryValue[]\n\trelationPath: Model.AnyRelationContext[]\n\trelationContext: Model.ManyHasManyInverseContext \| Model.ManyHasManyOwningContext\n}\ntype CountManyHasManyGroupArgs =\n\t& ManyHasManyBaseArgs\n\t& {\n\t\tfilter: Input.OptionalWhere \| undefined\n\t}\n\ntype FetchManyHasManyGroupsArgs =\n\t& ManyHasManyBaseArgs\n\t& {\n\t\tfield: ObjectNode<Input.ListQueryInput>\n\t}\n\nexport class RelationFetcher {\n\tconstructor(\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly orderBuilder: OrderByBuilder,\n\t\tprivate readonly predicateInjector: PredicatesInjector,\n\t\tprivate readonly pathFactory: PathFactory,\n\t) {}\n\n\tpublic async countOneHasManyGroups({\n\t\tmapper,\n\t\tfilter,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: CountOneHasManyGroupsArgs): Promise<GroupedCounts> {\n\t\tconst { targetRelation, targetEntity } = relationContext\n\t\tconst filterWithParent = this.createOneHasManyFilter(targetEntity, targetRelation, ids, filter)\n\t\treturn mapper.countGrouped(targetEntity, filterWithParent, targetRelation, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t}\n\n\tpublic async fetchOneHasManyGroups({\n\t\tmapper,\n\t\tobjectNode,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: FetchOneHasManyGroupsArgs): Promise<SelectGroupedObjects> {\n\t\tconst { relation, targetEntity, targetRelation } = relationContext\n\t\tconst filter = this.createOneHasManyFilter(targetEntity, targetRelation, ids, objectNode.args.filter)\n\t\tconst objectNodeWithWhere = objectNode.withArg<Input.ListQueryInput>('filter', filter)\n\t\tconst objectNodeWithOrder = OrderByHelper.appendDefaultOrderBy(\n\t\t\ttargetEntity,\n\t\t\tobjectNodeWithWhere,\n\t\t\trelation.orderBy,\n\t\t)\n\n\t\treturn mapper.selectGrouped(targetEntity, objectNodeWithOrder, targetRelation, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t}\n\n\tprivate createOneHasManyFilter(\n\t\ttargetEntity: Model.Entity,\n\t\ttargetRelation: Model.ManyHasOneRelation,\n\t\tids: Input.PrimaryValue[],\n\t\tfilter: Input.OptionalWhere \| undefined,\n\t): Input.OptionalWhere {\n\t\tconst targetRelationFilter: Input.OptionalWhere = { [targetEntity.primary]: { in: ids } }\n\t\treturn {\n\t\t\t...filter,\n\t\t\t[targetRelation.name]: !filter?.[targetRelation.name]\n\t\t\t\t? targetRelationFilter\n\t\t\t\t: ({ and: [filter[targetRelation.name], targetRelationFilter] } as Input.OptionalWhere),\n\t\t}\n\t}\n\n\tpublic async countManyHasManyGroups({\n\t\tmapper,\n\t\tfilter,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: CountManyHasManyGroupArgs): Promise<GroupedCounts> {\n\t\tconst owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation\n\n\t\tconst joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable })\n\n\t\tconst qb = this.buildJunctionQb(owningRelation, ids, joiningColumns, relationContext.targetEntity, relationContext.entity, { filter }, [\n\t\t\t...relationPath,\n\t\t\trelationContext,\n\t\t])\n\t\t\t.select(['junction_', joiningColumns.sourceColumn.columnName])\n\t\t\t.select(expr => expr.raw('count(*)'), 'row_count')\n\t\t\t.groupBy(['junction_', joiningColumns.sourceColumn.columnName])\n\n\t\tconst result = new Map<string, number>()\n\t\tconst rows = await qb.getResult(mapper.db)\n\t\tfor (const row of rows) {\n\t\t\tresult.set(String(row[joiningColumns.sourceColumn.columnName]), Number(row.row_count))\n\t\t}\n\n\t\treturn Object.fromEntries(result)\n\t}\n\n\tpublic async fetchManyHasManyGroups({\n\t\tmapper,\n\t\tfield,\n\t\trelationContext,\n\t\trelationPath,\n\t\tids,\n\t}: FetchManyHasManyGroupsArgs): Promise<SelectGroupedObjects> {\n\t\tconst owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation\n\t\tconst joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable })\n\t\tconst defaultOrderBy = relationContext.relation.orderBy\n\t\tconst objectNode = OrderByHelper.appendDefaultOrderBy(relationContext.targetEntity, field, defaultOrderBy)\n\t\tconst { targetEntity, entity } = relationContext\n\t\tconst junctionValues = await this.fetchJunction(\n\t\t\tmapper.db,\n\t\t\towningRelation,\n\t\t\tids,\n\t\t\tjoiningColumns,\n\t\t\ttargetEntity,\n\t\t\tentity,\n\t\t\tobjectNode,\n\t\t\t[...relationPath, relationContext],\n\t\t)\n\t\tif (junctionValues.length === 0) {\n\t\t\treturn {}\n\t\t}\n\n\t\tconst primaryField = new FieldNode(targetEntity.primary, targetEntity.primary, {})\n\t\tconst inverseJoiningColumn = joiningColumns.targetColumn.columnName\n\t\tconst inverseIds = junctionValues\n\t\t\t.map(it => it[inverseJoiningColumn])\n\t\t\t.filter((it, index, arr) => arr.indexOf(it) === index)\n\n\t\tconst queryWithWhere = objectNode\n\t\t\t.withArgs({\n\t\t\t\tfilter: {\n\t\t\t\t\t[targetEntity.primary]: { in: inverseIds },\n\t\t\t\t},\n\t\t\t})\n\t\t\t.withField(primaryField)\n\t\tconst result = await mapper.select(targetEntity, queryWithWhere, [...relationPath, relationContext])\n\n\t\treturn this.buildManyHasManyGroups(targetEntity, joiningColumns, result, junctionValues)\n\t}\n\n\tprivate resolveJoiningColumns(\n\t\t{ relationType, joiningTable }: { joiningTable: Model.JoiningTable; relationType: 'manyHasManyOwning' \| 'manyHasManyInverse' },\n\t): JoiningColumns {\n\t\treturn relationType === 'manyHasManyOwning'\n\t\t\t? {\n\t\t\t\tsourceColumn: joiningTable.joiningColumn,\n\t\t\t\ttargetColumn: joiningTable.inverseJoiningColumn,\n\t\t\t}\n\t\t\t: {\n\t\t\t\tsourceColumn: joiningTable.inverseJoiningColumn,\n\t\t\t\ttargetColumn: joiningTable.joiningColumn,\n\t\t\t}\n\t}\n\n\tprivate buildManyHasManyGroups(\n\t\tentity: Model.Entity,\n\t\tjoiningColumns: JoiningColumns,\n\t\tresultObjects: SelectResultObject[],\n\t\tjunctionValues: SelectRow[],\n\t): SelectGroupedObjects {\n\t\tconst dataById: { [id: string]: SelectResultObject } = {}\n\t\tfor (let object of resultObjects) {\n\t\t\tdataById[object[entity.primary] as Value.PrimaryValue] = object\n\t\t}\n\t\tconst sourceColumn = joiningColumns.sourceColumn.columnName\n\t\tconst targetColumn = joiningColumns.targetColumn.columnName\n\t\tconst groupedResult: SelectGroupedObjects = {}\n\t\tfor (let pair of junctionValues) {\n\t\t\tif (!groupedResult[pair[sourceColumn] as Value.PrimaryValue]) {\n\t\t\t\tgroupedResult[pair[sourceColumn] as Value.PrimaryValue] = []\n\t\t\t}\n\t\t\tconst resultObject = dataById[pair[targetColumn] as Value.PrimaryValue]\n\t\t\tif (resultObject) {\n\t\t\t\tgroupedResult[pair[sourceColumn] as Value.PrimaryValue].push(resultObject)\n\t\t\t}\n\t\t}\n\t\treturn groupedResult\n\t}\n\n\tprivate async fetchJunction(\n\t\tdb: Client,\n\t\trelation: Model.ManyHasManyOwningRelation,\n\t\tvalues: Input.PrimaryValue[],\n\t\tcolumn: JoiningColumns,\n\t\ttargetEntity: Model.Entity,\n\t\tsourceEntity: Model.Entity,\n\t\tobject: ObjectNode<Input.ListQueryInput>,\n\t\trelationPath: Model.AnyRelationContext[],\n\t): Promise<Record<string, Value.AtomicValue>[]> {\n\t\tconst joiningTable = relation.joiningTable\n\t\tconst qb = this.buildJunctionQb(relation, values, column, targetEntity, sourceEntity, object.args, relationPath)\n\t\t\t.select(['junction_', joiningTable.inverseJoiningColumn.columnName])\n\t\t\t.select(['junction_', joiningTable.joiningColumn.columnName])\n\t\tconst wrapper = new LimitByGroupWrapper(\n\t\t\t['junction_', column.sourceColumn.columnName],\n\t\t\t(orderable, qb) => {\n\t\t\t\tif (object.args.orderBy) {\n\t\t\t\t\t;[qb, orderable] = this.orderBuilder.build(\n\t\t\t\t\t\tqb,\n\t\t\t\t\t\torderable,\n\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\tthis.pathFactory.create([]),\n\t\t\t\t\t\tobject.args.orderBy,\n\t\t\t\t\t)\n\t\t\t\t}\n\t\t\t\treturn [orderable, qb]\n\t\t\t},\n\t\t\tobject.args.offset,\n\t\t\tobject.args.limit,\n\t\t)\n\n\t\treturn await wrapper.getResult(qb, db)\n\t}\n\n\tprivate buildJunctionQb(\n\t\trelation: Model.ManyHasManyOwningRelation,\n\t\tids: Input.PrimaryValue[],\n\t\tcolumn: JoiningColumns,\n\t\ttargetEntity: Model.Entity,\n\t\tsourceEntity: Model.Entity,\n\t\tobjectArgs: Input.ListQueryInput,\n\t\trelationPath: Model.AnyRelationContext[],\n\t): SelectBuilder {\n\t\tconst joiningTable = relation.joiningTable\n\n\t\tconst whereColumn = column.sourceColumn.columnName\n\t\tconst primaryColumn = sourceEntity.fields[sourceEntity.primary] as Model.AnyColumn\n\t\tlet qb = SelectBuilder.create()\n\t\t\t.from(joiningTable.tableName, 'junction_')\n\t\t\t.where(clause => clause.in(['junction_', whereColumn], ids, primaryColumn.columnType))\n\n\t\tconst where = this.predicateInjector.inject(targetEntity, objectArgs.filter \|\| {}, relationPath[relationPath.length - 1])\n\t\tconst hasWhere = where && Object.keys(where).length > 0\n\t\tconst hasFieldOrderBy = objectArgs.orderBy\n\t\t\t&& objectArgs.orderBy.length > 0\n\t\t\t&& !objectArgs.orderBy[0]._random\n\t\t\t&& objectArgs.orderBy[0]._randomSeeded === undefined\n\n\t\tif (hasWhere \|\| hasFieldOrderBy) {\n\t\t\tconst path = this.pathFactory.create([])\n\t\t\tqb = qb.join(\n\t\t\t\ttargetEntity.tableName,\n\t\t\t\tpath.alias,\n\t\t\t\tcondition =>\n\t\t\t\t\tcondition.compareColumns(['junction_', column.targetColumn.columnName], Operator.eq, [\n\t\t\t\t\t\tpath.alias,\n\t\t\t\t\t\ttargetEntity.primaryColumn,\n\t\t\t\t\t]),\n\t\t\t)\n\t\t}\n\n\t\tif (where && hasWhere) {\n\t\t\tqb = this.whereBuilder.build(qb, targetEntity, this.pathFactory.create([]), where, { relationPath })\n\t\t}\n\t\treturn qb\n\t}\n}\n"],"names":["qb"],"mappings":"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"}

package/dist/development/src/mapper/select/SelectBuilder.cjs CHANGED Viewed

@@ -83,16 +83,13 @@ class SelectBuilder {
           entity,
           path.back(),
           fieldPredicate,
-          (apply) => this.qb.select(
-            (expr) => expr.selectCondition((condition) => {
-              condition = apply(condition);
-              if (condition.isEmpty()) {
-                return condition.raw("true");
-              }
-              return condition;
-            }),
-            predicatePath.alias
-          ),
+          (apply) => this.qb.select((expr) => expr.selectCondition((condition) => {
+            condition = apply(condition);
+            if (condition.isEmpty()) {
+              return condition.raw("true");
+            }
+            return condition;
+          }), predicatePath.alias),
           { relationPath: this.relationPath, evaluatedPredicates: [primaryPredicate] }
         );
         fetchedPredicates.add(predicate);

package/dist/development/src/mapper/select/SelectBuilder.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SelectBuilder.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/select/SelectBuilder.ts"],"sourcesContent":["import { Acl, Input, Model, Value } from '@contember/schema'\nimport { acceptFieldVisitor, getColumnName } from '@contember/schema-utils'\nimport { ColumnValueGetter, SelectHydrator, SelectRow } from './SelectHydrator'\nimport { Path, PathFactory } from './Path'\nimport { WhereBuilder } from './WhereBuilder'\nimport { Client, LimitByGroupWrapper, SelectBuilder as DbSelectBuilder } from '@contember/database'\nimport { OrderByBuilder } from './OrderByBuilder'\nimport { FieldsVisitorFactory } from './handlers'\nimport { SelectExecutionHandler, SelectExecutionHandlerContext } from './SelectExecutionHandler'\nimport { MetaHandler } from './handlers'\nimport { Mapper } from '../Mapper'\nimport { FieldNode, ObjectNode } from '../../inputProcessing'\nimport { assertNever } from '../../utils'\nimport { PredicateFactory } from '../../acl'\n\nexport class SelectBuilder {\n\tprivate resolver: (value: SelectRow[]) => void = () => {\n\t\tthrow new Error('SelectBuilder: Resolver called too soon')\n\t}\n\tpublic readonly rows: Promise<SelectRow[]> = new Promise(resolve => (this.resolver = resolve))\n\n\tprivate queryWrapper: LimitByGroupWrapper \| null = null\n\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly orderByBuilder: OrderByBuilder,\n\t\tprivate readonly metaHandler: MetaHandler,\n\t\tprivate qb: DbSelectBuilder<DbSelectBuilder.Result>,\n\t\tprivate readonly hydrator: SelectHydrator,\n\t\tprivate readonly fieldsVisitorFactory: FieldsVisitorFactory,\n\t\tprivate readonly selectHandlers: { [key: string]: SelectExecutionHandler<any> },\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly relationPath: Model.AnyRelationContext[],\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic async execute(db: Client): Promise<SelectRow[]> {\n\t\tlet result: SelectRow[]\n\t\tif (this.queryWrapper) {\n\t\t\tresult = await this.queryWrapper.getResult(this.qb, db)\n\t\t} else {\n\t\t\tresult = await this.qb.getResult(db)\n\t\t}\n\t\tthis.resolver(result)\n\t\treturn result\n\t}\n\n\tpublic select(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tinput: ObjectNode<Input.ListQueryInput>,\n\t\tpath: Path,\n\t\tgroupBy?: string,\n\t) {\n\t\tthis.selectInternal(mapper, entity, path, input)\n\t\tconst where = input.args.filter\n\t\tif (where) {\n\t\t\tthis.qb = this.whereBuilder.build(this.qb, entity, path, where, { relationPath: this.relationPath })\n\t\t}\n\t\tconst orderBy = input.args.orderBy \|\| []\n\n\t\tif (groupBy) {\n\t\t\tconst groupByColumn = getColumnName(this.schema, entity, groupBy)\n\t\t\tthis.queryWrapper = new LimitByGroupWrapper(\n\t\t\t\t[path.alias, groupByColumn],\n\t\t\t\t(orderable, qb) => {\n\t\t\t\t\tif (orderBy.length > 0) {\n\t\t\t\t\t\t[qb, orderable] = this.orderByBuilder.build(qb, orderable, entity, this.pathFactory.create([]), orderBy)\n\t\t\t\t\t}\n\t\t\t\t\treturn [orderable, qb]\n\t\t\t\t},\n\t\t\t\tinput.args.offset,\n\t\t\t\tinput.args.limit,\n\t\t\t)\n\t\t} else {\n\t\t\tif (orderBy.length > 0) {\n\t\t\t\t[this.qb] = this.orderByBuilder.build(this.qb, null, entity, path, orderBy)\n\t\t\t}\n\t\t\tthis.qb = this.qb.limit(input.args.limit, input.args.offset)\n\t\t}\n\t}\n\n\tprivate selectInternal(mapper: Mapper, entity: Model.Entity, path: Path, input: ObjectNode) {\n\t\tif (!input.fields.find(it => it.name === entity.primary && it.alias === entity.primary)) {\n\t\t\tinput = input.withField(new FieldNode(entity.primary, entity.primary, {}))\n\t\t}\n\n\t\tconst fetchedPredicates = new Set()\n\t\tconst addPredicate = (predicate: Acl.Predicate): ColumnValueGetter<boolean> => {\n\t\t\tif (typeof predicate === 'boolean') {\n\t\t\t\treturn () => predicate\n\t\t\t}\n\t\t\tconst predicatePath = path.for('__predicate').for(predicate)\n\n\t\t\tif (!fetchedPredicates.has(predicate)) {\n\t\t\t\tconst relationContext = this.relationPath[this.relationPath.length - 1]\n\n\t\t\t\tconst primaryPredicate = this.predicateFactory.create(entity, Acl.Operation.read, undefined, relationContext)\n\t\t\t\tconst fieldPredicate = this.predicateFactory.buildPredicates(entity, [predicate], relationContext)\n\n\t\t\t\tthis.qb = this.whereBuilder.buildAdvanced(\n\t\t\t\t\tentity,\n\t\t\t\t\tpath.back(),\n\t\t\t\t\tfieldPredicate,\n\t\t\t\t\tapply => this.qb.select(expr =>\n\t\t\t\t\t\texpr.selectCondition(condition => {\n\t\t\t\t\t\t\tcondition = apply(condition)\n\t\t\t\t\t\t\tif (condition.isEmpty()) {\n\t\t\t\t\t\t\t\treturn condition.raw('true')\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\treturn condition\n\t\t\t\t\t\t}),\n\t\t\t\t\tpredicatePath.alias,\n\t\t\t\t\t),\n\t\t\t\t\t{ relationPath: this.relationPath, evaluatedPredicates: [primaryPredicate] },\n\t\t\t\t)\n\t\t\t\tfetchedPredicates.add(predicate)\n\t\t\t}\n\t\t\treturn row => row[predicatePath.alias] === true\n\t\t}\n\n\t\tfor (let field of input.fields) {\n\t\t\tconst fieldPath = path.for(field.alias)\n\t\t\tconst fieldProperty = (() => {\n\t\t\t\tif (field instanceof ObjectNode) {\n\t\t\t\t\treturn { objectNode: field }\n\t\t\t\t}\n\t\t\t\tif (field instanceof FieldNode) {\n\t\t\t\t\treturn { fieldNode: field }\n\t\t\t\t}\n\t\t\t\treturn assertNever(field)\n\t\t\t})()\n\n\n\t\t\tconst executionContext: SelectExecutionHandlerContext = {\n\t\t\t\tmapper,\n\t\t\t\trelationPath: this.relationPath,\n\t\t\t\taddData: async ({ field, dataProvider, defaultValue, predicate }) => {\n\t\t\t\t\tif (predicate === false) {\n\t\t\t\t\t\tthis.hydrator.addPromise(fieldPath, () => null, Promise.resolve({}), defaultValue ?? null)\n\t\t\t\t\t\treturn\n\t\t\t\t\t}\n\t\t\t\t\tconst predicateGetter = predicate !== undefined && predicate !== true ? addPredicate(predicate) : null\n\t\t\t\t\tconst columnName = getColumnName(this.schema, entity, field)\n\t\t\t\t\tconst parentValuePath = path.for(field)\n\t\t\t\t\tlet ids = await this.getColumnValues(parentValuePath, columnName, predicateGetter)\n\n\t\t\t\t\tconst data = ids.length > 0 ? dataProvider(ids) : Promise.resolve({})\n\t\t\t\t\tthis.hydrator.addPromise(\n\t\t\t\t\t\tfieldPath,\n\t\t\t\t\t\trow => predicateGetter === null \|\| predicateGetter(row) ? (row[parentValuePath.alias] as Value.PrimaryValue) : null,\n\t\t\t\t\t\tdata,\n\t\t\t\t\t\tdefaultValue ?? null,\n\t\t\t\t\t)\n\t\t\t\t},\n\t\t\t\taddColumn: ({ path = fieldPath, predicate, query, valueGetter }) => {\n\t\t\t\t\tif (predicate === false) {\n\t\t\t\t\t\tthis.hydrator.addColumn(path, () => null)\n\t\t\t\t\t\treturn\n\t\t\t\t\t}\n\t\t\t\t\tconst predicateGetter = predicate !== undefined && predicate !== true ? addPredicate(predicate) : null\n\t\t\t\t\tif (query) {\n\t\t\t\t\t\tthis.qb = query(this.qb)\n\t\t\t\t\t}\n\t\t\t\t\tthis.hydrator.addColumn(\n\t\t\t\t\t\tpath,\n\t\t\t\t\t\tvalueGetter ?? (row => predicateGetter === null \|\| predicateGetter(row) ? row[path.alias] : null),\n\t\t\t\t\t)\n\t\t\t\t},\n\t\t\t\taddPredicate: addPredicate,\n\t\t\t\tpath: fieldPath,\n\t\t\t\tentity: entity,\n\t\t\t\t...fieldProperty,\n\t\t\t}\n\n\t\t\tif (field.name === '_meta') {\n\t\t\t\tthis.metaHandler.process(executionContext)\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\t// Disregarding __typename field since it's automatically handled by apollo server\n\t\t\tif (field.name === '__typename') {\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\tif (field.extensions.extensionKey) {\n\t\t\t\tconst handler = this.selectHandlers[field.extensions.extensionKey]\n\t\t\t\tif (!handler) {\n\t\t\t\t\tthrow new Error(`Handler for ${field.extensions.extensionKey} not found`)\n\t\t\t\t}\n\t\t\t\thandler.process(executionContext)\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\tconst fieldVisitor = this.fieldsVisitorFactory.create(mapper, executionContext)\n\t\t\tacceptFieldVisitor(this.schema, entity, field.name, fieldVisitor)\n\t\t}\n\t}\n\n\tprivate async getColumnValues(columnPath: Path, columnName: string, predicateGetter: null \| ColumnValueGetter<boolean>): Promise<Input.PrimaryValue[]> {\n\t\tthis.qb = this.qb.select([columnPath.back().alias, columnName], columnPath.alias)\n\t\tconst rows = await this.rows\n\t\tconst filteredRows = predicateGetter === null ? rows : rows.filter(predicateGetter)\n\t\tconst columnAlias = columnPath.alias\n\t\tconst ids = filteredRows.map((it): Input.PrimaryValue => it[columnAlias] as Input.PrimaryValue).filter(it => it !== null)\n\t\treturn Array.from(new Set(ids))\n\t}\n}\n"],"names":["schema","getColumnName","LimitByGroupWrapper","FieldNode","Acl","ObjectNode","assertNever","field","path","acceptFieldVisitor"],"mappings":"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"}
1	+ {"version":3,"file":"SelectBuilder.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/select/SelectBuilder.ts"],"sourcesContent":["import { Acl, Input, Model, Value } from '@contember/schema'\nimport { acceptFieldVisitor, getColumnName } from '@contember/schema-utils'\nimport { ColumnValueGetter, SelectHydrator, SelectRow } from './SelectHydrator'\nimport { Path, PathFactory } from './Path'\nimport { WhereBuilder } from './WhereBuilder'\nimport { Client, LimitByGroupWrapper, SelectBuilder as DbSelectBuilder } from '@contember/database'\nimport { OrderByBuilder } from './OrderByBuilder'\nimport { FieldsVisitorFactory } from './handlers'\nimport { SelectExecutionHandler, SelectExecutionHandlerContext } from './SelectExecutionHandler'\nimport { MetaHandler } from './handlers'\nimport { Mapper } from '../Mapper'\nimport { FieldNode, ObjectNode } from '../../inputProcessing'\nimport { assertNever } from '../../utils'\nimport { PredicateFactory } from '../../acl'\n\nexport class SelectBuilder {\n\tprivate resolver: (value: SelectRow[]) => void = () => {\n\t\tthrow new Error('SelectBuilder: Resolver called too soon')\n\t}\n\tpublic readonly rows: Promise<SelectRow[]> = new Promise(resolve => (this.resolver = resolve))\n\n\tprivate queryWrapper: LimitByGroupWrapper \| null = null\n\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly orderByBuilder: OrderByBuilder,\n\t\tprivate readonly metaHandler: MetaHandler,\n\t\tprivate qb: DbSelectBuilder<DbSelectBuilder.Result>,\n\t\tprivate readonly hydrator: SelectHydrator,\n\t\tprivate readonly fieldsVisitorFactory: FieldsVisitorFactory,\n\t\tprivate readonly selectHandlers: { [key: string]: SelectExecutionHandler<any> },\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly relationPath: Model.AnyRelationContext[],\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic async execute(db: Client): Promise<SelectRow[]> {\n\t\tlet result: SelectRow[]\n\t\tif (this.queryWrapper) {\n\t\t\tresult = await this.queryWrapper.getResult(this.qb, db)\n\t\t} else {\n\t\t\tresult = await this.qb.getResult(db)\n\t\t}\n\t\tthis.resolver(result)\n\t\treturn result\n\t}\n\n\tpublic select(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tinput: ObjectNode<Input.ListQueryInput>,\n\t\tpath: Path,\n\t\tgroupBy?: string,\n\t) {\n\t\tthis.selectInternal(mapper, entity, path, input)\n\t\tconst where = input.args.filter\n\t\tif (where) {\n\t\t\tthis.qb = this.whereBuilder.build(this.qb, entity, path, where, { relationPath: this.relationPath })\n\t\t}\n\t\tconst orderBy = input.args.orderBy \|\| []\n\n\t\tif (groupBy) {\n\t\t\tconst groupByColumn = getColumnName(this.schema, entity, groupBy)\n\t\t\tthis.queryWrapper = new LimitByGroupWrapper(\n\t\t\t\t[path.alias, groupByColumn],\n\t\t\t\t(orderable, qb) => {\n\t\t\t\t\tif (orderBy.length > 0) {\n\t\t\t\t\t\t;[qb, orderable] = this.orderByBuilder.build(qb, orderable, entity, this.pathFactory.create([]), orderBy)\n\t\t\t\t\t}\n\t\t\t\t\treturn [orderable, qb]\n\t\t\t\t},\n\t\t\t\tinput.args.offset,\n\t\t\t\tinput.args.limit,\n\t\t\t)\n\t\t} else {\n\t\t\tif (orderBy.length > 0) {\n\t\t\t\t;[this.qb] = this.orderByBuilder.build(this.qb, null, entity, path, orderBy)\n\t\t\t}\n\t\t\tthis.qb = this.qb.limit(input.args.limit, input.args.offset)\n\t\t}\n\t}\n\n\tprivate selectInternal(mapper: Mapper, entity: Model.Entity, path: Path, input: ObjectNode) {\n\t\tif (!input.fields.find(it => it.name === entity.primary && it.alias === entity.primary)) {\n\t\t\tinput = input.withField(new FieldNode(entity.primary, entity.primary, {}))\n\t\t}\n\n\t\tconst fetchedPredicates = new Set()\n\t\tconst addPredicate = (predicate: Acl.Predicate): ColumnValueGetter<boolean> => {\n\t\t\tif (typeof predicate === 'boolean') {\n\t\t\t\treturn () => predicate\n\t\t\t}\n\t\t\tconst predicatePath = path.for('__predicate').for(predicate)\n\n\t\t\tif (!fetchedPredicates.has(predicate)) {\n\t\t\t\tconst relationContext = this.relationPath[this.relationPath.length - 1]\n\n\t\t\t\tconst primaryPredicate = this.predicateFactory.create(entity, Acl.Operation.read, undefined, relationContext)\n\t\t\t\tconst fieldPredicate = this.predicateFactory.buildPredicates(entity, [predicate], relationContext)\n\n\t\t\t\tthis.qb = this.whereBuilder.buildAdvanced(\n\t\t\t\t\tentity,\n\t\t\t\t\tpath.back(),\n\t\t\t\t\tfieldPredicate,\n\t\t\t\t\tapply =>\n\t\t\t\t\t\tthis.qb.select(expr =>\n\t\t\t\t\t\t\texpr.selectCondition(condition => {\n\t\t\t\t\t\t\t\tcondition = apply(condition)\n\t\t\t\t\t\t\t\tif (condition.isEmpty()) {\n\t\t\t\t\t\t\t\t\treturn condition.raw('true')\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\treturn condition\n\t\t\t\t\t\t\t}), predicatePath.alias),\n\t\t\t\t\t{ relationPath: this.relationPath, evaluatedPredicates: [primaryPredicate] },\n\t\t\t\t)\n\t\t\t\tfetchedPredicates.add(predicate)\n\t\t\t}\n\t\t\treturn row => row[predicatePath.alias] === true\n\t\t}\n\n\t\tfor (let field of input.fields) {\n\t\t\tconst fieldPath = path.for(field.alias)\n\t\t\tconst fieldProperty = (() => {\n\t\t\t\tif (field instanceof ObjectNode) {\n\t\t\t\t\treturn { objectNode: field }\n\t\t\t\t}\n\t\t\t\tif (field instanceof FieldNode) {\n\t\t\t\t\treturn { fieldNode: field }\n\t\t\t\t}\n\t\t\t\treturn assertNever(field)\n\t\t\t})()\n\n\t\t\tconst executionContext: SelectExecutionHandlerContext = {\n\t\t\t\tmapper,\n\t\t\t\trelationPath: this.relationPath,\n\t\t\t\taddData: async ({ field, dataProvider, defaultValue, predicate }) => {\n\t\t\t\t\tif (predicate === false) {\n\t\t\t\t\t\tthis.hydrator.addPromise(fieldPath, () => null, Promise.resolve({}), defaultValue ?? null)\n\t\t\t\t\t\treturn\n\t\t\t\t\t}\n\t\t\t\t\tconst predicateGetter = predicate !== undefined && predicate !== true ? addPredicate(predicate) : null\n\t\t\t\t\tconst columnName = getColumnName(this.schema, entity, field)\n\t\t\t\t\tconst parentValuePath = path.for(field)\n\t\t\t\t\tlet ids = await this.getColumnValues(parentValuePath, columnName, predicateGetter)\n\n\t\t\t\t\tconst data = ids.length > 0 ? dataProvider(ids) : Promise.resolve({})\n\t\t\t\t\tthis.hydrator.addPromise(\n\t\t\t\t\t\tfieldPath,\n\t\t\t\t\t\trow => predicateGetter === null \|\| predicateGetter(row) ? (row[parentValuePath.alias] as Value.PrimaryValue) : null,\n\t\t\t\t\t\tdata,\n\t\t\t\t\t\tdefaultValue ?? null,\n\t\t\t\t\t)\n\t\t\t\t},\n\t\t\t\taddColumn: ({ path = fieldPath, predicate, query, valueGetter }) => {\n\t\t\t\t\tif (predicate === false) {\n\t\t\t\t\t\tthis.hydrator.addColumn(path, () => null)\n\t\t\t\t\t\treturn\n\t\t\t\t\t}\n\t\t\t\t\tconst predicateGetter = predicate !== undefined && predicate !== true ? addPredicate(predicate) : null\n\t\t\t\t\tif (query) {\n\t\t\t\t\t\tthis.qb = query(this.qb)\n\t\t\t\t\t}\n\t\t\t\t\tthis.hydrator.addColumn(\n\t\t\t\t\t\tpath,\n\t\t\t\t\t\tvalueGetter ?? (row => predicateGetter === null \|\| predicateGetter(row) ? row[path.alias] : null),\n\t\t\t\t\t)\n\t\t\t\t},\n\t\t\t\taddPredicate: addPredicate,\n\t\t\t\tpath: fieldPath,\n\t\t\t\tentity: entity,\n\t\t\t\t...fieldProperty,\n\t\t\t}\n\n\t\t\tif (field.name === '_meta') {\n\t\t\t\tthis.metaHandler.process(executionContext)\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\t// Disregarding __typename field since it's automatically handled by apollo server\n\t\t\tif (field.name === '__typename') {\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\tif (field.extensions.extensionKey) {\n\t\t\t\tconst handler = this.selectHandlers[field.extensions.extensionKey]\n\t\t\t\tif (!handler) {\n\t\t\t\t\tthrow new Error(`Handler for ${field.extensions.extensionKey} not found`)\n\t\t\t\t}\n\t\t\t\thandler.process(executionContext)\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\tconst fieldVisitor = this.fieldsVisitorFactory.create(mapper, executionContext)\n\t\t\tacceptFieldVisitor(this.schema, entity, field.name, fieldVisitor)\n\t\t}\n\t}\n\n\tprivate async getColumnValues(\n\t\tcolumnPath: Path,\n\t\tcolumnName: string,\n\t\tpredicateGetter: null \| ColumnValueGetter<boolean>,\n\t): Promise<Input.PrimaryValue[]> {\n\t\tthis.qb = this.qb.select([columnPath.back().alias, columnName], columnPath.alias)\n\t\tconst rows = await this.rows\n\t\tconst filteredRows = predicateGetter === null ? rows : rows.filter(predicateGetter)\n\t\tconst columnAlias = columnPath.alias\n\t\tconst ids = filteredRows.map((it): Input.PrimaryValue => it[columnAlias] as Input.PrimaryValue).filter(it => it !== null)\n\t\treturn Array.from(new Set(ids))\n\t}\n}\n"],"names":["schema","getColumnName","LimitByGroupWrapper","FieldNode","Acl","ObjectNode","assertNever","field","path","acceptFieldVisitor"],"mappings":"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"}

package/dist/development/src/mapper/select/SelectBuilder.js CHANGED Viewed

@@ -81,16 +81,13 @@ class SelectBuilder {
           entity,
           path.back(),
           fieldPredicate,
-          (apply) => this.qb.select(
-            (expr) => expr.selectCondition((condition) => {
-              condition = apply(condition);
-              if (condition.isEmpty()) {
-                return condition.raw("true");
-              }
-              return condition;
-            }),
-            predicatePath.alias
-          ),
+          (apply) => this.qb.select((expr) => expr.selectCondition((condition) => {
+            condition = apply(condition);
+            if (condition.isEmpty()) {
+              return condition.raw("true");
+            }
+            return condition;
+          }), predicatePath.alias),
           { relationPath: this.relationPath, evaluatedPredicates: [primaryPredicate] }
         );
         fetchedPredicates.add(predicate);

package/dist/development/src/mapper/select/SelectBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SelectBuilder.js","sources":["../../../../../../packages/engine-content-api/src/mapper/select/SelectBuilder.ts"],"sourcesContent":["import { Acl, Input, Model, Value } from '@contember/schema'\nimport { acceptFieldVisitor, getColumnName } from '@contember/schema-utils'\nimport { ColumnValueGetter, SelectHydrator, SelectRow } from './SelectHydrator'\nimport { Path, PathFactory } from './Path'\nimport { WhereBuilder } from './WhereBuilder'\nimport { Client, LimitByGroupWrapper, SelectBuilder as DbSelectBuilder } from '@contember/database'\nimport { OrderByBuilder } from './OrderByBuilder'\nimport { FieldsVisitorFactory } from './handlers'\nimport { SelectExecutionHandler, SelectExecutionHandlerContext } from './SelectExecutionHandler'\nimport { MetaHandler } from './handlers'\nimport { Mapper } from '../Mapper'\nimport { FieldNode, ObjectNode } from '../../inputProcessing'\nimport { assertNever } from '../../utils'\nimport { PredicateFactory } from '../../acl'\n\nexport class SelectBuilder {\n\tprivate resolver: (value: SelectRow[]) => void = () => {\n\t\tthrow new Error('SelectBuilder: Resolver called too soon')\n\t}\n\tpublic readonly rows: Promise<SelectRow[]> = new Promise(resolve => (this.resolver = resolve))\n\n\tprivate queryWrapper: LimitByGroupWrapper \| null = null\n\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly orderByBuilder: OrderByBuilder,\n\t\tprivate readonly metaHandler: MetaHandler,\n\t\tprivate qb: DbSelectBuilder<DbSelectBuilder.Result>,\n\t\tprivate readonly hydrator: SelectHydrator,\n\t\tprivate readonly fieldsVisitorFactory: FieldsVisitorFactory,\n\t\tprivate readonly selectHandlers: { [key: string]: SelectExecutionHandler<any> },\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly relationPath: Model.AnyRelationContext[],\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic async execute(db: Client): Promise<SelectRow[]> {\n\t\tlet result: SelectRow[]\n\t\tif (this.queryWrapper) {\n\t\t\tresult = await this.queryWrapper.getResult(this.qb, db)\n\t\t} else {\n\t\t\tresult = await this.qb.getResult(db)\n\t\t}\n\t\tthis.resolver(result)\n\t\treturn result\n\t}\n\n\tpublic select(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tinput: ObjectNode<Input.ListQueryInput>,\n\t\tpath: Path,\n\t\tgroupBy?: string,\n\t) {\n\t\tthis.selectInternal(mapper, entity, path, input)\n\t\tconst where = input.args.filter\n\t\tif (where) {\n\t\t\tthis.qb = this.whereBuilder.build(this.qb, entity, path, where, { relationPath: this.relationPath })\n\t\t}\n\t\tconst orderBy = input.args.orderBy \|\| []\n\n\t\tif (groupBy) {\n\t\t\tconst groupByColumn = getColumnName(this.schema, entity, groupBy)\n\t\t\tthis.queryWrapper = new LimitByGroupWrapper(\n\t\t\t\t[path.alias, groupByColumn],\n\t\t\t\t(orderable, qb) => {\n\t\t\t\t\tif (orderBy.length > 0) {\n\t\t\t\t\t\t[qb, orderable] = this.orderByBuilder.build(qb, orderable, entity, this.pathFactory.create([]), orderBy)\n\t\t\t\t\t}\n\t\t\t\t\treturn [orderable, qb]\n\t\t\t\t},\n\t\t\t\tinput.args.offset,\n\t\t\t\tinput.args.limit,\n\t\t\t)\n\t\t} else {\n\t\t\tif (orderBy.length > 0) {\n\t\t\t\t[this.qb] = this.orderByBuilder.build(this.qb, null, entity, path, orderBy)\n\t\t\t}\n\t\t\tthis.qb = this.qb.limit(input.args.limit, input.args.offset)\n\t\t}\n\t}\n\n\tprivate selectInternal(mapper: Mapper, entity: Model.Entity, path: Path, input: ObjectNode) {\n\t\tif (!input.fields.find(it => it.name === entity.primary && it.alias === entity.primary)) {\n\t\t\tinput = input.withField(new FieldNode(entity.primary, entity.primary, {}))\n\t\t}\n\n\t\tconst fetchedPredicates = new Set()\n\t\tconst addPredicate = (predicate: Acl.Predicate): ColumnValueGetter<boolean> => {\n\t\t\tif (typeof predicate === 'boolean') {\n\t\t\t\treturn () => predicate\n\t\t\t}\n\t\t\tconst predicatePath = path.for('__predicate').for(predicate)\n\n\t\t\tif (!fetchedPredicates.has(predicate)) {\n\t\t\t\tconst relationContext = this.relationPath[this.relationPath.length - 1]\n\n\t\t\t\tconst primaryPredicate = this.predicateFactory.create(entity, Acl.Operation.read, undefined, relationContext)\n\t\t\t\tconst fieldPredicate = this.predicateFactory.buildPredicates(entity, [predicate], relationContext)\n\n\t\t\t\tthis.qb = this.whereBuilder.buildAdvanced(\n\t\t\t\t\tentity,\n\t\t\t\t\tpath.back(),\n\t\t\t\t\tfieldPredicate,\n\t\t\t\t\tapply => this.qb.select(expr =>\n\t\t\t\t\t\texpr.selectCondition(condition => {\n\t\t\t\t\t\t\tcondition = apply(condition)\n\t\t\t\t\t\t\tif (condition.isEmpty()) {\n\t\t\t\t\t\t\t\treturn condition.raw('true')\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\treturn condition\n\t\t\t\t\t\t}),\n\t\t\t\t\tpredicatePath.alias,\n\t\t\t\t\t),\n\t\t\t\t\t{ relationPath: this.relationPath, evaluatedPredicates: [primaryPredicate] },\n\t\t\t\t)\n\t\t\t\tfetchedPredicates.add(predicate)\n\t\t\t}\n\t\t\treturn row => row[predicatePath.alias] === true\n\t\t}\n\n\t\tfor (let field of input.fields) {\n\t\t\tconst fieldPath = path.for(field.alias)\n\t\t\tconst fieldProperty = (() => {\n\t\t\t\tif (field instanceof ObjectNode) {\n\t\t\t\t\treturn { objectNode: field }\n\t\t\t\t}\n\t\t\t\tif (field instanceof FieldNode) {\n\t\t\t\t\treturn { fieldNode: field }\n\t\t\t\t}\n\t\t\t\treturn assertNever(field)\n\t\t\t})()\n\n\n\t\t\tconst executionContext: SelectExecutionHandlerContext = {\n\t\t\t\tmapper,\n\t\t\t\trelationPath: this.relationPath,\n\t\t\t\taddData: async ({ field, dataProvider, defaultValue, predicate }) => {\n\t\t\t\t\tif (predicate === false) {\n\t\t\t\t\t\tthis.hydrator.addPromise(fieldPath, () => null, Promise.resolve({}), defaultValue ?? null)\n\t\t\t\t\t\treturn\n\t\t\t\t\t}\n\t\t\t\t\tconst predicateGetter = predicate !== undefined && predicate !== true ? addPredicate(predicate) : null\n\t\t\t\t\tconst columnName = getColumnName(this.schema, entity, field)\n\t\t\t\t\tconst parentValuePath = path.for(field)\n\t\t\t\t\tlet ids = await this.getColumnValues(parentValuePath, columnName, predicateGetter)\n\n\t\t\t\t\tconst data = ids.length > 0 ? dataProvider(ids) : Promise.resolve({})\n\t\t\t\t\tthis.hydrator.addPromise(\n\t\t\t\t\t\tfieldPath,\n\t\t\t\t\t\trow => predicateGetter === null \|\| predicateGetter(row) ? (row[parentValuePath.alias] as Value.PrimaryValue) : null,\n\t\t\t\t\t\tdata,\n\t\t\t\t\t\tdefaultValue ?? null,\n\t\t\t\t\t)\n\t\t\t\t},\n\t\t\t\taddColumn: ({ path = fieldPath, predicate, query, valueGetter }) => {\n\t\t\t\t\tif (predicate === false) {\n\t\t\t\t\t\tthis.hydrator.addColumn(path, () => null)\n\t\t\t\t\t\treturn\n\t\t\t\t\t}\n\t\t\t\t\tconst predicateGetter = predicate !== undefined && predicate !== true ? addPredicate(predicate) : null\n\t\t\t\t\tif (query) {\n\t\t\t\t\t\tthis.qb = query(this.qb)\n\t\t\t\t\t}\n\t\t\t\t\tthis.hydrator.addColumn(\n\t\t\t\t\t\tpath,\n\t\t\t\t\t\tvalueGetter ?? (row => predicateGetter === null \|\| predicateGetter(row) ? row[path.alias] : null),\n\t\t\t\t\t)\n\t\t\t\t},\n\t\t\t\taddPredicate: addPredicate,\n\t\t\t\tpath: fieldPath,\n\t\t\t\tentity: entity,\n\t\t\t\t...fieldProperty,\n\t\t\t}\n\n\t\t\tif (field.name === '_meta') {\n\t\t\t\tthis.metaHandler.process(executionContext)\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\t// Disregarding __typename field since it's automatically handled by apollo server\n\t\t\tif (field.name === '__typename') {\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\tif (field.extensions.extensionKey) {\n\t\t\t\tconst handler = this.selectHandlers[field.extensions.extensionKey]\n\t\t\t\tif (!handler) {\n\t\t\t\t\tthrow new Error(`Handler for ${field.extensions.extensionKey} not found`)\n\t\t\t\t}\n\t\t\t\thandler.process(executionContext)\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\tconst fieldVisitor = this.fieldsVisitorFactory.create(mapper, executionContext)\n\t\t\tacceptFieldVisitor(this.schema, entity, field.name, fieldVisitor)\n\t\t}\n\t}\n\n\tprivate async getColumnValues(columnPath: Path, columnName: string, predicateGetter: null \| ColumnValueGetter<boolean>): Promise<Input.PrimaryValue[]> {\n\t\tthis.qb = this.qb.select([columnPath.back().alias, columnName], columnPath.alias)\n\t\tconst rows = await this.rows\n\t\tconst filteredRows = predicateGetter === null ? rows : rows.filter(predicateGetter)\n\t\tconst columnAlias = columnPath.alias\n\t\tconst ids = filteredRows.map((it): Input.PrimaryValue => it[columnAlias] as Input.PrimaryValue).filter(it => it !== null)\n\t\treturn Array.from(new Set(ids))\n\t}\n}\n"],"names":["field","path"],"mappings":"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"}
1	+ {"version":3,"file":"SelectBuilder.js","sources":["../../../../../../packages/engine-content-api/src/mapper/select/SelectBuilder.ts"],"sourcesContent":["import { Acl, Input, Model, Value } from '@contember/schema'\nimport { acceptFieldVisitor, getColumnName } from '@contember/schema-utils'\nimport { ColumnValueGetter, SelectHydrator, SelectRow } from './SelectHydrator'\nimport { Path, PathFactory } from './Path'\nimport { WhereBuilder } from './WhereBuilder'\nimport { Client, LimitByGroupWrapper, SelectBuilder as DbSelectBuilder } from '@contember/database'\nimport { OrderByBuilder } from './OrderByBuilder'\nimport { FieldsVisitorFactory } from './handlers'\nimport { SelectExecutionHandler, SelectExecutionHandlerContext } from './SelectExecutionHandler'\nimport { MetaHandler } from './handlers'\nimport { Mapper } from '../Mapper'\nimport { FieldNode, ObjectNode } from '../../inputProcessing'\nimport { assertNever } from '../../utils'\nimport { PredicateFactory } from '../../acl'\n\nexport class SelectBuilder {\n\tprivate resolver: (value: SelectRow[]) => void = () => {\n\t\tthrow new Error('SelectBuilder: Resolver called too soon')\n\t}\n\tpublic readonly rows: Promise<SelectRow[]> = new Promise(resolve => (this.resolver = resolve))\n\n\tprivate queryWrapper: LimitByGroupWrapper \| null = null\n\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly orderByBuilder: OrderByBuilder,\n\t\tprivate readonly metaHandler: MetaHandler,\n\t\tprivate qb: DbSelectBuilder<DbSelectBuilder.Result>,\n\t\tprivate readonly hydrator: SelectHydrator,\n\t\tprivate readonly fieldsVisitorFactory: FieldsVisitorFactory,\n\t\tprivate readonly selectHandlers: { [key: string]: SelectExecutionHandler<any> },\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly relationPath: Model.AnyRelationContext[],\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic async execute(db: Client): Promise<SelectRow[]> {\n\t\tlet result: SelectRow[]\n\t\tif (this.queryWrapper) {\n\t\t\tresult = await this.queryWrapper.getResult(this.qb, db)\n\t\t} else {\n\t\t\tresult = await this.qb.getResult(db)\n\t\t}\n\t\tthis.resolver(result)\n\t\treturn result\n\t}\n\n\tpublic select(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tinput: ObjectNode<Input.ListQueryInput>,\n\t\tpath: Path,\n\t\tgroupBy?: string,\n\t) {\n\t\tthis.selectInternal(mapper, entity, path, input)\n\t\tconst where = input.args.filter\n\t\tif (where) {\n\t\t\tthis.qb = this.whereBuilder.build(this.qb, entity, path, where, { relationPath: this.relationPath })\n\t\t}\n\t\tconst orderBy = input.args.orderBy \|\| []\n\n\t\tif (groupBy) {\n\t\t\tconst groupByColumn = getColumnName(this.schema, entity, groupBy)\n\t\t\tthis.queryWrapper = new LimitByGroupWrapper(\n\t\t\t\t[path.alias, groupByColumn],\n\t\t\t\t(orderable, qb) => {\n\t\t\t\t\tif (orderBy.length > 0) {\n\t\t\t\t\t\t;[qb, orderable] = this.orderByBuilder.build(qb, orderable, entity, this.pathFactory.create([]), orderBy)\n\t\t\t\t\t}\n\t\t\t\t\treturn [orderable, qb]\n\t\t\t\t},\n\t\t\t\tinput.args.offset,\n\t\t\t\tinput.args.limit,\n\t\t\t)\n\t\t} else {\n\t\t\tif (orderBy.length > 0) {\n\t\t\t\t;[this.qb] = this.orderByBuilder.build(this.qb, null, entity, path, orderBy)\n\t\t\t}\n\t\t\tthis.qb = this.qb.limit(input.args.limit, input.args.offset)\n\t\t}\n\t}\n\n\tprivate selectInternal(mapper: Mapper, entity: Model.Entity, path: Path, input: ObjectNode) {\n\t\tif (!input.fields.find(it => it.name === entity.primary && it.alias === entity.primary)) {\n\t\t\tinput = input.withField(new FieldNode(entity.primary, entity.primary, {}))\n\t\t}\n\n\t\tconst fetchedPredicates = new Set()\n\t\tconst addPredicate = (predicate: Acl.Predicate): ColumnValueGetter<boolean> => {\n\t\t\tif (typeof predicate === 'boolean') {\n\t\t\t\treturn () => predicate\n\t\t\t}\n\t\t\tconst predicatePath = path.for('__predicate').for(predicate)\n\n\t\t\tif (!fetchedPredicates.has(predicate)) {\n\t\t\t\tconst relationContext = this.relationPath[this.relationPath.length - 1]\n\n\t\t\t\tconst primaryPredicate = this.predicateFactory.create(entity, Acl.Operation.read, undefined, relationContext)\n\t\t\t\tconst fieldPredicate = this.predicateFactory.buildPredicates(entity, [predicate], relationContext)\n\n\t\t\t\tthis.qb = this.whereBuilder.buildAdvanced(\n\t\t\t\t\tentity,\n\t\t\t\t\tpath.back(),\n\t\t\t\t\tfieldPredicate,\n\t\t\t\t\tapply =>\n\t\t\t\t\t\tthis.qb.select(expr =>\n\t\t\t\t\t\t\texpr.selectCondition(condition => {\n\t\t\t\t\t\t\t\tcondition = apply(condition)\n\t\t\t\t\t\t\t\tif (condition.isEmpty()) {\n\t\t\t\t\t\t\t\t\treturn condition.raw('true')\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\treturn condition\n\t\t\t\t\t\t\t}), predicatePath.alias),\n\t\t\t\t\t{ relationPath: this.relationPath, evaluatedPredicates: [primaryPredicate] },\n\t\t\t\t)\n\t\t\t\tfetchedPredicates.add(predicate)\n\t\t\t}\n\t\t\treturn row => row[predicatePath.alias] === true\n\t\t}\n\n\t\tfor (let field of input.fields) {\n\t\t\tconst fieldPath = path.for(field.alias)\n\t\t\tconst fieldProperty = (() => {\n\t\t\t\tif (field instanceof ObjectNode) {\n\t\t\t\t\treturn { objectNode: field }\n\t\t\t\t}\n\t\t\t\tif (field instanceof FieldNode) {\n\t\t\t\t\treturn { fieldNode: field }\n\t\t\t\t}\n\t\t\t\treturn assertNever(field)\n\t\t\t})()\n\n\t\t\tconst executionContext: SelectExecutionHandlerContext = {\n\t\t\t\tmapper,\n\t\t\t\trelationPath: this.relationPath,\n\t\t\t\taddData: async ({ field, dataProvider, defaultValue, predicate }) => {\n\t\t\t\t\tif (predicate === false) {\n\t\t\t\t\t\tthis.hydrator.addPromise(fieldPath, () => null, Promise.resolve({}), defaultValue ?? null)\n\t\t\t\t\t\treturn\n\t\t\t\t\t}\n\t\t\t\t\tconst predicateGetter = predicate !== undefined && predicate !== true ? addPredicate(predicate) : null\n\t\t\t\t\tconst columnName = getColumnName(this.schema, entity, field)\n\t\t\t\t\tconst parentValuePath = path.for(field)\n\t\t\t\t\tlet ids = await this.getColumnValues(parentValuePath, columnName, predicateGetter)\n\n\t\t\t\t\tconst data = ids.length > 0 ? dataProvider(ids) : Promise.resolve({})\n\t\t\t\t\tthis.hydrator.addPromise(\n\t\t\t\t\t\tfieldPath,\n\t\t\t\t\t\trow => predicateGetter === null \|\| predicateGetter(row) ? (row[parentValuePath.alias] as Value.PrimaryValue) : null,\n\t\t\t\t\t\tdata,\n\t\t\t\t\t\tdefaultValue ?? null,\n\t\t\t\t\t)\n\t\t\t\t},\n\t\t\t\taddColumn: ({ path = fieldPath, predicate, query, valueGetter }) => {\n\t\t\t\t\tif (predicate === false) {\n\t\t\t\t\t\tthis.hydrator.addColumn(path, () => null)\n\t\t\t\t\t\treturn\n\t\t\t\t\t}\n\t\t\t\t\tconst predicateGetter = predicate !== undefined && predicate !== true ? addPredicate(predicate) : null\n\t\t\t\t\tif (query) {\n\t\t\t\t\t\tthis.qb = query(this.qb)\n\t\t\t\t\t}\n\t\t\t\t\tthis.hydrator.addColumn(\n\t\t\t\t\t\tpath,\n\t\t\t\t\t\tvalueGetter ?? (row => predicateGetter === null \|\| predicateGetter(row) ? row[path.alias] : null),\n\t\t\t\t\t)\n\t\t\t\t},\n\t\t\t\taddPredicate: addPredicate,\n\t\t\t\tpath: fieldPath,\n\t\t\t\tentity: entity,\n\t\t\t\t...fieldProperty,\n\t\t\t}\n\n\t\t\tif (field.name === '_meta') {\n\t\t\t\tthis.metaHandler.process(executionContext)\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\t// Disregarding __typename field since it's automatically handled by apollo server\n\t\t\tif (field.name === '__typename') {\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\tif (field.extensions.extensionKey) {\n\t\t\t\tconst handler = this.selectHandlers[field.extensions.extensionKey]\n\t\t\t\tif (!handler) {\n\t\t\t\t\tthrow new Error(`Handler for ${field.extensions.extensionKey} not found`)\n\t\t\t\t}\n\t\t\t\thandler.process(executionContext)\n\t\t\t\tcontinue\n\t\t\t}\n\n\t\t\tconst fieldVisitor = this.fieldsVisitorFactory.create(mapper, executionContext)\n\t\t\tacceptFieldVisitor(this.schema, entity, field.name, fieldVisitor)\n\t\t}\n\t}\n\n\tprivate async getColumnValues(\n\t\tcolumnPath: Path,\n\t\tcolumnName: string,\n\t\tpredicateGetter: null \| ColumnValueGetter<boolean>,\n\t): Promise<Input.PrimaryValue[]> {\n\t\tthis.qb = this.qb.select([columnPath.back().alias, columnName], columnPath.alias)\n\t\tconst rows = await this.rows\n\t\tconst filteredRows = predicateGetter === null ? rows : rows.filter(predicateGetter)\n\t\tconst columnAlias = columnPath.alias\n\t\tconst ids = filteredRows.map((it): Input.PrimaryValue => it[columnAlias] as Input.PrimaryValue).filter(it => it !== null)\n\t\treturn Array.from(new Set(ids))\n\t}\n}\n"],"names":["field","path"],"mappings":"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"}

package/dist/development/src/mapper/select/SelectHydrator.cjs CHANGED Viewed

@@ -55,7 +55,7 @@ class SelectHydrator {
     for (let { path, getParentValue, data, defaultValue } of resolvedData) {
       const pathTmp = [...path.path];
       const last = pathTmp.pop();
-      const currentObject = pathTmp.reduce((obj, part) => obj && obj[part] || void 0, result);
+      const currentObject = pathTmp.reduce((obj, part) => obj?.[part] || void 0, result);
       const parentValue = getParentValue(row);
       if (currentObject) {
         currentObject[last] = (parentValue ? data[parentValue] : void 0) || defaultValue;

package/dist/development/src/mapper/select/SelectHydrator.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SelectHydrator.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/select/SelectHydrator.ts"],"sourcesContent":["import { Path } from './Path'\nimport { Value } from '@contember/schema'\nimport { getFulfilledValues, getRejections } from '../../utils'\nimport { logger } from '@contember/logger'\n\ntype DataPromises = {\n\tpath: Path\n\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>\n\tdata: Promise<SelectNestedData>\n\tdefaultValue: SelectNestedDefaultValue\n}\n\ntype ResolvedData = {\n\tpath: Path\n\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>\n\tdata: SelectNestedData\n\tdefaultValue: SelectNestedDefaultValue\n}\n\nexport type ColumnValueGetter<T extends Value.FieldValue = Value.FieldValue> = (row: SelectRow) => T\n\ntype Column = {\n\tpath: Path\n\tgetValue: ColumnValueGetter\n}\n\nexport class SelectHydrator {\n\tprivate columns: Column[] = []\n\tprivate promises: DataPromises[] = []\n\n\tpublic addColumn(path: Path, getValue: ColumnValueGetter) {\n\t\tthis.columns.push({ path, getValue })\n\t}\n\n\tpublic addPromise(\n\t\tpath: Path,\n\t\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>,\n\t\tdata: Promise<SelectNestedData>,\n\t\tdefaultValue: SelectNestedDefaultValue,\n\t) {\n\t\tthis.promises.push({ path, getParentValue, data, defaultValue })\n\t}\n\n\tpublic async hydrateGroups(rows: SelectRow[], groupBy: string): Promise<SelectGroupedObjects> {\n\t\tconst resolved = await this.resolveDataPromises()\n\t\tconst result: SelectGroupedObjects = {}\n\t\tfor (let row of rows) {\n\t\t\tconst key = row[groupBy] as Value.PrimaryValue\n\t\t\tif (!result[key]) {\n\t\t\t\tresult[key] = []\n\t\t\t}\n\t\t\tresult[key].push(this.hydrateRow(row, resolved))\n\t\t}\n\t\treturn result\n\t}\n\n\tpublic async hydrateAll(rows: SelectRow[]): Promise<SelectResultObject[]>\n\tpublic async hydrateAll(rows: SelectRow[], indexBy: string): Promise<SelectIndexedResultObjects>\n\n\tpublic async hydrateAll(\n\t\trows: SelectRow[],\n\t\tindexBy?: string,\n\t): Promise<SelectResultObject[] \| SelectIndexedResultObjects> {\n\t\tconst resolved = await this.resolveDataPromises()\n\t\tif (indexBy) {\n\t\t\tconst result: SelectIndexedResultObjects = {}\n\t\t\tfor (let row of rows) {\n\t\t\t\tresult[row[indexBy] as Value.PrimaryValue] = this.hydrateRow(row, resolved)\n\t\t\t}\n\t\t\treturn result\n\t\t}\n\t\tconst result: SelectResultObject[] = []\n\t\tfor (const row of rows) {\n\t\t\tresult.push(this.hydrateRow(row, resolved))\n\t\t}\n\t\treturn result\n\t}\n\n\tprivate hydrateRow(row: SelectRow, resolvedData: ResolvedData[]): SelectResultObject {\n\t\tconst result: SelectResultObject = {}\n\n\t\tfor (let columnPath of this.columns) {\n\t\t\tconst path = [...columnPath.path.path]\n\t\t\tconst last: string = path.pop() as string\n\t\t\tconst currentObject = path.reduce<any>((obj, part) => (obj[part] = obj[part] \|\| {}), result)\n\n\t\t\tcurrentObject[last] = this.formatValue(columnPath.getValue(row))\n\t\t}\n\n\t\tfor (let { path, getParentValue, data, defaultValue } of resolvedData) {\n\t\t\tconst pathTmp = [...path.path]\n\t\t\tconst last = pathTmp.pop() as string\n\t\t\tconst currentObject = pathTmp.reduce<any>((obj, part) => (obj ~~&& obj~~[part]) \|\| undefined, result)\n\t\t\tconst parentValue = getParentValue(row)\n\t\t\tif (currentObject) {\n\t\t\t\tcurrentObject[last] = (parentValue ? data[parentValue] : undefined) \|\| defaultValue\n\t\t\t}\n\t\t}\n\n\t\treturn result\n\t}\n\n\tprivate async resolveDataPromises(): Promise<ResolvedData[]> {\n\t\tconst results = await Promise.allSettled(this.promises.map(async (it): Promise<ResolvedData> => ({\n\t\t\tdefaultValue: it.defaultValue,\n\t\t\tgetParentValue: it.getParentValue,\n\t\t\tpath: it.path,\n\t\t\tdata: await it.data,\n\t\t})))\n\t\tconst failures = getRejections(results)\n\t\tif (failures.length > 0) {\n\t\t\tif (failures.length > 1) {\n\t\t\t\tfailures.slice(1).map(e => logger.error(e, { loc: 'SelectHydrator' }))\n\t\t\t}\n\t\t\tthrow failures[0]\n\t\t}\n\n\t\treturn getFulfilledValues(results)\n\t}\n\n\tprivate formatValue(value: any) {\n\t\tif (value instanceof Date) {\n\t\t\treturn value.toISOString()\n\t\t}\n\t\treturn value\n\t}\n}\n\nexport type SelectRow = { [key: string]: Value.FieldValue }\nexport type SelectResultObject = Value.Object\nexport type SelectIndexedResultObjects = { [key: string]: SelectResultObject }\nexport type SelectGroupedObjects = { [groupingKey: string]: SelectResultObject[] }\nexport type SelectNestedData = SelectGroupedObjects \| SelectIndexedResultObjects\nexport type SelectNestedDefaultValue = [] \| null\n"],"names":["result","getRejections","logger","getFulfilledValues"],"mappings":";;;;;;;;AA0BO,MAAM,eAAe;AAAA,EAArB,cAAA;AACN,kBAAA,MAAQ,WAAoB,EAAC;AAC7B,kBAAA,MAAQ,YAA2B,EAAC;AAAA,EAAA;AAAA,EAE7B,UAAU,MAAY,UAA6B;AACzD,SAAK,QAAQ,KAAK,EAAE,MAAM,UAAU;AAAA,~~EAAA~~;AAAA,~~EAG9B~~,WACN,MACA,gBACA,MACA,cACC;AACD,SAAK,SAAS,KAAK,EAAE,MAAM,gBAAgB,MAAM,cAAc;AAAA,~~EAAA~~;AAAA,~~EAGhE~~,MAAa,cAAc,MAAmB,SAAgD;~~AACvF~~,~~UAAA~~,WAAW,MAAM,KAAK,~~oBAAoB~~;~~AAChD~~,UAAM,SAA+B,~~CAAC~~;~~AACtC~~,aAAS,OAAO,MAAM;~~AACf~~,~~YAAA~~,MAAM,IAAI,OAAO;~~AACnB~~,~~UAAA~~,CAAC,OAAO,GAAG,GAAG;~~AACV~~,~~eAAA~~,GAAG,IAAI,~~CAAC~~;AAAA,~~MAAA~~;~~AAEhB~~,aAAO,GAAG,EAAE,KAAK,KAAK,WAAW,KAAK,QAAQ,CAAC;AAAA,~~IAAA~~;~~AAEzC~~,~~WAAA~~;AAAA,~~EAAA~~;AAAA,~~EAMR~~,MAAa,WACZ,MACA,SAC6D;~~AACvD~~,~~UAAA~~,WAAW,MAAM,KAAK,~~oBAAoB~~;~~AAChD~~,QAAI,SAAS;AACZ,YAAMA,UAAqC,~~CAAC~~;~~AAC5C~~,eAAS,OAAO,MAAM;AACrBA,gBAAO,IAAI,OAAO,CAAuB,IAAI,KAAK,WAAW,KAAK,QAAQ;AAAA,~~MAAA~~;~~AAEpEA~~,~~aAAAA~~;AAAAA,~~IAAA~~;~~AAER~~,UAAM,SAA+B,~~CAAC~~;~~AACtC~~,eAAW,OAAO,MAAM;AACvB,aAAO,KAAK,KAAK,WAAW,KAAK,QAAQ,CAAC;AAAA,~~IAAA~~;~~AAEpC~~,~~WAAA~~;AAAA,~~EAAA~~;AAAA,~~EAGA~~,WAAW,KAAgB,cAAkD;AACpF,UAAM,SAA6B,~~CAAC~~;~~AAE3B~~,~~aAAA~~,cAAc,KAAK,SAAS;AACpC,YAAM,OAAO,CAAC,GAAG,WAAW,KAAK,IAAI;~~AAC/B~~,~~YAAA~~,OAAe,KAAK,~~IAAI~~;~~AAC9B~~,YAAM,gBAAgB,KAAK,OAAY,CAAC,KAAK,SAAU,IAAI,IAAI,IAAI,IAAI,IAAI,KAAK,CAAA,GAAK,MAAM;AAE3F,oBAAc,IAAI,IAAI,KAAK,YAAY,WAAW,SAAS,GAAG,CAAC;AAAA,~~IAAA~~;~~AAGhE~~,aAAS,EAAE,MAAM,gBAAgB,MAAM,~~kBAAkB~~,cAAc;AACtE,YAAM,UAAU,CAAC,GAAG,KAAK,IAAI;~~AACvB~~,~~YAAA~~,OAAO,QAAQ,~~IAAI~~;~~AACnB~~,~~YAAA~~,gBAAgB,QAAQ,OAAY,CAAC,KAAK,SAAU,~~OAAO~~,IAAI,~~IAAI,~~KAAM,QAAW,MAAM;~~AAC1F~~,~~YAAA~~,cAAc,eAAe,GAAG;AACtC,UAAI,eAAe;AAClB,sBAAc,IAAI,KAAK,cAAc,KAAK,WAAW,IAAI,WAAc;AAAA,~~MAAA~~;AAAA,~~IACxE~~;~~AAGM~~,~~WAAA~~;AAAA,~~EAAA~~;AAAA,~~EAGR~~,MAAc,sBAA+C;~~AACtD~~,~~UAAA~~,UAAU,MAAM,QAAQ,WAAW,KAAK,SAAS,IAAI,OAAO,QAA+B;AAAA,MAChG,cAAc,GAAG;AAAA,MACjB,gBAAgB,GAAG;AAAA,MACnB,MAAM,GAAG;AAAA,MACT,MAAM,MAAM,GAAG;AAAA,~~MACd~~,CAAC;~~AACG~~,~~UAAA~~,WAAWC,~~uBAAc~~,OAAO;~~AAClC~~,~~QAAA~~,SAAS,SAAS,GAAG;~~AACpB~~,~~UAAA~~,SAAS,SAAS,GAAG;AACxB,iBAAS,MAAM,CAAC,EAAE,IAAI,~~CAAK~~,~~MAAAC~~,cAAO,MAAM,GAAG,EAAE,KAAK,~~iBAAkB~~,~~CAAA~~,CAAC;AAAA,~~MAAA~~;~~AAEtE~~,YAAM,SAAS,CAAC;AAAA,~~IAAA~~;~~AAGjB~~,WAAOC,SAAAA,mBAAmB,OAAO;AAAA,~~EAAA~~;AAAA,~~EAG1B~~,YAAY,OAAY;AAC/B,QAAI,iBAAiB,MAAM;AAC1B,aAAO,MAAM,~~YAAY~~;AAAA,~~IAAA~~;~~AAEnB~~,~~WAAA~~;AAAA,~~EAAA~~;~~AAET~~;;"}
1	+ {"version":3,"file":"SelectHydrator.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/select/SelectHydrator.ts"],"sourcesContent":["import { Path } from './Path'\nimport { Value } from '@contember/schema'\nimport { getFulfilledValues, getRejections } from '../../utils'\nimport { logger } from '@contember/logger'\n\ntype DataPromises = {\n\tpath: Path\n\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>\n\tdata: Promise<SelectNestedData>\n\tdefaultValue: SelectNestedDefaultValue\n}\n\ntype ResolvedData = {\n\tpath: Path\n\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>\n\tdata: SelectNestedData\n\tdefaultValue: SelectNestedDefaultValue\n}\n\nexport type ColumnValueGetter<T extends Value.FieldValue = Value.FieldValue> = (row: SelectRow) => T\n\ntype Column = {\n\tpath: Path\n\tgetValue: ColumnValueGetter\n}\n\nexport class SelectHydrator {\n\tprivate columns: Column[] = []\n\tprivate promises: DataPromises[] = []\n\n\tpublic addColumn(path: Path, getValue: ColumnValueGetter) {\n\t\tthis.columns.push({ path, getValue })\n\t}\n\n\tpublic addPromise(\n\t\tpath: Path,\n\t\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>,\n\t\tdata: Promise<SelectNestedData>,\n\t\tdefaultValue: SelectNestedDefaultValue,\n\t) {\n\t\tthis.promises.push({ path, getParentValue, data, defaultValue })\n\t}\n\n\tpublic async hydrateGroups(rows: SelectRow[], groupBy: string): Promise<SelectGroupedObjects> {\n\t\tconst resolved = await this.resolveDataPromises()\n\t\tconst result: SelectGroupedObjects = {}\n\t\tfor (let row of rows) {\n\t\t\tconst key = row[groupBy] as Value.PrimaryValue\n\t\t\tif (!result[key]) {\n\t\t\t\tresult[key] = []\n\t\t\t}\n\t\t\tresult[key].push(this.hydrateRow(row, resolved))\n\t\t}\n\t\treturn result\n\t}\n\n\tpublic async hydrateAll(rows: SelectRow[]): Promise<SelectResultObject[]>\n\tpublic async hydrateAll(rows: SelectRow[], indexBy: string): Promise<SelectIndexedResultObjects>\n\n\tpublic async hydrateAll(\n\t\trows: SelectRow[],\n\t\tindexBy?: string,\n\t): Promise<SelectResultObject[] \| SelectIndexedResultObjects> {\n\t\tconst resolved = await this.resolveDataPromises()\n\t\tif (indexBy) {\n\t\t\tconst result: SelectIndexedResultObjects = {}\n\t\t\tfor (let row of rows) {\n\t\t\t\tresult[row[indexBy] as Value.PrimaryValue] = this.hydrateRow(row, resolved)\n\t\t\t}\n\t\t\treturn result\n\t\t}\n\t\tconst result: SelectResultObject[] = []\n\t\tfor (const row of rows) {\n\t\t\tresult.push(this.hydrateRow(row, resolved))\n\t\t}\n\t\treturn result\n\t}\n\n\tprivate hydrateRow(row: SelectRow, resolvedData: ResolvedData[]): SelectResultObject {\n\t\tconst result: SelectResultObject = {}\n\n\t\tfor (let columnPath of this.columns) {\n\t\t\tconst path = [...columnPath.path.path]\n\t\t\tconst last: string = path.pop() as string\n\t\t\tconst currentObject = path.reduce<any>((obj, part) => (obj[part] = obj[part] \|\| {}), result)\n\n\t\t\tcurrentObject[last] = this.formatValue(columnPath.getValue(row))\n\t\t}\n\n\t\tfor (let { path, getParentValue, data, defaultValue } of resolvedData) {\n\t\t\tconst pathTmp = [...path.path]\n\t\t\tconst last = pathTmp.pop() as string\n\t\t\tconst currentObject = pathTmp.reduce<any>((obj, part) => (obj?.[part]) \|\| undefined, result)\n\t\t\tconst parentValue = getParentValue(row)\n\t\t\tif (currentObject) {\n\t\t\t\tcurrentObject[last] = (parentValue ? data[parentValue] : undefined) \|\| defaultValue\n\t\t\t}\n\t\t}\n\n\t\treturn result\n\t}\n\n\tprivate async resolveDataPromises(): Promise<ResolvedData[]> {\n\t\tconst results = await Promise.allSettled(this.promises.map(async (it): Promise<ResolvedData> => ({\n\t\t\tdefaultValue: it.defaultValue,\n\t\t\tgetParentValue: it.getParentValue,\n\t\t\tpath: it.path,\n\t\t\tdata: await it.data,\n\t\t})))\n\t\tconst failures = getRejections(results)\n\t\tif (failures.length > 0) {\n\t\t\tif (failures.length > 1) {\n\t\t\t\tfailures.slice(1).map(e => logger.error(e, { loc: 'SelectHydrator' }))\n\t\t\t}\n\t\t\tthrow failures[0]\n\t\t}\n\n\t\treturn getFulfilledValues(results)\n\t}\n\n\tprivate formatValue(value: any) {\n\t\tif (value instanceof Date) {\n\t\t\treturn value.toISOString()\n\t\t}\n\t\treturn value\n\t}\n}\n\nexport type SelectRow = { [key: string]: Value.FieldValue }\nexport type SelectResultObject = Value.Object\nexport type SelectIndexedResultObjects = { [key: string]: SelectResultObject }\nexport type SelectGroupedObjects = { [groupingKey: string]: SelectResultObject[] }\nexport type SelectNestedData = SelectGroupedObjects \| SelectIndexedResultObjects\nexport type SelectNestedDefaultValue = [] \| null\n"],"names":["result","getRejections","logger","getFulfilledValues"],"mappings":"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"}

package/dist/development/src/mapper/select/SelectHydrator.js CHANGED Viewed

@@ -53,7 +53,7 @@ class SelectHydrator {
     for (let { path, getParentValue, data, defaultValue } of resolvedData) {
       const pathTmp = [...path.path];
       const last = pathTmp.pop();
-      const currentObject = pathTmp.reduce((obj, part) => obj && obj[part] || void 0, result);
+      const currentObject = pathTmp.reduce((obj, part) => obj?.[part] || void 0, result);
       const parentValue = getParentValue(row);
       if (currentObject) {
         currentObject[last] = (parentValue ? data[parentValue] : void 0) || defaultValue;

package/dist/development/src/mapper/select/SelectHydrator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SelectHydrator.js","sources":["../../../../../../packages/engine-content-api/src/mapper/select/SelectHydrator.ts"],"sourcesContent":["import { Path } from './Path'\nimport { Value } from '@contember/schema'\nimport { getFulfilledValues, getRejections } from '../../utils'\nimport { logger } from '@contember/logger'\n\ntype DataPromises = {\n\tpath: Path\n\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>\n\tdata: Promise<SelectNestedData>\n\tdefaultValue: SelectNestedDefaultValue\n}\n\ntype ResolvedData = {\n\tpath: Path\n\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>\n\tdata: SelectNestedData\n\tdefaultValue: SelectNestedDefaultValue\n}\n\nexport type ColumnValueGetter<T extends Value.FieldValue = Value.FieldValue> = (row: SelectRow) => T\n\ntype Column = {\n\tpath: Path\n\tgetValue: ColumnValueGetter\n}\n\nexport class SelectHydrator {\n\tprivate columns: Column[] = []\n\tprivate promises: DataPromises[] = []\n\n\tpublic addColumn(path: Path, getValue: ColumnValueGetter) {\n\t\tthis.columns.push({ path, getValue })\n\t}\n\n\tpublic addPromise(\n\t\tpath: Path,\n\t\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>,\n\t\tdata: Promise<SelectNestedData>,\n\t\tdefaultValue: SelectNestedDefaultValue,\n\t) {\n\t\tthis.promises.push({ path, getParentValue, data, defaultValue })\n\t}\n\n\tpublic async hydrateGroups(rows: SelectRow[], groupBy: string): Promise<SelectGroupedObjects> {\n\t\tconst resolved = await this.resolveDataPromises()\n\t\tconst result: SelectGroupedObjects = {}\n\t\tfor (let row of rows) {\n\t\t\tconst key = row[groupBy] as Value.PrimaryValue\n\t\t\tif (!result[key]) {\n\t\t\t\tresult[key] = []\n\t\t\t}\n\t\t\tresult[key].push(this.hydrateRow(row, resolved))\n\t\t}\n\t\treturn result\n\t}\n\n\tpublic async hydrateAll(rows: SelectRow[]): Promise<SelectResultObject[]>\n\tpublic async hydrateAll(rows: SelectRow[], indexBy: string): Promise<SelectIndexedResultObjects>\n\n\tpublic async hydrateAll(\n\t\trows: SelectRow[],\n\t\tindexBy?: string,\n\t): Promise<SelectResultObject[] \| SelectIndexedResultObjects> {\n\t\tconst resolved = await this.resolveDataPromises()\n\t\tif (indexBy) {\n\t\t\tconst result: SelectIndexedResultObjects = {}\n\t\t\tfor (let row of rows) {\n\t\t\t\tresult[row[indexBy] as Value.PrimaryValue] = this.hydrateRow(row, resolved)\n\t\t\t}\n\t\t\treturn result\n\t\t}\n\t\tconst result: SelectResultObject[] = []\n\t\tfor (const row of rows) {\n\t\t\tresult.push(this.hydrateRow(row, resolved))\n\t\t}\n\t\treturn result\n\t}\n\n\tprivate hydrateRow(row: SelectRow, resolvedData: ResolvedData[]): SelectResultObject {\n\t\tconst result: SelectResultObject = {}\n\n\t\tfor (let columnPath of this.columns) {\n\t\t\tconst path = [...columnPath.path.path]\n\t\t\tconst last: string = path.pop() as string\n\t\t\tconst currentObject = path.reduce<any>((obj, part) => (obj[part] = obj[part] \|\| {}), result)\n\n\t\t\tcurrentObject[last] = this.formatValue(columnPath.getValue(row))\n\t\t}\n\n\t\tfor (let { path, getParentValue, data, defaultValue } of resolvedData) {\n\t\t\tconst pathTmp = [...path.path]\n\t\t\tconst last = pathTmp.pop() as string\n\t\t\tconst currentObject = pathTmp.reduce<any>((obj, part) => (obj ~~&& obj~~[part]) \|\| undefined, result)\n\t\t\tconst parentValue = getParentValue(row)\n\t\t\tif (currentObject) {\n\t\t\t\tcurrentObject[last] = (parentValue ? data[parentValue] : undefined) \|\| defaultValue\n\t\t\t}\n\t\t}\n\n\t\treturn result\n\t}\n\n\tprivate async resolveDataPromises(): Promise<ResolvedData[]> {\n\t\tconst results = await Promise.allSettled(this.promises.map(async (it): Promise<ResolvedData> => ({\n\t\t\tdefaultValue: it.defaultValue,\n\t\t\tgetParentValue: it.getParentValue,\n\t\t\tpath: it.path,\n\t\t\tdata: await it.data,\n\t\t})))\n\t\tconst failures = getRejections(results)\n\t\tif (failures.length > 0) {\n\t\t\tif (failures.length > 1) {\n\t\t\t\tfailures.slice(1).map(e => logger.error(e, { loc: 'SelectHydrator' }))\n\t\t\t}\n\t\t\tthrow failures[0]\n\t\t}\n\n\t\treturn getFulfilledValues(results)\n\t}\n\n\tprivate formatValue(value: any) {\n\t\tif (value instanceof Date) {\n\t\t\treturn value.toISOString()\n\t\t}\n\t\treturn value\n\t}\n}\n\nexport type SelectRow = { [key: string]: Value.FieldValue }\nexport type SelectResultObject = Value.Object\nexport type SelectIndexedResultObjects = { [key: string]: SelectResultObject }\nexport type SelectGroupedObjects = { [groupingKey: string]: SelectResultObject[] }\nexport type SelectNestedData = SelectGroupedObjects \| SelectIndexedResultObjects\nexport type SelectNestedDefaultValue = [] \| null\n"],"names":["result"],"mappings":";;;;;;AA0BO,MAAM,eAAe;AAAA,EAArB,cAAA;AACN,kBAAA,MAAQ,WAAoB,EAAC;AAC7B,kBAAA,MAAQ,YAA2B,EAAC;AAAA,EAAA;AAAA,EAE7B,UAAU,MAAY,UAA6B;AACzD,SAAK,QAAQ,KAAK,EAAE,MAAM,UAAU;AAAA,~~EAAA~~;AAAA,~~EAG9B~~,WACN,MACA,gBACA,MACA,cACC;AACD,SAAK,SAAS,KAAK,EAAE,MAAM,gBAAgB,MAAM,cAAc;AAAA,~~EAAA~~;AAAA,~~EAGhE~~,MAAa,cAAc,MAAmB,SAAgD;~~AACvF~~,~~UAAA~~,WAAW,MAAM,KAAK,~~oBAAoB~~;~~AAChD~~,UAAM,SAA+B,~~CAAC~~;~~AACtC~~,aAAS,OAAO,MAAM;~~AACf~~,~~YAAA~~,MAAM,IAAI,OAAO;~~AACnB~~,~~UAAA~~,CAAC,OAAO,GAAG,GAAG;~~AACV~~,~~eAAA~~,GAAG,IAAI,~~CAAC~~;AAAA,~~MAAA~~;~~AAEhB~~,aAAO,GAAG,EAAE,KAAK,KAAK,WAAW,KAAK,QAAQ,CAAC;AAAA,~~IAAA~~;~~AAEzC~~,~~WAAA~~;AAAA,~~EAAA~~;AAAA,~~EAMR~~,MAAa,WACZ,MACA,SAC6D;~~AACvD~~,~~UAAA~~,WAAW,MAAM,KAAK,~~oBAAoB~~;~~AAChD~~,QAAI,SAAS;AACZ,YAAMA,UAAqC,~~CAAC~~;~~AAC5C~~,eAAS,OAAO,MAAM;AACrBA,gBAAO,IAAI,OAAO,CAAuB,IAAI,KAAK,WAAW,KAAK,QAAQ;AAAA,~~MAAA~~;~~AAEpEA~~,~~aAAAA~~;AAAAA,~~IAAA~~;~~AAER~~,UAAM,SAA+B,~~CAAC~~;~~AACtC~~,eAAW,OAAO,MAAM;AACvB,aAAO,KAAK,KAAK,WAAW,KAAK,QAAQ,CAAC;AAAA,~~IAAA~~;~~AAEpC~~,~~WAAA~~;AAAA,~~EAAA~~;AAAA,~~EAGA~~,WAAW,KAAgB,cAAkD;AACpF,UAAM,SAA6B,~~CAAC~~;~~AAE3B~~,~~aAAA~~,cAAc,KAAK,SAAS;AACpC,YAAM,OAAO,CAAC,GAAG,WAAW,KAAK,IAAI;~~AAC/B~~,~~YAAA~~,OAAe,KAAK,~~IAAI~~;~~AAC9B~~,YAAM,gBAAgB,KAAK,OAAY,CAAC,KAAK,SAAU,IAAI,IAAI,IAAI,IAAI,IAAI,KAAK,CAAA,GAAK,MAAM;AAE3F,oBAAc,IAAI,IAAI,KAAK,YAAY,WAAW,SAAS,GAAG,CAAC;AAAA,~~IAAA~~;~~AAGhE~~,aAAS,EAAE,MAAM,gBAAgB,MAAM,~~kBAAkB~~,cAAc;AACtE,YAAM,UAAU,CAAC,GAAG,KAAK,IAAI;~~AACvB~~,~~YAAA~~,OAAO,QAAQ,~~IAAI~~;~~AACnB~~,~~YAAA~~,gBAAgB,QAAQ,OAAY,CAAC,KAAK,SAAU,~~OAAO~~,IAAI,~~IAAI,~~KAAM,QAAW,MAAM;~~AAC1F~~,~~YAAA~~,cAAc,eAAe,GAAG;AACtC,UAAI,eAAe;AAClB,sBAAc,IAAI,KAAK,cAAc,KAAK,WAAW,IAAI,WAAc;AAAA,~~MAAA~~;AAAA,~~IACxE~~;~~AAGM~~,~~WAAA~~;AAAA,~~EAAA~~;AAAA,~~EAGR~~,MAAc,sBAA+C;~~AACtD~~,~~UAAA~~,UAAU,MAAM,QAAQ,WAAW,KAAK,SAAS,IAAI,OAAO,QAA+B;AAAA,MAChG,cAAc,GAAG;AAAA,MACjB,gBAAgB,GAAG;AAAA,MACnB,MAAM,GAAG;AAAA,MACT,MAAM,MAAM,GAAG;AAAA,~~MACd~~,CAAC;~~AACG~~,~~UAAA~~,WAAW,cAAc,OAAO;~~AAClC~~,~~QAAA~~,SAAS,SAAS,GAAG;~~AACpB~~,~~UAAA~~,SAAS,SAAS,GAAG;AACxB,iBAAS,MAAM,CAAC,EAAE,IAAI,~~CAAK~~,~~MAAA~~,OAAO,MAAM,GAAG,EAAE,KAAK,~~iBAAkB~~,~~CAAA~~,CAAC;AAAA,~~MAAA~~;~~AAEtE~~,YAAM,SAAS,CAAC;AAAA,~~IAAA~~;~~AAGjB~~,WAAO,mBAAmB,OAAO;AAAA,~~EAAA~~;AAAA,~~EAG1B~~,YAAY,OAAY;AAC/B,QAAI,iBAAiB,MAAM;AAC1B,aAAO,MAAM,~~YAAY~~;AAAA,~~IAAA~~;~~AAEnB~~,~~WAAA~~;AAAA,~~EAAA~~;~~AAET~~;"}
1	+ {"version":3,"file":"SelectHydrator.js","sources":["../../../../../../packages/engine-content-api/src/mapper/select/SelectHydrator.ts"],"sourcesContent":["import { Path } from './Path'\nimport { Value } from '@contember/schema'\nimport { getFulfilledValues, getRejections } from '../../utils'\nimport { logger } from '@contember/logger'\n\ntype DataPromises = {\n\tpath: Path\n\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>\n\tdata: Promise<SelectNestedData>\n\tdefaultValue: SelectNestedDefaultValue\n}\n\ntype ResolvedData = {\n\tpath: Path\n\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>\n\tdata: SelectNestedData\n\tdefaultValue: SelectNestedDefaultValue\n}\n\nexport type ColumnValueGetter<T extends Value.FieldValue = Value.FieldValue> = (row: SelectRow) => T\n\ntype Column = {\n\tpath: Path\n\tgetValue: ColumnValueGetter\n}\n\nexport class SelectHydrator {\n\tprivate columns: Column[] = []\n\tprivate promises: DataPromises[] = []\n\n\tpublic addColumn(path: Path, getValue: ColumnValueGetter) {\n\t\tthis.columns.push({ path, getValue })\n\t}\n\n\tpublic addPromise(\n\t\tpath: Path,\n\t\tgetParentValue: ColumnValueGetter<Value.PrimaryValue \| null>,\n\t\tdata: Promise<SelectNestedData>,\n\t\tdefaultValue: SelectNestedDefaultValue,\n\t) {\n\t\tthis.promises.push({ path, getParentValue, data, defaultValue })\n\t}\n\n\tpublic async hydrateGroups(rows: SelectRow[], groupBy: string): Promise<SelectGroupedObjects> {\n\t\tconst resolved = await this.resolveDataPromises()\n\t\tconst result: SelectGroupedObjects = {}\n\t\tfor (let row of rows) {\n\t\t\tconst key = row[groupBy] as Value.PrimaryValue\n\t\t\tif (!result[key]) {\n\t\t\t\tresult[key] = []\n\t\t\t}\n\t\t\tresult[key].push(this.hydrateRow(row, resolved))\n\t\t}\n\t\treturn result\n\t}\n\n\tpublic async hydrateAll(rows: SelectRow[]): Promise<SelectResultObject[]>\n\tpublic async hydrateAll(rows: SelectRow[], indexBy: string): Promise<SelectIndexedResultObjects>\n\n\tpublic async hydrateAll(\n\t\trows: SelectRow[],\n\t\tindexBy?: string,\n\t): Promise<SelectResultObject[] \| SelectIndexedResultObjects> {\n\t\tconst resolved = await this.resolveDataPromises()\n\t\tif (indexBy) {\n\t\t\tconst result: SelectIndexedResultObjects = {}\n\t\t\tfor (let row of rows) {\n\t\t\t\tresult[row[indexBy] as Value.PrimaryValue] = this.hydrateRow(row, resolved)\n\t\t\t}\n\t\t\treturn result\n\t\t}\n\t\tconst result: SelectResultObject[] = []\n\t\tfor (const row of rows) {\n\t\t\tresult.push(this.hydrateRow(row, resolved))\n\t\t}\n\t\treturn result\n\t}\n\n\tprivate hydrateRow(row: SelectRow, resolvedData: ResolvedData[]): SelectResultObject {\n\t\tconst result: SelectResultObject = {}\n\n\t\tfor (let columnPath of this.columns) {\n\t\t\tconst path = [...columnPath.path.path]\n\t\t\tconst last: string = path.pop() as string\n\t\t\tconst currentObject = path.reduce<any>((obj, part) => (obj[part] = obj[part] \|\| {}), result)\n\n\t\t\tcurrentObject[last] = this.formatValue(columnPath.getValue(row))\n\t\t}\n\n\t\tfor (let { path, getParentValue, data, defaultValue } of resolvedData) {\n\t\t\tconst pathTmp = [...path.path]\n\t\t\tconst last = pathTmp.pop() as string\n\t\t\tconst currentObject = pathTmp.reduce<any>((obj, part) => (obj?.[part]) \|\| undefined, result)\n\t\t\tconst parentValue = getParentValue(row)\n\t\t\tif (currentObject) {\n\t\t\t\tcurrentObject[last] = (parentValue ? data[parentValue] : undefined) \|\| defaultValue\n\t\t\t}\n\t\t}\n\n\t\treturn result\n\t}\n\n\tprivate async resolveDataPromises(): Promise<ResolvedData[]> {\n\t\tconst results = await Promise.allSettled(this.promises.map(async (it): Promise<ResolvedData> => ({\n\t\t\tdefaultValue: it.defaultValue,\n\t\t\tgetParentValue: it.getParentValue,\n\t\t\tpath: it.path,\n\t\t\tdata: await it.data,\n\t\t})))\n\t\tconst failures = getRejections(results)\n\t\tif (failures.length > 0) {\n\t\t\tif (failures.length > 1) {\n\t\t\t\tfailures.slice(1).map(e => logger.error(e, { loc: 'SelectHydrator' }))\n\t\t\t}\n\t\t\tthrow failures[0]\n\t\t}\n\n\t\treturn getFulfilledValues(results)\n\t}\n\n\tprivate formatValue(value: any) {\n\t\tif (value instanceof Date) {\n\t\t\treturn value.toISOString()\n\t\t}\n\t\treturn value\n\t}\n}\n\nexport type SelectRow = { [key: string]: Value.FieldValue }\nexport type SelectResultObject = Value.Object\nexport type SelectIndexedResultObjects = { [key: string]: SelectResultObject }\nexport type SelectGroupedObjects = { [groupingKey: string]: SelectResultObject[] }\nexport type SelectNestedData = SelectGroupedObjects \| SelectIndexedResultObjects\nexport type SelectNestedDefaultValue = [] \| null\n"],"names":["result"],"mappings":";;;;;;AA0BO,MAAM,eAAe;AAAA,EAArB,cAAA;AACN,kBAAA,MAAQ,WAAoB,EAAC;AAC7B,kBAAA,MAAQ,YAA2B,EAAC;AAAA,EAAA;AAAA,EAE7B,UAAU,MAAY,UAA6B;AACzD,SAAK,QAAQ,KAAK,EAAE,MAAM,UAAU;AAAA,EACrC;AAAA,EAEO,WACN,MACA,gBACA,MACA,cACC;AACD,SAAK,SAAS,KAAK,EAAE,MAAM,gBAAgB,MAAM,cAAc;AAAA,EAChE;AAAA,EAEA,MAAa,cAAc,MAAmB,SAAgD;AAC7F,UAAM,WAAW,MAAM,KAAK,oBAAA;AAC5B,UAAM,SAA+B,CAAA;AACrC,aAAS,OAAO,MAAM;AACrB,YAAM,MAAM,IAAI,OAAO;AACvB,UAAI,CAAC,OAAO,GAAG,GAAG;AACjB,eAAO,GAAG,IAAI,CAAA;AAAA,MACf;AACA,aAAO,GAAG,EAAE,KAAK,KAAK,WAAW,KAAK,QAAQ,CAAC;AAAA,IAChD;AACA,WAAO;AAAA,EACR;AAAA,EAKA,MAAa,WACZ,MACA,SAC6D;AAC7D,UAAM,WAAW,MAAM,KAAK,oBAAA;AAC5B,QAAI,SAAS;AACZ,YAAMA,UAAqC,CAAA;AAC3C,eAAS,OAAO,MAAM;AACrBA,gBAAO,IAAI,OAAO,CAAuB,IAAI,KAAK,WAAW,KAAK,QAAQ;AAAA,MAC3E;AACA,aAAOA;AAAAA,IACR;AACA,UAAM,SAA+B,CAAA;AACrC,eAAW,OAAO,MAAM;AACvB,aAAO,KAAK,KAAK,WAAW,KAAK,QAAQ,CAAC;AAAA,IAC3C;AACA,WAAO;AAAA,EACR;AAAA,EAEQ,WAAW,KAAgB,cAAkD;AACpF,UAAM,SAA6B,CAAA;AAEnC,aAAS,cAAc,KAAK,SAAS;AACpC,YAAM,OAAO,CAAC,GAAG,WAAW,KAAK,IAAI;AACrC,YAAM,OAAe,KAAK,IAAA;AAC1B,YAAM,gBAAgB,KAAK,OAAY,CAAC,KAAK,SAAU,IAAI,IAAI,IAAI,IAAI,IAAI,KAAK,CAAA,GAAK,MAAM;AAE3F,oBAAc,IAAI,IAAI,KAAK,YAAY,WAAW,SAAS,GAAG,CAAC;AAAA,IAChE;AAEA,aAAS,EAAE,MAAM,gBAAgB,MAAM,aAAA,KAAkB,cAAc;AACtE,YAAM,UAAU,CAAC,GAAG,KAAK,IAAI;AAC7B,YAAM,OAAO,QAAQ,IAAA;AACrB,YAAM,gBAAgB,QAAQ,OAAY,CAAC,KAAK,SAAU,MAAM,IAAI,KAAM,QAAW,MAAM;AAC3F,YAAM,cAAc,eAAe,GAAG;AACtC,UAAI,eAAe;AAClB,sBAAc,IAAI,KAAK,cAAc,KAAK,WAAW,IAAI,WAAc;AAAA,MACxE;AAAA,IACD;AAEA,WAAO;AAAA,EACR;AAAA,EAEA,MAAc,sBAA+C;AAC5D,UAAM,UAAU,MAAM,QAAQ,WAAW,KAAK,SAAS,IAAI,OAAO,QAA+B;AAAA,MAChG,cAAc,GAAG;AAAA,MACjB,gBAAgB,GAAG;AAAA,MACnB,MAAM,GAAG;AAAA,MACT,MAAM,MAAM,GAAG;AAAA,IAAA,EACd,CAAC;AACH,UAAM,WAAW,cAAc,OAAO;AACtC,QAAI,SAAS,SAAS,GAAG;AACxB,UAAI,SAAS,SAAS,GAAG;AACxB,iBAAS,MAAM,CAAC,EAAE,IAAI,CAAA,MAAK,OAAO,MAAM,GAAG,EAAE,KAAK,iBAAA,CAAkB,CAAC;AAAA,MACtE;AACA,YAAM,SAAS,CAAC;AAAA,IACjB;AAEA,WAAO,mBAAmB,OAAO;AAAA,EAClC;AAAA,EAEQ,YAAY,OAAY;AAC/B,QAAI,iBAAiB,MAAM;AAC1B,aAAO,MAAM,YAAA;AAAA,IACd;AACA,WAAO;AAAA,EACR;AACD;"}

package/dist/development/src/mapper/select/WhereBuilder.cjs CHANGED Viewed

@@ -37,11 +37,13 @@ class WhereBuilder {
     ...args
   }) {
     const joinList = [];
-    const qbWithWhere = callback((clause) => this.buildRecursive({
-      conditionBuilder: clause,
-      joinList,
-      ...args
-    }));
+    const qbWithWhere = callback(
+      (clause) => this.buildRecursive({
+        conditionBuilder: clause,
+        joinList,
+        ...args
+      })
+    );
     return joinList.reduce(
       (qb, { path, entity, relationName }) => this.joinBuilder.join(qb, path, entity, relationName),
       qbWithWhere
@@ -76,14 +78,16 @@ class WhereBuilder {
       const expr = where.or;
       conditionBuilder = conditionBuilder.or(
         (clause) => expr.reduce(
-          (clause2, where2) => !where2 ? clause2 : clause2.and((clause3) => this.buildRecursive({
-            conditionBuilder: clause3,
-            entity,
-            path,
-            where: where2,
-            joinList,
-            allowManyJoin
-          })),
+          (clause2, where2) => !where2 ? clause2 : clause2.and(
+            (clause3) => this.buildRecursive({
+              conditionBuilder: clause3,
+              entity,
+              path,
+              where: where2,
+              joinList,
+              allowManyJoin
+            })
+          ),
           clause
         )
       );
@@ -207,9 +211,7 @@ class WhereBuilder {
     const primaryCondition = this.transformWhereToPrimaryCondition(relationWhere, targetEntity.primary);
     if (primaryCondition !== null) {
       const columnType = targetEntity.fields[targetEntity.primary];
-      return qb.where(
-        (condition) => this.conditionBuilder.build(condition, junctionPath.alias, toColumn, columnType, primaryCondition)
-      );
+      return qb.where((condition) => this.conditionBuilder.build(condition, junctionPath.alias, toColumn, columnType, primaryCondition));
     }
     const qbJoined = qb.join(
       targetEntity.tableName,
@@ -279,10 +281,10 @@ class WhereBuilder {
     if (cond.isNull !== void 0) {
       return true;
     }
-    if (cond.and && cond.and.some((it) => this.conditionHasIsNull(it))) {
+    if (cond.and?.some((it) => this.conditionHasIsNull(it))) {
       return true;
     }
-    if (cond.or && cond.or.some((it) => this.conditionHasIsNull(it))) {
+    if (cond.or?.some((it) => this.conditionHasIsNull(it))) {
       return true;
     }
     if (cond.not && this.conditionHasIsNull(cond.not)) {