@contember/engine-content-api 1.3.0-alpha.1 → 1.3.0-alpha.2

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/create.test.ts

@@ -43,17 +43,10 @@ test('create', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "setting_id",
-                 "root_"."id",
-                 "root_"."name"
-               from "public"."site" as "root_"
-               where "root_"."id" = ?) update "public"."site"
-              set "setting_id" = "newData_"."setting_id" from "newData_"
-              where "site"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+							update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
 					parameters: [testUuid(1), testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
 				},
 			]),
 		],
@@ -104,17 +97,10 @@ test('create - orphan removal', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "setting_id",
-                 "root_"."id",
-                 "root_"."name"
-               from "public"."site" as "root_"
-               where "root_"."id" = ?) update "public"."site"
-              set "setting_id" = "newData_"."setting_id" from "newData_"
-              where "site"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
 					parameters: [testUuid(1), siteId],
-					response: { rowCount: 1 },
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
 				},
 				{
 					sql: 'select "root_"."id"  from "public"."site_setting" as "root_"   where "root_"."id" = ?',

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/disconnect.test.ts

@@ -23,17 +23,10 @@ test('disconnect', async () => {
 					response: { rows: [{ id: testUuid(2) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "setting_id",
-                 "root_"."id",
-                 "root_"."name"
-               from "public"."site" as "root_"
-               where "root_"."id" = ?) update "public"."site"
-              set "setting_id" = "newData_"."setting_id" from "newData_"
-              where "site"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
 					parameters: [null, testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
 				},
 			]),
 		],

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/update.test.ts

@@ -37,16 +37,10 @@ test('update', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "url",
-                 "root_"."id"
-               from "public"."site_setting" as "root_"
-               where "root_"."id" = ?) update "public"."site_setting"
-              set "url" = "newData_"."url" from "newData_"
-              where "site_setting"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "url", "root_"."url" as "url_old__", "root_"."id"  from "public"."site_setting" as "root_"  where "root_"."id" = ?) 
+							update  "public"."site_setting" set  "url" =  "newData_"."url"   from "newData_"  where "site_setting"."id" = "newData_"."id"  returning "url_old__"`,
 					parameters: ['http://mangoweb.cz', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ url_old__: 'https://google.com' }] },
 				},
 			]),
 		],

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/upsert.test.ts

@@ -37,16 +37,10 @@ test('upsert - exists', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "url",
-                 "root_"."id"
-               from "public"."site_setting" as "root_"
-               where "root_"."id" = ?) update "public"."site_setting"
-              set "url" = "newData_"."url" from "newData_"
-              where "site_setting"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "url", "root_"."url" as "url_old__", "root_"."id"  from "public"."site_setting" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site_setting" set  "url" =  "newData_"."url"   from "newData_"  where "site_setting"."id" = "newData_"."id"  returning "url_old__"`,
 					parameters: ['http://mangoweb.cz', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ url_old__: 'xxx' }] },
 				},
 			]),
 		],
@@ -97,17 +91,10 @@ test('upsert - not exists', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "setting_id",
-                 "root_"."id",
-                 "root_"."name"
-               from "public"."site" as "root_"
-               where "root_"."id" = ?) update "public"."site"
-              set "setting_id" = "newData_"."setting_id" from "newData_"
-              where "site"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
 					parameters: [testUuid(1), testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ setting_id_old__: null }] },
 				},
 			]),
 		],

package/tests/cases/integration/graphQlRequests/update/queryPortal.test.ts

@@ -31,11 +31,10 @@ test('query portal', async () => {
 					parameters: [testUuid(1)],
 				},
 				{
-					sql: SQL`with "newData_" as
-    					(select ? :: text as "title", "root_"."id"  from "public"."post" as "root_"  where "root_"."id" = ?)
-						update  "public"."post" set  "title" =  "newData_"."title"   from "newData_"  where "post"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "title", "root_"."title" as "title_old__", "root_"."id"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+						update  "public"."post" set  "title" =  "newData_"."title"   from "newData_"  where "post"."id" = "newData_"."id"  returning "title_old__"`,
 					parameters: ['Hello', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ title_old__: 'Hi' }] },
 				},
 			]),
 			{
@@ -90,11 +89,10 @@ test('transaction with query portal', async () => {
 					parameters: [testUuid(1)],
 				},
 				{
-					sql: SQL`with "newData_" as
-    					(select ? :: text as "title", "root_"."id"  from "public"."post" as "root_"  where "root_"."id" = ?)
-						update  "public"."post" set  "title" =  "newData_"."title"   from "newData_"  where "post"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "title", "root_"."title" as "title_old__", "root_"."id"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+						update  "public"."post" set  "title" =  "newData_"."title"   from "newData_"  where "post"."id" = "newData_"."id"  returning "title_old__"`,
 					parameters: ['Hello', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ title_old__: 'Hi' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"

package/tests/cases/integration/graphQlRequests/update/transaction.test.ts

@@ -41,15 +41,10 @@ test('executes in a transaction', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as (select
-                  ? :: text as "name",
-                  "root_"."id"
-                from "public"."author" as "root_"
-                where "root_"."id" = ?) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where "root_"."id" = ?) 
+							update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['John', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Jack' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"
@@ -66,15 +61,10 @@ test('executes in a transaction', async () => {
 					response: { rows: [{ id: testUuid(2) }] },
 				},
 				{
-					sql: SQL`with "newData_" as (select
-                  ? :: text as "name",
-                  "root_"."id"
-                from "public"."author" as "root_"
-                where "root_"."id" = ?) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where "root_"."id" = ?) 
+							update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['Jack', testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Jack' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"
@@ -146,15 +136,10 @@ test('executes fails a transaction', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as (select
-                  ? :: text as "name",
-                  "root_"."id"
-                from "public"."author" as "root_"
-                where "root_"."id" = ?) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where "root_"."id" = ?) 
+							update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['John', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Jack' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"

package/tests/cases/integration/graphQlRequests/upsert/basicUpsert.test.ts

@@ -88,14 +88,10 @@ test('upsert author (exists)', async () => {
 					response: { rows: [{ id: testUuid(2) }] },
 				},
 				{
-					sql: SQL`
-						with "newData_" as
-    					(select ? :: text as "name", "root_"."id", "root_"."slug"  from "public"."author" as "root_"  where "root_"."id" = ?)
-						update  "public"."author" set  "name" =  "newData_"."name"
-  						from "newData_"  where "author"."id" = "newData_"."id"
-					`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id", "root_"."slug"  from "public"."author" as "root_"  where "root_"."id" = ?) 
+						update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['John Doe', testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Foo' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"  from "public"."author" as "root_"  where "root_"."slug" = ?`,

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

@@ -68,4 +68,17 @@ describe('order by helper', () => {
 		const newNode = OrderByHelper.appendDefaultOrderBy(entity, objectNode, [])
 		assert.isUndefined(newNode.args.orderBy)
 	})
+
+	it('set default order by without defined order', () => {
+		const objectNode = new ObjectNode('test', 'test', [], {}, {}, [])
+
+		const newNode = OrderByHelper.appendDefaultOrderBy({
+			...entity,
+			orderBy: [{ path: ['lorem', 'ipsum'], direction: Input.OrderDirection.desc }],
+		}, objectNode, undefined)
+		assert.deepStrictEqual(newNode.args.orderBy, [
+			{ lorem: { ipsum: Input.OrderDirection.desc } },
+			{ id: Input.OrderDirection.asc },
+		])
+	})
 })

package/tests/src/test.ts

@@ -1,12 +1,12 @@
 import { Acl, Model, Schema, Validation } from '@contember/schema'
-import { Authorizator, ExecutionContainerFactory, GraphQlSchemaBuilderFactory } from '../../src'
+import { Authorizator, GraphQlSchemaBuilderFactory, ExecutionContainerFactory } from '../../src'
 import { AllowAllPermissionFactory, emptySchema } from '@contember/schema-utils'
 import { executeGraphQlTest } from './testGraphql'
 import { Client } from '@contember/database'
 import { createConnectionMock } from '@contember/database-tester'
 import { createUuidGenerator } from '@contember/engine-api-tester'
-import { getArgumentValues } from 'graphql'
 import { SQL } from './tags'
+import { testUuid } from './testUuid'
 
 export interface SqlQuery {
 	sql: string
@@ -36,6 +36,19 @@ const SQL_REPEATABLE_READ = {
 	response: {},
 }
 
+export const systemVariableQueries: SqlQuery[] = [
+	{
+		sql: 'select set_config(?, ?, false)',
+		parameters: ['tenant.identity_id', '00000000-0000-0000-0000-000000000000'],
+		response: {},
+	},
+	{
+		sql: 'select set_config(?, ?, false)',
+		parameters: ['system.transaction_id', testUuid(1)],
+		response: {},
+	},
+]
+
 export const sqlTransaction = (executes: SqlQuery[]): SqlQuery[] => {
 	return [
 		SQL_BEGIN,
@@ -72,23 +85,33 @@ export const execute = async (test: Test) => {
 
 	const db = new Client(connection, 'public', {})
 	const schema: Schema = { ...emptySchema, model: test.schema, validation: test.validation || {} }
+	const providers = {
+		uuid: createUuidGenerator('a456', 0),
+		now: () => new Date('2019-09-04 12:00'),
+	}
+	const executionContainerFactory = new ExecutionContainerFactory(providers)
+	executionContainerFactory.hooks.push(it => {
+		return it.setupService('mapperFactory', mapperFactory => {
+			mapperFactory.hooks.push(mapper => {
+				(mapper as any).systemVariablesSetupDone = Promise.resolve(true)
+			})
+		})
+	})
 	await executeGraphQlTest({
 		context: {
 			db: db,
 			identityVariables: test.variables || {},
-			executionContainer: new ExecutionContainerFactory(
-				schema,
-				permissions,
-				{
-					uuid: createUuidGenerator(),
-					now: () => new Date('2019-09-04 12:00'),
-				},
-				getArgumentValues,
-				() => Promise.resolve(),
-			).create({
-				db,
-				identityVariables: test.variables || {},
-			}),
+			executionContainer: executionContainerFactory
+				.create({
+					permissions,
+					schema: { ...schema, id: 1 },
+					db,
+					identityVariables: test.variables || {},
+					identityId: '00000000-0000-0000-0000-000000000000',
+					systemSchema: 'system',
+					stage: { id: '00000000-0000-0000-0000-000000000000', slug: 'live' },
+					project: { slug: 'test' },
+				}),
 			timer: (label: any, cb: any) => cb(),
 		},
 		query: test.query,

package/tests/tsconfig.json

@@ -5,14 +5,8 @@
 		"esModuleInterop": true
 	},
 	"references": [
-		{
-			"path": "../src"
-		},
-		{
-			"path": "../../engine-api-tester/src"
-		},
-		{
-			"path": "../../schema-definition/src"
-		}
+		{ "path": "../src" },
+		{ "path": "../../engine-api-tester/src" },
+		{ "path": "../../schema-definition/src" }
 	]
 }

package/dist/src/mapper/MapperContainer.d.ts

@@ -1,18 +0,0 @@
-import { Mapper, MapperFactory } from '../mapper';
-import { Acl, Schema } from '@contember/schema';
-import { Client } from '@contember/database';
-import { Providers } from '@contember/schema-utils';
-declare type MapperContainerArgs = {
-    schema: Schema;
-    identityVariables: Acl.VariablesMap;
-    permissions: Acl.Permissions;
-    providers: Providers;
-};
-export interface MapperContainer {
-    mapperFactory: MapperFactory;
-}
-export declare const createMapperContainer: ({ permissions, schema, identityVariables, providers }: MapperContainerArgs) => import("@contember/dic").Container<{
-    mapperFactory: (db: Client) => Mapper;
-}>;
-export {};
-//# sourceMappingURL=MapperContainer.d.ts.map

package/dist/src/mapper/MapperContainer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MapperContainer.d.ts","sourceRoot":"","sources":["../../../src/mapper/MapperContainer.ts"],"names":[],"mappings":"AAYA,OAAO,EAON,MAAM,EACN,aAAa,EAOb,MAAM,WAAW,CAAA;AAElB,OAAO,EAAE,GAAG,EAAS,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,MAAM,EAAoC,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAMnD,aAAK,mBAAmB,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,GAAG,CAAC,YAAY,CAAA;IACnC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAA;IAC5B,SAAS,EAAE,SAAS,CAAA;CACpB,CAAA;AAED,MAAM,WAAW,eAAe;IAC/B,aAAa,EAAE,aAAa,CAAA;CAC5B;AAED,eAAO,MAAM,qBAAqB,0DAA2D,mBAAmB;wBA6EjG,MAAM;EAgBpB,CAAA"}

package/dist/src/mapper/MapperContainer.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMapperContainer = void 0;
-const acl_1 = require("../acl");
-const select_1 = require("./select");
-const inputProcessing_1 = require("../inputProcessing");
-const extensions_1 = require("../extensions");
-const mapper_1 = require("../mapper");
-const dic_1 = require("@contember/dic");
-const PaginatedHasManyExecutionHandler_1 = require("../extensions/paginatedHasMany/PaginatedHasManyExecutionHandler");
-const PaginatedHasManyFieldProvider_1 = require("../extensions/paginatedHasMany/PaginatedHasManyFieldProvider");
-const WhereOptimizer_1 = require("./select/optimizer/WhereOptimizer");
-const ConditionOptimizer_1 = require("./select/optimizer/ConditionOptimizer");
-const createMapperContainer = ({ permissions, schema, identityVariables, providers }) => {
-    const builder = new dic_1.Builder({})
-        .addService('providers', () => providers)
-        .addService('variableInjector', () => new acl_1.VariableInjector(schema.model, identityVariables))
-        .addService('predicateFactory', ({ variableInjector }) => new acl_1.PredicateFactory(permissions, schema.model, variableInjector))
-        .addService('predicatesInjector', ({ predicateFactory }) => new acl_1.PredicatesInjector(schema.model, predicateFactory))
-        .addService('joinBuilder', () => new select_1.JoinBuilder(schema.model))
-        .addService('conditionBuilder', () => new select_1.ConditionBuilder())
-        .addService('pathFactory', () => new mapper_1.PathFactory())
-        .addService('whereOptimized', () => new WhereOptimizer_1.WhereOptimizer(schema.model, new ConditionOptimizer_1.ConditionOptimizer()))
-        .addService('whereBuilder', ({ joinBuilder, conditionBuilder, pathFactory, whereOptimized }) => new select_1.WhereBuilder(schema.model, joinBuilder, conditionBuilder, pathFactory, whereOptimized, schema.settings.useExistsInHasManyFilter === true))
-        .addService('orderByBuilder', ({ joinBuilder }) => new select_1.OrderByBuilder(schema.model, joinBuilder))
-        .addService('relationFetcher', ({ whereBuilder, orderByBuilder, predicatesInjector, pathFactory }) => new select_1.RelationFetcher(whereBuilder, orderByBuilder, predicatesInjector, pathFactory))
-        .addService('fieldsVisitorFactory', ({ relationFetcher, predicateFactory, whereBuilder }) => new select_1.FieldsVisitorFactory(schema.model, relationFetcher, predicateFactory, whereBuilder))
-        .addService('metaHandler', ({ whereBuilder, predicateFactory }) => new select_1.MetaHandler(whereBuilder, predicateFactory))
-        .addService('uniqueWhereExpander', () => new inputProcessing_1.UniqueWhereExpander(schema.model))
-        .addService('hasManyToHasOneReducer', ({ uniqueWhereExpander }) => new extensions_1.HasManyToHasOneReducerExecutionHandler(schema.model, uniqueWhereExpander))
-        .addService('paginatedHasManyExecutionHandler', ({ relationFetcher }) => new PaginatedHasManyExecutionHandler_1.PaginatedHasManyExecutionHandler(schema.model, relationFetcher))
-        .addService('selectHandlers', ({ hasManyToHasOneReducer, paginatedHasManyExecutionHandler }) => ({
-        [extensions_1.HasManyToHasOneReducer.extensionName]: hasManyToHasOneReducer,
-        [PaginatedHasManyFieldProvider_1.PaginatedHasManyFieldProvider.extensionName]: paginatedHasManyExecutionHandler,
-    }))
-        .addService('selectBuilderFactory', ({ whereBuilder, orderByBuilder, fieldsVisitorFactory, metaHandler, selectHandlers, pathFactory, predicateFactory }) => new (class {
-        create(qb, hydrator, relationPath) {
-            return new mapper_1.SelectBuilder(schema.model, whereBuilder, orderByBuilder, metaHandler, qb, hydrator, fieldsVisitorFactory, selectHandlers, pathFactory, relationPath, predicateFactory);
-        }
-    })())
-        .addService('insertBuilderFactory', ({ whereBuilder, pathFactory, predicateFactory }) => new mapper_1.InsertBuilderFactory(schema.model, whereBuilder, pathFactory, predicateFactory))
-        .addService('updateBuilderFactory', ({ whereBuilder, pathFactory, predicateFactory }) => new mapper_1.UpdateBuilderFactory(schema.model, whereBuilder, pathFactory, predicateFactory))
-        .addService('connectJunctionHandler', () => new mapper_1.JunctionConnectHandler())
-        .addService('disconnectJunctionHandler', ({}) => new mapper_1.JunctionDisconnectHandler())
-        .addService('junctionTableManager', ({ predicateFactory, whereBuilder, connectJunctionHandler, disconnectJunctionHandler, pathFactory }) => new mapper_1.JunctionTableManager(schema.model, predicateFactory, whereBuilder, connectJunctionHandler, disconnectJunctionHandler, pathFactory))
-        .addService('deleteExecutor', ({ predicateFactory, updateBuilderFactory, whereBuilder, pathFactory }) => new mapper_1.DeleteExecutor(schema.model, predicateFactory, whereBuilder, updateBuilderFactory, pathFactory))
-        .addService('updater', ({ predicateFactory, updateBuilderFactory }) => new mapper_1.Updater(schema.model, predicateFactory, updateBuilderFactory))
-        .addService('inserter', ({ insertBuilderFactory, providers }) => new mapper_1.Inserter(schema.model, insertBuilderFactory, providers))
-        .addService('mapperFactory', ({ predicatesInjector, selectBuilderFactory, uniqueWhereExpander, whereBuilder, junctionTableManager, deleteExecutor, updater, inserter, pathFactory }) => {
-        return (db) => new mapper_1.Mapper(schema.model, db, predicatesInjector, selectBuilderFactory, uniqueWhereExpander, whereBuilder, junctionTableManager, deleteExecutor, updater, inserter, pathFactory);
-    });
-    return builder.build().pick('mapperFactory');
-};
-exports.createMapperContainer = createMapperContainer;
-//# sourceMappingURL=MapperContainer.js.map

package/dist/src/mapper/MapperContainer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MapperContainer.js","sourceRoot":"","sources":["../../../src/mapper/MapperContainer.ts"],"names":[],"mappings":"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"}

package/dist/src/resolvers/ExecutionContainerFactory.d.ts

@@ -1,24 +0,0 @@
-import { Container } from '@contember/dic';
-import { Acl, Schema } from '@contember/schema';
-import { Context } from '../types';
-import { ReadResolver } from './ReadResolver';
-import { MutationResolver } from './MutationResolver';
-import { Client } from '@contember/database';
-import { ValidationResolver } from './ValidationResolver';
-import { Providers } from '@contember/schema-utils';
-import { getArgumentValues } from 'graphql';
-export interface ExecutionContainer {
-    readResolver: ReadResolver;
-    mutationResolver: MutationResolver;
-    validationResolver: ValidationResolver;
-}
-export declare class ExecutionContainerFactory {
-    private readonly schema;
-    private readonly permissions;
-    private readonly providers;
-    private readonly argumentValuesResolver;
-    private readonly setupSystemVariables;
-    constructor(schema: Schema, permissions: Acl.Permissions, providers: Providers, argumentValuesResolver: typeof getArgumentValues, setupSystemVariables: (db: Client) => Promise<void>);
-    create(context: Pick<Context, 'db' | 'identityVariables'>): Container<ExecutionContainer>;
-}
-//# sourceMappingURL=ExecutionContainerFactory.d.ts.map

package/dist/src/resolvers/ExecutionContainerFactory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ExecutionContainerFactory.d.ts","sourceRoot":"","sources":["../../../src/resolvers/ExecutionContainerFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,SAAS,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAS5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAG3C,MAAM,WAAW,kBAAkB;IAClC,YAAY,EAAE,YAAY,CAAA;IAC1B,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,kBAAkB,EAAE,kBAAkB,CAAA;CACtC;AAED,qBAAa,yBAAyB;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBAJpB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,GAAG,CAAC,WAAW,EAC5B,SAAS,EAAE,SAAS,EACpB,sBAAsB,EAAE,OAAO,iBAAiB,EAChD,oBAAoB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;IAG9D,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,mBAAmB,CAAC,GAAG,SAAS,CAAC,kBAAkB,CAAC;CAsChG"}

package/dist/src/resolvers/ExecutionContainerFactory.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExecutionContainerFactory = void 0;
-const dic_1 = require("@contember/dic");
-const ReadResolver_1 = require("./ReadResolver");
-const MutationResolver_1 = require("./MutationResolver");
-const input_validation_1 = require("../input-validation");
-const ValidationResolver_1 = require("./ValidationResolver");
-const GraphQlQueryAstFactory_1 = require("./GraphQlQueryAstFactory");
-const mapper_1 = require("../mapper");
-class ExecutionContainerFactory {
-    constructor(schema, permissions, providers, argumentValuesResolver, setupSystemVariables) {
-        this.schema = schema;
-        this.permissions = permissions;
-        this.providers = providers;
-        this.argumentValuesResolver = argumentValuesResolver;
-        this.setupSystemVariables = setupSystemVariables;
-    }
-    create(context) {
-        const mapperContainer = (0, mapper_1.createMapperContainer)({
-            permissions: this.permissions,
-            identityVariables: context.identityVariables,
-            providers: this.providers,
-            schema: this.schema,
-        });
-        const innerDic = new dic_1.Builder({})
-            .addService('db', () => context.db)
-            .addService('providers', () => this.providers)
-            .addService('mapperFactory', () => mapperContainer.mapperFactory)
-            .addService('queryAstFactory', () => new GraphQlQueryAstFactory_1.GraphQlQueryAstFactory(this.argumentValuesResolver))
-            .addService('readResolver', ({ db, mapperFactory, queryAstFactory }) => new ReadResolver_1.ReadResolver(db, mapperFactory, queryAstFactory))
-            .addService('validationDependencyCollector', () => new input_validation_1.DependencyCollector())
-            .addService('validationQueryAstFactory', () => new input_validation_1.QueryAstFactory(this.schema.model))
-            .addService('dataSelector', ({ validationQueryAstFactory }) => new input_validation_1.ValidationDataSelector(this.schema.model, validationQueryAstFactory))
-            .addService('columnValueResolver', ({ providers }) => new input_validation_1.ColumnValueResolver(providers))
-            .addService('entityRulesResolver', () => new input_validation_1.EntityRulesResolver(this.schema.validation, this.schema.model))
-            .addService('inputPreValidator', ({ entityRulesResolver, columnValueResolver, dataSelector }) => new input_validation_1.InputPreValidator(this.schema.model, entityRulesResolver, columnValueResolver, dataSelector))
-            .addService('mutationResolver', ({ db, mapperFactory, inputPreValidator, queryAstFactory }) => new MutationResolver_1.MutationResolver(this.schema.model, db, mapperFactory, this.setupSystemVariables, inputPreValidator, queryAstFactory))
-            .addService('validationResolver', ({ inputPreValidator, db, mapperFactory }) => new ValidationResolver_1.ValidationResolver(db, mapperFactory, inputPreValidator))
-            .build();
-        return innerDic.pick('readResolver', 'mutationResolver', 'validationResolver');
-    }
-}
-exports.ExecutionContainerFactory = ExecutionContainerFactory;
-//# sourceMappingURL=ExecutionContainerFactory.js.map

package/dist/src/resolvers/ExecutionContainerFactory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ExecutionContainerFactory.js","sourceRoot":"","sources":["../../../src/resolvers/ExecutionContainerFactory.ts"],"names":[],"mappings":"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"}