@contember/engine-content-api 1.1.0-alpha.2 → 1.1.0-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "1.1.0-alpha.2",
+  "version": "1.1.0-alpha.3",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -10,19 +10,19 @@
     "test": "uvu dist/tests/cases/ \\.js$"
   },
   "dependencies": {
-    "@contember/database": "^1.1.0-alpha.2",
-    "@contember/dic": "^1.1.0-alpha.2",
-    "@contember/engine-common": "^1.1.0-alpha.2",
-    "@contember/graphql-utils": "^1.1.0-alpha.2",
-    "@contember/schema": "^1.1.0-alpha.2",
-    "@contember/schema-utils": "^1.1.0-alpha.2",
+    "@contember/database": "^1.1.0-alpha.3",
+    "@contember/dic": "^1.1.0-alpha.3",
+    "@contember/engine-common": "^1.1.0-alpha.3",
+    "@contember/graphql-utils": "^1.1.0-alpha.3",
+    "@contember/schema": "^1.1.0-alpha.3",
+    "@contember/schema-utils": "^1.1.0-alpha.3",
     "@graphql-tools/schema": "^7.1.5",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "^1.1.0-alpha.2",
-    "@contember/engine-api-tester": "^1.1.0-alpha.2",
-    "@contember/schema-definition": "^1.1.0-alpha.2",
+    "@contember/database-tester": "^1.1.0-alpha.3",
+    "@contember/engine-api-tester": "^1.1.0-alpha.3",
+    "@contember/schema-definition": "^1.1.0-alpha.3",
     "@graphql-codegen/cli": "^1.15.2",
     "@graphql-codegen/typescript": "^1.15.2",
     "@graphql-codegen/typescript-operations": "^1.15.2",
@@ -30,7 +30,7 @@
     "@types/node": "^17.0.5",
     "graphql": "^15.4.0",
     "pg": "^8.5.0",
-    "uvu": "^0.5.1"
+    "uvu": "^0.5.3"
   },
   "peerDependencies": {
     "graphql": ">= 14.6.0",

package/src/index.ts

@@ -1,5 +1,4 @@
 export * from './acl'
-export * from './bridges'
 export * from './resolvers'
 export * from './introspection'
 export * from './schema'

package/src/mapper/select/WhereBuilder.ts

@@ -4,7 +4,7 @@ import { Input, Model } from '@contember/schema'
 import { Path, PathFactory } from './Path'
 import { JoinBuilder } from './JoinBuilder'
 import { ConditionBuilder } from './ConditionBuilder'
-import { ConditionBuilder as SqlConditionBuilder, Operator, SelectBuilder } from '@contember/database'
+import { ConditionBuilder as SqlConditionBuilder, Operator, QueryBuilder, SelectBuilder } from '@contember/database'
 
 export class WhereBuilder {
 	constructor(
@@ -125,10 +125,9 @@ export class WhereBuilder {
 					}
 					const relationWhere = where[fieldName] as Input.Where
 
-					return conditionBuilder.in(
-						[tableName, entity.primaryColumn],
+					return conditionBuilder.exists(
 						this.createManyHasManySubquery(
-							SelectBuilder.create(),
+							[tableName, entity.primaryColumn],
 							relationWhere,
 							targetEntity,
 							targetRelation.joiningTable,
@@ -143,10 +142,9 @@ export class WhereBuilder {
 
 					const relationWhere = where[fieldName] as Input.Where
 
-					return conditionBuilder.in(
-						[tableName, entity.primaryColumn],
+					return conditionBuilder.exists(
 						this.createManyHasManySubquery(
-							SelectBuilder.create(),
+							[tableName, entity.primaryColumn],
 							relationWhere,
 							targetEntity,
 							relation.joiningTable,
@@ -161,15 +159,14 @@ export class WhereBuilder {
 
 					const relationWhere = where[fieldName] as Input.Where
 
-					return conditionBuilder.in(
-						[tableName, entity.primaryColumn],
+					return conditionBuilder.exists(
 						this.build(
 							SelectBuilder.create()
-								.distinct()
-								.select(['root_', targetRelation.joiningColumn.columnName])
-								.from(targetEntity.tableName, 'root_'),
+								.select(it => it.raw('1'))
+								.from(targetEntity.tableName, 'sub_')
+								.where(it => it.columnsEq([tableName, entity.primaryColumn], ['sub_', targetRelation.joiningColumn.columnName])),
 							targetEntity,
-							this.pathFactory.create([]),
+							this.pathFactory.create([], 'sub_'),
 							relationWhere,
 							true,
 						),
@@ -181,36 +178,35 @@ export class WhereBuilder {
 	}
 
 	private createManyHasManySubquery(
-		qb: SelectBuilder<SelectBuilder.Result>,
+		outerColumn: QueryBuilder.ColumnIdentifier,
 		relationWhere: Input.Where,
 		targetEntity: Model.Entity,
 		joiningTable: Model.JoiningTable,
 		fromSide: 'owning' | 'inverse',
 	) {
-		let augmentedBuilder: SelectBuilder<SelectBuilder.Result> = qb
-		const fromColumn =
-			fromSide === 'owning' ? joiningTable.joiningColumn.columnName : joiningTable.inverseJoiningColumn.columnName
-		const toColumn =
-			fromSide === 'owning' ? joiningTable.inverseJoiningColumn.columnName : joiningTable.joiningColumn.columnName
-		augmentedBuilder = augmentedBuilder
+		const fromColumn = fromSide === 'owning' ? joiningTable.joiningColumn.columnName : joiningTable.inverseJoiningColumn.columnName
+		const toColumn = fromSide === 'owning' ? joiningTable.inverseJoiningColumn.columnName : joiningTable.joiningColumn.columnName
+		const qb = SelectBuilder.create<SelectBuilder.Result>()
 			.from(joiningTable.tableName, 'junction_')
-			.distinct()
-			.select(['junction_', fromColumn])
+			.select(it => it.raw('1'))
+			.where(it => it.columnsEq(outerColumn, ['junction_', fromColumn]))
+
 		const primaryCondition = this.transformWhereToPrimaryCondition(relationWhere, targetEntity.primary)
 		if (primaryCondition !== null) {
-			return augmentedBuilder.where(condition =>
+
+			return qb.where(condition =>
 				this.conditionBuilder.build(condition, 'junction_', toColumn, primaryCondition),
 			)
 		}
 
-		augmentedBuilder = augmentedBuilder.join(targetEntity.tableName, 'root_', clause =>
-			clause.compareColumns(['junction_', toColumn], Operator.eq, ['root_', targetEntity.primary]),
+		const qbJoined = qb.join(targetEntity.tableName, 'sub_', clause =>
+			clause.compareColumns(['junction_', toColumn], Operator.eq, ['sub_', targetEntity.primary]),
 		)
 		return this.buildAdvanced(
 			targetEntity,
-			this.pathFactory.create([]),
+			this.pathFactory.create([], 'sub_'),
 			relationWhere,
-			cb => augmentedBuilder.where(clause => cb(clause)),
+			cb => qbJoined.where(clause => cb(clause)),
 			true,
 		)
 	}

package/src/resolvers/MutationResolver.ts

@@ -66,12 +66,12 @@ export class MutationResolver {
 			const validationResult: Record<string, Result.MutationFieldResult> = {}
 			const validationErrors: Result.ValidationError[] = []
 			for (const field of queryAst.fields) {
+				if (field.name === 'query' || field.name === '__typename') {
+					continue
+				}
 				if (!(field instanceof ObjectNode)) {
 					throw new ImplementationException()
 				}
-				if (field.name === 'query') {
-					continue
-				}
 				const fieldConfig = fields[field.name]
 				if (!fieldConfig) {
 					throw new ImplementationException()
@@ -110,6 +110,7 @@ export class MutationResolver {
 			}
 			if (validationErrors.length) {
 				return {
+					__typename: 'MutationTransaction',
 					ok: false,
 					errorMessage: this.stringifyValidationErrors(validationErrors),
 					errors: [],
@@ -123,6 +124,9 @@ export class MutationResolver {
 
 			const trxResult: Record<string, any> = {}
 			for (const field of queryAst.fields) {
+				if (field.name === '__typename') {
+					continue
+				}
 				if (!(field instanceof ObjectNode)) {
 					throw new ImplementationException()
 				}
@@ -198,7 +202,13 @@ export class MutationResolver {
 				}
 			}
 
-			return { ok: true, errors: [], validation: { valid: true, errors: [] }, ...trxResult }
+			return {
+				__typename: 'MutationTransaction',
+				ok: true,
+				errors: [],
+				validation: { valid: true, errors: [] },
+				...trxResult,
+			}
 		})
 	}
 

package/tests/cases/bugs/bug102.test.ts

@@ -50,10 +50,10 @@ test('Filter by has many with additional join', async () => {
 				sql: SQL`
 select "root_"."id" as "root_id", "root_"."short_name" as "root_shortName", "root_"."id" as "root_id"
 from "public"."person" as "root_"
-where "root_"."id" in (select distinct "root_"."person_id"
-  from "public"."person_locale" as "root_"
-    left join "public"."language" as "root_locale" on "root_"."locale_id" = "root_locale"."id"
-  where "root_locale"."slug" = ? and not("root_"."url_slug" is null))`,
+where exists (select 1
+  from "public"."person_locale" as "sub_"
+    left join "public"."language" as "sub_locale" on "sub_"."locale_id" = "sub_locale"."id"
+  where "root_"."id" = "sub_"."person_id" and "sub_locale"."slug" = ? and not("sub_"."url_slug" is null))`,
 				response: { rows: [{ root_id: testUuid(1), root_shortName: 'John' }] },
 				parameters: ['cs'],
 			},

package/tests/cases/integration/graphQlRequests/query/filter/manyHasManyOwnerRelation.test.ts

@@ -24,9 +24,9 @@ test('Post by category name (where many has many owning)', async () => {
 			{
 				sql: SQL`select "root_"."id" as "root_id"
                      from "public"."post" as "root_"
-                     where "root_"."id" in (select distinct "junction_"."post_id"
-                                            from "public"."post_categories" as "junction_" inner join "public"."category" as "root_" on "junction_"."category_id" = "root_"."id"
-                                            where "root_"."name" = ?)`,
+                     where exists (select 1
+                                            from "public"."post_categories" as "junction_" inner join "public"."category" as "sub_" on "junction_"."category_id" = "sub_"."id"
+                                            where "root_"."id" = "junction_"."post_id"  and "sub_"."name" = ?)`,
 				parameters: ['Stuff'],
 				response: {
 					rows: [
@@ -74,9 +74,9 @@ test('Post by category ids (where many has many owning)', async () => {
 			{
 				sql: SQL`select "root_"."id" as "root_id"
                      from "public"."post" as "root_"
-                     where "root_"."id" in (select distinct "junction_"."post_id"
+                     where exists (select 1
                                             from "public"."post_categories" as "junction_"
-                                            where "junction_"."category_id" in (?, ?))`,
+                                            where "root_"."id" = "junction_"."post_id" and "junction_"."category_id" in (?, ?))`,
 				parameters: [testUuid(10), testUuid(11)],
 				response: {
 					rows: [

package/tests/cases/integration/graphQlRequests/query/filter/oneHasManyRelation.test.ts

@@ -25,9 +25,9 @@ test('Author by post title (where one has many)', async () => {
 			{
 				sql: SQL`select "root_"."id" as "root_id"
                      from "public"."author" as "root_"
-                     where "root_"."id" in (select distinct "root_"."author_id"
-                                            from "public"."post" as "root_"
-                                            where "root_"."title" = ?)`,
+                     where exists (select 1
+                                            from "public"."post" as "sub_"
+                                            where "root_"."id" = "sub_"."author_id" and "sub_"."title" = ?)`,
 				parameters: ['Hello'],
 				response: {
 					rows: [

package/tests/cases/integration/graphQlRequests/query/unique/oneHasManyUnique.test.ts

@@ -30,7 +30,7 @@ test('Post by post locale (one-has-many unique)', async () => {
 			{
 				sql: SQL`SELECT "root_"."id" AS "root_id"
 						         FROM "public"."post" AS "root_"
-						         WHERE "root_"."id" IN (SELECT distinct "root_"."post_id" FROM "public"."post_locale" AS "root_" WHERE "root_"."id" = ?)`,
+						         WHERE EXISTS (SELECT 1 FROM "public"."post_locale" AS "sub_" WHERE "root_"."id" = "sub_"."post_id" AND "sub_"."id" = ?)`,
 				parameters: [testUuid(1)],
 				response: { rows: [{ root_id: testUuid(2) }] },
 			},

package/dist/src/bridges/index.d.ts

@@ -1,2 +0,0 @@
-export * from './system';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/bridges/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/bridges/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA"}

package/dist/src/bridges/index.js

@@ -1,14 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./system"), exports);
-//# sourceMappingURL=index.js.map

package/dist/src/bridges/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bridges/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwB"}

package/dist/src/bridges/system/EntitiesSelector.d.ts

@@ -1,36 +0,0 @@
-import { Client } from '@contember/database';
-import { Acl, Schema, Input } from '@contember/schema';
-import { Mapper } from '../../mapper';
-import { PermissionsByIdentityFactory } from '../../acl';
-export declare type EntitiesRelationsInput = readonly {
-    name: string;
-    relations: EntitiesRelationsInput;
-}[];
-export interface EntitiesSelectorContext {
-    db: Client;
-    schema: Schema;
-    identityVariables: Acl.VariablesMap;
-    roles: string[];
-}
-export interface EntitiesSelectorInput {
-    entity: string;
-    filter: Input.Where;
-    relations: EntitiesRelationsInput;
-}
-export declare class EntitiesSelector {
-    private readonly mapperFactory;
-    private readonly permissionsByIdentityFactory;
-    constructor(mapperFactory: EntitiesSelectorMapperFactory, permissionsByIdentityFactory: PermissionsByIdentityFactory);
-    getEntities(context: EntitiesSelectorContext, input: EntitiesSelectorInput): Promise<EntitiesResult[]>;
-    private createObjectNode;
-    private createRelations;
-}
-interface EntitiesResultRelations {
-    [relation: string]: EntitiesResult | EntitiesResult[] | null;
-}
-export declare type EntitiesResult = {
-    id: string;
-} & EntitiesResultRelations;
-export declare type EntitiesSelectorMapperFactory = (db: Client, schema: Schema, identityVariables: Acl.VariablesMap, permissions: Acl.Permissions) => Mapper;
-export {};
-//# sourceMappingURL=EntitiesSelector.d.ts.map

package/dist/src/bridges/system/EntitiesSelector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"EntitiesSelector.d.ts","sourceRoot":"","sources":["../../../../src/bridges/system/EntitiesSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAS,MAAM,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAGrC,OAAO,EAAE,4BAA4B,EAAE,MAAM,WAAW,CAAA;AAExD,oBAAY,sBAAsB,GAAG,SAAS;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,sBAAsB,CAAA;CACjC,EAAE,CAAA;AAEH,MAAM,WAAW,uBAAuB;IACvC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,GAAG,CAAC,YAAY,CAAA;IACnC,KAAK,EAAE,MAAM,EAAE,CAAA;CACf;AAED,MAAM,WAAW,qBAAqB;IACrC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,KAAK,CAAC,KAAK,CAAA;IACnB,SAAS,EAAE,sBAAsB,CAAA;CACjC;AAED,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,4BAA4B;gBAD5B,aAAa,EAAE,6BAA6B,EAC5C,4BAA4B,EAAE,4BAA4B;IAGtE,WAAW,CAAC,OAAO,EAAE,uBAAuB,EAAE,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAY5G,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,eAAe;CAuBvB;AAED,UAAU,uBAAuB;IAChC,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,cAAc,EAAE,GAAG,IAAI,CAAA;CAC5D;AAED,oBAAY,cAAc,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAA;CACV,GAAG,uBAAuB,CAAA;AAE3B,oBAAY,6BAA6B,GAAG,CAC3C,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,GAAG,CAAC,YAAY,EACnC,WAAW,EAAE,GAAG,CAAC,WAAW,KACxB,MAAM,CAAA"}

package/dist/src/bridges/system/EntitiesSelector.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntitiesSelector = void 0;
-const schema_utils_1 = require("@contember/schema-utils");
-const inputProcessing_1 = require("../../inputProcessing");
-class EntitiesSelector {
-    constructor(mapperFactory, permissionsByIdentityFactory) {
-        this.mapperFactory = mapperFactory;
-        this.permissionsByIdentityFactory = permissionsByIdentityFactory;
-    }
-    async getEntities(context, input) {
-        const { permissions } = this.permissionsByIdentityFactory.createPermissions(context.schema, {
-            projectRoles: context.roles,
-        });
-        const mapper = this.mapperFactory(context.db, context.schema, context.identityVariables, permissions);
-        const entity = (0, schema_utils_1.getEntity)(context.schema.model, input.entity);
-        const node = this.createObjectNode(context.schema, entity, input.relations).withArg('filter', input.filter);
-        const result = await mapper.select(entity, node);
-        return result;
-    }
-    createObjectNode(schema, entity, relations) {
-        return this.createRelations(schema, entity, new inputProcessing_1.ObjectNode(entity.name, entity.name, [], {}, {}, []), relations);
-    }
-    createRelations(schema, entity, node, relations) {
-        return relations.reduce((node, relation) => {
-            const fieldName = relation.name;
-            const newField = (0, schema_utils_1.acceptFieldVisitor)(schema.model, entity, fieldName, {
-                visitColumn: () => {
-                    throw new Error(`${fieldName} is not a relation`);
-                },
-                visitRelation: ({}, {}, targetEntity) => this.createRelations(schema, targetEntity, new inputProcessing_1.ObjectNode(fieldName, fieldName, [], {}, {}, []), relation.relations),
-            });
-            return node.withField(newField);
-        }, node.withField(new inputProcessing_1.FieldNode(entity.primary, 'id', {})));
-    }
-}
-exports.EntitiesSelector = EntitiesSelector;
-//# sourceMappingURL=EntitiesSelector.js.map

package/dist/src/bridges/system/EntitiesSelector.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"EntitiesSelector.js","sourceRoot":"","sources":["../../../../src/bridges/system/EntitiesSelector.ts"],"names":[],"mappings":";;;AAGA,0DAAuE;AACvE,2DAA6D;AAqB7D,MAAa,gBAAgB;IAC5B,YACkB,aAA4C,EAC5C,4BAA0D;QAD1D,kBAAa,GAAb,aAAa,CAA+B;QAC5C,iCAA4B,GAA5B,4BAA4B,CAA8B;IACzE,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAgC,EAAE,KAA4B;QAC/E,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,4BAA4B,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,EAAE;YAC3F,YAAY,EAAE,OAAO,CAAC,KAAK;SAC3B,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAA;QACrG,MAAM,MAAM,GAAG,IAAA,wBAAS,EAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAE3G,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAChD,OAAO,MAAqC,CAAA;IAC7C,CAAC;IAEO,gBAAgB,CAAC,MAAc,EAAE,MAAoB,EAAE,SAAiC;QAC/F,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,4BAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,SAAS,CAAC,CAAA;IACjH,CAAC;IAEO,eAAe,CACtB,MAAc,EACd,MAAoB,EACpB,IAAgB,EAChB,SAAiC;QAEjC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;YAC1C,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAA;YAC/B,MAAM,QAAQ,GAAG,IAAA,iCAAkB,EAAa,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE;gBAChF,WAAW,EAAE,GAAG,EAAE;oBACjB,MAAM,IAAI,KAAK,CAAC,GAAG,SAAS,oBAAoB,CAAC,CAAA;gBAClD,CAAC;gBACD,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,CACvC,IAAI,CAAC,eAAe,CACnB,MAAM,EACN,YAAY,EACZ,IAAI,4BAAU,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EACpD,QAAQ,CAAC,SAAS,CAClB;aACF,CAAC,CAAA;YACF,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAChC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,2BAAS,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5D,CAAC;CACD;AA7CD,4CA6CC"}

package/dist/src/bridges/system/index.d.ts

@@ -1,2 +0,0 @@
-export * from './EntitiesSelector';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/bridges/system/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/bridges/system/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA"}

package/dist/src/bridges/system/index.js

@@ -1,14 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./EntitiesSelector"), exports);
-//# sourceMappingURL=index.js.map

package/dist/src/bridges/system/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/bridges/system/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAkC"}

package/src/bridges/index.ts

@@ -1 +0,0 @@
-export * from './system'

package/src/bridges/system/EntitiesSelector.ts

@@ -1,86 +0,0 @@
-import { Client } from '@contember/database'
-import { Acl, Model, Schema, Input } from '@contember/schema'
-import { Mapper } from '../../mapper'
-import { acceptFieldVisitor, getEntity } from '@contember/schema-utils'
-import { FieldNode, ObjectNode } from '../../inputProcessing'
-import { PermissionsByIdentityFactory } from '../../acl'
-
-export type EntitiesRelationsInput = readonly {
-	name: string
-	relations: EntitiesRelationsInput
-}[]
-
-export interface EntitiesSelectorContext {
-	db: Client
-	schema: Schema
-	identityVariables: Acl.VariablesMap
-	roles: string[]
-}
-
-export interface EntitiesSelectorInput {
-	entity: string
-	filter: Input.Where
-	relations: EntitiesRelationsInput
-}
-
-export class EntitiesSelector {
-	constructor(
-		private readonly mapperFactory: EntitiesSelectorMapperFactory,
-		private readonly permissionsByIdentityFactory: PermissionsByIdentityFactory,
-	) {}
-
-	async getEntities(context: EntitiesSelectorContext, input: EntitiesSelectorInput): Promise<EntitiesResult[]> {
-		const { permissions } = this.permissionsByIdentityFactory.createPermissions(context.schema, {
-			projectRoles: context.roles,
-		})
-		const mapper = this.mapperFactory(context.db, context.schema, context.identityVariables, permissions)
-		const entity = getEntity(context.schema.model, input.entity)
-		const node = this.createObjectNode(context.schema, entity, input.relations).withArg('filter', input.filter)
-
-		const result = await mapper.select(entity, node)
-		return result as unknown as EntitiesResult[]
-	}
-
-	private createObjectNode(schema: Schema, entity: Model.Entity, relations: EntitiesRelationsInput): ObjectNode {
-		return this.createRelations(schema, entity, new ObjectNode(entity.name, entity.name, [], {}, {}, []), relations)
-	}
-
-	private createRelations(
-		schema: Schema,
-		entity: Model.Entity,
-		node: ObjectNode,
-		relations: EntitiesRelationsInput,
-	): ObjectNode {
-		return relations.reduce((node, relation) => {
-			const fieldName = relation.name
-			const newField = acceptFieldVisitor<ObjectNode>(schema.model, entity, fieldName, {
-				visitColumn: () => {
-					throw new Error(`${fieldName} is not a relation`)
-				},
-				visitRelation: ({}, {}, targetEntity) =>
-					this.createRelations(
-						schema,
-						targetEntity,
-						new ObjectNode(fieldName, fieldName, [], {}, {}, []),
-						relation.relations,
-					),
-			})
-			return node.withField(newField)
-		}, node.withField(new FieldNode(entity.primary, 'id', {})))
-	}
-}
-
-interface EntitiesResultRelations {
-	[relation: string]: EntitiesResult | EntitiesResult[] | null
-}
-
-export type EntitiesResult = {
-	id: string
-} & EntitiesResultRelations
-
-export type EntitiesSelectorMapperFactory = (
-	db: Client,
-	schema: Schema,
-	identityVariables: Acl.VariablesMap,
-	permissions: Acl.Permissions,
-) => Mapper

package/src/bridges/system/index.ts

@@ -1 +0,0 @@
-export * from './EntitiesSelector'